oa-oauth 0.1.2 → 0.1.3

data/lib/omniauth/oauth.rb

@@ -11,5 +11,6 @@ module OmniAuth
     autoload :GitHub,             'omniauth/strategies/github'
     autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
     autoload :Foursquare,         'omniauth/strategies/foursquare'
+    autoload :Gowalla,            'omniauth/strategies/gowalla'
   end
 end

data/lib/omniauth/strategies/gowalla.rb

@@ -0,0 +1,60 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Gowalla utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # Usage:
+    #
+    #    use OmniAuth::Strategies::Gowalla, 'API Key', 'Secret Key'
+    #
+    # Options:
+    #
+    # <tt>:scope</tt> :: Extended permissions such as <tt>email</tt> and <tt>offline_access</tt> (which are the defaults).
+    class Gowalla < OAuth2
+      def initialize(app, api_key, secret_key, options = {})
+        options[:site] = 'https://api.gowalla.com/api/oauth'
+        options[:authorize_url] = 'https://gowalla.com/api/oauth/new'
+        options[:access_token_url] = 'https://api.gowalla.com/api/oauth/token'
+        super(app, :gowalla, api_key, secret_key, options)
+      end
+      
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get("/users/me.json"))
+      end
+      
+      def request_phase(options = {})
+        options[:scope] ||= "email,offline_access"
+        super(options)
+      end
+      
+      def user_info
+        {
+          'name' => "#{user_data['first_name']} #{user_data['last_name']}",
+          'nickname' => user_data["username"],
+          'first_name' => user_data["first_name"],
+          'last_name' => user_data["last_name"],
+          'location' => user_data["hometown"],
+          'description' => user_data["bio"],
+          'image' => user_data["image_url"],
+          'phone' => nil,
+          'urls' => {
+            'Gowalla' => "http://www.gowalla.com#{user_data['url']}",
+            'Website' => user_data["website"]
+          }
+        }
+      end
+      
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_data["url"].split('/').last,
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_data}
+        })
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/oauth.rb

@@ -24,8 +24,8 @@ module OmniAuth
         request_token = ::OAuth::RequestToken.new(consumer, session[:oauth][name.to_sym].delete(:request_token), session[:oauth][name.to_sym].delete(:request_secret))
         @access_token = request_token.get_access_token(:oauth_verifier => request.params['oauth_verifier'])
         super
-      rescue ::OAuth::Unauthorized
-        fail!(:invalid_credentials)
+      rescue ::OAuth::Unauthorized => e
+        fail!(:invalid_credentials, e)
       end
       
       def auth_hash

data/lib/omniauth/strategies/oauth2.rb

@@ -26,8 +26,8 @@ module OmniAuth
         verifier = request.params['code']
         @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
         super
-      rescue ::OAuth2::HTTPError => e
-        fail!(:invalid_credentials)
+      rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied => e
+        fail!(:invalid_credentials, e)
       end
       
       def auth_hash

data/lib/omniauth/strategies/twitter.rb

@@ -14,7 +14,8 @@ module OmniAuth
     class Twitter < OmniAuth::Strategies::OAuth
       def initialize(app, consumer_key, consumer_secret)
         super(app, :twitter, consumer_key, consumer_secret,
-                :site => 'https://api.twitter.com')
+                :site => 'https://api.twitter.com',
+                :authorize_path => '/oauth/authenticate')
       end
       
       def auth_hash

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -05:00
+date: 2010-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -205,6 +205,7 @@ files:
 - lib/omniauth/strategies/facebook.rb
 - lib/omniauth/strategies/foursquare.rb
 - lib/omniauth/strategies/github.rb
+- lib/omniauth/strategies/gowalla.rb
 - lib/omniauth/strategies/linked_in.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb