gowalla 0.5.7 → 0.5.8

data/changelog.md

@@ -1,4 +1,7 @@
 # Changelog
+## 0.5.8 August 28, 2011
+  * update faraday and middleware dependencies
+  * fix checkin to work correctly with oauth token
 ## 0.5.7 June 19, 2011
   * user events pagination and readme updates from [tylerhunt](https://github.com/tylerhunt) and [ctide](https://github.com/ctide)
 ## 0.5.6 April 24, 2011

data/gowalla.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.description = %q{Ruby wrapper for the Gowalla API}
   s.homepage = 'http://wynnnetherland.com/projects/gowalla/'
 
-  s.add_runtime_dependency 'faraday', '~> 0.6'
-  s.add_runtime_dependency 'faraday_middleware', '~> 0.6'
+  s.add_runtime_dependency 'faraday', '~> 0.7'
+  s.add_runtime_dependency 'faraday_middleware', '~> 0.7'
   s.add_runtime_dependency 'hashie', '~> 1.0.0'
   s.add_runtime_dependency 'oauth2', '~> 0.4'
 

data/lib/gowalla.rb

@@ -21,16 +21,10 @@ module Gowalla
     end
 
     def test_mode?
-      !!self.test_mode
+      !!test_mode
     end
   end
 
-  require 'gowalla/spots'
-  require 'gowalla/items'
-  require 'gowalla/trips'
-  require 'gowalla/checkins'
-  require 'gowalla/flags'
-  require 'gowalla/users'
   require 'gowalla/client'
 
 end

data/lib/gowalla/checkins.rb

@@ -9,7 +9,7 @@ module Gowalla
       connection.get("/checkins/#{id}").body
     end
 
-    # Check in at a spot
+    # Check in at a spot (requires oauth token authentication)
     #
     # @option details [Integer] :spot_id Spot ID
     # @option details [Float] :lat Latitude of spot

data/lib/gowalla/client.rb

@@ -1,4 +1,10 @@
 require 'forwardable'
+require 'gowalla/spots'
+require 'gowalla/items'
+require 'gowalla/trips'
+require 'gowalla/checkins'
+require 'gowalla/flags'
+require 'gowalla/users'
 
 module Gowalla
   class Client
@@ -37,13 +43,13 @@ module Gowalla
     # @return [Faraday::Connection]
     def connection
       params = {}
-      params[:access_token] = @access_token if @access_token
+      params[:oauth_token] = @access_token if @access_token
       @connection ||= Faraday.new(:url => api_url, :params => params, :headers => default_headers) do |builder|
-        builder.adapter Faraday.default_adapter
+        builder.use Faraday::Request::UrlEncoded
         builder.use Faraday::Response::Mashify
         builder.use Faraday::Response::ParseJson
+        builder.adapter Faraday.default_adapter
       end
-
     end
 
     # Provides the URL for accessing the API

data/lib/gowalla/version.rb

@@ -1,3 +1,3 @@
 module Gowalla
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

data/test/checkins_test.rb

@@ -2,17 +2,27 @@ require 'helper'
 
 class CheckinsTest < Test::Unit::TestCase
 
-  context "When using the Gowalla API and working with checkins" do
-    setup do
-      @client = gowalla_test_client
-    end
+  should "fetch info for a checkin" do
+    client = gowalla_basic_client
 
-    should "fetch info for a checkin" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/checkins/88", "checkin.json")
-      checkin = @client.checkin_info(88)
-      checkin.spot.name.should == 'Movie Tavern'
-      checkin.message.should == 'There sending us Back-- to the Future!'
-    end
+    stub_request("https://pengwynn:0U812@api.gowalla.com/checkins/88", "checkin_info.json")
+    checkin = client.checkin_info(88)
+    checkin.spot.name.should == 'Movie Tavern'
+    checkin.message.should == 'There sending us Back-- to the Future!'
+  end
+
+  should "create a checkin" do
+    client = gowalla_oauth_client
+
+    stub_request("https://api.gowalla.com/checkins?oauth_token=0U812", "checkin.json")
+    checkin = client.checkin \
+                :spot_id => 18568,
+                :lat => 33.237593417,
+                :lng => -96.960559033,
+                :comment => 'visiting',
+                :post_to_facebook => 0,
+                :post_to_twitter => 0
+    checkin.message.should == 'coffee test'
   end
 
 end

data/test/client_test.rb

@@ -4,7 +4,7 @@ class ClientTest < Test::Unit::TestCase
 
   context "When using the Gowalla API" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
   end
 

data/test/fixtures/checkin.json

@@ -1,21 +1,13 @@
-{
-    "activity": [], 
-    "activity_url": "/checkins/13963823/activity", 
-    "created_at": "2010-08-06T01:42:13Z", 
-    "message": "There sending us Back-- to the Future!", 
-    "spot": {
-        "image_url": "http://static.gowalla.com/categories/30-c21e752b813cd8873603a18e06431675-100.png?1", 
-        "name": "Movie Tavern", 
-        "url": "/spots/195556"
-    }, 
-    "type": "checkin", 
-    "url": "/checkins/13963823", 
-    "user": {
-        "_is_friend": true, 
-        "first_name": "Wynn", 
-        "image_url": "http://s3.amazonaws.com/static.gowalla.com/users/1707-standard.jpg?1262011383?1", 
-        "last_name": "Netherland", 
-        "photos_url": "/users/1707/photos", 
-        "url": "/users/1707"
-    }
-}
+{"created_at":"2011-08-28T03:32:09Z",
+ "activity_url":"/checkins/123456/activity",
+ "spot":
+  {"image_url":
+    "http://static.gowalla.com/spots/21714-e178c13584f09af661f4cec1b4f24bdb-100.png",
+   "name":"Juan Pelota Cafe",
+   "url":"/spots/21714"},
+ "user":{"url":"/users/2385"},
+ "message":"coffee test",
+ "detail_text":
+  "\nThis is your 0th checkin at Juan Pelota Cafe. Spot Check In Message: Try out an iced honey latte - it's where it's at! You received a Big Bag o' Swag. Team Gowalla left you a note: Thanks for using the Gowalla API! You earned the Cup o' Joe Pin! My Happy Place Highlight from Scott Raymond: I think I could come here every day and not tire of it.\n",
+ "detail_html":"",
+ "url":"/checkins/123456"}

data/test/fixtures/checkin_info.json

@@ -0,0 +1,21 @@
+{
+    "activity": [], 
+    "activity_url": "/checkins/13963823/activity", 
+    "created_at": "2010-08-06T01:42:13Z", 
+    "message": "There sending us Back-- to the Future!", 
+    "spot": {
+        "image_url": "http://static.gowalla.com/categories/30-c21e752b813cd8873603a18e06431675-100.png?1", 
+        "name": "Movie Tavern", 
+        "url": "/spots/195556"
+    }, 
+    "type": "checkin", 
+    "url": "/checkins/13963823", 
+    "user": {
+        "_is_friend": true, 
+        "first_name": "Wynn", 
+        "image_url": "http://s3.amazonaws.com/static.gowalla.com/users/1707-standard.jpg?1262011383?1", 
+        "last_name": "Netherland", 
+        "photos_url": "/users/1707/photos", 
+        "url": "/users/1707"
+    }
+}

data/test/flags_test.rb

@@ -4,11 +4,11 @@ class FlagsTest < Test::Unit::TestCase
 
   context "When using the Gowalla API and working with flags" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
 
     should "retrieve a list of flags" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/flags", "flags.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/flags", "flags.json")
       flags = @client.list_flags
       flags.first.spot.name.should == 'Wild Gowallaby #1'
       flags.first.user.url.should == '/users/340897'
@@ -17,7 +17,7 @@ class FlagsTest < Test::Unit::TestCase
     end
 
     should "retrieve information about a specific flag" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/flags/1", "flag.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/flags/1", "flag.json")
       flag = @client.flag(1)
       flag.spot.name.should == 'Wild Gowallaby #1'
       flag.user.url.should == '/users/340897'
@@ -27,7 +27,7 @@ class FlagsTest < Test::Unit::TestCase
 
 
     should "retrieve flags associated with that spot" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/spots/1/flags", "flags.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/spots/1/flags", "flags.json")
       flags = @client.spot_flags(1)
       flags.first.spot.name.should == 'Wild Gowallaby #1'
       flags.first.user.url.should == '/users/340897'
@@ -37,7 +37,7 @@ 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"
-      stub_post(url, "flag_created.json")
+      stub_request(url, "flag_created.json")
       response = @client.flag_spot(1, 'invalid', 'my problem description')
       response.result.should == 'flag created'
     end

data/test/helper.rb

@@ -11,10 +11,14 @@ require 'gowalla'
 
 FakeWeb.allow_net_connect = false
 
-def gowalla_test_client
+def gowalla_basic_client
   Gowalla::Client.new(:username => 'pengwynn', :password => '0U812', :api_key => 'gowallawallabingbang')
 end
 
+def gowalla_oauth_client
+  Gowalla::Client.new(:access_token => '0U812', :api_key => 'gowallawallabingbang')
+end
+
 def fixture_file(filename)
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
@@ -25,18 +29,10 @@ def gowalla_url(url)
   url =~ /^http/ ? url : "http://api.gowalla.com#{url}"
 end
 
-def stub_get(url, filename, 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, options={})
+def stub_request(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)
+  FakeWeb.register_uri(:any, gowalla_url(url), opts)
 end

data/test/items_test.rb

@@ -4,11 +4,11 @@ class ItemsTest < Test::Unit::TestCase
 
   context "When using the Gowalla API and working with items" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
 
     should "retrieve information about a specific item" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/items/607583', 'item.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/items/607583', 'item.json')
       item = @client.item(607583)
       item.issue_number.should == 13998
       item.name.should == 'Sweets'
@@ -16,7 +16,7 @@ class ItemsTest < Test::Unit::TestCase
     end
 
     should "retrieve events associated with a specific item" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/items/607583/events', 'item_events.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/items/607583/events', 'item_events.json')
       events = @client.item_events(607583)
       events.first.spot.name = 'Jerusalem Bakery'
       events.first.user.first_name = 'Scott'

data/test/spots_test.rb

@@ -4,24 +4,24 @@ class SpotsTest < Test::Unit::TestCase
 
   context "When using the Gowalla API and working with Spots" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
 
     should "Retrieve a list of spots within a specified distance of a location" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/spots?lat=%2B33.237593417&lng=-96.960559033&radius=50", "spots.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/spots?lat=%2B33.237593417&lng=-96.960559033&radius=50", "spots.json")
       spots = @client.list_spots(:lat => 33.237593417, :lng => -96.960559033, :radius => 50)
       spots.first.name.should == 'Gnomb Bar'
       spots.first.radius_meters.should == 50
     end
 
     should "Retrieve a list of spots within a specified bounds" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/spots?sw=%2839.25565142103586%2C%20-8.717308044433594%29&nw=%2839.31411296530539%2C%20-8.490715026855469%29", "spots.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/spots?sw=%2839.25565142103586%2C%20-8.717308044433594%29&nw=%2839.31411296530539%2C%20-8.490715026855469%29", "spots.json")
       spots = @client.list_spots(:sw => "(39.25565142103586, -8.717308044433594)", :nw => "(39.31411296530539, -8.490715026855469)")
       spots.first.name.should == 'Gnomb Bar'
     end
 
     should "Retrieve information about a specific spot" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/spots/18568', 'spot.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/spots/18568', 'spot.json')
       spot = @client.spot(18568)
       spot.name.should == "Wahoo's"
       spot.twitter_username.should == 'Wahoos512'
@@ -29,21 +29,21 @@ class SpotsTest < Test::Unit::TestCase
     end
 
     should "retrieve a list of check-ins at a particular spot. Shows only the activity that is visible to a given user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/spots/452593/events', 'spot_events.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/spots/452593/events', 'spot_events.json')
       events = @client.spot_events(452593)
       events.first[:type].should == 'checkin'
       events.first.user.last_name.should == 'Mack'
     end
 
     should "retrieve a list of items available at a particular spot" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/spots/18568/items', 'items.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/spots/18568/items', 'items.json')
       items = @client.spot_items(18568)
       items.first.issue_number.should == 27868
       items.first.name.should == 'Bowl of Noodles'
     end
 
     should "lists all spot categories" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/categories", "categories.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/categories", "categories.json")
       categories = @client.categories
       categories.size.should == 9
       categories.first.name.should == 'Architecture & Buildings'
@@ -53,13 +53,13 @@ class SpotsTest < Test::Unit::TestCase
     end
 
     should "retrieve information about a specific category" do
-      stub_get("https://pengwynn:0U812@api.gowalla.com/categories/1", "category.json")
+      stub_request("https://pengwynn:0U812@api.gowalla.com/categories/1", "category.json")
       category = @client.category(1)
       category.name.should == 'Coffee Shop'
     end
 
     should "retrieve photos taken at a spot" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/spots/18568/photos', 'photos.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/spots/18568/photos', 'photos.json')
       photos = @client.spot_photos(18568)
       #photos.first.type.should == 'photo'
       photos.first.photo_urls.square_50.should == 'http://static.gowalla.com/photos/912078_square_50.jpg'

data/test/trips_test.rb

@@ -4,18 +4,18 @@ class TripsTest < Test::Unit::TestCase
 
   context "When using the Gowalla API and working with trips" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
 
     should "retrieve a list of trips" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/trips', 'trips.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/trips', 'trips.json')
       trips = @client.trips
       trips.first.name.should == 'London Pub Crawl'
       trips.first.spots.first.url.should == '/spots/164009'
     end
 
     should "retrieve information about a specific trip" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/trips/1', 'trip.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/trips/1', 'trip.json')
       trip = @client.trip(1)
       trip.creator.last_name.should == 'Gowalla'
       trip.map_bounds.east.should == -63.457031

data/test/users_test.rb

@@ -4,25 +4,25 @@ class UsersTest < Test::Unit::TestCase
 
   context "When using the Gowalla API and working with Users" do
     setup do
-      @client = gowalla_test_client
+      @client = gowalla_basic_client
     end
 
     should "retrive information about the current user if no user specified" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/pengwynn', 'user.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/pengwynn', 'user.json')
       user = @client.user
       user.bio.should == "CTO & co-founder of Gowalla. Ruby/Cocoa/JavaScript developer. Game designer. Author. Indoorsman."
       user.stamps_count.should == 506
     end
 
     should "retrieve information about a specific user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco', 'user.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco', 'user.json')
       user = @client.user('sco')
       user.bio.should == "CTO & co-founder of Gowalla. Ruby/Cocoa/JavaScript developer. Game designer. Author. Indoorsman."
       user.stamps_count.should == 506
     end
 
     should "retrieve a list of the stamps the user has collected" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/1707/stamps?limit=20', 'stamps.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/1707/stamps?limit=20', 'stamps.json')
       stamps = @client.stamps(1707)
       stamps.size.should == 20
       stamps.first.spot.name.should == "Muck-N-Dave's Texas BBQ"
@@ -30,7 +30,7 @@ class UsersTest < Test::Unit::TestCase
     end
 
     should "retrieve a list of spots the user has visited most often" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/1707/top_spots', 'top_spots.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/1707/top_spots', 'top_spots.json')
       top_spots = @client.top_spots(1707)
       top_spots.size.should == 10
       top_spots.first.name.should == 'Juan Pelota Cafe'
@@ -38,14 +38,14 @@ class UsersTest < Test::Unit::TestCase
     end
 
     should "retrieve a list of spot urls the user has visited" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/visited_spots_urls', 'spots_urls.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/visited_spots_urls', 'spots_urls.json')
       spot_urls = @client.visited_spots_urls('sco')
       spot_urls.size.should == 22
       spot_urls.first.should == '/spots/682460'
     end
 
     should "retrieve a list of the user's most recent checkins" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/1707/events', 'user_events.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/1707/events', 'user_events.json')
       user_events = @client.user_events(1707)
       user_events.size.should == 10
       user_events.first.url.should == '/checkins/18863224'
@@ -53,7 +53,7 @@ class UsersTest < Test::Unit::TestCase
     end
 
     should "retrieve a list of the user's most recent checkins with pagination" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/1707/events?page=2&per_page=50', 'user_events.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/1707/events?page=2&per_page=50', 'user_events.json')
       user_events = @client.user_events(1707, :page => 2, :per_page => 50)
       user_events.size.should == 10
       user_events.first.url.should == '/checkins/18863224'
@@ -61,34 +61,34 @@ class UsersTest < Test::Unit::TestCase
     end
 
     should "retrieve a list of items the user is carrying" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/items?context=vault', 'items.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/items?context=vault', 'items.json')
       items = @client.user_items('sco', 'vault')
       items.first.issue_number.should == 27868
       items.first.name.should == 'Bowl of Noodles'
     end
 
     should "retrieve a list of friends for the user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/friends', 'users.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/friends', 'users.json')
       users = @client.friends('sco')
       users.first.first_name.should == 'Chalkbot'
     end
 
     should "retrieve a list of trips created by the user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/trips', 'trips.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/trips', 'trips.json')
       trips = @client.user_trips('sco')
       trips.first.name.should == 'London Pub Crawl'
       trips.first.spots.first.url.should == '/spots/164009'
     end
 
     should "retrieve a list of photos taken by the user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/photos', 'photos.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/photos', 'photos.json')
       photos = @client.user_photos('sco')
       #photos.first.type.should == 'photo'
       photos.first.photo_urls.square_50.should == 'http://static.gowalla.com/photos/912078_square_50.jpg'
     end
 
     should "retrieve a list of pins collected by the user" do
-      stub_get('https://pengwynn:0U812@api.gowalla.com/users/sco/pins', 'pins.json')
+      stub_request('https://pengwynn:0U812@api.gowalla.com/users/sco/pins', 'pins.json')
       pins = @client.user_pins('sco')
       pins.first.name.should == '110 Film'
       #pins.first.trip.type.should == 'challenge'

metadata

@@ -2,7 +2,7 @@
 name: gowalla
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -05:00
+date: 2011-08-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0.7"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0.7"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,7 @@ files:
 - test/fixtures/category.json
 - test/fixtures/challenges.json
 - test/fixtures/checkin.json
+- test/fixtures/checkin_info.json
 - test/fixtures/find_spots.json
 - test/fixtures/find_trips.json
 - test/fixtures/flag.json
@@ -240,6 +241,7 @@ test_files:
 - test/fixtures/category.json
 - test/fixtures/challenges.json
 - test/fixtures/checkin.json
+- test/fixtures/checkin_info.json
 - test/fixtures/find_spots.json
 - test/fixtures/find_trips.json
 - test/fixtures/flag.json