rails_warden 0.2.2 → 0.2.3

data/Rakefile

@@ -21,7 +21,7 @@ begin
     gem.email = EMAIL
     gem.homepage = HOMEPAGE
     gem.rubyforge_project = "warden"
-    gem.add_dependency    "warden", "> 0.2.0"
+    gem.add_dependency    "warden", ">= 0.3.2"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available.  Install with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rails_warden.rb

@@ -1,15 +1,35 @@
-here = File.dirname(__FILE__)
-
-require 'rubygems'
+# encoding: utf-8
 require 'warden'
 require 'active_support'
-require "#{here}/rails_warden/manager"
-require "#{here}/rails_warden/rails_settings"
-require "#{here}/rails_warden/controller_mixin"
+
+$:.unshift File.expand_path(File.dirname(__FILE__))
+require "rails_warden/manager"
+require "rails_warden/rails_settings"
+require "rails_warden/controller_mixin"
+
+module Warden::Mixins::Common
+  # Gets the rails request object by default if it's available
+  def request
+    return @request if @request
+    if env['action_controller.rescue.request']
+      @request = env['action_controller.rescue.request']
+    else
+      Rack::Request.new(env)
+    end
+  end
+
+  def raw_session
+    request.session
+  end
+  
+  def reset_session!
+    raw_session.inspect # why do I have to inspect it to get it to clear?
+    raw_session.clear
+  end
+end
 
 Warden::Manager.before_failure do |env, opts|
-  request = env["action_controller.rescue.request"]
-  request.params["action"] = RailsWarden.unauthenticated_action || "unauthenticated"
+  env['warden'].request.params['action'] = RailsWarden.unauthenticated_action || "unauthenticated"
 end
 
 if defined?(Rails)
@@ -18,22 +38,22 @@ if defined?(Rails)
       include RailsWarden::Mixins::HelperMethods
       include RailsWarden::Mixins::ControllerOnlyMethods
     end
-    
+
     module ApplicationHelper
       include RailsWarden::Mixins::HelperMethods
     end
   end
 end
 
-# Session Serialization in.  This block determines how the user will 
-# be stored in the session.  If you're using a complex object like an 
+# Session Serialization in.  This block determines how the user will
+# be stored in the session.  If you're using a complex object like an
 # ActiveRecord model, it is not a good idea to store the complete object.
 # An ID is sufficient
-Warden::Manager.serialize_into_session{ |user| [user.class, user.id] } 
+Warden::Manager.serialize_into_session{ |user| [user.class, user.id] }
 
 # Session Serialization out.  This block gets the user out of the session.
 # It should be the reverse of serializing the object into the session
-Warden::Manager.serialize_from_session do |klass, id| 
+Warden::Manager.serialize_from_session do |klass, id|
   klass = case klass
   when Class
     klass
@@ -41,4 +61,4 @@ Warden::Manager.serialize_from_session do |klass, id|
     klass.to_s.classify.constantize
   end
   klass.find(id)
-end
+end

data/lib/rails_warden/controller_mixin.rb

@@ -1,32 +1,33 @@
+# encoding: utf-8
 module RailsWarden
-  module Mixins    
+  module Mixins
     module HelperMethods
       # The main accessor for the warden proxy instance
       # :api: public
       def warden
         request.env['warden']
       end
-      
+
       # Proxy to the authenticated? method on warden
       # :api: public
       def authenticated?(*args)
         warden.authenticated?(*args)
       end
       alias_method :logged_in?, :authenticated?
-      
+
       # Access the currently logged in user
       # :api: public
       def user(*args)
         warden.user(*args)
       end
       alias_method :current_user, :user
-      
+
       def user=(user)
         warden.set_user user
       end
       alias_method :current_user=, :user=
     end # Helper Methods
-    
+
     module ControllerOnlyMethods
       # Logout the current user
       # :api: public
@@ -34,19 +35,19 @@ module RailsWarden
         warden._session.inspect  # Without this inspect here.  The session does not clear :|
         warden.logout(*args)
       end
-      
+
       # Proxy to the authenticate method on warden
       # :api: public
       def authenticate(*args)
         warden.authenticate(*args)
       end
-      
+
       # Proxy to the authenticate method on warden
       # :api: public
       def authenticate!(*args)
         warden.authenticate!(*args)
       end
-      
+
     end
   end
 end

data/lib/rails_warden/manager.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RailsWarden
   class Manager
     

data/lib/rails_warden/rails_settings.rb

@@ -1,20 +1,21 @@
+# encoding: utf-8
 module RailsWarden
-  
+
   # Set the default user class for the application
   # :api: public
   def self.default_user_class=(klass)
     @default_user_class = klass
   end
-  
-  # Accessor for the default user class for the application 
+
+  # Accessor for the default user class for the application
   # :api: public
   def self.default_user_class
     @default_user_class ||= User
   end
-  
+
   # Get the action called when there is an unauthenticated failure
   # This is usually an action on a controller
-  # The action is called on the failure application.  This would normally be 
+  # The action is called on the failure application.  This would normally be
   # A rails controller
   #
   # Example
@@ -22,7 +23,7 @@ module RailsWarden
   #                                   :defaults     => :password,
   #                                   :unauthenticated_action => :bad_login
   #                           )
-  # 
+  #
   # The unauthenticated_action is :bad_login
   # The bad_login action will be called on the LoginController
   # :api: public
@@ -30,10 +31,10 @@ module RailsWarden
     action = action.to_s if action
     @unauthenticated_action = action
   end
-  
+
   # Get the action called when there is an unauthenticated failure
   # This is usually an action on a controller
-  # The action is called on the failure application.  This would normally be 
+  # The action is called on the failure application.  This would normally be
   # A rails controller
   #
   # Example
@@ -41,11 +42,11 @@ module RailsWarden
   #                                   :defaults     => :password,
   #                                   :unauthenticated_action => :bad_login
   #                           )
-  # 
+  #
   # The unauthenticated_action is :bad_login
   # The bad_login action will be called on the LoginController
   # :api: public
   def self.unauthenticated_action
     @unauthenticated_action ||= "unauthenticated"
   end
-end
+end

data/rails_warden.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_warden}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
@@ -52,11 +52,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<warden>, ["> 0.2.0"])
+      s.add_runtime_dependency(%q<warden>, [">= 0.3.2"])
     else
-      s.add_dependency(%q<warden>, ["> 0.2.0"])
+      s.add_dependency(%q<warden>, [">= 0.3.2"])
     end
   else
-    s.add_dependency(%q<warden>, ["> 0.2.0"])
+    s.add_dependency(%q<warden>, [">= 0.3.2"])
   end
 end

data/spec/rails_warden_spec.rb

@@ -1,45 +1,45 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "rails_warden" do
-  
+
   before(:each) do
-    @app = lambda{|e| [200, {"Content-Type" => "text/plain"}, ["resonse"]]}
-    class FooFailure
+    @app = lambda{|e| Rack::Resposnse.new("response").finish}
+    class ::FooFailure
     end
-    
-    class FooUser
+
+    class ::FooUser
     end
-    
-    class User
+
+    class ::User
     end
-    
+
     RailsWarden.default_user_class = nil
     RailsWarden.unauthenticated_action = nil
   end
-  
+
   it "RailsWarden::Manager.new should return an instance of Warden::Manager" do
     r = RailsWarden::Manager.new(@app, :failure_app => "foo_failure", :defaults => :password)
     r.should be_an_instance_of(Warden::Manager)
   end
-  
+
   it "should set the failure application to FooFailure" do
     r = RailsWarden::Manager.new(@app, :failure_app => "foo_failure", :defaults => :password)
     r.failure_app.should == FooFailure
   end
-  
+
   it "should set the default user to FooUser if specified" do
-    r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure", 
-                                        :defaults     => :password, 
+    r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure",
+                                        :defaults     => :password,
                                         :default_user => "foo_user")
     RailsWarden.default_user_class.should == FooUser
   end
-  
+
   it "should set the default user to User if there is none specified" do
-    r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure", 
+    r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure",
                                         :defaults     => :password)
     RailsWarden.default_user_class.should == User
   end
-  
+
   it "should set the failure action when specified" do
     r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure",
                                         :defaults     => :password,
@@ -47,11 +47,11 @@ describe "rails_warden" do
                                         )
     RailsWarden.unauthenticated_action.should == "bad_login"
   end
-  
+
   it "should set the failure action to unauthenticated when not specified" do
     r = RailsWarden::Manager.new(@app,  :failure_app  => "foo_failure",
                                         :defaults     => :password
                                         )
     RailsWarden.unauthenticated_action.should == "unauthenticated"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_warden
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.2
     version: 
 description: A gem that provides authenitcation via the Warden framework
 email: has.sox@gmail.com