oa-core 0.2.0.beta3 → 0.2.0.beta4

data/lib/omniauth/core.rb

@@ -10,7 +10,7 @@ module OmniAuth
   module Strategies
     autoload :Password, 'omniauth/strategies/password'
   end
-  
+
   def self.strategies
     @@strategies ||= []
   end

data/lib/omniauth/strategy.rb

@@ -1,9 +1,8 @@
 require 'omniauth/core'
 
 module OmniAuth
-  
-  module Strategy
-    
+  class NoSessionError < StandardError; end 
+  module Strategy 
     def self.included(base)
       OmniAuth.strategies << base
       base.class_eval do
@@ -24,29 +23,40 @@ module OmniAuth
     end
 
     def call!(env)
+      raise OmniAuth::NoSessionError.new("You must provide a session to use OmniAuth.") unless env['rack.session']
+
       @env = env
       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)
-        status, headers, body = *call_app!
-        @response = Rack::Response.new(body, status, headers)
-        request_phase
+        if response = call_through_to_app
+          response
+        else
+          env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
+          request_phase
+        end
       elsif current_path == callback_path
+        env['omniauth.origin'] = session.delete('omniauth.origin')
+        env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
+
         callback_phase
       else
         if respond_to?(:other_phase)
           other_phase
         else
-          call_app!
+          @app.call(env)
         end
       end
     end
 
     def mock_call!(env)
-      if current_path == request_path
-        status, headers, body = *call_app!
-        @response = Rack::Response.new(body, status, headers)
-        redirect callback_path
+      if current_path == request_path 
+        if response = call_through_to_app
+          response
+        else
+          env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
+          redirect(callback_path)
+        end
       elsif current_path == callback_path
         @env['omniauth.auth'] = OmniAuth.mock_auth_for(name.to_sym)
         call_app!
@@ -61,7 +71,6 @@ module OmniAuth
     
     def callback_phase
       @env['omniauth.auth'] = auth_hash
-      
       call_app! 
     end
     
@@ -85,9 +94,15 @@ module OmniAuth
       request.query_string.empty? ? "" : "?#{request.query_string}"
     end
     
-    def call_app!
-      @env['omniauth.strategy'] = self
+    def call_through_to_app
+      status, headers, body = *call_app!
+      @response = Rack::Response.new(body, status, headers)
       
+      status == 404 ? nil : @response.finish
+    end
+
+    def call_app!
+      @env['omniauth.strategy'] = self      
       @app.call(@env)
     end
     

data/lib/omniauth/test/strategy_test_case.rb

@@ -26,7 +26,7 @@ module OmniAuth
         Rack::Builder.new {
           use OmniAuth::Test::PhonySession
           use *strat
-          run lambda { |env| [200, {'Content-Type' => 'text/plain'}, [resp || env.key?('omniauth.auth').to_s]] }
+          run lambda {|env| [404, {'Content-Type' => 'text/plain'}, [resp || env.key?('omniauth.auth').to_s]] }
         }.to_app
       end
       
@@ -46,4 +46,4 @@ module OmniAuth
       
   end
   
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: oa-core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta3
+  version: 0.2.0.beta4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -06:00
+date: 2011-02-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4575558600340992300
+      hash: -3734078587052071503
       segments: 
       - 0
       version: "0"