oa-openid 0.2.4 → 0.2.5

data/lib/omniauth/openid.rb

@@ -2,56 +2,56 @@ require 'omniauth/core'
 
 module OmniAuth
   # OmniAuth::OpenID provides strategies for authenticating to providers
-  # using the OpenID standard. 
-  # 
+  # using the OpenID standard.
+  #
   # # Installation
-  # 
+  #
   # To get just OpenID functionality:
-  # 
+  #
   #     gem install oa-openid
-  # 
+  #
   # For the full auth suite:
-  # 
+  #
   #     gem install omniauth
-  # 
+  #
   # # Stand-Alone Example
-  # 
+  #
   # Use the strategy as a middleware in your application:
-  # 
+  #
   #     require 'omniauth/openid'
   #     require 'openid/store/filesystem'
-  # 
+  #
   #     use Rack::Session::Cookie
   #     use OmniAuth::Strategies::OpenID, OpenID::Store::Filesystem.new('/tmp')
-  # 
+  #
   # Then simply direct users to '/auth/open_id' to prompt them for their OpenID identifier. You may also pre-set the identifier by passing an <tt>identifier</tt> parameter to the URL (Example: <tt>/auth/open_id?openid_url=yahoo.com</tt>).
-  # 
+  #
   # A list of all OpenID stores is available at http://github.com/openid/ruby-openid/tree/master/lib/openid/store/
-  # 
+  #
   # # OmniAuth Builder
-  # 
+  #
   # If OpenID is one of several authentication strategies, use the OmniAuth Builder:
-  # 
+  #
   #     require 'omniauth/openid'
   #     require 'omniauth/basic'  # for Campfire
   #     require 'openid/store/filesystem'
-  # 
+  #
   #     use OmniAuth::Builder do
   #       provider :open_id, OpenID::Store::Filesystem.new('/tmp')
   #       provider :campfire
   #     end
-  # 
+  #
   # # Configured Identifiers
-  # 
+  #
   # You may pre-configure an OpenID identifier.  For example, to use Google's main OpenID endpoint:
-  # 
+  #
   #     use OmniAuth::Builder do
   #       provider :open_id, nil, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
   #     end
-  # 
+  #
   # Note the use of nil, which will trigger ruby-openid's default Memory Store.
   module OpenID; end
-  
+
   module Strategies
     autoload :OpenID, 'omniauth/strategies/open_id'
     autoload :GoogleApps, 'omniauth/strategies/google_apps'

data/lib/omniauth/openid/gapps.rb

@@ -8,25 +8,25 @@ module OpenID
   # with others.
   def self.discover(uri)
     discovered = self.default_discover(uri)
-    
+
     if discovered.last.empty?
-      info = discover_google_apps(uri) 
+      info = discover_google_apps(uri)
       return info if info
     end
-    
+
     return discovered
   rescue OpenID::DiscoveryFailure => e
     info = discover_google_apps(uri)
-    
+
     if info.nil?
       raise e
     else
       return info
     end
   end
-  
+
   def self.discover_google_apps(uri)
     discovery = GoogleDiscovery.new
     discovery.perform_discovery(uri)
   end
-end
+end

data/lib/omniauth/strategies/google_apps.rb

@@ -7,14 +7,14 @@ module OmniAuth
         options[:name] ||= 'google_apps'
         super(app, store, options, &block)
       end
-      
+
       def get_identifier
         OmniAuth::Form.build(:title => 'Google Apps Authentication') do
           label_field('Google Apps Domain', 'domain')
           input_field('url', 'domain')
         end.to_response
       end
-      
+
       def identifier
         options[:domain] || request['domain']
       end

data/lib/omniauth/strategies/open_id.rb

@@ -8,11 +8,11 @@ module OmniAuth
     # to a wide variety of sites, some of which are listed [on the OpenID website](http://openid.net/get-an-openid/).
     class OpenID
       include OmniAuth::Strategy
-      
+
       attr_accessor :options
-      
+
       IDENTIFIER_URL_PARAMETER = 'openid_url'
-      
+
       AX = {
         :email => 'http://axschema.org/contact/email',
         :name => 'http://axschema.org/namePerson',
@@ -24,13 +24,13 @@ module OmniAuth
         :website => 'http://axschema.org/contact/web/default',
         :image => 'http://axschema.org/media/image/aspect11'
       }
-      
+
       # Initialize the strategy as a Rack Middleware.
       #
       # @param app [Rack Application] Standard Rack middleware application argument.
       # @param store [OpenID Store] The [OpenID Store](http://github.com/openid/ruby-openid/tree/master/lib/openid/store/)
       #   you wish to use. Defaults to OpenID::MemoryStore.
-      # @option options [Array] :required The identity fields that are required for the OpenID 
+      # @option options [Array] :required The identity fields that are required for the OpenID
       #   request. May be an ActiveExchange schema URL or an sreg identifier.
       # @option options [Array] :optional The optional attributes for the OpenID request. May
       #   be ActiveExchange or sreg.
@@ -42,9 +42,9 @@ module OmniAuth
         @options[:optional] ||= [AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
         @store = store
       end
-      
+
       protected
-      
+
       def dummy_app
         lambda{|env| [401, {"WWW-Authenticate" => Rack::OpenID.build_header(
           :identifier => identifier,
@@ -54,15 +54,15 @@ module OmniAuth
           :method => 'post'
         )}, []]}
       end
-      
+
       def identifier
         options[:identifier] || request[IDENTIFIER_URL_PARAMETER]
       end
-      
+
       def request_phase
         identifier ? start : get_identifier
       end
-      
+
       def start
         openid = Rack::OpenID.new(dummy_app, @store)
         response = openid.call(env)
@@ -73,14 +73,14 @@ module OmniAuth
           response
         end
       end
-      
+
       def get_identifier
         OmniAuth::Form.build(:title => 'OpenID Authentication') do
           label_field('OpenID Identifier', IDENTIFIER_URL_PARAMETER)
           input_field('url', IDENTIFIER_URL_PARAMETER)
         end.to_response
       end
-      
+
       def callback_phase
         openid = Rack::OpenID.new(lambda{|env| [200,{},[]]}, @store)
         openid.call(env)
@@ -91,18 +91,18 @@ module OmniAuth
           fail!(:invalid_credentials)
         end
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super(), {
           'uid' => @openid_response.display_identifier,
           'user_info' => user_info(@openid_response)
         })
       end
-      
+
       def user_info(response)
         sreg_user_info(response).merge(ax_user_info(response))
       end
-      
+
       def sreg_user_info(response)
         sreg = ::OpenID::SReg::Response.from_success_response(response)
         return {} unless sreg
@@ -113,7 +113,7 @@ module OmniAuth
           'nickname' => sreg['nickname']
         }.reject{|k,v| v.nil? || v == ''}
       end
-      
+
       def ax_user_info(response)
         ax = ::OpenID::AX::FetchResponse.from_success_response(response)
         return {} unless ax

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-openid.gemspec

@@ -1,19 +1,23 @@
 # -*- 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 'rack-openid', '~> 1.2.0'
-  gem.add_dependency 'ruby-openid-apps-discovery'
+  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7.3' if RUBY_PLATFORM == 'java'
+  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_runtime_dependency 'rack-openid', '~> 1.3.1'
+  gem.add_runtime_dependency 'ruby-openid-apps-discovery', '~> 1.2.0'
+  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-openid'
-  gem.version = Omniauth::VERSION.dup
-  gem.summary = %q{OpenID strategies for OmniAuth.}
+  gem.version = OmniAuth::Version::STRING
   gem.description = %q{OpenID 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']

data/spec/omniauth/strategies/open_id_spec.rb

@@ -1,37 +1,37 @@
-require 'spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe OmniAuth::Strategies::OpenID do
 
 end
 
 # require File.dirname(__FILE__) + '/../../spec_helper'
-# 
+#
 # describe OmniAuth::Strategies::OpenID, :type => :strategy do
-#   
+#
 #   include OmniAuth::Test::StrategyTestCase
-#   
+#
 #   def strategy
 #     [OmniAuth::Strategies::OpenID]
 #   end
-#   
+#
 #   describe '/auth/open_id without an identifier URL' do
 #     before do
 #       get '/auth/open_id'
 #     end
-#     
+#
 #     it 'should respond with OK' do
 #       last_response.should be_ok
 #     end
-#     
+#
 #     it 'should respond with HTML' do
 #       last_response.content_type.should == 'text/html'
 #     end
-#     
+#
 #     it 'should render an identifier URL input' do
 #       last_response.body.should =~ %r{<input[^>]*#{OmniAuth::Strategies::OpenID::IDENTIFIER_URL_PARAMETER}}
 #     end
 #   end
-#   
+#
 #   describe '/auth/open_id with an identifier URL' do
 #     before do
 #       @identifier_url = 'http://me.example.org'
@@ -39,19 +39,19 @@ end
 #       stub_request(:get, @identifier_url)
 #       get '/auth/open_id?openid_url=' + @identifier_url
 #     end
-#     
+#
 #     it 'should redirect to the OpenID identity URL' do
 #       last_response.should be_redirect
 #       last_response.headers['Location'].should =~ %r{^#{@identifier_url}.*}
 #     end
-#     
+#
 #     it 'should tell the OpenID server to return to the callback URL' do
 #       return_to = CGI.escape(last_request.url + '/callback')
 #       last_response.headers['Location'].should =~ %r{[\?&]openid.return_to=#{return_to}}
 #     end
-#     
+#
 #   end
-#   
+#
 #   describe 'followed by /auth/open_id/callback' do
 #     before do
 #       @identifier_url = 'http://me.example.org'
@@ -59,11 +59,11 @@ end
 #       stub_request(:get, @identifier_url)
 #       get '/auth/open_id/callback'
 #     end
-#     
+#
 #     sets_an_auth_hash
 #     sets_provider_to 'open_id'
 #     sets_uid_to 'http://me.example.org'
-#   
+#
 #     it 'should call through to the master app' do
 #       last_response.body.should == 'true'
 #     end

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
+require 'simplecov'
+SimpleCov.start
 require 'rspec'
-require 'rspec/autorun'
-require 'webmock/rspec'
 require 'rack/test'
+require 'webmock/rspec'
 require 'omniauth/core'
 require 'omniauth/test'
 require 'omniauth/openid'
@@ -14,5 +12,3 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end
-
-WebMock.disable_net_connect!

metadata

@@ -2,7 +2,7 @@
 name: oa-openid
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oa-core
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -41,66 +41,99 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: maruku
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: "0.6"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack-test
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.5"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        version: "0.8"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.6"
+        version: "2.5"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0.4"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.6"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "4.5"
+  type: :development
+  version_requirements: *id011
 description: OpenID strategies for OmniAuth.
 email: 
 - michael@intridea.com
@@ -115,7 +148,6 @@ files:
 - .gemtest
 - .rspec
 - .yardopts
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -124,6 +156,7 @@ files:
 - lib/omniauth/openid/gapps.rb
 - lib/omniauth/strategies/google_apps.rb
 - lib/omniauth/strategies/open_id.rb
+- lib/omniauth/version.rb
 - oa-openid.gemspec
 - spec/omniauth/strategies/open_id_spec.rb
 - spec/spec_helper.rb

data/Gemfile

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec