alex-sinatra_warden 0.3.0.1 → 0.3.0.2

data/VERSION

@@ -1 +1 @@
-0.3.0.1
+0.3.0.2

data/alex-sinatra_warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alex-sinatra_warden}
-  s.version = "0.3.0.1"
+  s.version = "0.3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad", "Daniel Neighman"]
-  s.date = %q{2010-04-24}
+  s.date = %q{2010-04-25}
   s.description = %q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
   s.email = %q{justin.smestad@gmail.com}
   s.extra_rdoc_files = [

data/lib/sinatra_warden/sinatra.rb

@@ -87,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

data/spec/fixtures/testing_login.rb

@@ -52,4 +52,17 @@ end
 
 class TestingLoginWithReferrer < TestingLogin
   set :auth_use_referrer, true
-end 
+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

@@ -45,19 +45,7 @@ describe "Sinatra::Warden" do
     end
     
     context "when auth_use_referrer is set to true" do
-      def app
-        Rack::Builder.app do
-          use Rack::Session::Cookie
-          use Warden::Manager do |manager|
-            manager.default_strategies :password
-            manager.failure_app = TestingLogin
-            manager.serialize_into_session { |user| user.id }
-            manager.serialize_from_session { |id| User.get(id) }
-          end
-          use Rack::Flash
-          run TestingLoginWithReferrer
-        end
-      end
+      def app; app_with_referrer; end
       
       it "should store referrer in user's session" do
         get '/dashboard'
@@ -87,6 +75,17 @@ describe "Sinatra::Warden" do
         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

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 0
-  - 1
-  version: 0.3.0.1
+  - 2
+  version: 0.3.0.2
 platform: ruby
 authors: 
 - Justin Smestad
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 +02:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency