oa-oauth 0.3.0.rc3 → 0.3.0

data/lib/omniauth/oauth.rb

@@ -36,7 +36,6 @@ module OmniAuth
     autoload :TypePad,            'omniauth/strategies/oauth/type_pad'
     autoload :Vimeo,              'omniauth/strategies/oauth/vimeo'
     autoload :Yahoo,              'omniauth/strategies/oauth/yahoo'
-    autoload :Yammer,             'omniauth/strategies/oauth/yammer'
     autoload :YouTube,            'omniauth/strategies/oauth/you_tube'
 
     autoload :OAuth2,             'omniauth/strategies/oauth2'
@@ -65,6 +64,7 @@ module OmniAuth
     autoload :Viadeo,             'omniauth/strategies/oauth2/viadeo'
     autoload :Vkontakte,          'omniauth/strategies/oauth2/vkontakte'
     autoload :WePay,              'omniauth/strategies/oauth2/we_pay'
+    autoload :Yammer,             'omniauth/strategies/oauth2/yammer'
 
 
     autoload :XAuth,              'omniauth/strategies/xauth'

data/lib/omniauth/strategies/google_oauth2.rb

@@ -22,7 +22,7 @@ module OmniAuth
       def request_phase
         google_email_scope = "www.googleapis.com/auth/userinfo.email"
         options[:scope] ||= "https://#{google_email_scope}"
-        options[:scope] << "https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
+        options[:scope] << " https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
         redirect client.auth_code.authorize_url(
           {:redirect_uri => callback_url, :response_type => "code"}.merge(options))
       end

data/lib/omniauth/strategies/oauth/goodreads.rb

@@ -24,19 +24,19 @@ module OmniAuth
       end
 
       def user_info(access_token)
-        authenticated_user = MultiXml.parse(@access_token.get('/api/auth_user').body)
-        id = authenticated_user.xpath('GoodreadsResponse/user').attribute('id').value.to_i
-        response_doc = MultiXml.parse(open("http://www.goodreads.com/user/show/#{id}.xml?key=#{@consumer_key}").read)
-        user = response_doc.xpath('GoodreadsResponse/user')
+        authenticated_user = MultiXml.parse(access_token.get('/api/auth_user').body)
+        id = authenticated_user['GoodreadsResponse']['user']['id'].to_i
+        response_doc = MultiXml.parse(access_token.get("/user/show/#{id}.xml?key=#{@consumer_key}").body)
+        user = response_doc['GoodreadsResponse']['user']
 
         hash = {
           'id' => id,
-          'name' => user.xpath('name').text,
-          'user_name' => user.xpath('user_name').text,
-          'image_url' => user.xpath('image_url').text,
-          'about' => user.xpath('about').text,
-          'location' => user.xpath('location').text,
-          'website' => user.xpath('website').text,
+          'name' => user['name'],
+          'user_name' => user['user_name'],
+          'image_url' => user['image_url'],
+          'about' => user['about'],
+          'location' => user['location'],
+          'website' => user['website'],
         }
       end
     end

data/lib/omniauth/strategies/oauth/twitter.rb

@@ -17,7 +17,7 @@ module OmniAuth
           :site => 'https://api.twitter.com',
         }
         options[:authorize_params] = {:force_login => 'true'} if options.delete(:force_login) == true
-        client_options[:authorize_path] = '/oauth/authorize' unless options[:sign_in] == false
+        client_options[:authorize_path] = '/oauth/authenticate' unless options[:sign_in] == false
         super(app, options[:name] || :twitter, consumer_key, consumer_secret, client_options, options, &block)
       end
 

data/lib/omniauth/strategies/oauth2/yammer.rb

@@ -0,0 +1,63 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # OAuth 2.0 based authentication with GitHub. In order to
+    # sign up for an application, you need to [register an application](http://github.com/account/applications/new)
+    # and provide the proper credentials to this middleware.
+    class Yammer < OmniAuth::Strategies::OAuth2
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :token_url => '/oauth2/access_token.json',
+          :authorize_url => '/dialog/oauth',
+          :site => 'https://www.yammer.com'
+        }
+        super(app, :yammer, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_hash['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
+      end
+
+      def user_info
+        user_hash = self.user_hash
+        {
+          'nickname' => user_hash['name'],
+          'name' => user_hash['full_name'],
+          'location' => user_hash['location'],
+          'image' => user_hash['mugshot_url'],
+          'description' => user_hash['job_title'],
+          'email' => user_hash['contact']['email_addresses'][0]['address'],
+          'urls' => {
+            'Yammer' => user_hash['web_url'],
+          },
+        }
+      end
+
+      def build_access_token
+        # Dance to get the real token out of the object returned by Yammer
+        verifier = request.params['code']
+        temp_access_token = client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options))
+        token = eval(temp_access_token.token)['token']
+        @access_token = ::OAuth2::AccessToken.new(client, token, temp_access_token.params)
+      rescue ::OAuth2::Error => e
+        raise e.response.inspect
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('/api/v1/users/current.json').body)
+      end
+
+
+    end
+  end
+end

data/lib/omniauth/version.rb

@@ -10,7 +10,7 @@ module OmniAuth
       PATCH = 0
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc3"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/oa-oauth.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/omniauth/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '~> 0.7.3'
   gem.add_dependency 'multi_json', '~> 1.0.0'
-  gem.add_dependency 'multi_xml', '~> 0.3.0'
+  gem.add_dependency 'multi_xml', '~> 0.4.0'
   gem.add_dependency 'oa-core', OmniAuth::Version::STRING
   gem.add_dependency 'oauth', '~> 0.4.0'
   gem.add_dependency 'oauth2', '~> 0.5.0'

data/spec/omniauth/strategies/oauth/twitter_spec.rb

@@ -13,9 +13,9 @@ describe OmniAuth::Strategies::Twitter do
     }.to_app
   end
 
-  it 'should use the authorize path by default' do
+  it 'should use the authenticate path by default' do
     s = strategy_class.new(app, 'abc', 'def')
-    s.consumer.options[:authorize_path].should == '/oauth/authorize'
+    s.consumer.options[:authorize_path].should == '/oauth/authenticate'
   end
 
   it 'should set options[:authorize_params] to { :force_login => "true" } if :force_login is true' do

data/spec/omniauth/strategies/{oauth → oauth2}/yammer_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Yammer do
-  it_should_behave_like 'an oauth strategy'
+  it_should_behave_like 'an oauth2 strategy'
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
-  hash: 15424035
-  prerelease: 6
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 3
   - 0
-  - rc
-  - 3
-  version: 0.3.0.rc3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -18,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-03 00:00:00 Z
+date: 2011-09-22 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -60,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
+        - 4
         - 0
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,14 +75,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424035
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
-        - rc
-        - 3
-        version: 0.3.0.rc3
+        version: 0.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -309,7 +306,6 @@ files:
 - lib/omniauth/strategies/oauth/type_pad.rb
 - lib/omniauth/strategies/oauth/vimeo.rb
 - lib/omniauth/strategies/oauth/yahoo.rb
-- lib/omniauth/strategies/oauth/yammer.rb
 - lib/omniauth/strategies/oauth/you_tube.rb
 - lib/omniauth/strategies/oauth2.rb
 - lib/omniauth/strategies/oauth2/angellist.rb
@@ -336,6 +332,7 @@ files:
 - lib/omniauth/strategies/oauth2/viadeo.rb
 - lib/omniauth/strategies/oauth2/vkontakte.rb
 - lib/omniauth/strategies/oauth2/we_pay.rb
+- lib/omniauth/strategies/oauth2/yammer.rb
 - lib/omniauth/strategies/xauth.rb
 - lib/omniauth/strategies/xauth/instapaper.rb
 - lib/omniauth/version.rb
@@ -373,7 +370,6 @@ files:
 - spec/omniauth/strategies/oauth/type_pad_spec.rb
 - spec/omniauth/strategies/oauth/vimeo_spec.rb
 - spec/omniauth/strategies/oauth/yahoo_spec.rb
-- spec/omniauth/strategies/oauth/yammer_spec.rb
 - spec/omniauth/strategies/oauth/you_tube_spec.rb
 - spec/omniauth/strategies/oauth2/angellist_spec.rb
 - spec/omniauth/strategies/oauth2/bitly_spec.rb
@@ -397,8 +393,10 @@ files:
 - spec/omniauth/strategies/oauth2/viadeo_spec.rb
 - spec/omniauth/strategies/oauth2/vkontakte_spec.rb
 - spec/omniauth/strategies/oauth2/we_pay_spec.rb
+- spec/omniauth/strategies/oauth2/yammer_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
+has_rdoc: true
 homepage: http://github.com/intridea/omniauth
 licenses: []
 
@@ -419,18 +417,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 23
       segments: 
       - 1
       - 3
-      - 1
-      version: 1.3.1
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OAuth strategies for OmniAuth.
@@ -468,7 +466,6 @@ test_files:
 - spec/omniauth/strategies/oauth/type_pad_spec.rb
 - spec/omniauth/strategies/oauth/vimeo_spec.rb
 - spec/omniauth/strategies/oauth/yahoo_spec.rb
-- spec/omniauth/strategies/oauth/yammer_spec.rb
 - spec/omniauth/strategies/oauth/you_tube_spec.rb
 - spec/omniauth/strategies/oauth2/angellist_spec.rb
 - spec/omniauth/strategies/oauth2/bitly_spec.rb
@@ -492,5 +489,6 @@ test_files:
 - spec/omniauth/strategies/oauth2/viadeo_spec.rb
 - spec/omniauth/strategies/oauth2/vkontakte_spec.rb
 - spec/omniauth/strategies/oauth2/we_pay_spec.rb
+- spec/omniauth/strategies/oauth2/yammer_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb

data/lib/omniauth/strategies/oauth/yammer.rb

@@ -1,48 +0,0 @@
-require 'omniauth/oauth'
-require 'multi_json'
-
-module OmniAuth
-  module Strategies
-    class Yammer < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
-        client_options = {
-          :access_token_path => '/oauth/access_token',
-          :authorize_path => '/oauth/authorize',
-          :request_token_path => '/oauth/request_token',
-          :site => 'https://www.yammer.com',
-        }
-        super(app, :yammer, consumer_key, consumer_secret, client_options, options, &block)
-      end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(
-          super, {
-            'uid' => user_hash['id'],
-            'user_info' => user_info,
-            'extra' => {
-              'user_hash' => user_hash,
-            },
-          }
-        )
-      end
-
-      def user_info
-        user_hash = self.user_hash
-        {
-          'nickname' => user_hash['name'],
-          'name' => user_hash['full-name'],
-          'location' => user_hash['location'],
-          'image' => user_hash['mugshot-url'],
-          'description' => user_hash['job-title'],
-          'urls' => {
-            'Yammer' => user_hash['web-url'],
-          },
-        }
-      end
-
-      def user_hash
-        @user_hash ||= MultiJson.decode(@access_token.get('/api/v1/users/current.json').body)
-      end
-    end
-  end
-end