warden 0.9.5 → 0.9.6

data/lib/warden/proxy.rb

@@ -60,6 +60,22 @@ module Warden
       end
     end
 
+    # Provides access to the currently defined default strategies for the proxy.
+    # This can change as it moves throughout the rack graph
+    # Any changes to this are reflected only for the duration of the request
+    # By changing this value, you can change the default strategies for a downstream branch of you rack graph.
+    #
+    # @api public
+    def default_strategies
+      @default_strategies ||= config.default_strategies.dup
+    end
+
+    # Allows you to set the default strategies for this request.
+    # @api public
+    def default_strategies=(*strategies)
+      @default_strategies = strategies.flatten
+    end
+
     # Run the authentiation strategies for the given strategies.
     # If there is already a user logged in for a given scope, the strategies are not run
     # This does not halt the flow of control and is a passive attempt to authenticate only
@@ -265,7 +281,7 @@ module Warden
     # Run the strategies for a given scope
     def _run_strategies_for(scope, args) #:nodoc:
       self.winning_strategy = nil
-      strategies = args.empty? ? @config.default_strategies : args
+      strategies = args.empty? ? default_strategies : args
 
       strategies.each do |name|
         strategy = _fetch_strategy(name, scope)

data/lib/warden/version.rb

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

data/spec/warden/proxy_spec.rb

@@ -647,5 +647,77 @@ describe Warden::Proxy do
       app.call(@env)
     end
   end
+end
+
+describe "dynamic default_strategies" do
+  before(:all) do
+    class ::DynamicDefaultStrategies
+      def initialize(app, &blk)
+        @app, @blk = app, blk
+      end
+
+      def call(env)
+        @blk.call(env)
+        @app.call(env)
+      end
+    end
+
+    Warden::Strategies.add(:one) do
+      def authenticate!; $captures << :one; success!("User") end
+    end
+
+    Warden::Strategies.add(:two) do
+      def authenticate!; $captures << :two; fail!("User not found") end
+    end
+  end
+
+  before(:each) do
+    $captures = []
+    @app = lambda{|e| e['warden'].authenticate! }
+  end
+
+  def wrap_app(app, &blk)
+    builder = Rack::Builder.new do
+      use DynamicDefaultStrategies, &blk
+      run app
+    end
+    builder.to_app
+  end
+
+  it "should allow me to change the default strategies on the fly" do
+    app = wrap_app(@app) do |e|
+      e['warden'].default_strategies.should == [:password]
+      e['warden'].config.default_strategies.should == [:password]
+      e['warden'].default_strategies = [:one]
+      e['warden'].authenticate!
+      Rack::Response.new("OK").finish
+    end
+    setup_rack(app).call(env_with_params)
+
+    $captures.should == [:one]
+  end
+
+  it "should allow me to append to the default strategies on the fly" do
+    app = wrap_app(@app) do |e|
+      e['warden'].default_strategies << :one
+      e['warden'].default_strategies.should == [:password, :one]
+      e['warden'].authenticate!
+      Rack::Response.new("OK").finish
+    end
+    setup_rack(app).call(env_with_params)
 
+    $captures.should == [:one]
+  end
+  it "should not change the master configurations strategies when I change them" do
+    app = wrap_app(@app) do |e|
+      e['warden'].default_strategies << :one
+      e['warden'].default_strategies.should == [:password, :one]
+      e['warden'].config.default_strategies.should == [:password]
+      e['warden'].authenticate!
+      Rack::Response.new("OK").finish
+    end
+    setup_rack(app).call(env_with_params)
+
+    $captures.should == [:one]
+  end
 end

data/warden.gemspec

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +11:00
+date: 2010-03-04 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency