dailymile-ruby 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dailymile-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dailymile-ruby}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lostinpatterns"]

data/lib/dailymile/client.rb

@@ -10,9 +10,7 @@ module Dailymile
     def_instance_delegators :@connection, :get, :post, :put, :delete
     
     def initialize(token = nil)
-      raise "Please call set_client_credentials first" if @@oauth_client.nil?
-      
-      @connection = Connection::Token.new(@@oauth_client, token)
+      @connection = Connection::Token.new(self.class.oauth_client, token)
     end
     
     def self.get(*args); connection.get(*args) end
@@ -25,6 +23,12 @@ module Dailymile
       )
     end
     
+    def self.oauth_client
+      raise "Please call set_client_credentials first" if @@oauth_client.nil?
+      
+      @@oauth_client
+    end
+    
     # EXAMPLES:
     #   everyone stream: client.entries
     #   nearby stream: client.entries :nearby, 37.77916, -122.420049, :page => 2

data/lib/dailymile/connection.rb

@@ -57,7 +57,7 @@ module Dailymile
     def handle_response(response)
       case response.status
       when 200, 201
-        JSON.parse(response.body) rescue nil
+        JSON.parse(response) rescue nil
       when 404
         raise NotFound
       when 401
@@ -65,16 +65,18 @@ module Dailymile
       when 403
         raise Forbidden, "Not using HTTP over TLS"
       when 503, 502
-        if response.status == 503 && response['Retry-After']
-          raise RateLimitExceeded
+        retry_after = response.headers['Retry-After'] || response.headers['retry-after']
+        
+        if response.status == 503 && retry_after
+          raise RateLimitExceeded, "Retry-After: #{retry_after}"
         else
-          raise Unavailable, "#{response.status}: #{response.body}"
+          raise Unavailable, "#{response.status}: #{response}"
         end
       when 422
-        errors = JSON.parse(response.body) rescue nil
+        errors = JSON.parse(response) rescue nil
         raise UnprocessableEntity, errors
       else
-        raise DailymileError,"#{response.status}: #{response.body}"
+        raise DailymileError,"#{response.status}: #{response}"
       end
     end
     

data/lib/oauth2_monkey_patches.rb

@@ -8,15 +8,4 @@ module OAuth2
       @client.request(verb, path, params)
     end
   end
-  class Client
-    def request(verb, url, params = {}, headers = {})
-      if verb == :get
-        connection.run_request(verb, url, nil, headers) do |req|
-          req.params.update(params)
-        end
-      else
-        connection.run_request(verb, url, params, headers)
-      end
-    end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dailymile-ruby
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - lostinpatterns