oa-oauth 0.2.4 → 0.2.5

data/lib/omniauth/strategies/twitter.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    # 
+    #
     # Authenticate to Twitter via OAuth and retrieve basic
     # user information.
     #
@@ -19,12 +19,12 @@ module OmniAuth
         client_options = {
           :site => 'https://api.twitter.com'
         }
-        
+
         options[:authorize_params] = {:force_login => 'true'} if options.delete(:force_login) == true
         client_options[:authorize_path] = '/oauth/authenticate' unless options[:sign_in] == false
         super(app, :twitter, consumer_key, consumer_secret, client_options, options)
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @access_token.params[:user_id],
@@ -32,13 +32,13 @@ module OmniAuth
           'extra' => {'user_hash' => user_hash}
         })
       end
-      
+
       def user_info
         user_hash = self.user_hash
-        
+
         {
           'nickname' => user_hash['screen_name'],
-          'name' => user_hash['name'],
+          'name' => user_hash['name'] || user_hash['screen_name'],
           'location' => user_hash['location'],
           'image' => user_hash['profile_image_url'],
           'description' => user_hash['description'],
@@ -48,7 +48,7 @@ module OmniAuth
           }
         }
       end
-      
+
       def user_hash
         @user_hash ||= MultiJson.decode(@access_token.get('/1/account/verify_credentials.json').body)
       end

data/lib/omniauth/strategies/type_pad.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    # 
+    #
     # Authenticate to Typepad via OAuth and retrieve basic
     # user information.
     #
@@ -33,7 +33,7 @@ module OmniAuth
 
         super(app, :type_pad, consumer_key, consumer_secret, client_options, options)
       end
-      
+
       def auth_hash
         ui = user_info
         OmniAuth::Utils.deep_merge(super, {
@@ -42,10 +42,10 @@ module OmniAuth
           'extra' => {'user_hash' => user_hash}
         })
       end
-      
+
       def user_info
         user_hash = self.user_hash
-        
+
         {
           'uid' => user_hash['urlId'],
           'nickname' => user_hash['preferredUsername'],
@@ -55,12 +55,12 @@ module OmniAuth
           'urls' => {'Profile' => user_hash['profilePageUrl']}
         }
       end
-      
+
       def user_hash
         # For authenticated requests, you have to use header as your scheme.
         # Failure to do so gives a unique response body - 'Auth is required'.
         # 'Unauthorized' is the response body of a truly unauthorized request.
-        
+
         # Also note that API requests hit a different site than the OAuth dance.
         r = self.consumer.request(
               :get,

data/lib/omniauth/strategies/vkontakte.rb

@@ -6,7 +6,7 @@ module OmniAuth
     #
     # Authenticate to Vkontakte utilizing OAuth 2.0 and retrieve
     # basic user information.
-    # documentation available here: 
+    # documentation available here:
     # http://vkontakte.ru/developers.php?o=-17680044&p=Authorization&s=0
     #
     # @example Basic Usage

data/lib/omniauth/strategies/xauth.rb

@@ -5,17 +5,17 @@ module OmniAuth
   module Strategies
     class XAuth
       include OmniAuth::Strategy
-      
+
       attr_reader :name
       attr_accessor :consumer_key, :consumer_secret, :consumer_options
-      
+
       def initialize(app, name, consumer_key = nil, consumer_secret = nil, consumer_options = {}, options = {}, &block)
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
         self.consumer_options = consumer_options
         super
       end
-      
+
       def request_phase
         session['oauth'] ||= {}
         if env['REQUEST_METHOD'] == 'GET'
@@ -25,18 +25,18 @@ module OmniAuth
           redirect callback_path
         end
       end
-      
+
       def get_credentials
         OmniAuth::Form.build(consumer_options[:title] || "xAuth Credentials") do
           text_field 'Username', 'username'
           password_field 'Password', 'password'
         end.to_response
       end
-      
+
       def consumer
         ::OAuth::Consumer.new(consumer_key, consumer_secret, consumer_options.merge(options[:client_options] || options[:consumer_options] || {}))
       end
-      
+
       def callback_phase
         @access_token = consumer.get_access_token(nil, {}, session['omniauth.xauth'])
         super
@@ -47,9 +47,9 @@ module OmniAuth
         rescue ::MultiJson::DecodeError => e
           fail!(:invalid_response, e)
       ensure
-        session['omniauth.xauth'] = nil        
+        session['omniauth.xauth'] = nil
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'credentials' => {
@@ -60,7 +60,7 @@ module OmniAuth
           }
         })
       end
-    
+
     end
   end
 end

data/lib/omniauth/strategies/yahoo.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    # 
+    #
     # Authenticate to Yahoo via OAuth and retrieve basic
     # user information.
     #
@@ -22,7 +22,7 @@ module OmniAuth
 
         super(app, :yahoo, consumer_key, consumer_secret, client_options, options)
       end
-      
+
       def auth_hash
         ui = user_info
         OmniAuth::Utils.deep_merge(super, {
@@ -31,7 +31,7 @@ module OmniAuth
           'extra' => {'user_hash' => user_hash}
         })
       end
-      
+
       def user_info
         user_hash = self.user_hash
         profile = user_hash['profile']
@@ -45,7 +45,7 @@ module OmniAuth
           'urls' => {'Profile' => profile['profileUrl'] }
         }
       end
-      
+
       def user_hash
         uid = @access_token.params['xoauth_yahoo_guid']
         @user_hash ||= MultiJson.decode(@access_token.get("http://social.yahooapis.com/v1/user/#{uid}/profile?format=json").body)

data/lib/omniauth/strategies/yammer.rb

@@ -0,0 +1,43 @@
+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 = {
+          :site => 'https://www.yammer.com',
+          :request_token_path => '/oauth/request_token',
+          :access_token_path => '/oauth/access_token',
+          :authorize_path => "/oauth/authorize"
+        }
+
+        super(app, :yammer, consumer_key, consumer_secret, client_options, options)
+      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

data/lib/omniauth/version.rb

@@ -0,0 +1,19 @@
+module OmniAuth
+  module Version
+    unless defined?(::OmniAuth::Version::MAJOR)
+      MAJOR = 0
+    end
+    unless defined?(::OmniAuth::Version::MINOR)
+      MINOR = 2
+    end
+    unless defined?(::OmniAuth::Version::PATCH)
+      PATCH = 5
+    end
+    unless defined?(::OmniAuth::Version::PRE)
+      PRE   = nil
+    end
+    unless defined?(::OmniAuth::Version::STRING)
+      STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+    end
+  end
+end

data/oa-oauth.gemspec

@@ -1,23 +1,27 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../omniauth/lib/omniauth/version', __FILE__)
+require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency  'oa-core', Omniauth::VERSION.dup
-  gem.add_dependency  'multi_json', '>= 0.0.5'
-  gem.add_dependency  'nokogiri', '~> 1.4.2'
-  gem.add_dependency  'oauth', '~> 0.4.0'
-  gem.add_dependency  'faraday', '~> 0.6.1'
-  gem.add_dependency  'oauth2', '~> 0.4.1'
+  gem.add_runtime_dependency 'faraday', '~> 0.6.1'
+  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7.3' if RUBY_PLATFORM == 'java'
+  gem.add_runtime_dependency 'multi_json', '~> 1.0.0'
+  gem.add_runtime_dependency 'multi_xml', '~> 0.2.2'
+  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_runtime_dependency 'oauth', '~> 0.4.0'
+  gem.add_runtime_dependency 'oauth2', '~> 0.4.1'
   gem.add_development_dependency 'evernote', '~> 0.9'
+  gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.6'
+  gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-oauth'
-  gem.version = Omniauth::VERSION.dup
-  gem.summary = %q{OAuth strategies for OmniAuth.}
+  gem.version = OmniAuth::Version::STRING
   gem.description = %q{OAuth strategies for OmniAuth.}
+  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
   gem.homepage = 'http://github.com/intridea/omniauth'
   gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
@@ -26,5 +30,4 @@ Gem::Specification.new do |gem|
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
-
 end

data/spec/omniauth/strategies/bitly_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Bitly do
   it_should_behave_like "an oauth2 strategy"

data/spec/omniauth/strategies/dailymile_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Dailymile do
   it_should_behave_like "an oauth2 strategy"

data/spec/omniauth/strategies/doit_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Doit do
   it_should_behave_like "an oauth2 strategy"
-end
+end

data/spec/omniauth/strategies/dopplr_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Dopplr do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/douban_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe OmniAuth::Strategies::Douban do
+  it_should_behave_like 'an oauth strategy'
+end

data/spec/omniauth/strategies/evernote_spec.rb

@@ -1,7 +1,5 @@
-unless defined?(JRUBY_VERSION)
-  require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
-  describe OmniAuth::Strategies::Evernote do
-    it_should_behave_like "an oauth strategy"
-  end
+describe OmniAuth::Strategies::Evernote do
+  it_should_behave_like "an oauth strategy"
 end

data/spec/omniauth/strategies/facebook_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Facebook do
   it_should_behave_like "an oauth2 strategy"
-end
+end

data/spec/omniauth/strategies/foursquare_spec.rb

@@ -1,4 +1,18 @@
-require 'spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Foursquare do
+  it_should_behave_like "an oauth2 strategy"
+  subject{ OmniAuth::Strategies::Foursquare.new(lambda{|env|[200,{},[""]]} , 'abc', 'def')}
+
+  it 'should use the mobile authorize url when :mobile is true' do
+    subject.authorize_url(:mobile => true).should be_include("/mobile/")
+  end
+
+  it 'should use the authorize endpoint if :sign_in is false' do
+    subject.authorize_url(:sign_in => false).should be_include("/authorize")
+  end
+
+  it 'should default to the authenticate endpoint' do
+    subject.client.authorize_url.should be_include('/authenticate')
+  end
 end

data/spec/omniauth/strategies/github_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::GitHub do
   it_should_behave_like "an oauth2 strategy"

data/spec/omniauth/strategies/goodreads_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Goodreads do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/google_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Google do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/gowalla_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Gowalla do
-  it_should_behave_like "an oauth2 strategy"  
-end
+  it_should_behave_like "an oauth2 strategy"
+end

data/spec/omniauth/strategies/hyves_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Hyves do
   it_should_behave_like "an oauth strategy"
-end
+end

data/spec/omniauth/strategies/identica_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Identica do
   it_should_behave_like 'an oauth strategy'

data/spec/omniauth/strategies/linked_in_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::LinkedIn do
   it_should_behave_like "an oauth strategy"

data/spec/omniauth/strategies/meetup_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::Meetup do
   it_should_behave_like 'an oauth strategy'