warden 0.9.2 → 0.9.3

data/History.rdoc

@@ -1,3 +1,19 @@
+== Version 0.9.3 / 2010-02-17
+
+* Add prepend_ to all hooks (josevalim)
+
+== Version 0.9.2 / 2010-02-10
+
+* Ruby 1.9 compatibility changes (grimen)
+
+== Version 0.9.1 / 2010-02-09
+
+* Support for passing a custom message with Warden::Strategy::Base#success! as second optional (grimen)
+
+== Version 0.9.0 / 2010-01-21
+
+* Remove serializers and make strategies more powerful, including cache behavior (josevalim)
+
 == Version 0.8.1 / 2010-01-06
 
 * Fix a bug when silence missing serializers is set (josevalim)

data/lib/warden/hooks.rb

@@ -4,7 +4,7 @@ module Warden
 
     # Hook to _run_callbacks asserting for conditions.
     def _run_callbacks(kind, *args) #:nodoc:
-      options = args.last # Last callback args MUST be a Hash
+      options = args.last # Last callback arg MUST be a Hash
 
       send("_#{kind}").each do |callback, conditions|
         invalid = conditions.find do |key, value|
@@ -49,7 +49,7 @@ module Warden
     #   end
     #
     # :api: public
-    def after_set_user(options={}, &block)
+    def after_set_user(options = {}, method = :push, &block)
       raise BlockNotGiven unless block_given?
 
       if options.key?(:only)
@@ -58,7 +58,7 @@ module Warden
         options[:event] = [:set_user, :authentication, :fetch] - Array(options.delete(:except))
       end
 
-      _after_set_user << [block, options]
+      _after_set_user.send(method, [block, options])
     end
 
     # Provides access to the array of after_set_user blocks to run
@@ -72,8 +72,8 @@ module Warden
     # are the same as in after_set_user.
     #
     # :api: public
-    def after_authentication(options={}, &block)
-      after_set_user(options.merge(:event => :authentication), &block)
+    def after_authentication(options = {}, method = :push, &block)
+      after_set_user(options.merge(:event => :authentication), method, &block)
     end
 
     # after_fetch is just a wrapper to after_set_user, which is only invoked
@@ -81,8 +81,8 @@ module Warden
     # are the same as in after_set_user.
     #
     # :api: public
-    def after_fetch(options={}, &block)
-      after_set_user(options.merge(:event => :fetch), &block)
+    def after_fetch(options = {}, method = :push, &block)
+      after_set_user(options.merge(:event => :fetch), method, &block)
     end
 
     # A callback that runs just prior to the failur application being called.
@@ -106,9 +106,9 @@ module Warden
     #   end
     #
     # :api: public
-    def before_failure(options={}, &block)
+    def before_failure(options = {}, method = :push, &block)
       raise BlockNotGiven unless block_given?
-      _before_failure << [block, options]
+      _before_failure.send(method, [block, options])
     end
 
     # Provides access to the callback array for before_failure
@@ -134,9 +134,9 @@ module Warden
     #   end
     #
     # :api: public
-    def before_logout(options={}, &block)
+    def before_logout(options = {}, method = :push, &block)
       raise BlockNotGiven unless block_given?
-      _before_logout << [block, options]
+      _before_logout.send(method, [block, options])
     end
 
     # Provides access to the callback array for before_logout
@@ -145,5 +145,14 @@ module Warden
       @_before_logout ||= []
     end
 
+    # Add prepend filters version
+    %w(after_set_user after_authentication after_fetch
+       before_failure before_logout).each do |filter|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def prepend_#{filter}(options={}, &block)
+          #{filter}(options, :unshift, &block)
+        end
+      METHOD
+    end
   end # Hooks
 end # Warden

data/lib/warden/version.rb

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

data/spec/warden/hooks_spec.rb

@@ -65,12 +65,29 @@ describe "standard authentication hooks" do
       setup_rack(app).call(env)
     end
 
+    it "should run filters in the given order" do
+      RAM.after_set_user{|u,a,o| a.env['warden.spec.order'] << 2}
+      RAM.after_set_user{|u,a,o| a.env['warden.spec.order'] << 3}
+      RAM.prepend_after_set_user{|u,a,o| a.env['warden.spec.order'] << 1}
+      app = lambda do |e|
+        e['warden.spec.order'] = []
+        e['warden'].set_user("foo")
+        valid_response
+      end
+      env = env_with_params
+      setup_rack(app).call(env)
+      env['warden.spec.order'].should == [1,2,3]
+    end
+
     context "after_authentication" do
       it "should be a wrapper to after_set_user behavior" do
         RAM.after_authentication{|u,a,o| a.env['warden.spec.hook.baz'] = "run baz"}
         RAM.after_authentication{|u,a,o| a.env['warden.spec.hook.paz'] = "run paz"}
         RAM.after_authentication{|u,a,o| o[:event].should == :authentication }
-        app = lambda{|e| e['warden'].authenticate(:pass); valid_response}
+        app = lambda do |e|
+          e['warden'].authenticate(:pass)
+          valid_response
+        end
         env = env_with_params
         setup_rack(app).call(env)
         env['warden.spec.hook.baz'].should == 'run baz'
@@ -86,6 +103,20 @@ describe "standard authentication hooks" do
         env = env_with_params
         setup_rack(app).call(env)
       end
+
+      it "should run filters in the given order" do
+        RAM.after_authentication{|u,a,o| a.env['warden.spec.order'] << 2}
+        RAM.after_authentication{|u,a,o| a.env['warden.spec.order'] << 3}
+        RAM.prepend_after_authentication{|u,a,o| a.env['warden.spec.order'] << 1}
+        app = lambda do |e|
+          e['warden.spec.order'] = []
+          e['warden'].authenticate(:pass)
+          valid_response
+        end
+        env = env_with_params
+        setup_rack(app).call(env)
+        env['warden.spec.order'].should == [1,2,3]
+      end
     end
 
     context "after_fetch" do
@@ -118,6 +149,21 @@ describe "standard authentication hooks" do
         env['rack.session']['warden.user.default.key'] = nil
         env['warden'].user.should be_nil
       end
+
+      it "should run filters in the given order" do
+        RAM.after_fetch{|u,a,o| a.env['warden.spec.order'] << 2}
+        RAM.after_fetch{|u,a,o| a.env['warden.spec.order'] << 3}
+        RAM.prepend_after_fetch{|u,a,o| a.env['warden.spec.order'] << 1}
+        app = lambda do |e|
+          e['warden.spec.order'] = []
+          e['rack.session']['warden.user.default.key'] = "Foo"
+          e['warden'].user
+          valid_response
+        end
+        env = env_with_params
+        setup_rack(app).call(env)
+        env['warden.spec.order'].should == [1,2,3]
+      end
     end
 
   end
@@ -152,6 +198,20 @@ describe "standard authentication hooks" do
       env['warden.spec.before_failure.foo'].should == "foo"
       env['warden.spec.before_failure.bar'].should  == "bar"
     end
+
+    it "should run filters in the given order" do
+      RAM.before_failure{|e,o| e['warden.spec.order'] << 2}
+      RAM.before_failure{|e,o| e['warden.spec.order'] << 3}
+      RAM.prepend_before_failure{|e,o| e['warden.spec.order'] << 1}
+      app = lambda do |e|
+        e['warden.spec.order'] = []
+        e['warden'].authenticate!(:failz)
+        valid_response
+      end
+      env = env_with_params
+      setup_rack(app).call(env)
+      env['warden.spec.order'].should == [1,2,3]
+    end
   end
 
   describe "before_logout" do
@@ -208,6 +268,21 @@ describe "standard authentication hooks" do
       env['warden.spec.hook.a'].should == [:scope1]
       env['warden.spec.hook.b'].should == [:scope2]
     end
+
+    it "should run filters in the given order" do
+      RAM.before_logout{|u,a,o| a.env['warden.spec.order'] << 2}
+      RAM.before_logout{|u,a,o| a.env['warden.spec.order'] << 3}
+      RAM.prepend_before_logout{|u,a,o| a.env['warden.spec.order'] << 1}
+      app = lambda do |e|
+        e['warden.spec.order'] = []
+        e['warden'].authenticate(:pass)
+        e['warden'].logout
+        valid_response
+      end
+      env = env_with_params
+      setup_rack(app).call(env)
+      env['warden.spec.order'].should == [1,2,3]
+    end
   end
 
 end

data/warden.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +11:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency