merb-auth-core 1.1.0 → 1.1.1

data/spec/merb-auth-core/callbacks_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe "Authentication callbacks" do
-  
+
   before(:each) do
     Merb::Authentication.after_callbacks.clear
     clear_strategies!
     Viking.captures.clear
-    
-    # A basic user model that has some simple methods 
-    # to set and aknowlege that it's been called  
+
+    # A basic user model that has some simple methods
+    # to set and aknowlege that it's been called
     class AUser
       attr_accessor :active, :name
-      
+
       def initialize(params)
         params.each do |k,v|
           instance_variable_set("@#{k}", v)
         end
       end
-      
+
       def acknowledge(value)
         Viking.capture(value)
       end
-      
+
       def acknowledge!(value = "default acknowledge")
         throw(:acknowledged, value)
       end
@@ -32,24 +32,24 @@ describe "Authentication callbacks" do
         end
       end
     end
-    
+
     # Create a strategy to test the after stuff
     class MyStrategy < Merb::Authentication::Strategy
       def run!
         AUser.new(request.params[:user] || {}) unless request.params[:no_user]
       end
     end
-  
+
     @request  = fake_request
     @params   = @request.params
     @auth     = Merb::Authentication.new(@request.session)
   end
-  
+
   after(:all) do
     clear_strategies!
     Merb::Authentication.after_callbacks.clear
   end
-  
+
   it "should allow you to setup a callback as a block" do
     Merb::Authentication.after_authentication{ |user, request, params| user.acknowledge!("w00t threw it") }
     result = catch(:acknowledged) do
@@ -57,7 +57,7 @@ describe "Authentication callbacks" do
     end
     result.should == "w00t threw it"
   end
-  
+
   it "should allow you to setup a callback as a method" do
     Merb::Authentication.after_authentication(:acknowledge!)
     result = catch(:acknowledged) do
@@ -65,7 +65,7 @@ describe "Authentication callbacks" do
     end
     result.should == "default acknowledge"
   end
-  
+
   it "should allow many callbacks to be setup and executed" do
     Merb::Authentication.after_authentication{|u,r,p| u.acknowledge("first");  u}
     Merb::Authentication.after_authentication{|u,r,p| u.acknowledge("second"); u}
@@ -81,14 +81,14 @@ describe "Authentication callbacks" do
     end.should raise_error(Merb::Controller::Unauthenticated)
     Viking.captures.should == ["first"]
   end
-  
+
   it "should raise an Unauthenticated if a callback returns nil" do
     Merb::Authentication.after_authentication{|u,r,p| nil }
     lambda do
       @request.session.authenticate!(@request,@params)
     end.should raise_error(Merb::Controller::Unauthenticated)
   end
-  
+
   it "should not try to process the callbacks when no user is found" do
     Merb::Authentication.after_authentication{|u,r,p| u.acknowledge("first");  u}
     Merb::Authentication.after_authentication{|u,r,p| u.acknowledge("second"); u}
@@ -98,5 +98,5 @@ describe "Authentication callbacks" do
     end.should raise_error(Merb::Controller::Unauthenticated)
     Viking.captures.should be_empty
   end
-    
+
 end

data/spec/merb-auth-core/customizations_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe "Merb::Authentication.customizations" do
-  
+
   before(:each) do
     Merb::Authentication.default_customizations.clear
   end
-  
+
   it "should allow addition to the customizations" do
     Merb::Authentication.customize_default { "ONE" }
     Merb::Authentication.default_customizations.first.call.should == "ONE"
   end
-  
+
   it "should allow multiple additions to the customizations" do
     Merb::Authentication.customize_default {"ONE"}
     Merb::Authentication.customize_default {"TWO"}
-    
+
     Merb::Authentication.default_customizations.first.call.should == "ONE"
     Merb::Authentication.default_customizations.last.call.should  == "TWO"
   end
-  
+
 end

data/spec/merb-auth-core/errors_spec.rb

@@ -1,31 +1,31 @@
 require 'spec_helper'
 
 describe Merb::Authentication::Errors do
- 
+
   before(:each) do
     @errors = Merb::Authentication::Errors.new
   end
- 
+
   it "should report that it is empty on first creation" do
     @errors.empty?.should == true
   end
- 
+
   it "should continue to report that it is empty even after being checked" do
     @errors.on(:foo)
     @errors.empty?.should == true
   end
-  
+
   it "should add an error" do
     @errors.add(:login, "Login or password incorrect")
     @errors[:login].should == ["Login or password incorrect"]
   end
-  
+
   it "should allow many errors to be added to the same field" do
     @errors.add(:login, "bad 1")
     @errors.add(:login, "bad 2")
     @errors.on(:login).should == ["bad 1", "bad 2"]
   end
-  
+
   it "should give the full messages for an error" do
     @errors.add(:login, "login wrong")
     @errors.add(:password, "password wrong")
@@ -33,16 +33,16 @@ describe Merb::Authentication::Errors do
       @errors.full_messages.should include(msg)
     end
   end
-  
+
   it "should return the error for a specific field / label" do
     @errors.add(:login, "wrong")
     @errors.on(:login).should == ["wrong"]
   end
-  
+
   it "should return nil for a specific field if it's not been set" do
     @errors.on(:not_there).should be_nil
   end
-  
+
   it "should provide an errors instance method on the Authenticaiton instance" do
     a = Merb::Authentication.new(Merb::CookieSession.generate)
     a.errors.should be_a_kind_of(Merb::Authentication::Errors)

data/spec/merb-auth-core/failed_login_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Failed Login" do
-  
+
   before(:all) do
     Merb::Config[:exception_details] = true
     reset_exceptions!
@@ -11,7 +11,7 @@ describe "Failed Login" do
       end
     end
   end
-  
+
   after(:all) do
     reset_exceptions!
     class Exceptions < Merb::Controller
@@ -19,16 +19,16 @@ describe "Failed Login" do
         "Unauthenticated"
       end
     end
-    
+
     Viking.captures.clear
   end
-  
+
   def reset_exceptions!
     Object.class_eval do
       remove_const(:Exceptions) if defined?(Exceptions)
     end
   end
-  
+
   before(:each) do
     clear_strategies!
     Viking.captures.clear
@@ -37,33 +37,33 @@ describe "Failed Login" do
       match("/").to(:controller => "a_controller")
       match("/login", :method => :put).to(:controller => "sessions", :action => :update)
     end
-    
+
     class LOne < Merb::Authentication::Strategy
       def run!
         Viking.capture self.class
         params[self.class.name.snake_case.gsub("::", "_")]
       end
     end
-    
+
     class LTwo < LOne; end
-    
+
     class LThree < LOne; end
-    
+
     class AController < Merb::Controller
       before :ensure_authenticated, :with => [LThree]
       def index
         "INDEX OF AController"
       end
     end
-    
+
     class Sessions < Merb::Controller
       before :ensure_authenticated
       def update
         "In the login action"
       end
     end
-  end  
-  
+  end
+
   it "should fail login and then not try the default login on the second attempt but should try the original" do
     r1 = request("/")
     r1.status.should == 401
@@ -73,9 +73,9 @@ describe "Failed Login" do
     r2.status.should == 200
     Viking.captures.should == ["LThree"]
   end
-  
+
   it "should not be able to fail many times and still work" do
-    3.times do 
+    3.times do
       r1 = request("/")
       r1.status.should == 401
       Viking.captures.should == ["LThree"]
@@ -85,6 +85,6 @@ describe "Failed Login" do
     r2.status.should == 200
     Viking.captures.should == ["LThree"]
   end
-  
-  
+
+
 end

data/spec/merb-auth-core/merb-auth-core_spec.rb

@@ -6,7 +6,7 @@ describe "merb-auth-core" do
       controller.should_receive(:ensure_authenticated)
     end
   end
-  
+
   it "should not ensure_authenticated when skipped" do
     dispatch_to(Dingbats, :index) do |controller|
       controller.should_not_receive(:ensure_authenticated)

data/spec/merb-auth-core/router_helper_spec.rb

@@ -6,17 +6,17 @@ describe "router protection" do
     class Foo < Merb::Controller
       def index; "INDEX"; end
     end
-    
+
     clear_strategies!
-    
+
     Object.class_eval do
       remove_const("Mone") if defined?(Mone)
       remove_const("Mtwo") if defined?(Mtwo)
       remove_const("Mthree") if defined?(Mthree)
     end
-    
+
     Viking.captures.clear
-    
+
     class Mone < Merb::Authentication::Strategy
       def run!
         Viking.capture self.class
@@ -27,7 +27,7 @@ describe "router protection" do
         end
       end
     end
-    
+
     class Mthree < Mone; end
     class Mtwo < Mone; end
 
@@ -35,77 +35,77 @@ describe "router protection" do
       to(:controller => "foo") do
         authenticate do
           match("/single_level_default").register
-            
+
           authenticate(Mtwo) do
             match("/nested_specific").register
           end
         end
-              
+
         authenticate(Mtwo, Mone) do
           match("/single_level_specific").register
         end
       end
     end
   end
-  
+
   describe "single level default" do
-    
+
     it "should allow access to the controller if the strategy passes" do
       result = request("/single_level_default", :params => {"Mtwo" => true})
-      result.body.should == "INDEX" 
+      result.body.should == "INDEX"
       Viking.captures.should == %w(Mone Mthree Mtwo)
     end
-    
+
     it "should fail if no strategies match" do
       result = request("/single_level_default")
       result.status.should == Merb::Controller::Unauthenticated.status
     end
-    
+
     it "should set return a rack array if the strategy redirects" do
       result = request("/single_level_default", :params => {"url" => "/some/url"})
       result.status.should == 302
       result.body.should_not =="INDEX"
     end
   end
-  
+
   describe "nested_specific" do
-    
+
     it "should allow access to the controller if the strategy passes" do
       result = request("/nested_specific", :params => {"Mtwo" => true})
-      result.body.should == "INDEX" 
+      result.body.should == "INDEX"
       Viking.captures.should == %w(Mone Mthree Mtwo)
     end
-    
+
     it "should fail if no strategies match" do
       result = request("/nested_specific")
       result.status.should == Merb::Controller::Unauthenticated.status
     end
-    
+
     it "should set return a rack array if the strategy redirects" do
       result = request("/nested_specific", :params => {"url" => "/some/url"})
       result.status.should == 302
       result.body.should_not =="INDEX"
     end
   end
-  
+
   describe "single_level_specific" do
-    
+
     it "should allow access to the controller if the strategy passes" do
       result = request("/single_level_specific", :params => {"Mone" => true})
-      result.body.should == "INDEX" 
+      result.body.should == "INDEX"
       Viking.captures.should == %w(Mtwo Mone)
     end
-    
+
     it "should fail if no strategies match" do
       result = request("/single_level_specific")
       result.status.should == Merb::Controller::Unauthenticated.status
     end
-    
+
     it "should set return a rack array if the strategy redirects" do
       result = request("/single_level_specific", :params => {"url" => "/some/url"})
       result.status.should == 302
       result.body.should_not =="INDEX"
     end
   end
-  
+
 end

data/spec/merb-auth-core/strategy_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe "Merb::Authentication::Strategy" do
-    
+
   before(:all) do
     clear_strategies!
   end
-  
+
   before(:each) do
     clear_strategies!
   end
-  
+
   after(:all) do
     clear_strategies!
   end
-  
+
   describe "adding a strategy" do
     it "should add a strategy" do
       class MyStrategy < Merb::Authentication::Strategy; end
       Merb::Authentication.strategies.should include(MyStrategy)
     end
-    
+
     it "should keep track of the strategies" do
       class Sone < Merb::Authentication::Strategy; end
       class Stwo < Merb::Authentication::Strategy; end
@@ -27,13 +27,13 @@ describe "Merb::Authentication::Strategy" do
       Merb::Authentication.default_strategy_order.pop
       Merb::Authentication.strategies.should include(Sone, Stwo)
     end
-    
+
     it "should add multiple strategies in order of decleration" do
       class Sone < Merb::Authentication::Strategy; end
       class Stwo < Merb::Authentication::Strategy; end
       Merb::Authentication.default_strategy_order.should == [Sone, Stwo]
     end
-    
+
     it "should allow a strategy to be inserted _before_ another strategy in the default order" do
       class Sone < Merb::Authentication::Strategy; end
       class Stwo < Merb::Authentication::Strategy; end
@@ -41,7 +41,7 @@ describe "Merb::Authentication::Strategy" do
       Merb::Authentication.strategies.should include(AuthIntruder, Stwo, Sone)
       Merb::Authentication.default_strategy_order.should == [Sone, AuthIntruder, Stwo]
     end
-    
+
     it "should allow a strategy to be inserted _after_ another strategy in the default order" do
       class Sone < Merb::Authentication::Strategy; end
       class Stwo < Merb::Authentication::Strategy; end
@@ -50,7 +50,7 @@ describe "Merb::Authentication::Strategy" do
       Merb::Authentication.default_strategy_order.should == [Sone, AuthIntruder, Stwo]
     end
   end
-  
+
   describe "the default order" do
     it "should allow a user to overwrite the default order" do
       class Sone < Merb::Authentication::Strategy; end
@@ -58,7 +58,7 @@ describe "Merb::Authentication::Strategy" do
       Merb::Authentication.default_strategy_order = [Stwo]
       Merb::Authentication.default_strategy_order.should == [Stwo]
     end
-    
+
     it "should get raise an error if any strategy is not an Merb::Authentication::Strategy" do
       class Sone < Merb::Authentication::Strategy; end
       class Stwo < Merb::Authentication::Strategy; end
@@ -75,107 +75,107 @@ describe "Merb::Authentication::Strategy" do
       Sone.new(request, request.params).run!
     end.should raise_error(Merb::Authentication::NotImplemented)
   end
-  
+
   it "should not raise an implemented error if the run! method is defined on the subclass" do
     class Sone < Merb::Authentication::Strategy; def run!; end; end
     lambda do
       Sone.new("controller").run!
     end.should_not raise_error(Merb::Authentication::NotImplemented)
   end
-  
+
   describe "convinience methods" do
-    
+
     before(:each) do
-      class Sone < Merb::Authentication::Strategy; def run!; end; end 
+      class Sone < Merb::Authentication::Strategy; def run!; end; end
       @request = fake_request
       @strategy = Sone.new(@request, {:params => true})
     end
-    
+
     it "should provide a params helper that defers to the controller" do
       @strategy.params.should == {:params => true }
     end
-    
+
     it "should provide a cookies helper" do
       @request.should_receive(:cookies).and_return("COOKIES")
       @strategy.cookies.should == "COOKIES"
     end
-    
+
   end
-  
+
   describe "#user_class" do
-    
+
     # This allows you to scope a particular strategy to a particular user class object
     # By inheriting you can add multiple user types to the authentication process
-    
+
     before(:each) do
       class Sone < Merb::Authentication::Strategy; def run!; end; end
       class Stwo < Sone; end
-      
+
       class Mone < Merb::Authentication::Strategy
         def user_class; String; end
         def run!; end
       end
       class Mtwo < Mone; end
-      
+
       class Pone < Merb::Authentication::Strategy
         abstract!
         def user_class; Hash; end
         def special_method; true end
       end
       class Ptwo < Pone; end;
-      
+
       @request = fake_request
     end
-    
+
     it "should allow being set to an abstract strategy" do
       Pone.abstract?.should be_true
     end
-    
+
     it "should not set the child class of an abstract class to be abstract" do
       Ptwo.abstract?.should be_false
     end
-    
+
     it "should implement a user_class helper" do
       s = Sone.new(@request, @request.params)
       s.user_class.should == User
     end
-    
+
     it "should make it into the strategies collection when subclassed from a subclass" do
       Merb::Authentication.strategies.should include(Mtwo)
     end
-    
+
     it "should make it in the default_strategy_order when subclassed from a subclass" do
       Merb::Authentication.default_strategy_order.should include(Mtwo)
     end
-    
+
     it "should defer to the Merb::Authentication.user_class if not over written" do
       Merb::Authentication.should_receive(:user_class).and_return(User)
       s = Sone.new(@request, @request.params)
       s.user_class
     end
-    
+
     it "should inherit the user class from it's parent by default" do
       Merb::Authentication.should_receive(:user_class).and_return(User)
       s = Stwo.new(@request, @request.params)
       s.user_class.should == User
     end
-    
+
     it "should inherit the user_class form it's parent when the parent defines a new one" do
       Merb::Authentication.should_not_receive(:user_class)
       m = Mtwo.new(@request, @request.params)
       m.user_class.should == String
     end
-    
+
   end
-  
+
   describe "#redirect!" do
-    
+
     before(:all) do
       class FooController < Merb::Controller
         def index; "FooController#index" end
       end
     end
-    
+
     before(:each) do
       class MyStrategy < Merb::Authentication::Strategy
         def run!
@@ -186,89 +186,89 @@ describe "Merb::Authentication::Strategy" do
           end
         end
       end # MyStrategy
-      
+
       Merb::Router.reset!
       Merb::Router.prepare{ match("/").to(:controller => "foo_controller")}
       @request = fake_request
       @s = MyStrategy.new(@request, @request.params)
     end
-    
+
     it "allow for a redirect!" do
       @s.redirect!("/somewhere")
       @s.headers["Location"].should == "/somewhere"
     end
-    
+
     it "should provide access to setting the headers" do
       @s.headers["Location"] = "/a/url"
       @s.headers["Location"].should == "/a/url"
     end
-    
+
     it "should allow access to the setting header" do
       @s.status = 403
       @s.status.should == 403
     end
-    
+
     it "should return nil for the Location if it is not redirected" do
       @s.should_not be_redirected
       @s.headers["Location"].should be_nil
     end
-      
+
     it "should pass through the options to the redirect options" do
       @s.redirect!("/somewhere", :status => 401)
       @s.headers["Location"].should == "/somewhere"
       @s.status.should == 401
     end
-    
+
     it "should set a redirect with a permanent true" do
       @s.redirect!("/somewhere", :permanent => true)
       @s.status.should == 301
     end
-    
+
     it "should be redirected?" do
       @s.should_not be_redirected
       @s.redirect!("/somewhere")
       @s.should be_redirected
     end
-    
+
     it "should set the strategy to halted" do
       @s.redirect!("/somewhere")
       @s.should be_halted
     end
-    
+
     it "should halt a strategy" do
       @s.should_not be_halted
       @s.halt!
       @s.should be_halted
     end
-    
+
     it "should allow a body to be set" do
       @s.body = "body"
       @s.body.should == "body"
     end
-    
+
   end
-  
+
   describe "register strategies" do
-    
+
     it "should allow for a strategy to be registered" do
       Merb::Authentication.register(:test_one, "/path/to/strategy")
       Merb::Authentication.registered_strategies[:test_one].should == "/path/to/strategy"
     end
-    
+
     it "should activate a strategy" do
       Merb::Authentication.register(:test_activation, File.expand_path(File.dirname(__FILE__)) / "activation_fixture")
       defined?(TheActivationTest).should be_nil
       Merb::Authentication.activate!(:test_activation)
       defined?(TheActivationTest).should_not be_nil
     end
-    
+
     it "should raise if the strategy is not registered" do
       lambda do
         Merb::Authentication.activate!(:not_here)
       end.should raise_error
     end
-    
-    
+
+
   end
-  
+
 end