warden 0.6.0 → 0.6.1

data/lib/warden/proxy.rb

@@ -111,10 +111,11 @@ module Warden
     def set_user(user, opts = {})
       scope = (opts[:scope] ||= :default)
       _store_user(user, scope) unless opts[:store] == false
+      @users[scope] = user
 
       # Run the after hooks for setting the user
       Warden::Manager._after_set_user.each{ |hook| hook.call(user, self, opts) }
-      @users[scope] = user
+      user
     end
 
     # Provides acccess to the user object in a given scope for a request.
@@ -185,13 +186,13 @@ module Warden
     # proxy methods through to the winning strategy
     # :api: private
     def result # :nodoc:
-      winning_strategy.nil? ? nil : winning_strategy.result
+      winning_strategy && winning_strategy.result
     end
 
     # Proxy through to the authentication strategy to find out the message that was generated.
     # :api: public
     def message
-      winning_strategy.nil? ? "" : winning_strategy.message
+      winning_strategy && winning_strategy.message
     end
 
     # Provides a way to return a 401 without warden defering to the failure app
@@ -243,7 +244,7 @@ module Warden
           next
         end
 
-        strategy = Warden::Strategies[s].new(@env, scope, @conf)
+        strategy = Warden::Strategies[s].new(@env, scope)
         self.winning_strategy = strategy
         next unless strategy.valid?
 

data/lib/warden/strategies/base.rb

@@ -44,9 +44,9 @@ module Warden
       include ::Warden::Mixins::Common
 
       # :api: private
-      def initialize(env, scope=nil, config={}) # :nodoc:
-        @scope, @config = scope, config
-        @env, @_status, @headers = env, nil, {}
+      def initialize(env, scope=nil) # :nodoc:
+        @env, @scope = env, scope
+        @_status, @headers = nil, {}
         @halted = false
       end
 
@@ -132,7 +132,7 @@ module Warden
         headers["Location"] << "?" << Rack::Utils.build_query(params) unless params.empty?
         headers["Content-Type"] = opts[:content_type] || 'text/plain'
 
-        @message = opts[:message].nil? ? "You are being redirected to #{headers["Location"]}" : opts[:message]
+        @message = opts[:message] || "You are being redirected to #{headers["Location"]}"
         @result = :redirect
 
         headers["Location"]

data/lib/warden/version.rb

@@ -1,3 +1,3 @@
 module Warden
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/warden/hooks_spec.rb

@@ -32,9 +32,14 @@ describe "standard authentication hooks" do
     it "should run each after_set_user hook after the user is set" do
       RAM.after_set_user{|u,a,o| a.env['warden.spec.hook.foo'] = "run foo"}
       RAM.after_set_user{|u,a,o| a.env['warden.spec.hook.bar'] = "run bar"}
-      app = lambda{|e| e['warden'].set_user("foo"); valid_response}
+      RAM.after_set_user{|u,a,o| a.logout}
+      app = lambda do |e|
+        e['warden'].set_user("foo")
+        valid_response
+      end
       env = env_with_params
       setup_rack(app).call(env)
+      env['warden'].user.should be_nil
       env['warden.spec.hook.foo'].should == "run foo"
       env['warden.spec.hook.bar'].should == "run bar"
     end

data/spec/warden/proxy_spec.rb

@@ -421,7 +421,6 @@ describe Warden::Proxy do
   end
 
   describe "messages" do
-
     it "should allow access to the failure message" do
       failure = lambda do |e|
         [401, {"Content-Type" => "text/plain"}, [e['warden'].message]]
@@ -438,7 +437,7 @@ describe Warden::Proxy do
         [200, {"Content-Type" => "text/plain"}, [e['warden'].message]]
       end
       result = setup_rack(app).call(env_with_params)
-      result[2].should == [""]
+      result[2].should == [nil]
     end
   end
 

data/spec/warden/serializers_spec.rb

@@ -83,14 +83,20 @@ describe Warden::Serializers do
   end
 
   it "should allow me to clear the Serializers" do
-    Warden::Serializers.add(:foobar) do
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
+    old_serializers = Warden::Serializers._serializers.dup
+
+    begin
+      Warden::Serializers.add(:foobar) do
+        def fetch; end
+        def store; end
+        def stored?; end
+        def delete; end
+      end
+      Warden::Serializers[:foobar].should_not be_nil
+      Warden::Serializers.clear!
+      Warden::Serializers[:foobar].should be_nil
+    else
+      Warden::Serializers._serializers.replace(old_serializers)
     end
-    Warden::Serializers[:foobar].should_not be_nil
-    Warden::Serializers.clear!
-    Warden::Serializers[:foobar].should be_nil
   end
 end

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-11-15}
+  s.date = %q{2009-11-17}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -65,24 +65,24 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Rack middleware that provides authentication for rack applications}
   s.test_files = [
-    "spec/helpers/request_helper.rb",
-     "spec/helpers/strategies/failz.rb",
+    "spec/warden_spec.rb",
      "spec/helpers/strategies/invalid.rb",
+     "spec/helpers/strategies/failz.rb",
      "spec/helpers/strategies/pass.rb",
-     "spec/helpers/strategies/pass_without_user.rb",
      "spec/helpers/strategies/password.rb",
+     "spec/helpers/strategies/pass_without_user.rb",
+     "spec/helpers/request_helper.rb",
      "spec/spec_helper.rb",
-     "spec/warden/authenticated_data_store_spec.rb",
-     "spec/warden/errors_spec.rb",
+     "spec/warden/strategies/base_spec.rb",
      "spec/warden/hooks_spec.rb",
      "spec/warden/manager_spec.rb",
-     "spec/warden/proxy_spec.rb",
+     "spec/warden/authenticated_data_store_spec.rb",
+     "spec/warden/errors_spec.rb",
      "spec/warden/serializers/cookie_spec.rb",
      "spec/warden/serializers/session_spec.rb",
      "spec/warden/serializers_spec.rb",
-     "spec/warden/strategies/base_spec.rb",
-     "spec/warden/strategies_spec.rb",
-     "spec/warden_spec.rb"
+     "spec/warden/proxy_spec.rb",
+     "spec/warden/strategies_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +11:00
+date: 2009-11-17 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,21 +102,21 @@ signing_key:
 specification_version: 3
 summary: Rack middleware that provides authentication for rack applications
 test_files: 
-- spec/helpers/request_helper.rb
-- spec/helpers/strategies/failz.rb
+- spec/warden_spec.rb
 - spec/helpers/strategies/invalid.rb
+- spec/helpers/strategies/failz.rb
 - spec/helpers/strategies/pass.rb
-- spec/helpers/strategies/pass_without_user.rb
 - spec/helpers/strategies/password.rb
+- spec/helpers/strategies/pass_without_user.rb
+- spec/helpers/request_helper.rb
 - spec/spec_helper.rb
-- spec/warden/authenticated_data_store_spec.rb
-- spec/warden/errors_spec.rb
+- spec/warden/strategies/base_spec.rb
 - spec/warden/hooks_spec.rb
 - spec/warden/manager_spec.rb
-- spec/warden/proxy_spec.rb
+- spec/warden/authenticated_data_store_spec.rb
+- spec/warden/errors_spec.rb
 - spec/warden/serializers/cookie_spec.rb
 - spec/warden/serializers/session_spec.rb
 - spec/warden/serializers_spec.rb
-- spec/warden/strategies/base_spec.rb
+- spec/warden/proxy_spec.rb
 - spec/warden/strategies_spec.rb
-- spec/warden_spec.rb