revo-lockdown 1.6.2.1 → 1.6.2.2

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

@@ -106,7 +106,12 @@ module Lockdown
             respond_to do |format|
               format.html do
                 store_location
-                redirect_to Lockdown::System.fetch(:access_denied_path)
+                access_denied_action = Lockdown::System.fetch(:access_denied_action)
+                if access_denied_action && respond_to?(access_denied_action)
+                  send(access_denied_action)
+                else
+                  redirect_to Lockdown::System.fetch(:access_denied_path)
+                end
                 return
               end
               format.xml do

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

@@ -58,6 +58,8 @@ module Lockdown
           return ""
         end
 
+        private
+
         def remove_subdirectory(url)
           subdir = Lockdown::System.fetch(:subdirectory)
           subdir ? url.gsub(/^\/?#{subdir}/,'') : url
@@ -68,8 +70,6 @@ module Lockdown
           url_for(url)
         end
 
-        private :remove_subdirectory
-
 
       end # View
     end # Rails

data/rails_generators/lockdown/templates/lib/lockdown/init.rb

@@ -40,6 +40,11 @@ Lockdown::System.configure do
   #
   # Set redirect to path on unauthorized access attempt:
   #       options[:access_denied_path] = "/"
+  
+  # Set action in controller to handle unauthorized access attempt. 
+  # This will allow specific controller to handle :access_denined_action error
+  # e.g. redirect to specific URL.
+  # options[:access_denied_action] =  :access_denied_action
   #
   # Set redirect to path on successful login:
   #       options[:successful_login_path] = "/"

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

@@ -3,6 +3,18 @@ require File.join(File.dirname(__FILE__), %w[.. .. .. spec_helper])
 class TestAController
   extend Lockdown::Frameworks::Rails::Controller
   include Lockdown::Frameworks::Rails::Controller::Lock
+  
+  # Stub method for tests
+  def respond_to &block
+    block.call(self) 
+  end
+  
+  def html &block
+    block.call(self)
+  end
+  
+  def xml
+  end
 end
 
 describe Lockdown::Frameworks::Rails::Controller do
@@ -156,6 +168,27 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
   end
 
   describe "#access_denied" do
+    
+    before(:each) do
+      @exception = SecurityError.new
+      Lockdown::System.stub!(:fetch).with(:logout_on_access_violation).and_return(false)
+      @controller.should_receive(:store_location)
+    end
+    
+    it "should call configured access_denied_action" do
+      Lockdown::System.stub!(:fetch).with(:access_denied_action).and_return(:some_action)
+      @controller.should_receive(:respond_to?).with(:some_action).and_return(true)
+      @controller.should_receive(:some_action)
+      @controller.send(:ld_access_denied, @exception)
+    end
+    
+    it "should redirect to accessed_denied_path" do
+      Lockdown::System.stub!(:fetch).with(:access_denied_path).and_return("some_path")
+      Lockdown::System.stub!(:fetch).with(:access_denied_action).and_return(nil)
+      @controller.should_receive(:redirect_to).with("some_path")
+      @controller.send(:ld_access_denied, @exception)
+    end
+    
   end
 
   describe "#path_from_hash" do

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

@@ -177,13 +177,13 @@ describe Lockdown::Frameworks::Rails::Controller do
       options = { :url => 'test/test' }
       @view.should_receive(:url_for).with(options[:url])
       @view.should_not_receive(:url_for).with(options)
-      @view.url_from(options)
+      @view.send(:url_from, options)
     end
 
     it "should derive the path from the options hash if no :url is given" do
       options = { :controller => 'test', :action => 'index' }
       @view.should_receive(:url_for).with(options)
-      @view.url_from(options)
+      @view.send(:url_from, options)
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: revo-lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.6.2.1
+  version: 1.6.2.2
 platform: ruby
 authors: 
   - Andrew Stone