omniauth 1.0.0 → 1.0.1

data/.rspec

@@ -1,2 +1 @@
 --color
---format=progress

data/.travis.yml

@@ -1,8 +1,8 @@
 rvm:
   - 1.8.7
-  - ree
   - 1.9.2
   - 1.9.3
   - jruby
-  - rbx-18mode
-# - rbx-19mode
+  - rbx
+  - rbx-2.0
+  - ree

data/README.md

@@ -1,5 +1,10 @@
 # OmniAuth: Standardized Multi-Provider Authentication
 
+**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
+upgrade. See [the wiki](https://github.com/intridea/omniauth/wiki/Upgrading-to-1.0)
+for more information.**
+
 ## An Introduction
 
 OmniAuth is a libary that standardizes multi-provider authentication for
@@ -26,13 +31,15 @@ it the same way that you use any other Rack middleware. For example, to
 use the built-in Developer strategy in a Sinatra application I might do
 this:
 
-    require 'sinatra'
-    require 'omniauth'
+```ruby
+require 'sinatra'
+require 'omniauth'
 
-    class MyApplication < Sinatra::Base
-      use Rack::Session
-      use OmniAuth::Strategies::Developer
-    end
+class MyApplication < Sinatra::Base
+  use Rack::Session
+  use OmniAuth::Strategies::Developer
+end
+```
 
 Because OmniAuth is built for *multi-provider* authentication, I may
 want to leave room to run multiple strategies. For this, the built-in
@@ -42,10 +49,12 @@ code and using each strategy individually as middleware. This is an
 example that you might put into a Rails initializer at
 `config/initializers/omniauth.rb`:
 
-    Rails.application.config.middleware.use OmniAuth::Builder do
-      provider :developer unless Rails.env.production?
-      provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
-    end
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :developer unless Rails.env.production?
+  provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
+end
+```
 
 You should look to the documentation for each provider you use for
 specific initialization requirements.
@@ -73,24 +82,28 @@ application that matches to the callback URL and then performs whatever
 steps are necessary for your application. For example, in a Rails app I
 would add a line in my `routes.rb` file like this:
 
-    match '/auth/:provider/callback', to: 'sessions#create'
+```ruby
+match '/auth/:provider/callback', to: 'sessions#create'
+```
 
 And I might then have a `SessionsController` with code that looks
 something like this:
 
-    class SessionsController < ApplicationController
-      def create
-        @user = User.find_or_create_from_auth_hash(auth_hash)
-        self.current_user = @user
-        redirect_to '/'
-      end
+```ruby
+class SessionsController < ApplicationController
+  def create
+    @user = User.find_or_create_from_auth_hash(auth_hash)
+    self.current_user = @user
+    redirect_to '/'
+  end
 
-      protected
+  protected
 
-      def auth_hash
-        request.env['omniauth.auth']
-      end
-    end
+  def auth_hash
+    request.env['omniauth.auth']
+  end
+end
+```
 
 The `omniauth.auth` key in the environment hash gives me my
 Authentication Hash which will contain information about the just
@@ -116,8 +129,7 @@ OmniAuth, how it works, and how to use it.
 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)
+[![CI Build Status](https://secure.travis-ci.org/intridea/omniauth.png)](http://travis-ci.org/intridea/omniauth)
 
 
 ## License

data/lib/omniauth.rb

@@ -34,7 +34,9 @@ module OmniAuth
         :default => {
           'provider' => 'default',
           'uid' => '1234',
-          'name' => 'Bob Example'
+          'info' => {
+            'name' => 'Bob Example'
+          }
         }
       }
     }

data/lib/omniauth/builder.rb

@@ -19,7 +19,11 @@ module OmniAuth
       if klass.is_a?(Class)
         middleware = klass
       else
-        middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
+        begin
+          middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
+        rescue NameError
+          raise LoadError, "Could not find matching strategy for #{klass.inspect}. You may need to install an additional gem (such as omniauth-#{klass})."
+        end
       end
 
       use middleware, *args, &block

data/lib/omniauth/strategy.rb

@@ -177,6 +177,10 @@ module OmniAuth
     # Performs the steps necessary to run the request phase of a strategy.
     def request_call
       setup_phase
+
+      #store query params from the request url, extracted in the callback_phase
+      session['omniauth.params'] = request.params
+
       if options.form.respond_to?(:call)
         options.form.call(env)
       elsif options.form
@@ -196,7 +200,7 @@ module OmniAuth
       setup_phase
       @env['omniauth.origin'] = session.delete('omniauth.origin')
       @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
-      @env['omniauth.params'] = session.delete('query_params') || {}
+      @env['omniauth.params'] = session.delete('omniauth.params') || {}
       callback_phase
     end
 
@@ -250,6 +254,7 @@ module OmniAuth
         fail!(mocked_auth)
       else
         @env['omniauth.auth'] = mocked_auth
+        @env['omniauth.params'] = session.delete('query_params') || {}
         @env['omniauth.origin'] = session.delete('omniauth.origin')
         @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
         call_app!

data/lib/omniauth/version.rb

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

data/spec/omniauth/builder_spec.rb

@@ -16,5 +16,13 @@ describe OmniAuth::Builder do
         provider ::ExampleClass
       end }.should_not raise_error
     end
+
+    it "should raise a helpful LoadError messgae if it can't find the class" do
+      expect {
+        OmniAuth::Builder.new(nil) do
+          provider :lorax
+        end
+      }.to raise_error(LoadError, "Could not find matching strategy for :lorax. You may need to install an additional gem (such as omniauth-lorax).")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70252345407440 !ruby/object:Gem::Requirement
+  requirement: &70297966785140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252345407440
+  version_requirements: *70297966785140
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70252345405080 !ruby/object:Gem::Requirement
+  requirement: &70297966784640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70252345405080
+  version_requirements: *70297966784640
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70252345401000 !ruby/object:Gem::Requirement
+  requirement: &70297966784140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70252345401000
+  version_requirements: *70297966784140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70252345398880 !ruby/object:Gem::Requirement
+  requirement: &70297966783680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70252345398880
+  version_requirements: *70297966783680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70252345396500 !ruby/object:Gem::Requirement
+  requirement: &70297966783220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70252345396500
+  version_requirements: *70297966783220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70252345388780 !ruby/object:Gem::Requirement
+  requirement: &70297966782760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70252345388780
+  version_requirements: *70297966782760
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70252345387020 !ruby/object:Gem::Requirement
+  requirement: &70297966782300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70252345387020
+  version_requirements: *70297966782300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70252345384400 !ruby/object:Gem::Requirement
+  requirement: &70297966781840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70252345384400
+  version_requirements: *70297966781840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70252345382060 !ruby/object:Gem::Requirement
+  requirement: &70297966781380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70252345382060
+  version_requirements: *70297966781380
 description: A generalized Rack framework for multiple-provider authentication.
 email:
 - michael@intridea.com