oa-core 0.2.0.beta4 → 0.2.0.beta5

data/lib/oa-core.rb

@@ -0,0 +1 @@
+require 'omniauth/core'

data/lib/omniauth/core.rb

@@ -20,20 +20,20 @@ module OmniAuth
 
     @@defaults = {
       :path_prefix => '/auth',
-      :on_failure => Proc.new do |env, message_key|
+      :on_failure => Proc.new do |env|
+        message_key = env['omniauth.error.type']
         new_path = "#{OmniAuth.config.path_prefix}/failure?message=#{message_key}"
-        [302, {'Location' => "#{new_path}", 'Content-Type'=> 'text/html'}, []]
+        [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 => {
+          'provider' => 'default',
           'uid' => '1234',
           'user_info' => {
-            'name' => 'Bob Example',
-            'email' => 'bob@example.com',
-            'nickname' => 'bob'
+            'name' => 'Bob Example'
           }
         }
       }
@@ -55,6 +55,23 @@ module OmniAuth
       end
     end
 
+    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!
+        end
+      end
+
+      # Merge with the default mock and ensure provider is correct.
+      mock = self.mock_auth[:default].dup.merge(mock)
+      mock["provider"] = provider.to_s
+
+      # Add it to the mocks.
+      self.mock_auth[provider.to_sym] = mock
+    end
+
     attr_writer :on_failure
     attr_accessor :path_prefix, :allowed_request_methods, :form_css, :test_mode, :mock_auth, :full_host
   end

data/lib/omniauth/strategy.rb

@@ -26,6 +26,9 @@ module OmniAuth
       raise OmniAuth::NoSessionError.new("You must provide a session to use OmniAuth.") unless env['rack.session']
 
       @env = env
+      @env['omniauth.strategy'] = self      
+      
+      setup_phase            
       return mock_call!(env) if OmniAuth.config.test_mode
       
       if current_path == request_path && OmniAuth.config.allowed_request_methods.include?(request.request_method.downcase.to_sym)
@@ -58,13 +61,27 @@ module OmniAuth
           redirect(callback_path)
         end
       elsif current_path == callback_path
-        @env['omniauth.auth'] = OmniAuth.mock_auth_for(name.to_sym)
-        call_app!
+        mocked_auth = OmniAuth.mock_auth_for(name.to_sym)
+        if mocked_auth.is_a?(Symbol)
+          fail!(mocked_auth)
+        else
+          @env['omniauth.auth'] = mocked_auth
+          call_app!
+        end
       else
         call_app!
       end
     end
     
+    def setup_phase
+      if options[:setup].respond_to?(:call)
+        options[:setup].call(env) 
+      elsif options[:setup]
+        setup_env = env.merge('PATH_INFO' => setup_path, 'REQUEST_METHOD' => 'GET')
+        call_app!(setup_env)
+      end
+    end
+
     def request_phase
       raise NotImplementedError
     end
@@ -86,8 +103,12 @@ module OmniAuth
       options[:callback_path] || "#{path_prefix}/#{name}/callback"
     end
 
+    def setup_path
+      options[:setup_path] || "#{path_prefix}/#{name}/setup"
+    end
+
     def current_path
-      request.path.sub(/\/$/,'')
+      request.path.downcase.sub(/\/$/,'')
     end
 
     def query_string
@@ -101,9 +122,8 @@ module OmniAuth
       status == 404 ? nil : @response.finish
     end
 
-    def call_app!
-      @env['omniauth.strategy'] = self      
-      @app.call(@env)
+    def call_app!(env = @env)
+      @app.call(env)
     end
     
     def auth_hash

metadata

@@ -2,7 +2,7 @@
 name: oa-core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta4
+  version: 0.2.0.beta5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -06:00
+date: 2011-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/oa-core.rb
 - lib/omniauth/builder.rb
 - lib/omniauth/core.rb
 - lib/omniauth/form.rb
@@ -123,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3734078587052071503
+      hash: -2207262758413508228
       segments: 
       - 0
       version: "0"