sinatra_warden 0.3.0 → 0.3.1

data/.gitignore

@@ -19,5 +19,6 @@ rdoc
 pkg
 bin
 vendor
+.bundle
 
 ## PROJECT::SPECIFIC

data/Gemfile

@@ -18,5 +18,5 @@ group :test do
   gem 'dm-core',        '~> 0.10.1'
   gem 'bcrypt-ruby',                :require => 'bcrypt'
   gem 'haml'
-  gem 'rack-flash',                 :require => 'rack-flash'
+  gem 'rack-flash',     '~> 0.1.1', :require => 'rack-flash'
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sinatra_warden/sinatra.rb

@@ -56,7 +56,10 @@ module Sinatra
       #
       # @param [String] path to redirect to if user is unauthenticated
       def authorize!(failure_path=nil)
-        redirect(failure_path ? failure_path : options.auth_failure_path) unless authenticated?
+        unless authenticated?
+          session[:return_to] = request.path if options.auth_use_referrer
+          redirect(failure_path ? failure_path : options.auth_failure_path)
+        end
       end
 
     end
@@ -69,6 +72,10 @@ module Sinatra
 
       app.set :auth_failure_path, '/'
       app.set :auth_success_path, '/'
+      # Setting this to true will store last request URL
+      # into a user's session so that to redirect back to it
+      # upon successful authentication
+      app.set :auth_use_referrer, false
 
       app.set :auth_error_message,   "Could not log you in."
       app.set :auth_success_message, "You have logged in successfully."
@@ -80,6 +87,7 @@ module Sinatra
 
       app.post '/unauthenticated/?' do
         status 401
+        warden.custom_failure! if warden.config.failure_app == self.class
         env['x-rack.flash'][:error] = options.auth_error_message if defined?(Rack::Flash)
         options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
       end
@@ -107,7 +115,8 @@ module Sinatra
       app.post '/login/?' do
         authenticate
         env['x-rack.flash'][:success] = options.auth_success_message if defined?(Rack::Flash)
-        redirect options.auth_success_path
+        redirect options.auth_use_referrer && session[:return_to] ? session.delete(:return_to) : 
+                 options.auth_success_path
       end
 
       app.get '/logout/?' do

data/spec/fixtures/testing_login.rb

@@ -49,3 +49,20 @@ class TestingLogin < Sinatra::Base
   end
 
 end
+
+class TestingLoginWithReferrer < TestingLogin
+  set :auth_use_referrer, true
+end
+
+class TestingLoginAsRackApp < TestingLogin
+  use Rack::Session::Cookie
+  use Warden::Manager do |manager|
+    manager.default_strategies :password
+    manager.failure_app = TestingLoginAsRackApp
+    manager.serialize_into_session { |user| user.id }
+    manager.serialize_from_session { |id| User.get(id) }
+  end
+  use Rack::Flash
+  
+  set :auth_failure_path, '/login'
+end

data/spec/sinatra_warden_spec.rb

@@ -27,6 +27,65 @@ describe "Sinatra::Warden" do
       get '/logout'
       last_request.env['warden'].authenticated?.should == false
     end
+    
+    context "auth_use_referrer is disabled" do
+      it "should not store :return_to" do
+        get '/dashboard'
+        follow_redirect!
+        last_request.session[:return_to].should be_nil
+      end
+    
+      it "should redirect to a default success URL" do
+        get '/dashboard'
+        follow_redirect!
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        follow_redirect!
+        last_request.path.should == '/welcome'
+      end
+    end
+    
+    context "when auth_use_referrer is set to true" do
+      def app; app_with_referrer; end
+      
+      it "should store referrer in user's session" do
+        get '/dashboard'
+        follow_redirect!
+        last_request.session[:return_to].should == "/dashboard"
+      end
+      
+      it "should redirect to stored return_to URL" do
+        get '/dashboard'
+        follow_redirect!
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        follow_redirect!
+        last_request.path.should == '/dashboard'
+      end
+      
+      it "should remove :return_to from session" do
+        get '/dashboard'
+        follow_redirect!
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        follow_redirect!
+        last_request.session[:return_to].should be_nil
+      end
+      
+      it "should default to :auth_success_path if there wasn't a return_to" do
+        post '/login', 'email' => 'justin.smestad@gmail.com', 'password' => 'thedude'
+        follow_redirect!
+        last_request.path.should == '/welcome'
+      end
+    end
+    
+    context "TestingLoginAsRackApp" do
+      def app; @app ||= TestingLoginAsRackApp; end
+      
+      # what happens here is you'll eventually get
+      # "stack too deep" error if the following test fails
+      it "should not get in a loop" do
+        post '/login', :email => 'bad', :password => 'password'
+        last_request.path.should == '/unauthenticated'
+      end
+    end
   end
 
   context "the helpers" do

data/spec/spec_helper.rb

@@ -23,8 +23,21 @@ Spec::Runner.configure do |config|
     DataMapper.auto_migrate!
   end
 
+  # default app
   def app
-    @app ||= Rack::Builder.app do
+    @app ||= define_app TestingLogin
+  end
+  
+  # app with auth_use_referrer enabled
+  def app_with_referrer
+    @app ||= define_app TestingLoginWithReferrer
+  end
+  
+  private 
+  
+  # :which should be a sinatra app
+  def define_app(which)
+    Rack::Builder.app do
       use Rack::Session::Cookie
       use Warden::Manager do |manager|
         manager.default_strategies :password
@@ -33,7 +46,7 @@ Spec::Runner.configure do |config|
         manager.serialize_from_session { |id| User.get(id) }
       end
       use Rack::Flash
-      run TestingLogin
+      run which
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Justin Smestad
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -06:00
+date: 2010-04-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency