oa-core 0.1.2 → 0.1.3

data/lib/omniauth/builder.rb

@@ -7,6 +7,14 @@ module OmniAuth
       super(&block)
     end
     
+    def on_failure(&block)
+      OmniAuth.config.on_failure = block
+    end
+    
+    def configure(&block)
+      OmniAuth.configure(&block)
+    end
+    
     def provider(klass, *args, &block)
       if klass.is_a?(Class)
         middleware = klass

data/lib/omniauth/strategies/password.rb

@@ -19,8 +19,8 @@ module OmniAuth
         return fail!(:password_mismatch) if request[:password_confirmation] && request[:password_confirmation] != '' && request[:password] != request[:password_confirmation]
         env['REQUEST_METHOD'] = 'GET'
         env['PATH_INFO'] = request.path + '/callback'
-        env['rack.auth'] = auth_hash(encrypt(request[:identifier], request[:password]))
-        @app.call(env)
+        env['omniauth.auth'] = auth_hash(encrypt(request[:identifier], request[:password]))
+        call_app!
       end
       
       def auth_hash(crypted_password)
@@ -33,7 +33,7 @@ module OmniAuth
       end
       
       def callback_phase
-        @app.call(env)
+        call_app!
       end
       
       def encrypt(identifier, password)

data/lib/omniauth/strategy.rb

@@ -29,7 +29,7 @@ module OmniAuth
         if respond_to?(:other_phase)
           other_phase
         else
-          @app.call(env)
+          call_app!
         end
       end
     end
@@ -39,8 +39,15 @@ module OmniAuth
     end
     
     def callback_phase
-      env['rack.auth'] = auth_hash
-      @app.call(env)
+      @env['omniauth.auth'] = auth_hash
+      call_app!
+    end
+    
+    def call_app!
+      @env['rack.auth'] = env['omniauth.auth'] if env.key?('omniauth.auth')
+      @env['rack.auth.error'] = env['omniauth.error'] if env.key?('omniauth.error')
+      
+      @app.call(@env)
     end
     
     def auth_hash
@@ -77,7 +84,8 @@ module OmniAuth
     
     def user_info; {} end
     
-    def fail!(message_key)
+    def fail!(message_key, exception = nil)
+      self.env['omniauth.error'] = exception
       OmniAuth.config.on_failure.call(self.env, message_key.to_sym)
     end
   end

data/lib/omniauth/test/strategy_macros.rb

@@ -6,19 +6,19 @@ module OmniAuth
       
       def sets_an_auth_hash
         it 'should set an auth hash' do
-          last_request.env['rack.auth'].should be_kind_of(Hash)
+          last_request.env['omniauth.auth'].should be_kind_of(Hash)
         end
       end
       
       def sets_provider_to(provider)
         it "should set the provider to #{provider}" do
-          (last_request.env['rack.auth'] || {})['provider'].should == provider
+          (last_request.env['omniauth.auth'] || {})['provider'].should == provider
         end
       end
       
       def sets_uid_to(uid)
         it "should set the UID to #{uid}" do
-          (last_request.env['rack.auth'] || {})['uid'].should == uid
+          (last_request.env['omniauth.auth'] || {})['uid'].should == uid
         end
       end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -05:00
+date: 2010-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency