warden 0.10.3 → 0.10.4

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 pkg
-.*~
+.*~
+
+*.gem

data/lib/warden/config.rb

@@ -65,7 +65,7 @@ module Warden
       scope = opts[:scope] || :_all
 
       hash[scope] = strategies.flatten unless strategies.empty?
-      hash[scope] || hash[:_all] || []
+      hash[scope] || hash[:_all]
     end
 
     # A short hand way to set up a particular scope

data/lib/warden/manager.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'warden/hooks'
 require 'warden/config'
+require 'warden/manager_deprecation'
 
 module Warden
   # The middleware for Rack Authentication
@@ -9,6 +10,7 @@ module Warden
   # the rack environment hash
   class Manager
     extend Warden::Hooks
+    extend Warden::ManagerDeprecation
 
     attr_accessor :config
 
@@ -28,7 +30,7 @@ module Warden
     # If this is downstream from another warden instance, don't do anything.
     # :api: private
     def call(env) # :nodoc:
-      return @app.call(env) if env['warden'] && env['warden'].manager != self
+      return @app.call(env) unless env['warden'].nil? || env['warden'].manager == self
 
       env['warden'] = Proxy.new(env, self)
       result = catch(:warden) do
@@ -85,7 +87,7 @@ module Warden
     # It looks at the result of the proxy to see if it's been executed and what action to take.
     # :api: private
     def process_unauthenticated(env, options={})
-      options[:action] ||= :unauthenticated
+      options[:action] ||= "unauthenticated"
 
       proxy  = env['warden']
       result = options[:result] || proxy.result

data/lib/warden/manager_deprecation.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+module Warden
+  module ManagerDeprecation
+    class Dummy
+      def update(type, &block)
+        if type == :session
+          warn "[DEPRECATION] warden.serializers.update(:session) is deprecated. " <<
+               "Please use Warden::Manager.serialize_from_session and Warden::Manager.serialize_into_session"
+          Warden::SessionSerializer.class_eval(&block)
+        else
+          method_missing(update)
+        end
+      end
+
+      def method_missing(method, *args)
+        warn "[DEPRECATION] warden.serializers.#{method} is deprecated."
+        nil
+      end
+    end
+
+    # Read the default scope from Warden
+    def default_scope
+      warn "[DEPRECATION] Warden::Manager.default_scope is deprecated. It's now accessible in the Warden::Manager instance."
+    end
+
+    # Set the default scope for Warden.
+    def default_scope=(scope)
+      warn "[DEPRECATION] Warden::Manager.default_scope= is deprecated. Please set it in the Warden::Manager instance."
+    end
+
+    def serializers
+      warn "[DEPRECATION] warden.serializers is deprecated since Warden::Serializers were merged into Warden::Strategies."
+      Dummy.new
+    end
+  end
+end

data/lib/warden/proxy.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
+require 'warden/proxy_deprecation'
 
 module Warden
   class UserNotSet < RuntimeError; end
 
   class Proxy
+    include ProxyDeprecation
     # An accessor to the winning strategy
     # :api: private
     attr_accessor :winning_strategy
@@ -267,14 +269,13 @@ module Warden
     def _retrieve_scope_and_opts(args) #:nodoc:
       opts  = args.last.is_a?(Hash) ? args.pop : {}
       scope = opts[:scope] || @config.default_scope
+      opts  = (config[:scope_defaults][scope] || {}).merge(opts)
       [scope, opts]
     end
 
     # Run the strategies for a given scope
     def _run_strategies_for(scope, args) #:nodoc:
       self.winning_strategy = @winning_strategies[scope]
-      return if winning_strategy && winning_strategy.halted?
-
       strategies = args.empty? ? default_strategies(:scope => scope) : args
 
       strategies.each do |name|

data/lib/warden/proxy_deprecation.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Warden
+  # Sets up a place for deprecation of methods from the main proxy
+  module ProxyDeprecation
+    def default_strategies=(*strategies)
+      warn "[DEPRECATION] warden.default_strategies= is deprecated. Instead use warden.default_strategies(*strategies) with an optional :scope => :scope)"
+      strategies.push(:scope => @config.default_scope)
+      default_strategies(*strategies)
+    end
+  end
+end

data/lib/warden/test/helpers.rb

@@ -16,6 +16,7 @@ module Warden
       # @api public
       def login_as(user, opts = {})
         Warden.on_next_request do |proxy|
+          opts[:event] ||= :authentication
           proxy.set_user(user, opts)
         end
       end

data/lib/warden/version.rb

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

data/spec/warden/proxy_spec.rb

@@ -220,6 +220,18 @@ describe Warden::Proxy do
       setup_rack(app).call(env)
     end
 
+    it "should store the last winning strategy per scope" do
+      env = env_with_params("/")
+      app = lambda do |env|
+        env['warden'].authenticate(:failz)
+        env['warden'].should_not be_authenticated
+        env['warden'].authenticate(:failz)
+        env['warden'].winning_strategy.message.should == "The Fails Strategy Has Failed You"
+        valid_response
+      end
+      setup_rack(app).call(env)
+    end
+
     it "should run strategies for a given scope several times if cache is cleaned" do
       env = env_with_params("/")
       app = lambda do |env|
@@ -256,19 +268,6 @@ describe Warden::Proxy do
       end
       setup_rack(app).call(env)
     end
-
-    it "should not run strategies until cache is cleaned if latest winning strategy halted" do
-      env = env_with_params("/")
-      app = lambda do |env|
-        env['warden'].authenticate(:failz)
-        env['warden'].should_not be_authenticated
-        env['warden'].authenticate(:pass)
-        env['warden'].winning_strategy.message.should == "The Fails Strategy Has Failed You"
-        valid_response
-      end
-      setup_rack(app).call(env)
-    end
-
   end
 
   describe "set user" do
@@ -774,6 +773,27 @@ describe "dynamic default_strategies" do
   end
 
   describe "default scope options" do
+
+    it "should allow me to set a default action for a given scope" do
+      $captures = []
+      builder = Rack::Builder.new do
+        use Warden::Manager do |config|
+          config.scope_defaults :foo, :strategies => [:two], :action => "some_bad_action"
+          config.failure_app = Warden::Spec::Helpers::FAILURE_APP
+        end
+
+        run(lambda do |e|
+          e['warden'].authenticate!(:scope => :foo)
+        end)
+      end
+
+      env = env_with_params("/foo")
+      env["rack.session"] = {}
+      builder.to_app.call(env)
+      request = Rack::Request.new(env)
+      request.path.should == "/some_bad_action"
+    end
+
     it "should allow me to set store, false on a given scope" do
       $captures = []
       builder = Rack::Builder.new do

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-05-14}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -27,8 +27,10 @@ Gem::Specification.new do |s|
      "lib/warden/errors.rb",
      "lib/warden/hooks.rb",
      "lib/warden/manager.rb",
+     "lib/warden/manager_deprecation.rb",
      "lib/warden/mixins/common.rb",
      "lib/warden/proxy.rb",
+     "lib/warden/proxy_deprecation.rb",
      "lib/warden/session_serializer.rb",
      "lib/warden/strategies.rb",
      "lib/warden/strategies/base.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,10 @@ files:
 - lib/warden/errors.rb
 - lib/warden/hooks.rb
 - lib/warden/manager.rb
+- lib/warden/manager_deprecation.rb
 - lib/warden/mixins/common.rb
 - lib/warden/proxy.rb
+- lib/warden/proxy_deprecation.rb
 - lib/warden/session_serializer.rb
 - lib/warden/strategies.rb
 - lib/warden/strategies/base.rb