oa-oauth 0.0.1 → 0.0.4

data/README.rdoc

@@ -0,0 +1,35 @@
+= OmniAuth::OAuth
+
+OAuth 1.0 and 2.0 strategies for the OmniAuth gem.
+
+== Installation
+
+To get just OAuth functionality:
+
+    gem install oa-oauth
+    
+For the full auth suite:
+
+    gem install omniauth
+    
+== Stand-Alone Example
+
+Use the strategy as a middleware in your application:
+
+    require 'omniauth/oauth'
+    
+    use OmniAuth::Strategies::Twitter, 'consumer_key', 'consumer_secret'
+    
+Then simply direct users to '/auth/twitter' to have them authenticate via Twitter.
+
+== OmniAuth Builder
+
+If you want to allow multiple providers, use the OmniAuth Builder:
+
+    require 'omniauth/oauth'
+    
+    use OmniAuth::Builder do
+      provider :twitter, 'consumer_key', 'consumer_secret'
+      provider :facebook, 'app_id', 'app_secret'
+    end
+    

data/lib/omniauth/oauth.rb

@@ -1,10 +1,14 @@
-require 'oauth'
-require 'oauth2'
-
 require 'omniauth/core'
-require 'omniauth/strategies/oauth'
-require 'omniauth/strategies/twitter'
-require 'omniauth/strategies/linked_in'
-require 'omniauth/strategies/oauth2'
-require 'omniauth/strategies/facebook'
-require 'omniauth/strategies/github'
+
+module OmniAuth
+  module Strategies
+    autoload :OAuth,              'omniauth/strategies/oauth'
+    autoload :OAuth2,             'omniauth/strategies/oauth2'
+    
+    autoload :Twitter,            'omniauth/strategies/twitter'
+    autoload :LinkedIn,           'omniauth/strategies/linked_in'
+    autoload :Facebook,           'omniauth/strategies/facebook'
+    autoload :GitHub,             'omniauth/strategies/github'
+    autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
+  end
+end

data/lib/omniauth/strategies/facebook.rb

@@ -1,4 +1,5 @@
-require 'json'
+require 'omniauth/oauth'
+require 'multi_json'
 
 module OmniAuth
   module Strategies
@@ -20,7 +21,7 @@ module OmniAuth
       end
       
       def user_data
-        @data ||= JSON.parse(@access_token.get('/me'))
+        @data ||= MultiJson.decode(@access_token.get('/me'))
       end
       
       def request_phase(options = {})
@@ -50,4 +51,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/github.rb

@@ -1,4 +1,5 @@
-require 'json'
+require 'omniauth/oauth'
+require 'multi_json'
 
 module OmniAuth
   module Strategies
@@ -11,7 +12,7 @@ module OmniAuth
       end
       
       def user_data
-        @data ||= JSON.parse(@access_token.get('/api/v2/json/user/show'))['user']
+        @data ||= MultiJson.decode(@access_token.get('/api/v2/json/user/show'))['user']
       end
       
       def user_info
@@ -35,4 +36,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/linked_in.rb

@@ -1,6 +1,5 @@
-require 'omniauth/core'
-require 'omniauth/strategies/oauth'
 require 'nokogiri'
+require 'omniauth/oauth'
 
 module OmniAuth
   module Strategies
@@ -33,9 +32,9 @@ module OmniAuth
           'location' => person.xpath('location/name').text,
           'image' => person.xpath('picture-url').text,
           'description' => person.xpath('headline').text,
-          'urls' => person.css('member-url-resources member-url').inject({}) do |hash,element|
-            hash[element.xpath('name').text] = element.xpath('url').text
-            hash
+          'urls' => person.css('member-url-resources member-url').inject({}) do |h,element|
+            h[element.xpath('name').text] = element.xpath('url').text
+            h
           end
         }
         
@@ -44,4 +43,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/oauth.rb

@@ -1,10 +1,12 @@
+require 'oauth'
+require 'omniauth/oauth'
+
 module OmniAuth
   module Strategies
     class OAuth
       include OmniAuth::Strategy
       
       def initialize(app, name, consumer_key, consumer_secret, options = {})
-        require 'oauth'
         super
         @consumer = ::OAuth::Consumer.new(consumer_key, consumer_secret, options)
       end
@@ -45,4 +47,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/oauth2.rb

@@ -1,5 +1,7 @@
 require 'cgi'
 require 'uri'
+require 'oauth2'
+require 'omniauth/oauth'
 
 module OmniAuth
   module Strategies
@@ -12,15 +14,17 @@ module OmniAuth
         @client = ::OAuth2::Client.new(client_id, client_secret, options)
       end
       
-      attr_accessor :client_id, :client_secret, :options
+      protected
+      
+      attr_accessor :client
       
       def request_phase(options = {})
-        redirect @client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
+        redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
       end
       
       def callback_phase
         verifier = request.params['code']
-        @access_token = @client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
+        @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
         super
       rescue ::OAuth2::HTTPError => e
         fail!(:invalid_credentials)
@@ -35,4 +39,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/thirty_seven_signals.rb

@@ -0,0 +1,38 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class ThirtySevenSignals < OAuth2
+      def initialize(app, app_id, app_secret, options = {})
+        options[:site] = 'https://launchpad.37signals.com/'
+        options[:authorize_path] = '/authorization/new'
+        options[:access_token_path] = '/authorization/token'
+        super(app, :thirty_seven_signals, app_id, app_secret, options)
+      end
+      
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/authorization.json'))
+      end
+      
+      def user_info
+        {
+          'email' => user_data['identity']['email_address'],
+          'first_name' => user_data['identity']['first_name'],
+          'last_name' => user_data['identity']['last_name'],
+          'name' => [user_data['identity']['first_name'], user_data['identity']['last_name']].join(' ').strip
+        }
+      end
+      
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_data['identity']['id'],
+          'user_info' => user_info,
+          'extra' => {
+            'accounts' => user_data['accounts']
+          }
+        })
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/twitter.rb

@@ -1,6 +1,5 @@
-require 'omniauth/core'
-require 'omniauth/strategies/oauth'
-require 'json'
+require 'omniauth/oauth'
+require 'multi_json'
 
 module OmniAuth
   module Strategies
@@ -41,8 +40,8 @@ module OmniAuth
       end
       
       def user_hash
-        @user_hash ||= JSON.parse(@access_token.get('/1/account/verify_credentials.json').body)
+        @user_hash ||= MultiJson.decode(@access_token.get('/1/account/verify_credentials.json').body)
       end
     end
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,121 +15,183 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-08-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  requirement: *id001
   name: oa-core
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 0
-        - 0
-        version: 0.0.0
+        - 2
+        version: 0.0.2
+  requirement: *id002
+  name: multi_json
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: oauth
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  requirement: *id003
+  name: nokogiri
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: oauth2
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 0
+        version: 0.4.0
+  requirement: *id004
+  name: oauth
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 10
+        version: 0.0.10
+  requirement: *id005
+  name: oauth2
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  requirement: *id006
+  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        - 8
+        version: 0.0.8
+  requirement: *id007
+  name: mg
+  prerelease: false
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
+  requirement: *id008
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
+  requirement: *id009
+  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 4
+        version: 0.5.4
+  requirement: *id010
+  name: rack-test
+  prerelease: false
   type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: mg
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  requirement: *id011
+  name: json
+  prerelease: false
   type: :development
-  version_requirements: *id009
 description: OAuth strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -144,6 +207,7 @@ files:
 - lib/omniauth/strategies/linked_in.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb
+- lib/omniauth/strategies/thirty_seven_signals.rb
 - lib/omniauth/strategies/twitter.rb
 - README.rdoc
 - LICENSE.rdoc
@@ -158,23 +222,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OAuth strategies for OmniAuth.