merb-auth-core 0.9.13 → 1.0

data/lib/merb-auth-core/authenticated_helper.rb

@@ -29,7 +29,7 @@ module Merb
     #    end
     # 
     def ensure_authenticated(*strategies)
-      session.authenticate!(request, params, *strategies) unless session.user
+      session.authenticate!(request, params, *strategies) unless session.authenticated?
       auth = session.authentication
       if auth.halted?
         self.headers.merge!(auth.headers)

data/lib/merb-auth-core/authentication.rb

@@ -30,7 +30,7 @@ module Merb
     # @return <TrueClass|FalseClass>
     # 
     def authenticated?
-      !!user
+      !!session[:user]
     end
   
     # This method will retrieve the user object stored in the session or nil if there

data/spec/helpers/authentication_helper_spec.rb

@@ -40,7 +40,8 @@ describe "Merb::AuthenticationHelper" do
   
   it "should run the authentication when testing if it is authenticated" do
     @controller = ControllerMock.new(fake_request)
-    @controller.session.should_receive(:user).and_return(nil, "WINNA")
+    @controller.session.should_receive(:authenticated?).and_return(false)
+    @controller.session.should_receive(:user).and_return("WINNA")
     @controller.session.authentication.should_receive(:authenticate!).and_return("WINNA")
     @controller.send(:ensure_authenticated)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: "1.0"
 platform: ruby
 authors: 
 - Adam French, Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2008-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.13
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib