lockdown 1.5.1 → 1.6.0

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

data/lib/lockdown.rb

@@ -16,7 +16,7 @@ module Lockdown
   extend Lockdown::References
   extend Lockdown::Helper
 
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 
   class << self
     attr_accessor :logger
@@ -54,7 +54,7 @@ module Lockdown
 
       if File.exists?(Lockdown.init_file)
         Lockdown.logger.info "=> Requiring Lockdown rules engine: #{Lockdown.init_file} \n"
-        require Lockdown.init_file
+        load Lockdown.init_file
       else
         Lockdown.logger.info "=> Note:: Lockdown couldn't find init file: #{Lockdown.init_file}\n"
       end

data/lib/lockdown/frameworks/rails.rb

@@ -66,14 +66,14 @@ module Lockdown
         # cache_classes is true in production and testing, need to
         # modify the ApplicationController 
         def controller_parent
-          if caching_classes?
+          if caching?
             ApplicationController
           else
             ActionController::Base
           end
         end
         
-        def caching_classes?
+        def caching?
           ::Rails.configuration.cache_classes
         end
 

data/lib/lockdown/frameworks/rails/controller.rb

@@ -63,6 +63,9 @@ module Lockdown
           end
       
           def authorized?(url, method = nil)
+            # Reset access unless caching?
+            add_lockdown_session_values unless Lockdown.caching?
+
             return false unless url
 
             return true if current_user_is_admin?

data/lib/lockdown/session.rb

@@ -9,6 +9,8 @@ module Lockdown
       if user
         session[:access_rights] = Lockdown::System.access_rights_for_user(user)
         session[:current_user_id] = user.id
+      else
+        session[:access_rights] = Lockdown::System.public_access
       end
     end
 

data/lib/lockdown/system.rb

@@ -13,7 +13,7 @@ module Lockdown
 
       Lockdown::Database.sync_with_db unless skip_sync?
 
-      @initialized = true
+      @initialized = true if Lockdown.caching?
     end
 
     def self.initialized?

data/spec/lockdown/frameworks/rails/controller_spec.rb

@@ -37,7 +37,8 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
   end
   
   describe "#configure_lockdown" do
-    it "should call check_session_expiry and store_location" do
+    it "should call Lockdown.maybe_parse_init, check_session_expiry and store_location" do
+      Lockdown.should_receive(:maybe_parse_init)
       @controller.should_receive(:check_session_expiry)
       @controller.should_receive(:store_location)
 
@@ -115,6 +116,7 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
 
       request = mock("request")
       request.stub!(:method).and_return(:get)
+      Lockdown.stub(:caching?).and_return(true)
       @controller.stub!(:params).and_return({})
       @controller.stub!(:request).and_return(request)
 
@@ -127,6 +129,13 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
       URI.stub!(:split).with(@a_path).and_return(a_path_parts)
     end
 
+    it "should call add_lockdown_session_values unless caching" do
+      Lockdown.stub(:caching?).and_return(false)
+      @controller.should_receive(:add_lockdown_session_values)
+
+      @controller.send(:authorized?,nil)
+    end
+
     it "should return false if url is nil" do
       @controller.send(:authorized?,nil).should be_false
     end

data/spec/lockdown/frameworks/rails_spec.rb

@@ -115,12 +115,12 @@ describe Lockdown::Frameworks::Rails::Environment do
 
   describe "#controller_parent" do
     it "should return ActionController::Base if not caching classes" do
-      @env.should_receive(:caching_classes?).and_return(false)
+      @env.should_receive(:caching?).and_return(false)
       @env.controller_parent.should == ActionController::Base
     end
 
     it "should return ApplicationController if caching classes" do
-      @env.should_receive(:caching_classes?).and_return(true)
+      @env.should_receive(:caching?).and_return(true)
       @env.controller_parent.should == ApplicationController
     end
 

data/spec/lockdown/system_spec.rb

@@ -20,6 +20,8 @@ describe Lockdown::System do
  
       Lockdown::Database.should_receive :sync_with_db 
      
+      Lockdown.should_receive :caching?
+
       Lockdown::System.configure do
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency