loyal_warden 2.0.0 → 2.0.1

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/loyal_warden.rb

@@ -0,0 +1,2 @@
+require 'warden'
+

data/lib/warden.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'forwardable'
 
 require 'warden/mixins/common'

data/lib/warden/config.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 
 module Warden
   # This is a class which is yielded on use Warden::Manager. If you have a plugin

data/lib/warden/errors.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden
   class Proxy
     # Lifted from DataMapper's dm-validations plugin :)

data/lib/warden/hooks.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden
   module Hooks
 

data/lib/warden/manager.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'warden/hooks'
 require 'warden/config'
 
@@ -123,7 +123,8 @@ module Warden
     def call_failure_app(env, options = {})
       if config.failure_app
         options.merge!(:attempted_path => ::Rack::Request.new(env).fullpath)
-        options.merge!(:attempted_url => ::Rack::Request.new(env).url)
+        options.merge!(:attempted_url  => ::Rack::Request.new(env).url)
+
         env["PATH_INFO"] = "/#{options[:action]}"
         env["warden.options"] = options
 

data/lib/warden/mixins/common.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden
   module Mixins
     module Common
@@ -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

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 
 module Warden
   class UserNotSet < RuntimeError; end
@@ -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

@@ -1,8 +1,7 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 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

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden
   module Strategies
     class << self
@@ -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/strategies/base.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden
   module Strategies
     # A strategy is a place where you can put logic related to authentication. Any strategy inherits

data/lib/warden/test/helpers.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 
 module Warden
   module Test

data/lib/warden/test/warden_helpers.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 
 module Warden
 

data/lib/warden/version.rb

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

data/loyal_warden.gemspec

@@ -4,20 +4,23 @@ require './lib/warden/version'
 
 Gem::Specification.new do |s|
   s.name = %q{loyal_warden}
-  s.version = Warden::VERSION.dup
+  # s.version = Warden::VERSION.dup
+  s.version = '2.0.1'
   s.authors = ["Daniel Neighman"]
-  s.email = %q{andywang7259@gmail.com}
+  s.email = %q{has.sox@gmail.com}
+  s.license = "MIT"
   s.extra_rdoc_files = [
     "LICENSE",
      "README.textile"
   ]
   s.files = Dir["**/*"] - Dir["*.gem"] - ["Gemfile.lock"]
-  s.homepage = %q{http://github.com/blogsoso/warden}
+  s.homepage = %q{http://github.com/hassox/warden}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{warden}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rack middleware that provides authentication for rack applications}
+
   s.add_dependency "rack", ">= 1.0"
 end
 

data/spec/helpers/request_helper.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 module Warden::Spec
   module Helpers
     FAILURE_APP = lambda{|e|[401, {"Content-Type" => "text/plain"}, ["You Fail!"]] }
@@ -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/helpers/strategies/failz.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:failz) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []

data/spec/helpers/strategies/invalid.rb

@@ -1,8 +1,8 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:invalid) do
   def valid?
     false
   end
 
   def authenticate!; end
-end
+end

data/spec/helpers/strategies/pass.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:pass) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []

data/spec/helpers/strategies/pass_with_message.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:pass_with_message) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []

data/spec/helpers/strategies/password.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:password) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []

data/spec/helpers/strategies/single.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 Warden::Strategies.add(:single) do
   def authenticate!
     request.env['warden.spec.strategies'] ||= []

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 $TESTING=true
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')

data/spec/warden/authenticated_data_store_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe "authenticated data store" do

data/spec/warden/config_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Config do

data/spec/warden/errors_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Proxy::Errors do

data/spec/warden/hooks_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe "standard authentication hooks" do

data/spec/warden/manager_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Manager do

data/spec/warden/proxy_spec.rb

@@ -1,8 +1,7 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 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/scoped_session_serializer.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Manager do

data/spec/warden/session_serializer_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::SessionSerializer do
@@ -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/base_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Strategies::Base do

data/spec/warden/strategies_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Strategies do
@@ -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/spec/warden/test/helpers_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Test::Helpers do

data/spec/warden/test/test_mode_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 require 'spec_helper'
 
 describe Warden::Test::WardenHelpers do

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loyal_warden
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: 
-email: andywang7259@gmail.com
+email: has.sox@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -49,6 +49,7 @@ files:
 - lib/warden/errors.rb
 - lib/warden/session_serializer.rb
 - lib/warden.rb
+- lib/loyal_warden.rb
 - warden.gemspec
 - History.rdoc
 - spec/warden/hooks_spec.rb
@@ -75,8 +76,9 @@ files:
 - Gemfile
 - Rakefile
 - README.textile
-homepage: http://github.com/blogsoso/warden
-licenses: []
+homepage: http://github.com/hassox/warden
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"