gowalla 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -2,22 +2,22 @@ PATH
   remote: .
   specs:
     gowalla (0.5.2)
-      faraday (~> 0.5.0)
-      faraday_middleware (~> 0.1.6)
+      faraday (~> 0.5.1)
+      faraday_middleware (~> 0.2.0)
       hashie (~> 0.4.0)
       oauth2 (~> 0.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.1.2)
+    addressable (2.2.2)
     fakeweb (1.3.0)
-    faraday (0.5.0)
-      addressable (~> 2.1.1)
+    faraday (0.5.1)
+      addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
       rack (~> 1.2.1)
-    faraday_middleware (0.1.6)
-      faraday (~> 0.5.0)
+    faraday_middleware (0.2.0)
+      faraday (~> 0.5.1)
     hashie (0.4.0)
     jnunemaker-matchy (0.4.0)
     json_pure (1.4.6)
@@ -29,6 +29,7 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     shoulda (2.11.3)
+    test-unit (2.1.1)
 
 PLATFORMS
   ruby
@@ -36,8 +37,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   fakeweb (~> 1.3)
-  faraday (~> 0.5.0)
-  faraday_middleware (~> 0.1.6)
+  faraday (~> 0.5.1)
+  faraday_middleware (~> 0.2.0)
   gowalla!
   hashie (~> 0.4.0)
   jnunemaker-matchy (~> 0.4)
@@ -45,3 +46,4 @@ DEPENDENCIES
   oauth2 (~> 0.1.0)
   rake (~> 0.8)
   shoulda (~> 2.11)
+  test-unit (~> 2.1)

data/README.md

@@ -2,21 +2,20 @@
 
 Ruby wrapper for the [Gowalla API](http://gowalla.com/api/docs).
 
-
 ## Installation
 
     sudo gem install gowalla
-    
+
 ## Get your API key
 
 Be sure and get your API key: [http://gowalla.com/api/keys](http://gowalla.com/api/keys)
-    
+
 ## Usage
 
 ### Instantiate a client (Basic Auth)
 
     gowalla = Gowalla::Client.new(:username => 'pengwynn', :password => 'somepassword', :api_key => 'your_api_key')
-    
+
 ### or configure once
 
     Gowalla.configure do |config|
@@ -25,7 +24,7 @@ Be sure and get your API key: [http://gowalla.com/api/keys](http://gowalla.com/a
       config.password = 'somepassword'
     end
     gowalla = Gowalla::Client.new
-    
+
 ### Instantiate a client (OAuth2)
 
 For OAuth2, you'll need to specify a callback URL when you [set up your app and get your API keys](http://gowalla.com/api/keys).
@@ -33,7 +32,7 @@ For OAuth2, you'll need to specify a callback URL when you [set up your app and
 Let's create the client in a protected method in our controller:
 
     protected
-      def client    
+      def client
         Gowalla::Client.new (
           :api_key     => "your_api_key",
           :api_secret  => "your_api_secret",
@@ -42,46 +41,43 @@ Let's create the client in a protected method in our controller:
       end
 
 We need to get an access token. Perhaps in an a before filter where you need to access Gowalla:
-    
+
     redirect(@client.web_server.authorize_url(:redirect_uri => redirect_uri, :state => 1))
 
 or if you need read-write access:
 
     redirect(@client.web_server.authorize_url(:redirect_uri => redirect_uri, :state => 1, :scope => 'read-write))
-    
+
 You'll need a callback route to catch the code coming back from Gowalla after a user grants you access and this must match what you specified when you created your app on Gowalla:
 
     get '/auth/gowalla/callback' do
       session[:access_token] = client.web_server.get_access_token(params[:code], :redirect_uri => redirect_uri).token
-
+    
       if session[:access_token]
         redirect '/auth/gowalla/test'
       else
         "Error retrieving access token."
       end
     end
-    
+
 Now that we have an access token we can use the client to make calls, just like we would with Basic Auth. You can checkout a basic [Sinatra example](http://gist.github.com/454283).
-    
+
 #### Examples
 
     gowalla.user('pengwynn')
     => <#Hashie::Mash accept_url="/friendships/accept?user_id=1707" activity_url="/users/1707/events" bio="Web designer and Ruby developer." events_url="/users/1707/events" fb_id=605681706 first_name="Wynn" friends_count=27 friends_only=false friends_url="/users/1707/friends" hometown="Aubrey, TX" image_url="http://s3.amazonaws.com/static.gowalla.com/users/1707-standard.jpg?1262011383" is_friend=false items_count=5 items_url="/users/1707/items" last_name="Netherland" last_visit=<#Hashie::Mash comment="Closing every account I have " created_at="2010/01/26 15:31:46 +0000" spot=<#Hashie::Mash image_url="http://static.gowalla.com/categories/186-standard.png" name="Bank Of America" small_image_url="http://static.gowalla.com/categories/186-small-standard.png" url="/spots/164052"name="Wynn Netherland" pins_count=3 pins_url="/users/1707/pins" reject_url="/friendships/reject?user_id=1707" request_url="/friendships/request?user_id=1707" stamps_count=15 stamps_url="/users/1707/stamps" top_spots_url="/users/1707/top_spots" twitter_username="pengwynn" url="/users/1707" username="pengwynn" vaulted_kinds_count=0 visited_spots_count=15 website="http://wynnnetherland.com">
-    
 
 Details for the current user
 
     gowalla.user
-    
+
 Details for another user
 
     gowalla.user('bradleyjoyce')
     gowalla.user(1707)
-    
-
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/changelog.md

@@ -1,4 +1,6 @@
 # Changelog
+## 0.5.3 October 26, 2010
+  * Patch from [sferik](http://github.com/sferik) for dependency updates
 ## 0.5.2 October 14, 2010
   * Patch from [sferik](http://github.com/sferik) for dependency updates
 ## 0.5.1 October 10, 2010

data/gowalla.gemspec

@@ -1,31 +1,32 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/gowalla/version", __FILE__)
+require File.expand_path('../lib/gowalla/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = "gowalla"
+  s.name = 'gowalla'
   s.version = Gowalla::VERSION
   s.authors = ["Wynn Netherland", "Eric Hutzelman"]
-  s.email = ["wynn.netherland@gmail.com"]
+  s.email = ['wynn.netherland@gmail.com']
   s.summary = %q{Wrapper for the Gowalla API}
   s.description = %q{Ruby wrapper for the Gowalla API}
-  s.homepage = "http://wynnnetherland.com/projects/gowalla/"
+  s.homepage = 'http://wynnnetherland.com/projects/gowalla/'
 
-  s.add_runtime_dependency "faraday", "~> 0.5.0"
-  s.add_runtime_dependency "faraday_middleware", "~> 0.1.6"
-  s.add_runtime_dependency "hashie", "~> 0.4.0"
-  s.add_runtime_dependency "oauth2", "~> 0.1.0"
+  s.add_runtime_dependency 'faraday', '~> 0.5.1'
+  s.add_runtime_dependency 'faraday_middleware', '~> 0.2.0'
+  s.add_runtime_dependency 'hashie', '~> 0.4.0'
+  s.add_runtime_dependency 'oauth2', '~> 0.1.0'
 
-  s.add_development_dependency "bundler", "~> 1.0"
-  s.add_development_dependency "fakeweb", "~> 1.3"
-  s.add_development_dependency "jnunemaker-matchy", "~> 0.4"
-  s.add_development_dependency "json_pure", "~> 1.4"
-  s.add_development_dependency "rake", "~> 0.8"
-  s.add_development_dependency "shoulda", "~> 2.11"
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'fakeweb', '~> 1.3'
+  s.add_development_dependency 'jnunemaker-matchy', '~> 0.4'
+  s.add_development_dependency 'json_pure', '~> 1.4'
+  s.add_development_dependency 'rake', '~> 0.8'
+  s.add_development_dependency 'shoulda', '~> 2.11'
+  s.add_development_dependency 'test-unit', '~> 2.1'
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
   s.platform = Gem::Platform::RUBY
-  s.require_path  = 'lib'
+  s.require_paths = ['lib']
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
 end

data/lib/gowalla.rb

@@ -13,7 +13,7 @@ module Gowalla
     attr_accessor :api_secret
     attr_accessor :test_mode
 
-    # Configures default credentials easily 
+    # Configures default credentials easily
     # @yield [api_key, username, password]
     def configure
       yield self

data/lib/gowalla/client.rb

@@ -40,7 +40,7 @@ module Gowalla
       params[:access_token] = @access_token if @access_token
       @connection ||= Faraday::Connection.new(:url => api_url, :params => params, :headers => default_headers) do |builder|
         builder.adapter Faraday.default_adapter
-        builder.use Faraday::Response::ParseJson
+        builder.use Faraday::Response::Parse
         builder.use Faraday::Response::Mashify
       end
 

data/lib/gowalla/version.rb

@@ -1,3 +1,3 @@
 module Gowalla
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/test/client_test.rb

@@ -6,8 +6,6 @@ class ClientTest < Test::Unit::TestCase
     setup do
       @client = gowalla_test_client
     end
-
-
   end
 
   context "when accessing the API anonymously" do
@@ -34,7 +32,7 @@ class ClientTest < Test::Unit::TestCase
 
       @client.username.should == 'username'
     end
-    
+
     should "use HTTPS to avoid sending password in plain text" do
       Gowalla.configure do |config|
         config.api_key = 'api_key'
@@ -79,7 +77,7 @@ class ClientTest < Test::Unit::TestCase
     should "use HTTPS to avoid sending credentials in plain text" do
       @client.api_url.should == 'https://api.gowalla.com'
     end
-    
+
     should "create an OAuth2 client" do
       @client.oauth_client.class.to_s.should == "OAuth2::Client"
     end
@@ -90,5 +88,4 @@ class ClientTest < Test::Unit::TestCase
 
   end
 
-
 end

data/test/fixtures/flag_created.json

@@ -0,0 +1 @@
+{"result": "flag created"}

data/test/flags_test.rb

@@ -37,10 +37,10 @@ class FlagsTest < Test::Unit::TestCase
 
     should "set a flag on a specific spot" do
       url = "https://pengwynn:0U812@api.gowalla.com/spots/1/flags/invalid"
-      FakeWeb.register_uri(:post, url, :body => '{"result": "flag created"}')
+      stub_post(url, "flag_created.json")
       response = @client.flag_spot(1, 'invalid', 'my problem description')
       response.result.should == 'flag created'
     end
 
   end
-end
+end

data/test/helper.rb

@@ -11,9 +11,6 @@ require 'gowalla'
 
 FakeWeb.allow_net_connect = false
 
-class Test::Unit::TestCase
-end
-
 def gowalla_test_client
   Gowalla::Client.new(:username => 'pengwynn', :password => '0U812', :api_key => 'gowallawallabingbang')
 end
@@ -29,12 +26,17 @@ def gowalla_url(url)
 end
 
 def stub_get(url, filename, options={})
-  opts = {:body => fixture_file(filename)}.merge(options)
-
+  opts = {
+    :body => fixture_file(filename),
+    :content_type => 'application/json; charset=utf-8'
+  }.merge(options)
   FakeWeb.register_uri(:get, gowalla_url(url), opts)
 end
 
-def stub_post(url, filename)
-  FakeWeb.register_uri(:post, gowalla_url(url), :body => fixture_file(filename))
+def stub_post(url, filename, options={})
+  opts = {
+    :body => fixture_file(filename),
+    :content_type => 'application/json; charset=utf-8'
+  }.merge(options)
+  FakeWeb.register_uri(:post, gowalla_url(url), opts)
 end
-

data/test/spots_test.rb

@@ -67,4 +67,4 @@ class SpotsTest < Test::Unit::TestCase
 
   end
 
-end
+end

data/test/users_test.rb

@@ -88,4 +88,4 @@ class UsersTest < Test::Unit::TestCase
 
   end
 
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -05:00
+date: 2010-10-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -162,6 +162,20 @@ dependencies:
         version: "2.11"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :development
+  version_requirements: *id011
 description: Ruby wrapper for the Gowalla API
 email: 
 - wynn.netherland@gmail.com
@@ -199,6 +213,7 @@ files:
 - test/fixtures/find_spots.json
 - test/fixtures/find_trips.json
 - test/fixtures/flag.json
+- test/fixtures/flag_created.json
 - test/fixtures/flags.json
 - test/fixtures/friend_requests.json
 - test/fixtures/friends.json
@@ -276,6 +291,7 @@ test_files:
 - test/fixtures/find_spots.json
 - test/fixtures/find_trips.json
 - test/fixtures/flag.json
+- test/fixtures/flag_created.json
 - test/fixtures/flags.json
 - test/fixtures/friend_requests.json
 - test/fixtures/friends.json