warden 0.10.0 → 0.10.1

data/lib/warden/manager.rb

@@ -40,14 +40,13 @@ module Warden
       result ||= {}
       case result
       when Array
-        if result.first == 401
-          process_unauthenticated({:original_response => result, :action => :unauthenticated}, env)
+        if result.first == 401 && !env['warden'].custom_failure?
+          process_unauthenticated(env)
         else
           result
         end
       when Hash
-        result[:action] ||= :unauthenticated
-        process_unauthenticated(result, env)
+        process_unauthenticated(env, result || {})
       end
     end
 
@@ -87,30 +86,33 @@ module Warden
     # When a request is unauthentiated, here's where the processing occurs.
     # It looks at the result of the proxy to see if it's been executed and what action to take.
     # :api: private
-    def process_unauthenticated(result, env)
-      action = result[:result] || env['warden'].result
-
-      case action
-        when :redirect
-          [env['warden'].status, env['warden'].headers, [env['warden'].message || "You are being redirected to #{env['warden'].headers['Location']}"]]
-        when :custom
-          env['warden'].custom_response
-        else
-          call_failure_app(env, result)
+    def process_unauthenticated(env, options={})
+      options[:action] ||= :unauthenticated
+
+      proxy  = env['warden']
+      result = options[:result] || proxy.result
+
+      case result
+      when :redirect
+        body = proxy.message || "You are being redirected to #{proxy.headers['Location']}"
+        [proxy.status, proxy.headers, [body]]
+      when :custom
+        proxy.custom_response
+      else
+        call_failure_app(env, options)
       end
     end
 
     # Calls the failure app.
     # The before_failure hooks are run on each failure
     # :api: private
-    def call_failure_app(env, opts = {})
-      if env['warden'].custom_failure?
-        opts[:original_response]
-      elsif config.failure_app
-        env["PATH_INFO"] = "/#{opts[:action]}"
-        env["warden.options"] = opts
-
-        _run_callbacks(:before_failure, env, opts)
+    def call_failure_app(env, options = {})
+      if config.failure_app
+        options.merge!(:attempted_path => ::Rack::Request.new(env).fullpath)
+        env["PATH_INFO"] = "/#{options[:action]}"
+        env["warden.options"] = options
+
+        _run_callbacks(:before_failure, env, options)
         config.failure_app.call(env).to_a
       else
         raise "No Failure App provided"

data/lib/warden/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Warden
-  VERSION = "0.10.0".freeze
+  VERSION = "0.10.1".freeze
 end

data/spec/warden/manager_spec.rb

@@ -69,6 +69,17 @@ describe Warden::Manager do
         result.first.should == 401
         result.last.should == ["You Fail!"]
       end
+
+      it "should set the attempted url in warden.options hash" do
+        env = env_with_params("/access/path", {})
+        app = lambda do |env|
+          env['warden'].authenticate(:pass)
+          throw(:warden)
+        end
+        result = setup_rack(app, :failure_app => @fail_app).call(env)
+        result.first.should == 401
+        env["warden.options"][:attempted_path].should == "/access/path"
+      end
     end # failure
 
   end

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-23}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +11:00
+date: 2010-03-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency