warden 1.1.0 → 1.1.1

data/Gemfile.lock

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

data/History.rdoc

@@ -1,7 +1,12 @@
+== Version 1.1.1 / 2012-02-16
+* Allow run_callbacks as an option to set_user and user
+
 == 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
 * Do not renew session on user fetch
 

data/lib/warden/proxy.rb

@@ -144,7 +144,7 @@ module Warden
     #
     # Parameters:
     #   user - An object that has been setup to serialize into and out of the session.
-    #   opts - An options hash.  Use the :scope option to set the scope of the user, set the :store option to false to skip serializing into the session.
+    #   opts - An options hash.  Use the :scope option to set the scope of the user, set the :store option to false to skip serializing into the session, set the :run_callbacks to false to skip running the callbacks (the default is true).
     #
     # :api: public
     def set_user(user, opts = {})
@@ -161,7 +161,9 @@ module Warden
         session_serializer.store(user, scope)
       end
 
-      manager._run_callbacks(:after_set_user, user, self, opts)
+      run_callbacks = opts.fetch(:run_callbacks, true)
+      manager._run_callbacks(:after_set_user, user, self, opts) if run_callbacks
+
       @users[scope]
     end
 
@@ -176,11 +178,24 @@ module Warden
     #   # with scope
     #   env['warden'].user(:admin)
     #
+    #   # as a Hash
+    #   env['warden'].user(:scope => :admin)
+    #
+    #   # with default scope and run_callbacks option
+    #   env['warden'].user(:run_callbacks => false)
+    #
+    #  # with a scope and run_callbacks option
+    #  env['warden'].user(:scope => :admin, :run_callbacks => true)
+    #
     # :api: public
-    def user(scope = @config.default_scope)
+    def user(argument = {})
+      opts  = argument.is_a?(Hash) ? argument : { :scope => argument }
+      scope = (opts[:scope] ||= @config.default_scope)
+
       @users[scope] ||= begin
         user = session_serializer.fetch(scope)
-        set_user(user, :scope => scope, :event => :fetch) if user
+        opts[:event] = :fetch
+        set_user(user, opts) if user
       end
     end
 
@@ -323,6 +338,6 @@ module Warden
         raise "Invalid strategy #{name}"
       end
     end
-
   end # Proxy
+
 end # Warden

data/lib/warden/version.rb

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

data/spec/helpers/request_helper.rb

@@ -15,7 +15,7 @@ module Warden::Spec
       opts[:failure_app]         ||= failure_app
       opts[:default_strategies]  ||= [:password]
       opts[:default_serializers] ||= [:session]
-      blk = opts[:configurator] || lambda{}
+      blk = opts[:configurator] || proc{}
 
       Rack::Builder.new do
         use opts[:session] || Warden::Spec::Helpers::Session

data/spec/warden/proxy_spec.rb

@@ -365,6 +365,33 @@ describe Warden::Proxy do
       end
       setup_rack(app).call(@env)
     end
+
+    it "should not run the callbacks when :run_callbacks is false" do
+      app = lambda do |env|
+        env['warden'].manager.should_not_receive(:_run_callbacks)
+        env['warden'].authenticate(:run_callbacks => false, :scope => :pass)
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+
+    it "should run the callbacks when :run_callbacks is true" do
+      app = lambda do |env|
+        env['warden'].manager.should_receive(:_run_callbacks)
+        env['warden'].authenticate(:pass)
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+
+    it "should run the callbacks by default" do
+      app = lambda do |env|
+        env['warden'].manager.should_receive(:_run_callbacks)
+        env['warden'].authenticate(:pass)
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end    
   end
 
   describe "get user" do
@@ -412,6 +439,35 @@ describe Warden::Proxy do
         setup_rack(app).call(@env)
         @env['warden.spec.strategies'].should_not include(:pass)
       end
+
+      describe "run callback option" do
+        it "should not call run_callbacks when we pass a :run_callback => false" do
+          app = lambda do |env|
+            env['warden'].manager.should_not_receive(:_run_callbacks)
+            env['warden'].user(:run_callbacks => false)
+            valid_response
+          end
+          setup_rack(app).call(@env)
+        end
+
+        it "should call run_callbacks when we pass a :run_callback => true" do
+          app = lambda do |env|
+            env['warden'].manager.should_receive(:_run_callbacks)
+            env['warden'].user(:run_callbacks => true)
+            valid_response
+          end
+          setup_rack(app).call(@env)
+        end
+
+        it "should call run_callbacks by default" do
+          app = lambda do |env|
+            env['warden'].manager.should_receive(:_run_callbacks)
+            env['warden'].user
+            valid_response
+          end
+          setup_rack(app).call(@env)
+        end
+      end
     end
   end
 
@@ -900,4 +956,4 @@ describe "dynamic default_strategies" do
       session['warden.user.baz.key'].should == "User"
     end
   end
-end
+end

data/warden.gemspec

@@ -4,7 +4,7 @@ require './lib/warden/version'
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = Warden::VERSION
+  s.version = Warden::VERSION.dup
   s.authors = ["Daniel Neighman"]
   s.date = %q{2011-07-27}
   s.email = %q{has.sox@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
+date: 2011-07-27 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -82,6 +83,7 @@ files:
 - spec/warden/test/test_mode_spec.rb
 - TODO.textile
 - warden.gemspec
+has_rdoc: true
 homepage: http://github.com/hassox/warden
 licenses: []
 
@@ -111,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: warden
-rubygems_version: 1.8.6
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Rack middleware that provides authentication for rack applications