oa-core 0.2.6 → 0.3.0.rc3

data/lib/omniauth/core.rb

@@ -55,10 +55,14 @@ module OmniAuth
 
     def add_mock(provider, mock={})
       # Stringify keys recursively one level.
-      mock.stringify_keys!
-      mock.keys.each do|key|
-        if mock[key].is_a? Hash
-          mock[key].stringify_keys!
+      mock.keys.each do |key|
+        mock[key.to_s] = mock.delete(key)
+      end
+      mock.each_pair do |key, val|
+        if val.is_a? Hash
+          val.keys.each do |subkey|
+            val[subkey.to_s] = val.delete(subkey)
+          end
         end
       end
 
@@ -98,7 +102,8 @@ module OmniAuth
       'smugmug' => 'SmugMug',
       'cas' => 'CAS',
       'trademe' => 'TradeMe',
-      'ldap'  => 'LDAP'
+      'ldap'  => 'LDAP',
+      'google_oauth2' => 'GoogleOAuth2'
     }
 
     module_function

data/lib/omniauth/strategy.rb

@@ -95,7 +95,7 @@ module OmniAuth
       elsif env['HTTP_REFERER'] && !env['HTTP_REFERER'].match(/#{request_path}$/)
         @env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
       end
-      redirect(script_name + callback_path)
+      redirect(script_name + callback_path + query_string)
     end
 
     def mock_callback_call
@@ -126,6 +126,8 @@ module OmniAuth
 
     def callback_phase
       @env['omniauth.auth'] = auth_hash
+      @env['omniauth.params'] = session['query_params'] || {}
+      session['query_params'] = nil if session['query_params']
       call_app!
     end
 
@@ -155,6 +157,7 @@ module OmniAuth
 
     def call_through_to_app
       status, headers, body = *call_app!
+      session['query_params'] = Rack::Request.new(env).params
       @response = Rack::Response.new(body, status, headers)
 
       status == 404 ? nil : @response.finish

data/lib/omniauth/version.rb

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

data/oa-core.gemspec

@@ -1,24 +1,22 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  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.5'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.name = 'oa-core'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{Core 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']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-core'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end

data/spec/omniauth/strategy_spec.rb

@@ -267,6 +267,11 @@ describe OmniAuth::Strategy do
         strategy.call(make_env('/AUTH/TeSt/CaLlBAck')).should == strategy.call(make_env('/auth/test/callback'))
       end
 
+      it 'should maintain query string parameters' do
+        response = strategy.call(make_env('/auth/test', 'QUERY_STRING' => 'cheese=stilton'))
+        response[1]['Location'].should == '/auth/test/callback?cheese=stilton'
+      end
+
       it 'should not short circuit requests outside of authentication' do
         strategy.call(make_env('/')).should == app.call(make_env('/'))
       end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: oa-core
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.6
+  hash: 15424035
+  prerelease: 6
+  segments: 
+  - 0
+  - 3
+  - 0
+  - rc
+  - 3
+  version: 0.3.0.rc3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -11,61 +18,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-09-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: rack-test
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rdiscount
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: simplecov
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,20 +103,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.5"
-  type: :development
-  version_requirements: *id007
 description: Core strategies for OmniAuth.
 email: 
 - michael@intridea.com
@@ -136,17 +156,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core strategies for OmniAuth.