omniauth 1.0.1 → 1.0.2

data/Gemfile

@@ -1,11 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
+gem 'rack', '~> 1.4'
 gemspec
-
-group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'growl'
-  gem 'rb-fsevent'
-end

data/Gemfile.rack-1.3.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rack', '~> 1.3.0'
+gemspec

data/README.md

@@ -1,4 +1,7 @@
-# OmniAuth: Standardized Multi-Provider Authentication
+# OmniAuth: Standardized Multi-Provider Authentication [![CI Build Status](https://secure.travis-ci.org/intridea/omniauth.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/intridea/omniauth.png?travis)][gemnasium]
+
+[travis]: http://travis-ci.org/intridea/omniauth
+[gemnasium]: https://gemnasium.com/intridea/omniauth
 
 **OmniAuth 1.0 has several breaking changes from version 0.x. You can set
 the dependency to `~> 0.3.2` if you do not wish to make the more difficult
@@ -7,7 +10,7 @@ for more information.**
 
 ## An Introduction
 
-OmniAuth is a libary that standardizes multi-provider authentication for
+OmniAuth is a library that standardizes multi-provider authentication for
 web applications. It was created to be powerful, flexible, and do as
 little as possible. Any developer can create **strategies** for OmniAuth
 that can authenticate users via disparate systems. OmniAuth strategies
@@ -15,11 +18,11 @@ have been created for everything from Facebook to LDAP.
 
 In order to use OmniAuth in your applications, you will need to leverage
 one or more strategies. These strategies are generally released
-individually as RubyGems, and you can see a [community maintained list](https://github.com/intridea/omniauth/wiki/List-of-Strategies) 
+individually as RubyGems, and you can see a [community maintained list](https://github.com/intridea/omniauth/wiki/List-of-Strategies)
 on the wiki for this project.
 
 One strategy, called `Developer`, is included with OmniAuth and provides
-a completely unsecure, non-production-usable strategy that directly
+a completely insecure, non-production-usable strategy that directly
 prompts a user for authentication information and then passes it
 straight through. You can use it as a placeholder when you start
 development and easily swap in other strategies later.
@@ -117,39 +120,36 @@ environment information on the callback request. It is entirely up to
 you how you want to implement the particulars of your application's
 authentication flow.
 
-## Resources
+## <a name="resources"></a>Resources
 
 The [OmniAuth Wiki](https://github.com/intridea/omniauth/wiki) has
 actively maintained in-depth documentation for OmniAuth. It should be
 your first stop if you are wondering about a more in-depth look at
 OmniAuth, how it works, and how to use it.
 
-## Supported Rubies
+## <a name="versions"></a>Supported Ruby Versions
 
 OmniAuth is tested under 1.8.7, 1.9.2, 1.9.3, JRuby, Rubinius (1.8
 mode), and Ruby Enterprise Edition.
 
-[![CI Build Status](https://secure.travis-ci.org/intridea/omniauth.png)](http://travis-ci.org/intridea/omniauth)
-
-
-## License
+## <a name="license"></a>License
 
 Copyright (c) 2011 Intridea, Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included 
+The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

data/lib/omniauth.rb

@@ -24,20 +24,20 @@ module OmniAuth
       :path_prefix => '/auth',
       :on_failure => Proc.new do |env|
         message_key = env['omniauth.error.type']
-        new_path = "#{OmniAuth.config.path_prefix}/failure?message=#{message_key}"
+        new_path = "#{env['SCRIPT_NAME']}#{OmniAuth.config.path_prefix}/failure?message=#{message_key}"
         [302, {'Location' => new_path, 'Content-Type'=> 'text/html'}, []]
       end,
       :form_css => Form::DEFAULT_CSS,
       :test_mode => false,
       :allowed_request_methods => [:get, :post],
       :mock_auth => {
-        :default => {
+        :default => AuthHash.new(
           'provider' => 'default',
           'uid' => '1234',
           'info' => {
             'name' => 'Bob Example'
           }
-        }
+        )
       }
     }
 

data/lib/omniauth/builder.rb

@@ -3,8 +3,16 @@ require 'omniauth'
 module OmniAuth
   class Builder < ::Rack::Builder
     def initialize(app, &block)
-      @app = app
-      super(&block)
+      if rack14?
+        super
+      else
+        @app = app
+        super(&block)
+      end
+    end
+
+    def rack14?
+      Rack.release.split('.')[1].to_i >= 4
     end
 
     def on_failure(&block)
@@ -30,7 +38,7 @@ module OmniAuth
     end
 
     def call(env)
-      @ins << @app unless @ins.include?(@app)
+      @ins << @app unless rack14? || @ins.include?(@app)
       to_app.call(env)
     end
   end

data/lib/omniauth/form.rb

@@ -94,6 +94,7 @@ module OmniAuth
       self.options = options
 
       @html = ""
+      @with_custom_button = false
       header(options[:title],options[:header_info])
     end
 
@@ -130,6 +131,7 @@ module OmniAuth
     end
 
     def button(text)
+      @with_custom_button = true
       @html << "\n<button type='submit'>#{text}</button>"
     end
 
@@ -162,8 +164,8 @@ module OmniAuth
 
     def footer
       return self if @footer
+      @html << "\n<button type='submit'>Connect</button>" unless @with_custom_button
       @html << <<-HTML
-      <button type='submit'>Connect</button>
       </form>
       </body>
       </html>

data/lib/omniauth/version.rb

@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/omniauth.gemspec

@@ -10,13 +10,17 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rack'
   gem.add_runtime_dependency 'hashie', '~> 1.2'
 
-  gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'rack-test', '~> 0.5'
-  gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'rdiscount', '~> 1.6'
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'yard', '~> 0.7'
+  gem.add_development_dependency 'growl'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-bundler'
+  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'rack-test'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rb-fsevent'
+  gem.add_development_dependency 'rdiscount'
+  gem.add_development_dependency 'rspec', '~> 2.8'
+  gem.add_development_dependency 'yard'
 
   gem.version = OmniAuth::VERSION
   gem.files = `git ls-files`.split("\n")

data/spec/omniauth/strategy_spec.rb

@@ -496,6 +496,18 @@ describe OmniAuth::Strategy do
         response[1]['Location'].should == '/sub_uri/auth/test/callback'
       end
 
+      it 'should redirect on failure' do
+        response = OmniAuth.config.on_failure.call(make_env('/auth/test', 'omniauth.error.type' => 'error'))
+        response[0].should == 302
+        response[1]['Location'].should == '/auth/failure?message=error'
+      end
+
+      it 'should respect SCRIPT_NAME (a.k.a. BaseURI) on failure' do
+        response = OmniAuth.config.on_failure.call(make_env('/auth/test', 'SCRIPT_NAME' => '/sub_uri', 'omniauth.error.type' => 'error'))
+        response[0].should == 302
+        response[1]['Location'].should == '/sub_uri/auth/failure?message=error'
+      end
+
       it 'should be case insensitive on callback path' do
         strategy.call(make_env('/AUTH/TeSt/CaLlBAck')).should == strategy.call(make_env('/auth/test/callback'))
       end
@@ -510,6 +522,8 @@ describe OmniAuth::Strategy do
       end
 
       it 'should respond with the default hash if none is set' do
+        OmniAuth.config.mock_auth[:test] = nil
+
         strategy.call make_env('/auth/test/callback')
         strategy.env['omniauth.auth']['uid'].should == '1234'
       end
@@ -546,7 +560,7 @@ describe OmniAuth::Strategy do
         strategy.call(make_env('/auth/test/callback', 'rack.session' => {'omniauth.origin' => 'http://example.com/origin'}))
         strategy.env['omniauth.origin'].should == 'http://example.com/origin'
       end
-      
+
       after do
         OmniAuth.config.test_mode = false
       end
@@ -556,7 +570,7 @@ describe OmniAuth::Strategy do
       before do
         OmniAuth.config.test_mode = true
       end
-      
+
       it 'should be the string when a string is there' do
         OmniAuth.config.full_host = 'my.host.com'
         strategy.full_host.should == 'my.host.com'
@@ -567,7 +581,7 @@ describe OmniAuth::Strategy do
         strategy.call(make_env('/auth/test', 'HOST' => 'my.host.net'))
         strategy.full_host.should == 'my.host.net'
       end
-      
+
       after do
         OmniAuth.config.test_mode = false
       end
@@ -578,7 +592,7 @@ describe OmniAuth::Strategy do
     before do
       OmniAuth.config.test_mode = true
     end
-    
+
     context 'when options[:setup] = true' do
       let(:strategy){ ExampleStrategy.new(app, :setup => true) }
       let(:app){lambda{|env| env['omniauth.strategy'].options[:awesome] = 'sauce' if env['PATH_INFO'] == '/auth/test/setup'; [404, {}, 'Awesome'] }}
@@ -613,7 +627,7 @@ describe OmniAuth::Strategy do
         strategy.options[:awesome].should == 'sauce'
       end
     end
-    
+
     after do
       OmniAuth.config.test_mode = false
     end

data/spec/omniauth_spec.rb

@@ -52,6 +52,28 @@ describe OmniAuth do
 
       OmniAuth.config.on_failure.call.should == 'yoyo'
     end
+    describe 'mock auth' do
+      before do
+        OmniAuth.config.add_mock(:facebook, :uid => '12345',:info=>{:name=>'Joe', :email=>'joe@example.com'})
+      end
+      it 'default should be AuthHash' do
+        OmniAuth.configure do |config|
+          config.mock_auth[:default].should be_kind_of(OmniAuth::AuthHash)
+        end
+      end
+      it 'facebook should be AuthHash' do
+        OmniAuth.configure do |config|
+          config.mock_auth[:facebook].should be_kind_of(OmniAuth::AuthHash)
+        end        
+      end
+      it 'should set facebook attributes' do
+        OmniAuth.configure do |config|
+          config.mock_auth[:facebook].uid.should eq('12345')
+          config.mock_auth[:facebook].info.name.should eq('Joe')
+          config.mock_auth[:facebook].info.email.should eq('joe@example.com')
+        end
+      end
+    end
   end
 
   describe '::Utils' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70297966785140 !ruby/object:Gem::Requirement
+  requirement: &70122274715460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297966785140
+  version_requirements: *70122274715460
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70297966784640 !ruby/object:Gem::Requirement
+  requirement: &70122274714780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,84 +33,128 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70297966784640
+  version_requirements: *70122274714780
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70297966784140 !ruby/object:Gem::Requirement
+  name: growl
+  requirement: &70122274714040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70122274714040
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70122274713040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70122274713040
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70122274712400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70122274712400
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70122274711600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966784140
+  version_requirements: *70122274711600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70297966783680 !ruby/object:Gem::Requirement
+  requirement: &70122274573840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966783680
+  version_requirements: *70122274573840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70297966783220 !ruby/object:Gem::Requirement
+  requirement: &70122274572580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966783220
+  version_requirements: *70122274572580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70297966782760 !ruby/object:Gem::Requirement
+  requirement: &70122274571680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966782760
+  version_requirements: *70122274571680
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70122274571120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70122274571120
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70297966782300 !ruby/object:Gem::Requirement
+  requirement: &70122274570500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966782300
+  version_requirements: *70122274570500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297966781840 !ruby/object:Gem::Requirement
+  requirement: &70122274569760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70297966781840
+  version_requirements: *70122274569760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70297966781380 !ruby/object:Gem::Requirement
+  requirement: &70122274569120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297966781380
+  version_requirements: *70122274569120
 description: A generalized Rack framework for multiple-provider authentication.
 email:
 - michael@intridea.com
@@ -125,6 +169,7 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
+- Gemfile.rack-1.3.x
 - Guardfile
 - LICENSE
 - README.md
@@ -168,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A generalized Rack framework for multiple-provider authentication.