dailymile-ruby 0.1.3 → 0.2.0

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'psych'
 require 'rake'
 
 begin
@@ -11,9 +12,9 @@ begin
     gem.homepage = "http://github.com/dailymile/dailymile-ruby"
     gem.authors = ["lostinpatterns"]
     
-    gem.add_dependency("faraday", "~> 0.4.1")
+    gem.add_dependency("faraday", "~> 0.5.7")
     gem.add_dependency("json_pure")
-    gem.add_dependency("oauth2", "0.0.13")
+    gem.add_dependency("oauth2", "0.1.1")
     
     # 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.3
+0.2.0

data/dailymile-ruby.gemspec

@@ -1,64 +1,60 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dailymile-ruby}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lostinpatterns"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2011-03-10}
   s.description = %q{This gem wraps the dailymile API that's available at http://www.dailymile.com/api}
   s.email = %q{blweiner@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dailymile-ruby.gemspec",
-     "lib/dailymile.rb",
-     "lib/dailymile/client.rb",
-     "lib/dailymile/connection.rb",
-     "lib/dailymile/connection/token.rb",
-     "lib/oauth2_monkey_patches.rb",
-     "test/helper.rb",
-     "test/test_dailymile-ruby.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dailymile-ruby.gemspec",
+    "lib/dailymile.rb",
+    "lib/dailymile/client.rb",
+    "lib/dailymile/connection.rb",
+    "lib/dailymile/connection/token.rb",
+    "test/helper.rb",
+    "test/test_dailymile-ruby.rb"
   ]
   s.homepage = %q{http://github.com/dailymile/dailymile-ruby}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{dailymile ruby client}
   s.test_files = [
     "test/helper.rb",
-     "test/test_dailymile-ruby.rb"
+    "test/test_dailymile-ruby.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.5.7"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_runtime_dependency(%q<oauth2>, ["= 0.1.1"])
     else
-      s.add_dependency(%q<faraday>, ["~> 0.4.1"])
+      s.add_dependency(%q<faraday>, ["~> 0.5.7"])
       s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+      s.add_dependency(%q<oauth2>, ["= 0.1.1"])
     end
   else
-    s.add_dependency(%q<faraday>, ["~> 0.4.1"])
+    s.add_dependency(%q<faraday>, ["~> 0.5.7"])
     s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<oauth2>, ["= 0.0.13"])
+    s.add_dependency(%q<oauth2>, ["= 0.1.1"])
   end
 end
 

data/lib/dailymile.rb

@@ -2,15 +2,11 @@ require 'faraday'
 require 'json'
 require 'oauth2'
 
-require 'oauth2_monkey_patches'
-require 'dailymile/connection'
-require 'dailymile/connection/token'
-require 'dailymile/client'
-
 module Dailymile
   
   VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
-  BASE_URI = 'https://api.dailymile.com'
+  HOST = 'api.dailymile.com'
+  BASE_URI = "https://#{HOST}"
   OAUTH_AUTHORIZE_PATH = '/oauth/authorize'
   OAUTH_TOKEN_PATH = '/oauth/token'
   
@@ -29,4 +25,8 @@ module Dailymile
     end
   end
   
-end
+end
+
+require 'dailymile/connection' # require File.expand_path(File.dirname(__FILE__) + '/dailymile/connection')
+require 'dailymile/connection/token'
+require 'dailymile/client'

data/lib/dailymile/client.rb

@@ -30,13 +30,13 @@ module Dailymile
     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
+    #   everyone stream: Dailymile::Client.entries
+    #   nearby stream:   Dailymile::Client.entries :nearby, 37.77916, -122.420049, :page => 2
+    #   ben's stream:    Dailymile::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
@@ -54,12 +54,11 @@ module Dailymile
       else
         '/entries'
       end
-    
+      
       data = get entries_path, params
       data["entries"]
     end
     
-    
   private
     
     def self.extract_options_from_args!(args)

data/lib/dailymile/connection.rb

@@ -5,7 +5,7 @@ module Dailymile
     DEFAULT_FORMAT = :json
     DEFAULT_HEADERS = {
       'Accept' =>  'application/json',
-      'User-Agent' => "dailymile-ruby/#{VERSION}"
+      'User-Agent' => "dailymile-ruby/#{Dailymile::VERSION}"
     }
     
     def get(path, params = {})
@@ -28,9 +28,13 @@ module Dailymile
   
     def make_request(verb, path, params = {}, headers = {}, &block)
       path << ".#{DEFAULT_FORMAT}" unless path =~ /.+\.\w+$/
-      path << to_query_string(params) unless params.empty?
       
-      response = block.call verb, path, {}, DEFAULT_HEADERS.merge(headers)
+      if verb == :get
+        path << to_query_string(params) unless params.empty?
+        params = {}
+      end
+      
+      response = block.call verb, path, params, DEFAULT_HEADERS.merge(headers)
       
       handle_response(response)
     end
@@ -38,7 +42,7 @@ module Dailymile
   private
   
     def request(verb, path, params = {}, headers = {})
-      @connection ||= Faraday::Connection.new(:url => "http://api.dailymile.com", :headers => DEFAULT_HEADERS) do |builder|
+      @connection ||= Faraday::Connection.new(:url => "http://#{Dailymile::HOST}", :headers => DEFAULT_HEADERS) do |builder|
         builder.adapter Faraday.default_adapter
         #builder.use Faraday::Response::Mashify
       end
@@ -57,7 +61,7 @@ module Dailymile
     def handle_response(response)
       case response.status
       when 200, 201
-        JSON.parse(response) rescue nil
+        JSON.parse(response) unless response.nil? # rescue nil
       when 404
         raise NotFound
       when 401
@@ -73,7 +77,7 @@ module Dailymile
           raise Unavailable, "#{response.status}: #{response}"
         end
       when 422
-        errors = JSON.parse(response) rescue nil
+        errors = JSON.parse(response) unless response.nil? # rescue nil
         raise UnprocessableEntity, errors
       else
         raise DailymileError,"#{response.status}: #{response}"

data/lib/dailymile/connection/token.rb

@@ -21,6 +21,7 @@ module Dailymile
     
     def set_access_token(token)
       @access_token = OAuth2::AccessToken.new(@client, token)
+      @access_token.token_param = 'oauth_token'
     end
     
   end

metadata

@@ -1,81 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dailymile-ruby
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - lostinpatterns
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-11 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-03-10 00:00:00.000000000 -08:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153329620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
+      - !ruby/object:Gem::Version
+        version: 0.5.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153329620
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2153329080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: oauth2
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153329080
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: &2153328580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 0
-        - 13
-        version: 0.0.13
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153328580
 description: This gem wraps the dailymile API that's available at http://www.dailymile.com/api
 email: blweiner@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,43 +63,33 @@ files:
 - lib/dailymile/client.rb
 - lib/dailymile/connection.rb
 - lib/dailymile/connection/token.rb
-- lib/oauth2_monkey_patches.rb
 - test/helper.rb
 - test/test_dailymile-ruby.rb
 has_rdoc: true
 homepage: http://github.com/dailymile/dailymile-ruby
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+post_install_message: !!null 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: dailymile ruby client
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_dailymile-ruby.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/lib/oauth2_monkey_patches.rb

@@ -1,11 +0,0 @@
-# 
-# HACK: monkey-patching oauth2 lib
-# 
-module OAuth2
-  class AccessToken
-    def request(verb, path, params = {}, headers = {})
-      params = params.merge('oauth_token' => @token) unless @token.nil?
-      @client.request(verb, path, params)
-    end
-  end
-end