gowalla 0.2.0 → 0.2.1

data/lib/gowalla.rb

@@ -2,6 +2,7 @@ require 'hashie'
 require 'faraday'
 require 'multi_json'
 require 'oauth2'
+require 'faraday_middleware'
 
 directory = File.expand_path(File.dirname(__FILE__))
 
@@ -9,7 +10,7 @@ Hash.send :include, Hashie::HashExtensions
 
 module Gowalla
   
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
   
   # config/initializers/gowalla.rb (for instance)
   # 

data/lib/gowalla/client.rb

@@ -15,6 +15,7 @@ module Gowalla
       @access_token = options[:access_token]
       password = options[:password] || Gowalla.password
       connection.basic_auth(@username, password) unless @api_secret
+      connection.token_auth(@access_token) if @access_token
     end
     
     # Retrieve information about a specific user
@@ -23,7 +24,7 @@ module Gowalla
     # @return [Hashie::Mash] User info
     def user(user_id=nil)
       user_id ||= username
-      handle_response(connection.get("/users/#{user_id}"))
+      connection.get("/users/#{user_id}").body
     end
 
     # Retrieve information about a specific item
@@ -31,7 +32,7 @@ module Gowalla
     # @param [Integer] id Item ID
     # @return [Hashie::Mash] item info
     def item(id)
-      handle_response(connection.get("/items/#{id}"))
+      connection.get("/items/#{id}").body
     end
 
     # Retrieve a list of the stamps the user has collected
@@ -43,7 +44,7 @@ module Gowalla
       response = connection.get do |req|
         req.url "/users/#{user_id}/stamps", :limit => limit
       end
-      handle_response(response).stamps
+      response.body.stamps
     end
 
     # Retrieve a list of spots the user has visited most often
@@ -51,7 +52,7 @@ module Gowalla
     # @param [String] user_id (authenticated basic auth user) User ID (screen name)
     # @return [Hashie::Mash] item info
     def top_spots(user_id=self.username)
-      handle_response(connection.get("/users/#{user_id}/top_spots")).top_spots
+      connection.get("/users/#{user_id}/top_spots").body.top_spots
     end
 
     # Retrieve information about a specific trip
@@ -59,7 +60,7 @@ module Gowalla
     # @param [Integer] trip_id Trip ID
     # @return [Hashie::Mash] trip info
     def trip(trip_id)
-      handle_response(connection.get("/trips/#{trip_id}"))
+      connection.get("/trips/#{trip_id}").body
     end
     
     # Retrieve information about a specific spot
@@ -67,7 +68,7 @@ module Gowalla
     # @param [Integer] spot_id Spot ID
     # @return [Hashie::Mash] Spot info
     def spot(spot_id)
-      handle_response(connection.get("/spots/#{spot_id}"))
+      connection.get("/spots/#{spot_id}").body
     end
     
     # Retrieve a list of check-ins at a particular spot. Shows only the activity that is visible to a given user.
@@ -75,7 +76,7 @@ module Gowalla
     # @param [Integer] spot_id Spot ID
     # @return [Hashie::Mash] Spot info
     def spot_events(spot_id)
-      handle_response(connection.get("/spots/#{spot_id}/events")).activity
+      connection.get("/spots/#{spot_id}/events").body.activity
     end
     
     # Retrieve a list of items available at a particular spot
@@ -83,7 +84,7 @@ module Gowalla
     # @param [Integer] spot_id Spot ID
     # @return [Hashie::Mash] Spot info
     def spot_items(spot_id)
-      handle_response(connection.get("/spots/#{spot_id}/items")).items
+      connection.get("/spots/#{spot_id}/items").body.items
     end
     
     # Retrieve a list of spots within a specified distance of a location
@@ -97,7 +98,7 @@ module Gowalla
       response = connection.get do |req|
         req.url "/spots", query
       end
-      handle_response(response).spots
+      response.body.spots
     end
     
     # List of trips
@@ -111,14 +112,14 @@ module Gowalla
       response = connection.get do |req|
         req.url "/trips", query
       end
-      handle_response(response).trips
+      response.body.trips
     end
 
     # Lists all spot categories
     #
     # @return [<Hashie::Mash>] category info
     def categories
-      handle_response(connection.get("/categories")).spot_categories
+      connection.get("/categories").body.spot_categories
     end
     
     # Retrieve information about a specific category
@@ -126,7 +127,7 @@ module Gowalla
     # @param [Integer] id Category ID
     # @return [Hashie::Mash] category info
     def category(id)
-      handle_response(connection.get("/categories/#{id}"))
+      connection.get("/categories/#{id}").body
     end
     
     # Check for missing access token
@@ -136,20 +137,19 @@ module Gowalla
       @api_secret and @access_token.to_s == ''
     end
     
-    # Raw HTTP connection, either Faraday::Connection or OAuth2::AccessToken
+    # Raw HTTP connection, either Faraday::Connection 
     #
-    # @return [OAuth2::Client]
+    # @return [Faraday::Connection]
     def connection
-      
-      if api_secret
-        @connection ||= OAuth2::AccessToken.new(oauth_client, @access_token)
-      else
-        headers = default_headers
-        headers['X-Gowalla-API-Key'] = api_key if api_key
-        @connection ||= Faraday::Connection.new \
-          :url => "http://api.gowalla.com", 
-          :headers => headers
+      url = @access_token ? "https://api.gowalla.com" : "http://api.gowalla.com"
+      params = {}
+      params[:access_token] = @access_token if @access_token
+      @connection ||= Faraday::Connection.new(:url => url, :params => params, :headers => default_headers) do |builder|
+        builder.adapter Faraday.default_adapter
+        builder.use Faraday::Response::MultiJson
+        builder.use Faraday::Response::Mashify
       end
+            
     end
     
     # Provides raw access to the OAuth2 Client
@@ -189,28 +189,11 @@ module Gowalla
       def default_headers
         headers = {
           :accept =>  'application/json', 
-          :user_agent => 'Ruby gem'
+          :user_agent => 'Ruby gem',
+          'X-Gowalla-API-Key' => api_key
         }
       end
       
-      # @private
-      def handle_response(response)
-        case response.status
-        when 200
-          body = response.respond_to?(:body) ? response.body : response
-          data = MultiJson.decode(body)
-          if data.is_a?(Hash)
-            Hashie::Mash.new(data)
-          else
-            if data.first.is_a?(Hash)
-              data.map{|item| Hashie::Mash.new(item)}
-            else
-              data
-            end
-          end
-        end
-      end
-      
     
   end
   

data/test/gowalla_test.rb

@@ -154,10 +154,6 @@ class GowallaTest < Test::Unit::TestCase
       @client.oauth_client.class.to_s.should == "OAuth2::Client"
     end
     
-    should "create an OAuth2 connection" do
-      @client.connection.class.to_s.should == "OAuth2::AccessToken"
-    end
-    
     should "indicate if it needs an access_token" do
       @client.needs_access?.should == true
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -73,6 +73,18 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: faraday-middleware
+  prerelease: false
+  requirement: *id005
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -83,7 +95,7 @@ dependencies:
         version: 2.10.0
   name: shoulda
   prerelease: false
-  requirement: *id005
+  requirement: *id006
   type: :development
 description: Ruby wrapper for the Gowalla API
 email: wynn.netherland@gmail.com