oa-oauth 0.2.1 → 0.2.2

data/lib/omniauth/oauth.rb

@@ -37,5 +37,7 @@ module OmniAuth
     autoload :Doit,               'omniauth/strategies/doit'
     autoload :Instapaper,         'omniauth/strategies/instapaper'
     autoload :TradeMe,            'omniauth/strategies/trade_me'
+    autoload :Teambox,            'omniauth/strategies/teambox'
+    autoload :Tumblr,             'omniauth/strategies/tumblr'
   end
 end

data/lib/omniauth/strategies/oauth.rb

@@ -62,7 +62,7 @@ module OmniAuth
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
-      rescue ::MultiJson::DecodeError => e
+      rescue ::NoMethodError, ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
       end
 

data/lib/omniauth/strategies/teambox.rb

@@ -0,0 +1,49 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class Teambox < OAuth2
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        client_options = {
+          :site => "https://teambox.com/",
+          :authorize_path => "/oauth/authorize",
+          :access_token_path => "/oauth/token"
+        }
+        super(app, :teambox, client_id, client_secret, client_options, options, &block)
+      end
+      def request_phase
+        options[:scope] ||= "offline_access"
+        options[:response_type] ||= 'code'
+        super
+      end
+
+      def callback_phase
+        options[:grant_type] ||= 'authorization_code'
+        super
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get("/api/1/account"))
+      end
+
+      def user_info
+        {
+          'nickname' => user_data['username'],
+          'name' => user_data['first_name'],
+          'image' => user_data['avatar_url'],
+          'urls' => {}
+        }
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_data['id'],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_data}
+        })
+      end
+    end
+  end
+end
+

data/lib/omniauth/strategies/tumblr.rb

@@ -0,0 +1,60 @@
+require 'omniauth/oauth'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Tumblr via OAuth and retrieve basic
+    # user information.
+    #
+    # Usage:
+    #
+    #    use OmniAuth::Strategies::Tumblr, 'consumerkey', 'consumersecret'
+    #
+    class Tumblr < OmniAuth::Strategies::OAuth
+      # Initialize the middleware
+      #
+      # @option options [Boolean, true] :sign_in When true, use the "Sign in with Tumblr" flow instead of the authorization flow.
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'http://www.tumblr.com'
+        }
+
+        client_options[:authorize_path] = '/oauth/authorize' unless options[:sign_in] == false
+        super(app, :tumblr, consumer_key, consumer_secret, client_options, options)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user['name'],
+          'user_info' => user_info,
+          'extra' => { 'user_hash' => user }
+        })
+      end
+
+      def user_info
+        {
+          'nickname' => user['name'],
+          'name' => user['title'],
+          'image' => user['avatar_url'],
+          'urls' => {
+            'website' => user['url'],
+          }
+        }
+      end
+
+      def user
+        tumblelogs = user_hash['tumblr']['tumblelog']
+        if tumblelogs.kind_of?(Array)
+          @user ||= tumblelogs[0]
+        else
+          @user ||= tumblelogs
+        end
+      end
+
+      def user_hash
+        url = "http://www.tumblr.com/api/authenticate"
+        @user_hash ||= Hash.from_xml(@access_token.get(url).body)
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: oa-oauth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -05:00
+date: 2011-04-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -58,19 +58,30 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: faraday
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: oauth2
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,10 +89,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mg
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +100,10 @@ dependencies:
         version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +111,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +122,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,21 +133,21 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: json_pure
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.3
+        version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: evernote
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,7 +155,7 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 description: OAuth strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -181,9 +192,11 @@ files:
 - lib/omniauth/strategies/salesforce.rb
 - lib/omniauth/strategies/smug_mug.rb
 - lib/omniauth/strategies/sound_cloud.rb
+- lib/omniauth/strategies/teambox.rb
 - lib/omniauth/strategies/thirty_seven_signals.rb
 - lib/omniauth/strategies/trade_me.rb
 - lib/omniauth/strategies/trip_it.rb
+- lib/omniauth/strategies/tumblr.rb
 - lib/omniauth/strategies/twitter.rb
 - lib/omniauth/strategies/type_pad.rb
 - lib/omniauth/strategies/vimeo.rb
@@ -206,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1141434774696898432
+      hash: -58406961140861733
       segments: 
       - 0
       version: "0"
@@ -215,14 +228,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1141434774696898432
+      hash: -58406961140861733
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OAuth strategies for OmniAuth.