foursquare-oauth 0.2.2 → 0.2.3

data/Rakefile

@@ -4,49 +4,57 @@ require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
 
-spec = Gem::Specification.new do |s|
-  s.name = "foursquare-oauth"
-  s.version = '0.2.2'
-  s.authors = ['Jeremy Welch', 'Thomas Hanley', 'Elise Wood']
-  s.email = "hello@jeremyrwelch.com"
-  s.homepage = "http://github.com/glytch/Foursquare"
-  s.description = s.summary = "A simple Ruby wrapper for the Foursquare API"
-  s.post_install_message = "NOTE: This version of the Foursquare Gem has significant changes to the way methods are called. Please review the examples in the README"
-  
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "History"]
-  
-  s.require_path = 'lib'
-  s.autorequire = 'foursquare'
-  s.files = %w(README.rdoc Rakefile History) + Dir.glob("{lib,spec,script,examples}/**/*")
-  
-  s.add_dependency('httparty', '0.4.3')
-  s.add_dependency('oauth', '0.3.6')
-  s.add_dependency('hashie', '0.1.5')
-end
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "foursquare-oauth"
+    s.version = '0.2.3'
+    s.authors = ['Jeremy Welch', 'Thomas Hanley', 'Elise Wood']
+    s.email = "hello@jeremyrwelch.com"
+    s.homepage = "http://github.com/glytch/Foursquare"
+    s.description = s.summary = "A simple Ruby wrapper for the Foursquare API"
+    s.post_install_message = "NOTE: This version of the Foursquare Gem has significant changes to the way methods are called. Please review the examples in the README"
+
+    s.platform = Gem::Platform::RUBY
+    s.has_rdoc = true
+    s.extra_rdoc_files = ["README.rdoc", "History"]
+
+    s.require_path = 'lib'
+    s.autorequire = 'foursquare'
+    s.files = %w(README.rdoc Rakefile History) + Dir.glob("{lib,spec,script,examples}/**/*")
 
-task :default => :spec
+    s.add_dependency('httparty', '0.5.0')
+    s.add_dependency('oauth', '0.3.6')
+    s.add_dependency('hashie', '0.1.5')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
 
-desc "Run specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
 end
 
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('rcov') do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.rcov = true
 end
 
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+desc 'Confirm that gemspec is $SAFE'
+task :safe do
+  require 'yaml'
+  require 'rubygems/specification'
+  data = File.read('rack-oauth.gemspec')
+  spec = nil
+  if data !~ %r{!ruby/object:Gem::Specification}
+    Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
+  else
+    spec = YAML.load(data)
+  end
+  spec.validate
+  puts spec
+  puts "OK"
 end
 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("foursquare.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
+task :default => :spec

data/lib/foursquare.rb

@@ -3,10 +3,6 @@ require 'httparty'
 require 'hashie'
 require 'oauth'
 
-Hash.send :include, Hashie::HashExtensions
-
-
-
 module Foursquare
   class OAuth
     def initialize(ctoken, csecret, options={})
@@ -84,23 +80,23 @@ module Foursquare
     # the right side of the assignment operator. So there are some wrapper methods below
     # for POSTs that make sure it gets turned into a hashie
     #
-    def method_missing(method_symbol, params = {})
-      method_name = method_symbol.to_s.split(/\.|_/).join('/')
-      
-      if (method_name[-1,1]) == '='
-        method = method_name[0..-2]
-        result = post(api_url(method), params)
-        params.replace(result[method] || result)
-      else
-        result = get(api_url(method_name, params))
-        result[method_name] || result
-      end
-    end
-    
-    def api(method_symbol, params = {})
-      Hashie::Mash.new(method_missing(method_symbol, params))
-    end
-    
+    # def method_missing(method_symbol, params = {})
+    #   method_name = method_symbol.to_s.split(/\.|_/).join('/')
+    #   
+    #   if (method_name[-1,1]) == '='
+    #     method = method_name[0..-2]
+    #     result = post(api_url(method), params)
+    #     params.replace(result[method] || result)
+    #   else
+    #     result = get(api_url(method_name, params))
+    #     result[method_name] || result
+    #   end
+    # end
+    # 
+    # def api(method_symbol, params = {})
+    #   Hashie::Mash.new(method_missing(method_symbol, params))
+    # end
+    # 
     def api_url(method_name, options = nil)
       params = options.is_a?(Hash) ? to_query_params(options) : options
       params = nil if params and params.blank?
@@ -112,89 +108,131 @@ module Foursquare
     
     def parse_response(response)
       raise_errors(response)
-      Crack::JSON.parse(response.body)
+      
+      Hashie::Mash.new(Yajl::Parser.parse(response.body))
     end
     
     def to_query_params(options)
-      options.collect { |key, value| "#{key}=#{value}" }.join('&')
+      options.map{|key, value| "#{key}=#{value}"}.join('&')
     end
     
-    def get(url)
-      parse_response(@oauth.access_token.get(url))
+    def get(url, params)
+      parse_response(@oauth.access_token.get(api_url(url, params)))
     end
     
     def post(url, body)
-      parse_response(@oauth.access_token.post(url, body))
+      parse_response(@oauth.access_token.post(api_url(url), body))
     end
     
     # API method wrappers
     
+    # Check in methods
+
+    def checkins(params = {})
+      get('/checkins', params).checkins
+    end
+    
     def checkin(params = {})
-      api(:checkin=, params).checkin
+      post('/checkin', params).checkin
     end
     
     def history(params = {})
-      api(:history, params).checkins
+      get('/history', params).checkins
+    end
+    
+    # User methods
+    
+    def user(params = {})
+      get('/user', params).user
     end
     
-    def addvenue(params = {})
-      api(:addvenue=, params).venue
+    def friends(params = {})
+      get('/friends', params).friends
     end
     
-    def venue_proposeedit(params = {})
-      api(:venue_proposeedit=, params)
+    # Venue methods
+    
+    def venues(params = {})
+      get('/venues', params).venues
+    end
+    
+    def venue(params = P)
+      get('/venue', params).venue
+    end
+    
+    def categories
+      get('/categories', params).categories
+    end
+
+    def add_venue(params = {})
+      post('/addvenue', params).venue
+    end
+    
+    def venue_propose_edit(params = {})
+      post('/venue/proposeedit', params)
+    end
+    
+    def venue_flag_closed(params = {})
+      post('/venue/flagclosed', params)
     end
     
-    def venue_flagclosed(params = {})
-      api(:venue_flagclosed=, params)
+    # Tip methods
+    
+    def tips(params = {})
+      get('/tips', params).tips
     end
     
-    def addtip(params = {})
-      api(:addtip=, params).tip
+    def add_tip(params = {})
+      post('/addtip', params).tip
     end
     
-    def tip_marktodo(params = {})
-      api(:tip_marktodo=, params).tip
+    def tip_mark_todo(params = {})
+      post('/tip/marktodo', params).tip
     end
     
-    def tip_markdone(params = {})
-      api(:tip_markdone=, params).tip
+    def tip_mark_done(params = {})
+      post('/tip/markdone', params).tip
     end
     
+    # Friend methods
+    
     def friend_requests
-      api(:friend_requests).requests
+      get('/friend/requests').requests
     end
     
     def friend_approve(params = {})
-      api(:friend_approve=, params).user
+      post('/friend/approve', params).user
     end
     
     def friend_deny(params = {})
-      api(:friend_deny=, params).user
+      post('/friend/deny', params).user
     end
 
-    def friend_sendrequest(params = {})
-      api(:friend_sendrequest=, params).user
+    def friend_send_request(params = {})
+      post('/friend/sendrequest', params).user
     end
     
-    def findfriends_byname(params = {})
-      api(:findfriends_byname, params).users
+    def friends_by_name(params = {})
+      post('/findfriends/byname', params).users
     end
     
-    def findfriends_byphone(params = {})
-      api(:findfriends_byphone, params).users
+    def friends_by_phone(params = {})
+      get('/findfriends/byphone', params).users
     end
     
-    def findfriends_bytwitter(params = {})
-      api(:findfriends_bytwitter, params).users
+    def friends_by_twitter(params = {})
+      get('/findfriends/bytwitter', params).users
     end
     
-    def settings_setpings(params = {})
-      api(:settings_setpings=, params).settings
+    def settings_set_pings(params = {})
+      post('/settings/setpings', params).settings
     end
     
-    private
+    def test(params = {})
+      get('/test', params)
+    end
     
+    private
     
     def raise_errors(response)
       message = "(#{response.code}): #{response.message} - #{response.inspect} - #{response.body}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foursquare-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeremy Welch
@@ -11,7 +11,7 @@ autorequire: foursquare
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -06:00
+date: 2010-03-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -51,24 +51,24 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - History
+- README.rdoc
 files: 
+- History
 - README.rdoc
 - Rakefile
-- History
 - lib/foursquare.rb
-- spec/foursquare_spec.rb
-- spec/spec_helper.rb
 - script/destroy
 - script/generate
+- spec/foursquare_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/glytch/Foursquare
 licenses: []
 
 post_install_message: "NOTE: This version of the Foursquare Gem has significant changes to the way methods are called. Please review the examples in the README"
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,5 +90,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple Ruby wrapper for the Foursquare API
-test_files: []
-
+test_files: 
+- spec/foursquare_spec.rb
+- spec/spec_helper.rb