lostinpatterns-dailymile-client 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,34 +1,20 @@
 = dailymile-client
 
-Example usage:
+Before getting started:
 
-  dailymile = DailymileClient.new(CONSUMER_KEY, CONSUMER_SECRET, :token => '', :secret => '')
-
-  # get a specific entry
-  dailymile.entry(1)
+  You'll want to register your app here:
   
-  # get the public feed
-  dailymile.entries :page => 2
-
-  # get the user's entries
-  dailymile.entries("ben")
+  http://www.dailymile.com/api/consumers/new
 
-  # get friends of the given user
-  dailymile.friends("ben")
+Documentation:
 
-  # get the info for a user
-  dailymile.user "ben"
+  You can read the API documentation here:
   
-  # post a workout
-  dailymile.authenticated_user.post_workout("hill repeats. tough stuff!", 
-                                            :duration => 30.minutes, :type => 'running', 
-                                            :distance => { :value => 5.5, :units => 'miles' })
-                                            
-  # post a note
-  dailymile.authenticated_user.post_workout "think today is a rest day!"
-
-  # you and friends feed for the authenticated user
-  dailymile.authenticated_user.entries 
+  http://www.dailymile.com/api/documentation
+  
+  You can view an example of using this client here:
+  
+  http://www.dailymile.com/api/documentation/example
 
 == Note on Patches/Pull Requests
  

data/VERSION

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

data/dailymile-client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dailymile-client}
-  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"]
-  s.date = %q{2009-08-01}
+  s.date = %q{2009-08-02}
   s.description = %q{TODO: longer description of your gem}
   s.email = %q{blweiner@gmail.com}
   s.extra_rdoc_files = [

data/lib/dailymile-client/client.rb

@@ -13,8 +13,22 @@ module Dailymile
     def initialize(consumer_key, consumer_secret, options = {})
       @consumer = OAuth::Consumer.new(consumer_key, consumer_secret,
                                       :site => File.join(API_PROTOCOL, API_HOST))
-      @access_token = OAuth::AccessToken.new(@consumer, options[:token], options[:secret])
       @authenticated_user = AuthenticatedUser.new(self)
+      
+      if token = options[:token] and secret = options[:secret]
+        @access_token = OAuth::AccessToken.new(@consumer, token, secret)
+      end
+    end
+    
+    # TODO: add timeouts
+    def get_request_token
+      @consumer.get_request_token
+    end
+    
+    # TODO: add timeouts
+    def get_access_token(token, secret, verifier)
+      request_token = OAuth::RequestToken.new(@consumer, token, secret)
+      request_token.get_access_token(:oauth_verifier => verifier)
     end
     
     def entries(*args)
@@ -39,21 +53,28 @@ module Dailymile
     
     def post(path, params = {})
       set_format! path
-      handle_response @access_token.post(path, params.to_json, DEFAULT_REQUEST_HEADERS)
+      handle_response access_token.post(path, params.to_json, DEFAULT_REQUEST_HEADERS)
     end
   
     def get(path, params = {})
       set_format! path
       path << params.to_query_string unless params.empty?
-      handle_response @access_token.get(path)
+      handle_response access_token.get(path)
     end
   
     def delete(path)
-      handle_response @access_token.delete(path)
+      handle_response access_token.delete(path)
     end
     
   private
   
+    def access_token
+      if @access_token.nil?
+        raise DailymileException, "You aren't authorized! Initialize client with access token and secret or ask for a request token."
+      end
+      @access_token
+    end
+  
     def extract_options_from_args!(args)
       args.last.is_a?(Hash) ? args.pop : {}
     end
@@ -66,7 +87,7 @@ module Dailymile
     
     def handle_response(response)
       case response
-      when Net::HTTPOK:           JSON.parse(response.body)
+      when Net::HTTPOK:           JSON.parse(response.body) rescue nil
       when Net::HTTPNotFound:     raise NotFound
       when Net::HTTPUnauthorized: raise Unauthorized
       when Net::HTTPBadGateway:   raise Unavailable

data/lib/dailymile-client.rb

@@ -7,8 +7,7 @@ require File.dirname(__FILE__) + '/dailymile-client/authenticated_user'
 
 module Dailymile
   
-  #API_HOST = 'api.dailymile.com'
-  API_HOST     = 'localhost:3000'
+  API_HOST = 'api.dailymile.com'
   API_PROTOCOL = 'http://'
   
   class DailymileException < StandardError; end
@@ -26,4 +25,58 @@ module Dailymile
     end
   end
   
+end
+
+# http://github.com/mojodna/oauth/commit/37fa79cc988f8eaaf1c6b966f6190b14476d95a1
+# fix for oauth 0.3.5
+class OAuth::Consumer
+  
+  def create_http_request(http_method, path, *arguments)
+    http_method = http_method.to_sym
+  
+    if [:post, :put].include?(http_method)
+      data = arguments.shift
+      data.reject! { |k,v| v.nil? } if data.is_a?(Hash)
+    end
+  
+    headers = arguments.first.is_a?(Hash) ? arguments.shift : {}
+
+    case http_method
+    when :post
+      request = Net::HTTP::Post.new(path,headers)
+      request["Content-Length"] = 0 # Default to 0
+    when :put
+      request = Net::HTTP::Put.new(path,headers)
+      request["Content-Length"] = 0 # Default to 0
+    when :get
+      request = Net::HTTP::Get.new(path,headers)
+    when :delete
+      request =  Net::HTTP::Delete.new(path,headers)
+    when :head
+      request = Net::HTTP::Head.new(path,headers)
+    else
+      raise ArgumentError, "Don't know how to handle http_method: :#{http_method.to_s}"
+    end
+
+    if data.is_a?(Hash)
+      request.set_form_data(data)
+    elsif data
+      if data.respond_to?(:read)
+        request.body_stream = data
+        if data.respond_to?(:length)
+          request["Content-Length"] = data.length
+        elsif data.respond_to?(:stat) && data.stat.respond_to?(:size)
+          request["Content-Length"] = data.stat.size
+        else
+          raise ArgumentError, "Don't know how to send a body_stream that doesn't respond to .length or .stat.size"
+        end
+      else
+        request.body = data.to_s
+        request["Content-Length"] = request.body.length
+      end
+    end
+
+    request
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lostinpatterns-dailymile-client
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - lostinpatterns
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 -07:00
+date: 2009-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: []