Changeset 3504

Timestamp:

01/31/06 23:55:04 (3 years ago)

Author:

david

Message:

Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/filters.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/filters_test.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH]
-
-* Ensure that the instance variables are copied to the template when performing render :update. [Nicholas Seckar]

trunk/actionpack/lib/action_controller/filters.rb

@@ -252 +252 @@
-      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
-      # of many sub-controllers need a different hierarchy.
+      #
+      # You can control the actions to skip the filter for with the <tt>:only</tt> and <tt>:except</tt> options, 
+      # just like when you apply the filters.
-      def skip_before_filter(*filters)
-
-
+
+
+
+
+
+
+
-        end
-      end
@@ -261 +269 @@
-      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
-      # of many sub-controllers need a different hierarchy.
+      #
+      # You can control the actions to skip the filter for with the <tt>:only</tt> and <tt>:except</tt> options, 
+      # just like when you apply the filters.
-      def skip_after_filter(*filters)
-
-
+
+
+
+
+
+
+
-        end
-      end

trunk/actionpack/test/controller/filters_test.rb

@@ -4 +4 @@
-  class TestController < ActionController::Base
-    before_filter :ensure_login
+    after_filter  :clean_up
-
-    def show
@@ -14 +15 @@
-        @ran_filter << "ensure_login"
-      end
+      
+      def clean_up
+        @ran_after_filter ||= []
+        @ran_after_filter << "clean_up"
+      end
-  end
-
@@ -108 +114 @@
-      end
-  end
+
+  class ConditionalSkippingController < TestController
+    skip_before_filter :ensure_login, :only => [ :login ]
+    skip_after_filter  :clean_up,     :only => [ :login ]
+
+    def login
+      render :inline => "ran action"
+    end
+
+    def change_password
+      render :inline => "ran action"
+    end
+  end
+
-
-  class ProcController < PrependingController
@@ -344 +364 @@
-  end
-
+  def test_conditional_skipping_of_filters
+    assert_nil test_process(ConditionalSkippingController, "login").template.assigns["ran_filter"]
+    assert_equal %w( ensure_login ), test_process(ConditionalSkippingController, "change_password").template.assigns["ran_filter"]
+
+    assert_nil test_process(ConditionalSkippingController, "login").template.controller.instance_variable_get("@ran_after_filter")
+    assert_equal %w( clean_up ), test_process(ConditionalSkippingController, "change_password").template.controller.instance_variable_get("@ran_after_filter")
+  end
+
-  private
-    def test_process(controller, action = "show")