warden 1.0.6 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    warden (1.0.5)
+    warden (1.0.7)
       rack (>= 1.0)
 
 GEM

data/History.rdoc

@@ -1,3 +1,5 @@
+== Version 1.1.0 / 2011-11-02
+* Use the default scopes action when using a bare throw(:warden)
 == Version 1.0.6
 * Remove gem files from the packaged gem
 == Version 1.0.3

data/lib/warden/errors.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Warden
-  class Proxy 
+  class Proxy
     # Lifted from DataMapper's dm-validations plugin :)
     # @author Guy van den Berg
     # @since  DM 0.9
@@ -56,7 +56,7 @@ module Warden
       def errors
         @errors ||= {}
       end
-      
+
       def blank?(thing)
         thing.nil? || thing == "" || (thing.respond_to?(:empty?) && thing.empty?)
       end

data/lib/warden/manager.rb

@@ -89,7 +89,10 @@ module Warden
     # 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(env, options={})
-      options[:action] ||= "unauthenticated"
+      options[:action] ||= begin
+        opts = config[:scope_defaults][config.default_scope] || {}
+        opts[:action] || 'unauthenticated'
+      end
 
       proxy  = env['warden']
       result = options[:result] || proxy.result

data/lib/warden/version.rb

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

data/spec/helpers/request_helper.rb

@@ -15,10 +15,11 @@ module Warden::Spec
       opts[:failure_app]         ||= failure_app
       opts[:default_strategies]  ||= [:password]
       opts[:default_serializers] ||= [:session]
+      blk = opts[:configurator] || lambda{}
 
       Rack::Builder.new do
         use opts[:session] || Warden::Spec::Helpers::Session
-        use Warden::Manager, opts
+        use Warden::Manager, opts, &blk
         run app
       end
     end

data/spec/helpers/strategies/single.rb

@@ -5,7 +5,7 @@ Warden::Strategies.add(:single) do
     request.env['warden.spec.strategies'] << :single
     success!("Valid User")
   end
-  
+
   def store?
     false
   end

data/spec/warden/manager_spec.rb

@@ -126,6 +126,27 @@ describe Warden::Manager do
         result[2].body.should == ["Bad"]
         $throw_count.should == 2
       end
+
+      it "should use the default scopes action when a bare throw is used" do
+         env = env_with_params("/", :foo => "bar")
+         action = nil
+
+         failure = lambda do |env|
+           action = env['PATH_INFO'] 
+           [401, {}, ['fail']]
+         end
+
+         app = lambda do |env|
+           throw(:warden)
+         end
+         result = setup_rack(app,
+                             :failure_app => failure,
+                             :configurator => lambda{ |c| c.scope_defaults(:default, :action => 'my_action', :strategies => [:password]) }
+                            ).call(env)
+
+         action.should == "/my_action"
+         result.first.should == 401
+      end
     end # failure
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 6
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Neighman