warden 0.2.1 → 0.2.2

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+pkg/*

data/Rakefile

@@ -1,34 +1,29 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
-require 'date'
+require 'rack'
 require 'spec/rake/spectask'
 
 GEM = "warden"
 GEM_VERSION = "0.2.1"
-AUTHOR = "Daniel Neighman"
+AUTHORS = ["Daniel Neighman"]
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://github.com/hassox/warden"
 SUMMARY = "Rack middleware that provides authentication for rack applications"
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO.textile']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  # Uncomment this to add a dependency
-  # s.add_dependency "foo"
-  
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(LICENSE README.textile Rakefile TODO.textile) + Dir.glob("{lib,spec}/**/*")
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = GEM
+    gem.summary = SUMMARY
+    gem.email = EMAIL
+    gem.homepage = HOMEPAGE
+    gem.authors = AUTHORS
+    gem.rubyforge_project = "warden"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+ 
+    gem.add_dependency "rack", ">= 1.0.0"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
 task :default => :spec
@@ -38,20 +33,3 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = %w(-fs --color)
 end
-
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/lib/warden/proxy.rb

@@ -26,18 +26,17 @@ module Warden
 
     # Check to see if there is an authenticated user for the given scope.
     # When scope is not specified, :default is assumed.
+    # This will not try to reconstitute the user from the session and will simply check for the 
+    # existance of a session key
     # 
     # Parameters: 
-    #   args - a list of symbols (labels) that name the strategies to attempt
-    #   opts - an options hash that contains the :scope of the user to check
+    #   scope - the scope to check for authentication.  Defaults to :default
     #
     # Example: 
-    #   env['warden'].authenticated?(:password, :scope => :admin)
+    #   env['warden'].authenticated?(:admin)
     # :api: public
-    def authenticated?(*args)
-      scope = scope_from_args(args)
-      _perform_authentication(*args)
-      !user(scope).nil?
+    def authenticated?(scope = :default)
+      !_session["warden.user.#{scope}.key"].nil?
     end # authenticated?
     
     # Run the authentiation strategies for the given strategies.  
@@ -101,7 +100,7 @@ module Warden
     #
     # :api: public
     def user(scope = :default)
-      @users[scope]
+      @users[scope] ||= lookup_user_from_session(scope)
     end
     
     # Provides a scoped session data for authenticated users.
@@ -116,7 +115,7 @@ module Warden
     #
     # :api: public
     def session(scope = :default)
-      raise NotAuthenticated, "#{scope.inspect} user is not logged in" unless authenticated?(:scope => scope)
+      raise NotAuthenticated, "#{scope.inspect} user is not logged in" unless authenticated?(scope)
       _session["warden.user.#{scope}.session"] ||= {}
     end
     
@@ -159,9 +158,10 @@ module Warden
     def _perform_authentication(*args)
       scope = scope_from_args(args)
       opts = opts_from_args(args)
+      
       # Look for an existing user in the session for this scope
-      if @users[scope] || set_user(Warden::Manager._fetch_user(_session, scope), :scope => scope)
-        return @users[scope]
+      if the_user = user(scope)
+        return the_user
       end
       
       # If there was no user in the session.  See if we can get one from the request
@@ -196,5 +196,9 @@ module Warden
       Hash === args.last ? args.pop : {}
     end
 
+    # :api: private
+    def lookup_user_from_session(scope)
+      set_user(Warden::Manager._fetch_user(_session, scope), :scope => scope)
+    end
   end # Proxy
 end # Warden

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '.'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '.'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/warden/authenticated_data_store_spec.rb

@@ -13,8 +13,10 @@ describe "authenticated data store" do
   
   it "should store data for the default scope" do
     app = lambda do |e|
-      e['warden'].should be_authenticated(:pass)
-      e['warden'].should be_authenticated(:pass, :scope => :foo)
+      e['warden'].authenticate(:pass)
+      e['warden'].authenticate(:pass, :scope => :foo)
+      e['warden'].should be_authenticated
+      e['warden'].should be_authenticated(:foo)
       
       # Store the data for :deafult
       e['warden'].session[:key] = "value"

data/spec/warden/hooks_spec.rb

@@ -60,7 +60,7 @@ describe "standard authentication hooks" do
     it "should run each after_authentication hook after authentication is run" do
       RAM.after_authentication{|u,a,o| a.env['warden.spec.hook.baz'] = "run baz"}
       RAM.after_authentication{|u,a,o| a.env['warden.spec.hook.paz'] = "run paz"}
-      app = lambda{|e| e['warden'].authenticated?(:pass); valid_response}
+      app = lambda{|e| e['warden'].authenticate(:pass); valid_response}
       env = env_with_params
       setup_rack(app).call(env)
       env['warden.spec.hook.baz'].should == 'run baz'

data/spec/warden/proxy_spec.rb

@@ -9,6 +9,7 @@ describe Warden::Proxy do
   before(:each) do
     @basic_app = lambda{|env| [200,{'Content-Type' => 'text/plain'},'OK']}
     @authd_app = lambda do |e| 
+      e['warden'].authenticate
       if e['warden'].authenticated?
         [200,{'Content-Type' => 'text/plain'},"OK"]
       else
@@ -50,6 +51,7 @@ describe Warden::Proxy do
       it "should allow authentication in my application" do
         env = env_with_params('/', :username => "fred", :password => "sekrit")
         app = lambda do |env|
+          env['warden'].authenticate
           env['warden'].should be_authenticated
           env['warden.spec.strategies'].should == [:password]
         end
@@ -58,6 +60,7 @@ describe Warden::Proxy do
       it "should be false in my application" do
         env = env_with_params("/", :foo => "bar")
         app = lambda do |env|
+          env['warden'].authenticate
           env['warden'].should_not be_authenticated
           env['warden.spec.strategies'].should == [:password]
           valid_response
@@ -68,7 +71,8 @@ describe Warden::Proxy do
       it "should allow me to select which strategies I use in my appliction" do
         env = env_with_params("/", :foo => "bar")
         app = lambda do |env|
-          env['warden'].should_not be_authenticated(:failz)
+          env['warden'].authenticate(:failz)
+          env['warden'].should_not be_authenticated
           env['warden.spec.strategies'].should == [:failz]
           valid_response
         end
@@ -78,7 +82,8 @@ describe Warden::Proxy do
       it "should allow me to get access to the user at warden.user." do
         env = env_with_params("/")
         app = lambda do |env|
-          env['warden'].should be_authenticated(:pass)
+          env['warden'].authenticate(:pass)
+          env['warden'].should be_authenticated
           env['warden.spec.strategies'].should == [:pass]
           valid_response
         end
@@ -88,7 +93,8 @@ describe Warden::Proxy do
       it "should try multiple authentication strategies" do
         env = env_with_params("/")
         app = lambda do |env|
-          env['warden'].should be_authenticated(:password, :pass)
+          env['warden'].authenticate(:password,:pass)
+          env['warden'].should be_authenticated
           env['warden.spec.strategies'].should == [:password, :pass]
           valid_response
         end
@@ -109,7 +115,8 @@ describe Warden::Proxy do
       it "should look for an active user in the session with authenticate?" do
         app = lambda do |env|
           env['rack.session']['warden.user.foo_scope.key'] = "a foo user"
-          env['warden'].authenticated?(:pass, :scope => :foo_scope)
+          env['warden'].authenticate(:pass, :scope => :foo_scope)
+          env['warden'].authenticated?(:foo_scope)
           valid_response
         end
         env = env_with_params
@@ -121,9 +128,12 @@ describe Warden::Proxy do
         app = lambda do |env|
           env['rack.session']['warden.user.foo.key'] = 'foo user'
           env['rack.session']['warden.user.bar.key'] = 'bar user'
-          env['warden'].authenticated?(:pass, :scope => :foo).should be_true
-          env['warden'].authenticated?(:pass, :scope => :bar).should be_true
-          env['warden'].authenticated?(:password).should be_false
+          env['warden'].authenticate(:pass, :scope => :foo)
+          env['warden'].authenticate(:pass, :scope => :bar)
+          env['warden'].authenticate(:password)
+          env['warden'].authenticated?(:foo).should be_true
+          env['warden'].authenticated?(:bar).should be_true
+          env['warden'].authenticated?.should be_false
           valid_response
         end
         env = env_with_params
@@ -139,7 +149,8 @@ describe Warden::Proxy do
     it "should store the user into the session" do
       env = env_with_params("/")
       app = lambda do |env|
-        env['warden'].should be_authenticated(:pass)
+        env['warden'].authenticate(:pass)
+        env['warden'].should be_authenticated
         env['warden'].user.should == "Valid User"
         env['rack.session']["warden.user.default.key"].should == "Valid User"
         valid_response
@@ -147,6 +158,47 @@ describe Warden::Proxy do
       setup_rack(app).call(env)
     end
   end
+  
+  describe "get user" do
+    before(:each) do
+      @env['rack.session'] ||= {}
+      @env['rack.session'].delete("warden.user.default.key")
+    end
+    
+    it "should return nil when not logged in" do
+      app = lambda do |env|
+        env['warden'].user.should be_nil
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+    
+    it "should not run strategies when not logged in" do
+      app = lambda do |env|
+        env['warden'].user.should be_nil
+        env['warden.spec.strategies'].should be_nil
+        valid_response
+      end
+      setup_rack(app).call(@env)
+    end
+    
+    describe "previously logged in" do
+      
+      before(:each) do
+        @env['rack.session']['warden.user.default.key'] = "A Previous User"
+      end
+      
+      it "should take the user from the session when logged in" do
+        app = lambda do |env|
+          env['warden'].user.should == "A Previous User"
+          valid_response
+        end
+        setup_rack(app).call(@env)
+      end
+      
+      it "should not run strategies when the user exists in the session"
+    end
+  end
 
   describe "logout" do
 

data/warden.gemspec

@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{warden}
+  s.version = "0.2.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Daniel Neighman"]
+  s.date = %q{2009-07-07}
+  s.email = %q{has.sox@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.textile"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.textile",
+     "Rakefile",
+     "TODO.textile",
+     "VERSION",
+     "lib/warden.rb",
+     "lib/warden/authentication/hooks.rb",
+     "lib/warden/authentication/strategies.rb",
+     "lib/warden/authentication/strategy_base.rb",
+     "lib/warden/errors.rb",
+     "lib/warden/manager.rb",
+     "lib/warden/mixins/common.rb",
+     "lib/warden/proxy.rb",
+     "script/destroy",
+     "script/generate",
+     "spec/helpers/request_helper.rb",
+     "spec/spec_helper.rb",
+     "spec/warden/authenticated_data_store_spec.rb",
+     "spec/warden/errors_spec.rb",
+     "spec/warden/hooks_spec.rb",
+     "spec/warden/manager_spec.rb",
+     "spec/warden/proxy_spec.rb",
+     "spec/warden/strategies/failz.rb",
+     "spec/warden/strategies/invalid.rb",
+     "spec/warden/strategies/pass.rb",
+     "spec/warden/strategies/pass_without_user.rb",
+     "spec/warden/strategies/password.rb",
+     "spec/warden/strategies_spec.rb",
+     "spec/warden/strategy_base_spec.rb",
+     "spec/warden_spec.rb",
+     "warden.gemspec"
+  ]
+  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.3}
+  s.summary = %q{Rack middleware that provides authentication for rack applications}
+  s.test_files = [
+    "spec/helpers/request_helper.rb",
+     "spec/spec_helper.rb",
+     "spec/warden/authenticated_data_store_spec.rb",
+     "spec/warden/errors_spec.rb",
+     "spec/warden/hooks_spec.rb",
+     "spec/warden/manager_spec.rb",
+     "spec/warden/proxy_spec.rb",
+     "spec/warden/strategies/failz.rb",
+     "spec/warden/strategies/invalid.rb",
+     "spec/warden/strategies/pass.rb",
+     "spec/warden/strategies/pass_without_user.rb",
+     "spec/warden/strategies/password.rb",
+     "spec/warden/strategies_spec.rb",
+     "spec/warden/strategy_base_spec.rb",
+     "spec/warden_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<rack>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 1.0.0"])
+  end
+end

metadata

@@ -1,33 +1,44 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Daniel Neighman
-autorequire: warden
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 +10:00
+date: 2009-07-07 00:00:00 +10:00
 default_executable: 
-dependencies: []
-
-description: Rack middleware that provides authentication for rack applications
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+description: 
 email: has.sox@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
 - LICENSE
-- TODO.textile
+- README.textile
 files: 
+- .gitignore
 - LICENSE
 - README.textile
 - Rakefile
 - TODO.textile
+- VERSION
+- lib/warden.rb
 - lib/warden/authentication/hooks.rb
 - lib/warden/authentication/strategies.rb
 - lib/warden/authentication/strategy_base.rb
@@ -35,7 +46,8 @@ files:
 - lib/warden/manager.rb
 - lib/warden/mixins/common.rb
 - lib/warden/proxy.rb
-- lib/warden.rb
+- script/destroy
+- script/generate
 - spec/helpers/request_helper.rb
 - spec/spec_helper.rb
 - spec/warden/authenticated_data_store_spec.rb
@@ -51,13 +63,14 @@ files:
 - spec/warden/strategies_spec.rb
 - spec/warden/strategy_base_spec.rb
 - spec/warden_spec.rb
+- warden.gemspec
 has_rdoc: true
 homepage: http://github.com/hassox/warden
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -74,10 +87,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: warden
 rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Rack middleware that provides authentication for rack applications
-test_files: []
-
+test_files: 
+- spec/helpers/request_helper.rb
+- spec/spec_helper.rb
+- spec/warden/authenticated_data_store_spec.rb
+- spec/warden/errors_spec.rb
+- spec/warden/hooks_spec.rb
+- spec/warden/manager_spec.rb
+- spec/warden/proxy_spec.rb
+- spec/warden/strategies/failz.rb
+- spec/warden/strategies/invalid.rb
+- spec/warden/strategies/pass.rb
+- spec/warden/strategies/pass_without_user.rb
+- spec/warden/strategies/password.rb
+- spec/warden/strategies_spec.rb
+- spec/warden/strategy_base_spec.rb
+- spec/warden_spec.rb