desk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: f5707b5b210f15d2441f5601fc18344b89046e2d6b79aef3f86dc0b8aba22fe0eb7e2e1de36b867dd72c6b4b84549e3097de6067f8cf9c25fa34ae4878b15963
-  metadata.gz: 9ec58c7e7f4a6b0ea44dd9ae678a81777923e3e0a64ca75a088959088247c54552eb18427c1a8f42777ca9020d215d587d95953a7de167d46c5df1eb2305f684
 SHA1: 
-  data.tar.gz: c5c8e13964633c35df237320f14a3c2dd3dc6af5
-  metadata.gz: 47e3d104d111e35c853d8ffcd0dfb8a7c95900ce
+  data.tar.gz: 431843df69ff391f0895bef451f4342a657b0613
+  metadata.gz: f975d744573fdd39377aeb18ed2b66d5d0e425d4
+SHA512: 
+  data.tar.gz: fb0efe6acca7471194aa91072690210addc1b79d2838127010b687568624344eeb8c5e39124727114f5751eeb777f67b56998fde3b81db0fc74b3f7286491cbe
+  metadata.gz: 43e7560e18b054ef3eb2216af88f4c3409de90304a4f81da39cb9674baf6b7b992f5a3e12e621c487acfab4da3e57235937cbd83c4b4efdbd6072d7de2c20c48

data/Gemfile

@@ -4,9 +4,7 @@ gemspec
 
 
 group :development do
-  gem "ruby-debug"
 end
 
 group :test do
-  gem "ruby-debug"
-end
+end

data/desk.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('yard', '~> 0.6')
   s.add_runtime_dependency('json', '~> 1.7')  if RUBY_VERSION < '1.9'
   s.add_runtime_dependency('hashie', '~> 1.2.0')
-  s.add_runtime_dependency('faraday', '~> 0.8.0')
+  s.add_runtime_dependency('faraday', '~> 0.9.0')
   s.add_runtime_dependency('faraday_middleware', '~> 0.9.0')
   s.add_runtime_dependency('jruby-openssl', '~> 0.7.2') if RUBY_PLATFORM == 'java'
   s.add_runtime_dependency('multi_json', '~> 1.6')

data/lib/desk/error.rb

@@ -10,19 +10,19 @@ module Desk
     end
 
     def ratelimit_reset
-      Time.at(@http_headers.values_at('x-ratelimit-reset', 'X-RateLimit-Reset').detect {|value| value }.to_i)
+      @http_headers.values_at('x-rate-limit-reset', 'X-Rate-Limit-Reset').detect {|value| value }.to_i
     end
 
     def ratelimit_limit
-      @http_headers.values_at('x-ratelimit-limit', 'X-RateLimit-Limit').detect {|value| value }.to_i
+      @http_headers.values_at('x-rate-limit-limit', 'X-Rate-Limit-Limit').detect {|value| value }.to_i
     end
 
     def ratelimit_remaining
-      @http_headers.values_at('x-ratelimit-limit', 'X-RateLimit-Limit').detect {|value| value }.to_i
+      @http_headers.values_at('x-rate-limit-remaining', 'X-Rate-Limit-Remaining').detect {|value| value }.to_i
     end
 
     def retry_after
-      [(ratelimit_reset - Time.now).ceil, 0].max
+      ratelimit_reset
     end
   end
 
@@ -41,15 +41,9 @@ module Desk
   # Raised when Desk returns the HTTP status code 406
   class NotAcceptable < Error; end
 
-  # Raised when Desk returns the HTTP status code 420
-  class EnhanceYourCalm < Error
-    # The number of seconds your application should wait before requesting date from the Search API again
-    #
-    # @see http://dev.desk.com/pages/rate-limiting
-    def retry_after
-      @http_headers.values_at('retry-after', 'Retry-After').detect {|value| value }.to_i
-    end
-  end
+  # Raised when Desk returns the HTTP status code 429
+  # Called EnhanceYourCalm because TooManyRequests is taken (see below)
+  class EnhanceYourCalm < Error; end
   
   # Raised when Desk max_requests is reached and use_max_requests is set to true
   class TooManyRequests < StandardError; end

data/lib/desk/version.rb

@@ -1,4 +1,4 @@
 module Desk
   # The version of the gem
-  VERSION = '1.0.0'.freeze unless defined?(::Desk::VERSION)
+  VERSION = '1.0.1'.freeze unless defined?(::Desk::VERSION)
 end

data/lib/faraday/response/raise_http_4xx.rb

@@ -16,7 +16,7 @@ module Faraday
         raise Desk::NotFound.new(error_message(env), env[:response_headers])
       when 406
         raise Desk::NotAcceptable.new(error_message(env), env[:response_headers])
-      when 420
+      when 429
         raise Desk::EnhanceYourCalm.new(error_message(env), env[:response_headers])
       end
     end

data/spec/faraday/response_spec.rb

@@ -11,7 +11,7 @@ describe Faraday::Response do
     403 => Desk::Forbidden,
     404 => Desk::NotFound,
     406 => Desk::NotAcceptable,
-    420 => Desk::EnhanceYourCalm,
+    429 => Desk::EnhanceYourCalm,
     500 => Desk::InternalServerError,
     502 => Desk::BadGateway,
     503 => Desk::ServiceUnavailable,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desk
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Chris Warren
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-31 00:00:00 Z
+date: 2014-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -118,7 +118,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency