dailymile-ruby 0.1.0 → 0.1.1

data/Rakefile

@@ -11,8 +11,9 @@ begin
     gem.homepage = "http://github.com/dailymile/dailymile-ruby"
     gem.authors = ["lostinpatterns"]
     
-    gem.add_dependency("oauth2", "0.0.13")
+    gem.add_dependency("faraday", "~> 0.4.1")
     gem.add_dependency("json_pure")
+    gem.add_dependency("oauth2", "0.0.13")
     
     # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/dailymile-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dailymile-ruby}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lostinpatterns"]
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
      "dailymile-ruby.gemspec",
      "lib/dailymile.rb",
      "lib/dailymile/client.rb",
-     "lib/dailymile/token.rb",
+     "lib/dailymile/connection.rb",
+     "lib/dailymile/connection/token.rb",
      "lib/oauth2_monkey_patches.rb",
      "test/helper.rb",
      "test/test_dailymile-ruby.rb"
@@ -46,15 +47,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_runtime_dependency(%q<oauth2>, ["= 0.0.13"])
     else
-      s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_dependency(%q<faraday>, ["~> 0.4.1"])
       s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<oauth2>, ["= 0.0.13"])
     end
   else
-    s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+    s.add_dependency(%q<faraday>, ["~> 0.4.1"])
     s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<oauth2>, ["= 0.0.13"])
   end
 end
 

data/lib/dailymile.rb

@@ -1,8 +1,10 @@
-require 'oauth2'
+require 'faraday'
 require 'json'
+require 'oauth2'
 
 require 'oauth2_monkey_patches'
-require 'dailymile/token'
+require 'dailymile/connection'
+require 'dailymile/connection/token'
 require 'dailymile/client'
 
 module Dailymile

data/lib/dailymile/client.rb

@@ -2,41 +2,41 @@ require 'forwardable'
 
 module Dailymile
   
-  DEFAULT_FORMAT = 'json'
   STREAM_FILTERS = %w(nearby popular)
   
   class Client
     extend Forwardable
     
-    attr_reader :access_token
-    def_delegators :access_token, :get, :post, :put, :delete
+    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)
+    end
+    
+    def self.get(*args); connection.get(*args) end
     
     def self.set_client_credentials(client_id, client_secret)
-      @@client = OAuth2::Client.new(client_id, client_secret,
+      @@oauth_client = OAuth2::Client.new(client_id, client_secret,
         :site => BASE_URI,
         :access_token_path => OAUTH_TOKEN_PATH,
         :authorize_path => OAUTH_AUTHORIZE_PATH
       )
     end
     
-    def initialize(token = nil)
-      @@client ||= OAuth2::Client.new('', '', :site => BASE_URI) # HACK: dummy client
-      
-      @access_token = Token.new(@@client, token)
-    end
-    
     # EXAMPLES:
     #   everyone stream: client.entries
     #   nearby stream: client.entries :nearby, 37.77916, -122.420049, :page => 2
-    #   ben's stream: client.entries :ben, :page => 2
-    def entries(*args)
+    #   ben's stream: client.entries 'ben', :page => 2
+    def self.entries(*args)
       params = extract_options_from_args!(args)
       filter = args.shift
     
       entries_path = case filter
       when String, Symbol
         filter = filter.to_s.strip
-    
+        
         if STREAM_FILTERS.include?(filter)
           if filter == 'nearby'
             lat, lon = args
@@ -55,12 +55,17 @@ module Dailymile
       data["entries"]
     end
     
+    
   private
     
-    def extract_options_from_args!(args)
+    def self.extract_options_from_args!(args)
       args.last.is_a?(Hash) ? args.pop : {}
     end
     
+    def self.connection
+      @@connection ||= Connection.new
+    end
+    
   end
   
 end

data/lib/dailymile/{token.rb → connection.rb}

@@ -1,15 +1,12 @@
 module Dailymile
   
-  class Token
+  class Connection
     
-    def initialize(client, token)
-      @client = client
-      set_access_token token
-    end
-    
-    def access_token=(token)
-      set_access_token token
-    end
+    DEFAULT_FORMAT = :json
+    DEFAULT_HEADERS = {
+      'Accept' =>  'application/json',
+      'User-Agent' => "dailymile-ruby/#{VERSION}"
+    }
     
     def get(path, params = {})
       request :get, path, params
@@ -27,16 +24,36 @@ module Dailymile
       request :delete, path
     end
     
-  private
+  protected
   
-    def request(verb, path, params = {}, headers = {})
+    def make_request(verb, path, params = {}, headers = {}, &block)
       path << ".#{DEFAULT_FORMAT}" unless path =~ /.+\.\w+$/
       path << to_query_string(params) unless params.empty?
       
-      response = @access_token.request(verb, path, {}, default_headers.merge(headers))
+      response = block.call verb, path, {}, DEFAULT_HEADERS.merge(headers)
+      
       handle_response(response)
     end
     
+  private
+  
+    def request(verb, path, params = {}, headers = {})
+      @connection ||= Faraday::Connection.new(:url => "http://api.dailymile.com", :headers => DEFAULT_HEADERS) do |builder|
+        builder.adapter Faraday.default_adapter
+        #builder.use Faraday::Response::Mashify
+      end
+      
+      make_request(verb, path, params, headers) do |verb, path, params, headers|
+        if verb == :get
+          @connection.run_request(verb, path, nil, headers) do |req|
+            req.params.update(params)
+          end
+        else
+          @connection.run_request(verb, path, params, headers)
+        end
+      end
+    end
+  
     def handle_response(response)
       case response.status
       when 200, 201
@@ -47,7 +64,7 @@ module Dailymile
         raise Unauthorized
       when 403
         raise Forbidden, "Not using HTTP over TLS"
-    when 503, 502
+      when 503, 502
         if response.status == 503 && response['Retry-After']
           raise RateLimitExceeded
         else
@@ -72,17 +89,6 @@ module Dailymile
         end
       end.join('&')
     end
-  
-    def default_headers
-      {
-        'Accept' =>  'application/json',
-        'User-Agent' => "dailymile-ruby/#{VERSION}"
-      }
-    end
-    
-    def set_access_token(token)
-      @access_token = OAuth2::AccessToken.new(@client, token)
-    end
     
   end
   

data/lib/dailymile/connection/token.rb

@@ -0,0 +1,28 @@
+module Dailymile
+  
+  class Connection::Token < Connection
+    
+    def initialize(client, token)
+      @client = client
+      set_access_token token
+    end
+    
+    def access_token=(token)
+      set_access_token token
+    end
+    
+  private
+  
+    def request(verb, path, params = {}, headers = {})
+      make_request(verb, path, params, headers) do |verb, path, params, headers|
+        @access_token.request(verb, path, params, headers)
+      end
+    end
+    
+    def set_access_token(token)
+      @access_token = OAuth2::AccessToken.new(@client, token)
+    end
+    
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dailymile-ruby
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - lostinpatterns
@@ -19,19 +19,19 @@ date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 13
         segments: 
         - 0
-        - 0
-        - 13
-        version: 0.0.13
+        - 4
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: oauth2
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 0
+        - 13
+        version: 0.0.13
+  type: :runtime
+  version_requirements: *id003
 description: This gem wraps the dailymile API that's available at http://www.dailymile.com/api
 email: blweiner@gmail.com
 executables: []
@@ -67,7 +83,8 @@ files:
 - dailymile-ruby.gemspec
 - lib/dailymile.rb
 - lib/dailymile/client.rb
-- lib/dailymile/token.rb
+- lib/dailymile/connection.rb
+- lib/dailymile/connection/token.rb
 - lib/oauth2_monkey_patches.rb
 - test/helper.rb
 - test/test_dailymile-ruby.rb