warden 1.2.1 → 1.2.3

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/History.rdoc

@@ -1,3 +1,10 @@
+== Version 1.2.3 / 2013-07-14
+* Fix an issue with lazy loaded sessions
+
+== Version 1.2.2 / 2013-07-12
+* Support nil session stores on logout
+* Fix strategies blowing up with undefined method base
+
 == Version 1.2.1 / 2012-06-16
 * Minor caching and speed improvements
 * Add support to #lock in the proxy

data/README.textile

@@ -4,5 +4,6 @@ h2. Maintainers
 
 * Daniel Neighman (hassox)
 * José Valim (josevalim)
+* Justin Smestad (jsmestad)
 
-"A list of all contributors is available on Github.":https://github.com/hassox/warden/contributors
+"A list of all contributors is available on Github.":https://github.com/hassox/warden/contributors

data/lib/warden/mixins/common.rb

@@ -24,7 +24,7 @@ module Warden
       def warden_cookies
         warn "warden_cookies was never functional and is going to be removed in next versions"
         env['warden.cookies'] ||= {}
-      end # response
+      end # warden_cookies
 
       # Convenience method to access the rack request params
       # :api: public
@@ -37,7 +37,8 @@ module Warden
       # @api overwritable
       def reset_session!
         raw_session.clear
-      end
+      end # reset_session!
+
     end # Common
   end # Mixins
 end # Warden

data/lib/warden/proxy.rb

@@ -261,7 +261,7 @@ module Warden
         user = @users.delete(scope)
         manager._run_callbacks(:before_logout, user, self, :scope => scope)
 
-        raw_session.delete("warden.user.#{scope}.session")
+        raw_session.delete("warden.user.#{scope}.session") unless raw_session.nil?
         session_serializer.delete(scope, user)
       end
 

data/lib/warden/session_serializer.rb

@@ -2,7 +2,6 @@
 module Warden
   class SessionSerializer
     attr_reader :env
-    include ::Warden::Mixins::Common
 
     def initialize(env)
       @env = env
@@ -44,5 +43,10 @@ module Warden
     def delete(scope, user=nil)
       session.delete(key_for(scope))
     end
+
+    # We can't cache this result because the session can be lazy loaded
+    def session
+      env["rack.session"] || {}
+    end
   end # SessionSerializer
 end # Warden

data/lib/warden/strategies.rb

@@ -11,7 +11,8 @@ module Warden
           raise NoMethodError, "authenticate! is not declared in the #{label.inspect} strategy"
         end
 
-        unless strategy.ancestors.include?(Warden::Strategies::Base)
+        base = Warden::Strategies::Base
+        unless strategy.ancestors.include?(base)
           raise "#{label.inspect} is not a #{base}"
         end
 

data/lib/warden/version.rb

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

data/spec/helpers/request_helper.rb

@@ -18,7 +18,7 @@ module Warden::Spec
       blk = opts[:configurator] || proc{}
 
       Rack::Builder.new do
-        use opts[:session] || Warden::Spec::Helpers::Session
+        use opts[:session] || Warden::Spec::Helpers::Session unless opts[:nil_session]
         use Warden::Manager, opts, &blk
         run app
       end

data/spec/warden/proxy_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 describe Warden::Proxy do
-
   before(:all) do
     load_strategies
   end
@@ -340,7 +339,6 @@ describe Warden::Proxy do
       end
       setup_rack(app).call(@env)
     end
-
   end
 
   describe "set user" do
@@ -366,6 +364,17 @@ describe Warden::Proxy do
       setup_rack(app).call(@env)
     end
 
+    it "should not throw error when no session is configured and store is false" do
+      app = lambda do |env|
+        env['rack.session'] = nil
+        env['warden'].authenticate(:pass, :store => false)
+        env['warden'].should be_authenticated
+        env['warden'].user.should == "Valid User"
+        valid_response
+      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)
@@ -512,7 +521,6 @@ describe Warden::Proxy do
   end
 
   describe "logout" do
-
     before(:each) do
       @env['rack.session'] = {"warden.user.default.key" => "default key", "warden.user.foo.key" => "foo key", :foo => "bar"}
       @app = lambda do |e|
@@ -549,6 +557,13 @@ describe Warden::Proxy do
       @env['rack.session'].should be_empty
     end
 
+    it "should not raise exception if raw_session is nil" do
+      @app = setup_rack(@app, { nil_session: true })
+      @env['rack.session'] = nil
+      @env['warden.spec.which_logout'] = :foo
+      expect { @app.call(@env) }.to_not raise_error(NoMethodError)
+    end
+
     it "should clear the user when logging out" do
       @env['rack.session'].should_not be_nil
       app = lambda do |e|
@@ -665,7 +680,7 @@ describe Warden::Proxy do
         app = lambda do |e|
           e['warden'].should be_authenticated
         end
-        result = setup_rack(app).call(@env)
+        setup_rack(app).call(@env)
       end
 
       it "should yield to a block when the block is passed and authenticated" do
@@ -700,7 +715,7 @@ describe Warden::Proxy do
         app = lambda do |e|
           e['warden'].should_not be_authenticated
         end
-        result = setup_rack(app).call(@env)
+        setup_rack(app).call(@env)
       end
 
       it "should return false if scope cannot be retrieved from session" do
@@ -786,7 +801,7 @@ describe Warden::Proxy do
         app = lambda do |e|
           e['warden'].should be_unauthenticated
         end
-        result = setup_rack(app).call(@env)
+        setup_rack(app).call(@env)
       end
 
       it "should yield to a block when the block is passed and authenticated" do
@@ -828,6 +843,8 @@ end
 
 describe "dynamic default_strategies" do
   before(:all) do
+    load_strategies
+
     class ::DynamicDefaultStrategies
       def initialize(app, &blk)
         @app, @blk = app, blk

data/spec/warden/session_serializer_spec.rb

@@ -45,4 +45,9 @@ describe Warden::SessionSerializer do
     @session.fetch(:default)
     @env['rack.session'].should_not have_key("warden.user.default.key")
   end
+
+  it "should support a nil session store" do
+    @env['rack.session'] = nil
+    @session.fetch(:default).should be_nil
+  end
 end

data/spec/warden/strategies_spec.rb

@@ -11,13 +11,23 @@ describe Warden::Strategies do
     Warden::Strategies[:strategy1].ancestors.should include(Warden::Strategies::Base)
   end
 
-  it "should raise an error if I add a strategy via a block, that does not have an autheniticate! method" do
+  it "should raise an error if I add a strategy via a block, that does not have an authenticate! method" do
     lambda do
       Warden::Strategies.add(:strategy2) do
       end
     end.should raise_error
   end
 
+  it "should raise an error if I add a strategy that does not extend Warden::Strategies::Base" do
+    non_base = Class.new do
+      def authenticate!
+      end
+    end
+    expect do
+      Warden::Strategies.add(:strategy_non_base, non_base)
+    end.to raise_error(/is not a Warden::Strategies::Base/)
+  end
+
   it "should allow me to get access to a particular strategy" do
     Warden::Strategies.add(:strategy3) do
       def authenticate!; end

data/warden.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version = Warden::VERSION.dup
   s.authors = ["Daniel Neighman"]
   s.email = %q{has.sox@gmail.com}
+  s.license = "MIT"
   s.extra_rdoc_files = [
     "LICENSE",
      "README.textile"

metadata

@@ -1,48 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: warden
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
   name: rack
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id001
 description: 
 email: has.sox@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - Gemfile
 - History.rdoc
 - lib/warden/config.rb
@@ -82,39 +74,31 @@ files:
 - spec/warden/test/helpers_spec.rb
 - spec/warden/test/test_mode_spec.rb
 - warden.gemspec
-has_rdoc: true
 homepage: http://github.com/hassox/warden
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
 rubyforge_project: warden
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rack middleware that provides authentication for rack applications
 test_files: []
-
+has_rdoc: