warden 0.5.1 → 0.5.2

data/History.rdoc

@@ -1,3 +1,15 @@
+* enhancements
+  * authenticated? always try to serialize the user from session (josevalim)
+  * stored_in_session? checks if user information is stored in session, without serializing (josevalim)
+  * 401 behaves exactly like throw :warden (staugaard)
+
+=== Version 0.5.1 / 2009-10-25
+* enhancements
+  * Adds yeilding to authenticated? and unauthenticated? methods (hassox)
+  * Adds an option to silence missing strategies (josevalim)
+  * Add an option to authenticate(!) to prevent storage of a user into the session (hassox)
+  * allow custom :action to be thrown (josevalim)
+
 === Version 0.4.0 / 2009-10-12
 
 * enhancements

data/README.textile

@@ -6,4 +6,6 @@ I'm going to try and keep a list of all the contributors to this project.  If I'
 
 * Daniel Neighman (hassox)
 * Mick Staugaard (staugaard)
-
+* José Valim (josevalim)
+* Carlo Santoniodasilva (carlosantoniodasilva)
+* Justin Smestad (jsmestad)

data/Rakefile

@@ -14,6 +14,8 @@ begin
     gem.rubyforge_project = "warden"
     gem.add_dependency "rack", ">= 1.0.0"
   end
+  
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/lib/warden/manager.rb

@@ -54,7 +54,7 @@ module Warden
         if result.first != 401
           return result
         else
-          call_failure_app(env, :original_response => result)
+          process_unauthenticated({:original_response => result, :action => :unauthenticated}, env)
         end
       when Hash
         result[:action] ||= :unauthenticated

data/lib/warden/proxy.rb

@@ -36,11 +36,12 @@ module Warden
     #   env['warden'].authenticated?(:admin)
     # :api: public
     def authenticated?(scope = :default)
-      result = !raw_session["warden.user.#{scope}.key"].nil? || !!user(scope)
+      result = user(scope) || false
       yield if block_given? && result
       result
-    end # authenticated?
+    end
 
+    # Same API as authenticated, but returns false when authenticated.
     def unauthenticated?(scope = :default)
       result = !authenticated?(scope)
       yield if block_given? && result
@@ -77,6 +78,18 @@ module Warden
       user(scope)
     end
 
+    # Checks if the given scope is stored in session. Different from authenticated?, this method
+    # does not serialize values from session.
+    #
+    # Example
+    #   env['warden'].set_user(@user)
+    #   env['warden'].stored_in_session? #=> true
+    # 
+    # :api: public
+    def stored_in_session?(scope = :default)
+      !!raw_session["warden.user.#{scope}.key"]
+    end
+
     # Manually set the user into the session and auth proxy
     #
     # Parameters:
@@ -113,10 +126,10 @@ module Warden
     #
     # Example
     #  # default scope
-    #  env['warden'].data[:foo] = "bar"
+    #  env['warden'].session[:foo] = "bar"
     #
     #  # :sudo scope
-    #  env['warden'].data(:sudo)[:foo] = "bar"
+    #  env['warden'].session(:sudo)[:foo] = "bar"
     #
     # :api: public
     def session(scope = :default)
@@ -163,7 +176,7 @@ module Warden
     # proxy methods through to the winning strategy
     # :api: private
     def result # :nodoc:
-       winning_strategy.nil? ? nil : winning_strategy.result
+      winning_strategy.nil? ? nil : winning_strategy.result
     end
 
     # Proxy through to the authentication strategy to find out the message that was generated.

data/lib/warden/version.rb

@@ -1,3 +1,3 @@
 module Warden
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/warden/proxy_spec.rb

@@ -176,9 +176,49 @@ describe Warden::Proxy do
         env['warden'].user(:bar).should == 'bar user'
         env['warden'].user.should be_nil
       end
+      
+      it "should not be authenticated if scope cannot be retrieved from session" do
+        begin
+          Warden::Manager.serialize_from_session { |k| nil } 
+          app = lambda do |env|
+            env['rack.session']['warden.user.foo_scope.key'] = "a foo user"
+            env['warden'].authenticated?(:foo_scope)
+            valid_response
+          end
+          env = env_with_params
+          setup_rack(app).call(env)
+          env['warden'].user(:foo_scope).should be_nil
+        ensure
+          Warden::Manager.serialize_from_session { |k| k } 
+        end
+      end
     end
   end # describe "authentication"
 
+  describe "stored in session" do
+    before(:each) do
+      @env['rack.session'] ||= {}
+      @env['rack.session']['warden.user.default.key'] = "User"
+    end
+
+    it "returns true if user key is stored in session" do
+      app = lambda do |env|
+        env['warden'].stored_in_session?.should be_true
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+    
+    it "returns false if user key is not stored in session" do
+      @env['rack.session'].delete("warden.user.default.key")
+      app = lambda do |env|
+        env['warden'].stored_in_session?.should be_false
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+  end
+
   describe "set user" do
     it "should store the user into the session" do
       env = env_with_params("/")
@@ -309,7 +349,6 @@ describe Warden::Proxy do
     it "should clear the session data when logging out" do
       @env['rack.session'].should_not be_nil
       app = lambda do |e|
-        # debugger
         e['warden'].user.should_not be_nil
         e['warden'].session[:foo] = :bar
         e['warden'].logout

data/warden.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-10-24}
+  s.date = %q{2009-11-09}
   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.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-24 00:00:00 +11:00
+date: 2009-11-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency