Allow using the response_headers or headers when getting the Rate Lim…

…it information from the headers

lib/octokit/rate_limit.rb

@@ -20,10 +20,12 @@ class RateLimit < Struct.new(:limit, :remaining, :resets_at, :resets_in)
  # @return [RateLimit]
  def self.from_response(response)
  info = new
- if response.respond_to?(:headers) && !response.headers.nil?
- info.limit = (response.headers['X-RateLimit-Limit'] || 1).to_i
- info.remaining = (response.headers['X-RateLimit-Remaining'] || 1).to_i
- info.resets_at = Time.at((response.headers['X-RateLimit-Reset'] || Time.now).to_i)
+ headers = response.headers if response.respond_to?(:headers) && !response.headers.nil?
+ headers ||= response.response_headers if response.respond_to?(:response_headers) && !response.response_headers.nil?
+ if headers
+ info.limit = (headers['X-RateLimit-Limit'] || 1).to_i
+ info.remaining = (headers['X-RateLimit-Remaining'] || 1).to_i
+ info.resets_at = Time.at((headers['X-RateLimit-Reset'] || Time.now).to_i)
  info.resets_in = [(info.resets_at - Time.now).to_i, 0].max
  end
 

spec/octokit/client_spec.rb

@@ -1167,12 +1167,13 @@
  stub_get('/user').to_return \
  status: 403,
  headers: {
- 'content_type' => 'application/json'
+ 'content_type' => 'application/json',
+ 'X-RateLimit-Limit' => 60,
+ 'X-RateLimit-Remaining' => 42,
+ 'X-RateLimit-Reset' => (Time.now + 60).to_i
  },
  body: { message: 'rate limit exceeded' }.to_json
  begin
- rate_limit_headers = { 'X-RateLimit-Limit' => 60, 'X-RateLimit-Remaining' => 42, 'X-RateLimit-Reset' => (Time.now + 60).to_i }
- expect_any_instance_of(Faraday::Env).to receive(:headers).at_least(:once).and_return(rate_limit_headers)
  Octokit.get('/user')
  rescue Octokit::TooManyRequests => e
  expect(e.context).to be_an_instance_of(Octokit::RateLimit)
@@ -1189,7 +1190,6 @@
  },
  body: { message: 'You have exceeded a secondary rate limit.' }.to_json
  begin
- expect_any_instance_of(Faraday::Env).to receive(:headers).at_least(:once).and_return({})
  Octokit.get('/user')
  rescue Octokit::TooManyRequests => e
  expect(e.context).to be_an_instance_of(Octokit::RateLimit)
@@ -1200,12 +1200,13 @@
  stub_get('/user').to_return \
  status: 403,
  headers: {
- 'content_type' => 'application/json'
+ 'content_type' => 'application/json',
+ 'X-RateLimit-Limit' => 60,
+ 'X-RateLimit-Remaining' => 42,
+ 'X-RateLimit-Reset' => (Time.now + 60).to_i 
  },
  body: { message: 'You have exceeded a secondary rate limit.' }.to_json
  begin
- rate_limit_headers = { 'X-RateLimit-Limit' => 60, 'X-RateLimit-Remaining' => 42, 'X-RateLimit-Reset' => (Time.now + 60).to_i }
- expect_any_instance_of(Faraday::Env).to receive(:headers).at_least(:once).and_return(rate_limit_headers)
  Octokit.get('/user')
  rescue Octokit::TooManyRequests => e
  expect(e.context).to be_an_instance_of(Octokit::RateLimit)

spec/octokit/rate_limit_spec.rb

@@ -16,7 +16,7 @@
  let(:response) { double('response') }
 
  it 'parses rate limit info from response headers' do
- expect(response).to receive(:headers)
+ expect(response).to receive(:response_headers)
  .at_least(:once)
  .and_return(response_headers)
  info = described_class.from_response(response)
@@ -27,7 +27,7 @@
  end
 
  it 'returns a positive rate limit for Enterprise' do
- expect(response).to receive(:headers)
+ expect(response).to receive(:response_headers)
  .at_least(:once)
  .and_return({})
  info = described_class.from_response(response)
@@ -46,7 +46,7 @@
  end
 
  it 'handles resets_in time in past' do
- expect(response).to receive(:headers)
+ expect(response).to receive(:response_headers)
  .at_least(:once)
  .and_return(
  response_headers.merge('X-RateLimit-Reset' => (Time.now - 60).to_i)