warden 0.3.2 → 0.4.0

data/README.textile

@@ -1,2 +1,9 @@
-Please see the "Warden Wiki":http://wiki.github.com/hassox/warden for overview documentation. 
+Please see the "Warden Wiki":http://wiki.github.com/hassox/warden for overview documentation.
+
+h2. Contributors
+
+I'm going to try and keep a list of all the contributors to this project.  If I've missed your name please just let me know and I'll update it.
+
+* Daniel Neighman (hassox)
+* Mick Staugaard (staugaard)
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/warden/authentication/strategy_base.rb

@@ -14,14 +14,14 @@ module Warden
       
       # Accessor for the rack env
       # :api: public 
-      attr_reader   :env
+      attr_reader   :env, :scope
       include ::Warden::Mixins::Common
       
       # :api: private
-      def initialize(env, config = {}) # :nodoc:
-        @config = config
+      def initialize(env, scope=nil, config={}) # :nodoc:
+        @scope, @config = scope, config
         @env, @_status, @headers = env, nil, {}
-        @halted = false       
+        @halted = false
       end
       
       # The method that is called from above.  This method calls the underlying authetniate! method
@@ -104,7 +104,8 @@ module Warden
         @_status = opts[:permanent] ? 301 : 302
         headers["Location"] = url
         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]
         
         @result = :redirect

data/lib/warden/proxy.rb

@@ -52,8 +52,7 @@ module Warden
     #   env['auth'].authenticate(:password, :basic, :scope => :sudo)
     # :api: public
     def authenticate(*args)
-      scope = scope_from_args(args)
-      _perform_authentication(*args)
+      scope, opts = _perform_authentication(*args)
       user(scope)
     end
 
@@ -65,9 +64,7 @@ module Warden
     #
     # :api: public
     def authenticate!(*args)
-      opts = opts_from_args(args)
-      scope = scope_from_args(args)
-      _perform_authentication(*args)
+      scope, opts = _perform_authentication(*args)
       throw(:warden, opts.merge(:action => :unauthenticated)) if !user(scope)
       user(scope)
     end
@@ -181,22 +178,20 @@ module Warden
       opts = opts_from_args(args)
 
       # Look for an existing user in the session for this scope
-      if the_user = user(scope)
-        return the_user
-      end
+      return scope, opts if the_user = user(scope)
 
       # If there was no user in the session.  See if we can get one from the request
       strategies = args.empty? ? @strategies : args
       raise "No Strategies Found" if strategies.empty? || !(strategies - Warden::Strategies._strategies.keys).empty?
+
       strategies.each do |s|
-        strategy = Warden::Strategies[s].new(@env, @conf)
+        strategy = Warden::Strategies[s].new(@env, scope, @conf)
         self.winning_strategy = strategy
         next unless strategy.valid?
         strategy._run!
         break if strategy.halted?
       end
 
-
       if winning_strategy && winning_strategy.user
         set_user(winning_strategy.user, opts)
 
@@ -204,7 +199,7 @@ module Warden
         Warden::Manager._after_authentication.each{|hook| hook.call(winning_strategy.user, self, opts)}
       end
 
-      winning_strategy
+      [scope, opts]
     end
 
     # :api: private

data/spec/warden/manager_spec.rb

@@ -110,6 +110,30 @@ describe Warden::Manager do
         result = @app.call(env_with_params)
         result[0].should == 301
       end
+      
+      it "should redirect with a content type" do
+        RAS.add(:foobar) do
+          def authenticate!
+            redirect!("/foo/bar", {:foo => "bar"}, :content_type => "text/xml")
+          end
+        end
+        result = @app.call(env_with_params)
+        result[0].should == 302
+        result[1]["Location"].should == "/foo/bar?foo=bar"
+        result[1]["Content-Type"].should == "text/xml"
+      end
+      
+      it "should redirect with a default content type" do
+        RAS.add(:foobar) do
+          def authenticate!
+            redirect!("/foo/bar", {:foo => "bar"})
+          end
+        end
+        result = @app.call(env_with_params)
+        result[0].should == 302
+        result[1]["Location"].should == "/foo/bar?foo=bar"
+        result[1]["Content-Type"].should == "text/plain"
+      end
     end
   
     describe "failing" do

data/spec/warden/proxy_spec.rb

@@ -90,6 +90,17 @@ describe Warden::Proxy do
         setup_rack(app).call(env)
       end
 
+      it "should properly sent the scope to the strategy" do
+        env = env_with_params("/")
+        app = lambda do |env|
+          env['warden'].authenticate!(:pass, :scope => :failz)
+          env['warden'].should_not be_authenticated
+          env['warden.spec.strategies'].should == [:pass]
+          valid_response
+        end
+        setup_rack(app).call(env)
+      end
+
       it "should try multiple authentication strategies" do
         env = env_with_params("/")
         app = lambda do |env|

data/spec/warden/strategies/pass.rb

@@ -2,6 +2,6 @@ Warden::Strategies.add(:pass) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []
     request.env['warden.spec.strategies'] << :pass
-    success!("Valid User")
+    success!("Valid User") unless scope == :failz
   end
 end

data/spec/warden/strategy_base_spec.rb

@@ -44,6 +44,15 @@ describe Warden::Strategies::Base do
     strategy.user.should == "foo"
   end
   
+  it "should set the scope" do
+    RAS.add(:foobar) do
+      def authenticate!
+        self.scope.should == :user
+      end
+    end
+    strategy = RAS[:foobar].new(env_with_params, :user)
+  end
+  
   it "should allow you to set a message" do
     RAS.add(:foobar) do
       def authenticate!
@@ -256,4 +265,4 @@ describe Warden::Strategies::Base do
     end
   end
 
-end
+end

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-09-05}
+  s.date = %q{2009-10-12}
   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.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 +10:00
+date: 2009-10-12 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency