warden 0.2.3 → 0.3.1

data/README.textile

@@ -1 +1,2 @@
-Please see the "Warden Wiki":http://wiki.github.com/hassox/warden for overview documentation.
+Please see the "Warden Wiki":http://wiki.github.com/hassox/warden for overview documentation. 
+

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.1

data/lib/warden/manager.rb

@@ -47,7 +47,7 @@ module Warden
         if result.first != 401
           return result
         else
-          call_failure_app(env)
+          call_failure_app(env, :original_response => result)
         end
       when Hash
         if (result[:action] ||= :unauthenticated) == :unauthenticated
@@ -122,13 +122,17 @@ module Warden
     # The before_failure hooks are run on each failure
     # :api: private
     def call_failure_app(env, opts = {})
-      env["PATH_INFO"] = "/#{opts[:action]}"
-      env["warden.options"] = opts
+      if env['warden'].custom_failure?
+        opts[:original_response]
+      else
+        env["PATH_INFO"] = "/#{opts[:action]}"
+        env["warden.options"] = opts
       
-      # Call the before failure callbacks
-      Warden::Manager._before_failure.each{|hook| hook.call(env,opts)}
+        # Call the before failure callbacks
+        Warden::Manager._before_failure.each{|hook| hook.call(env,opts)}
       
-      @failure_app.call(env).to_a
+        @failure_app.call(env).to_a
+      end
     end # call_failure_app
   end
 end # Warden

data/lib/warden/proxy.rb

@@ -14,7 +14,7 @@ module Warden
     alias_method :_session, :session
           
     # :api: private
-    def_delegators :winning_strategy, :headers, :message, :_status, :custom_response
+    def_delegators :winning_strategy, :headers, :_status, :custom_response
 
     def initialize(env, config = {}) # :nodoc:
       @env = env
@@ -155,6 +155,25 @@ module Warden
        winning_strategy.nil? ? nil : winning_strategy.result
     end
     
+    # Proxy through to the authentication strategy to find out the message that was generated.
+    # :api: public
+    def message
+      winning_strategy.nil? ? "" : winning_strategy.message
+    end
+    
+    # Provides a way to return a 401 without warden defering to the failure app
+    # The result is a direct passthrough of your own response
+    # :api: public
+    def custom_failure!
+      @custom_failure = true
+    end
+    
+    # Check to see if the custom failur flag has been set
+    # :api: public
+    def custom_failure?
+      !!@custom_failure
+    end
+    
     private 
     # :api: private
     def _perform_authentication(*args)

data/spec/helpers/request_helper.rb

@@ -13,7 +13,7 @@ module Warden::Spec
     def setup_rack(app = nil, opts = {}, &block)
       app ||= block if block_given?
       # opts[:default_strategies] ||= [:password]
-      # opts[:failure_app] ||= failure_app
+      opts[:failure_app] ||= Warden::Spec::Helpers::FAILURE_APP
       Rack::Builder.new do 
         use Warden::Spec::Helpers::Session
         use Warden::Manager, opts do |manager|

data/spec/warden/manager_spec.rb

@@ -23,7 +23,7 @@ describe Warden::Manager do
         if e['warden'].authenticated? 
           [200,{'Content-Type' => 'text/plain'},"OK"]
         else
-          [401,{'Content-Type' => 'text/plain'},"You Fail"]
+          [401,{'Content-Type' => 'text/plain'},"Fail From The App"]
         end
       end
       @env = Rack::MockRequest.
@@ -125,6 +125,27 @@ describe Warden::Manager do
         result[2].should == ["You Fail!"]
         env['PATH_INFO'].should == "/unauthenticated"
       end
+      
+      it "should allow you to customize the response" do
+        app = lambda do |e|
+          e['warden'].custom_failure!
+          [401,{'Content-Type' => 'text/plain'},["Fail From The App"]]
+        end
+        env = env_with_params
+        result = setup_rack(app).call(env)
+        result[0].should == 401
+        result[2].should == ["Fail From The App"]
+      end
+      
+      it "should render the failure application for a 401 if no custom_failure flag is set" do
+        app = lambda do |e|
+          [401,{'Content-Type' => 'text/plain'},["Fail From The App"]]
+        end
+        result = setup_rack(app).call(env_with_params)
+        result[0].should == 401
+        result[2].should == ["You Fail!"]
+      end
+      
     end # failing
     
     describe "custom rack response" do
@@ -153,6 +174,7 @@ describe Warden::Manager do
         result[0].should == 200
         result[2].should == ["Foo Is A Winna"]
       end
-    end
+    end    
   end # integrated strategies
+
 end

data/spec/warden/proxy_spec.rb

@@ -251,7 +251,7 @@ describe Warden::Proxy do
       @env['warden'].user.should be_nil
       
     end
-    require 'ruby-debug'
+
     it "should clear the session data when logging out" do
       @env['rack.session'].should_not be_nil
       app = lambda do |e|
@@ -265,6 +265,28 @@ describe Warden::Proxy do
     end
   end
   
+  describe "messages" do
+    
+    it "should allow access to the failure message" do
+      failure = lambda do |e|
+        [401, {"Content-Type" => "text/plain"}, [e['warden'].message]]
+      end
+      app = lambda do |e|
+        e['warden'].authenticate! :failz
+      end
+      result = setup_rack(app, :failure_app => failure).call(env_with_params)
+      result.last.should == ["The Fails Strategy Has Failed You"]
+    end
+    
+    it "should not die when accessing a message from a source where no authentication has occured" do
+      app = lambda do |e|
+        [200, {"Content-Type" => "text/plain"}, [e['warden'].message]]
+      end
+      result = setup_rack(app).call(env_with_params)
+      result[2].should == [""]
+    end
+  end
+  
   describe "when all strategies are not valid?" do
     it "should return false for authenticated when there are no valid? strategies" do
      @env['rack.session'] = {}
@@ -293,4 +315,6 @@ describe Warden::Proxy do
     
   end
   
+
+  
 end

data/spec/warden/strategies/failz.rb

@@ -3,7 +3,7 @@ Warden::Strategies.add(:failz) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []
     request.env['warden.spec.strategies'] << :failz
-    fail!("You Fail!")
+    fail!("The Fails Strategy Has Failed You")
   end
   
 end

data/warden.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.2.3"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-07-08}
+  s.date = %q{2009-08-10}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{warden}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Rack middleware that provides authentication for rack applications}
   s.test_files = [
     "spec/helpers/request_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 +10:00
+date: 2009-08-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: warden
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Rack middleware that provides authentication for rack applications