Changeset 2873

Timestamp:

11/04/05 19:42:22 (3 years ago)

Author:

david

Message:

Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [DHH] Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [DHH]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-* Change javascript_include_tag :defaults to not use script.aculo.us loader, which facilitates the use of plugins for future script.aculo.us and third party javascript extensions, and provide register_javascript_include_default for plugins to specify additional JavaScript files to load. Removed slider.js and builder.js from actionpack. [Thomas Fuchs]

trunk/actionpack/lib/action_controller/assertions.rb

@@ -222 +222 @@
-      #   assert_tag :tag => "span"
-      #
+      #   # assert that there is a "span" tag with id="x"
+      #   assert_tag :tag => "span", :attributes => { :id => "x" }
+      #
+      #   # assert that there is a "span" tag using the short-hand
+      #   assert_tag :span
+      #
+      #   # assert that there is a "span" tag with id="x" using the short-hand
+      #   assert_tag :span, :attributes => { :id => "x" }
+      #
-      #   # assert that there is a "span" inside of a "div"
-      #   assert_tag :tag => "span", :parent => { :tag => "div" }
@@ -249 +258 @@
-      #              :descendant => { :tag => "span",
-      #                               :child => /hello world/ }
-
-
+
+
+
-          tag = find_tag(opts)
-          assert tag, "expected tag, but no tag found matching #{opts.inspect} in:\n#{@response.body.inspect}"
@@ -260 +270 @@
-      def assert_no_tag(opts)
-        clean_backtrace do
+          opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
-          tag = find_tag(opts)
-          assert !tag, "expected no tag, but found tag matching #{opts.inspect} in:\n#{@response.body.inspect}"

trunk/actionpack/lib/action_controller/filters.rb

@@ -126 +126 @@
-    #       report_result
-    #     end
+    #   end
+    #
+    # == Filter chain skipping
+    #
+    # Some times its convenient to specify a filter chain in a superclass that'll hold true for the majority of the 
+    # subclasses, but not necessarily all of them. The subclasses that behave in exception can then specify which filters
+    # they would like to be relieved of. Examples
+    #
+    #   class ApplicationController < ActionController::Base
+    #     before_filter :authenticate
+    #   end
+    #
+    #   class WeblogController < ApplicationController
+    #     # will run the :authenticate filter
+    #   end
+    #
+    #   class SignupController < ActionController::Base
+    #     # will not run the :authenticate filter
+    #     skip_before_filter :authenticate
-    #   end
-    #
@@ -229 +248 @@
-      # Short-hand for append_around_filter since that's the most common of the two.
-      alias :around_filter :append_around_filter
+      
+      # Removes the specified filters from the +before+ filter chain. Note that this only works for skipping method-reference 
+      # 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.
+      def skip_before_filter(*filters)
+        for filter in filters.flatten
+          write_inheritable_attribute("before_filters", read_inheritable_attribute("before_filters") - [ filter ])
+        end
+      end
+
+      # Removes the specified filters from the +after+ filter chain. Note that this only works for skipping method-reference 
+      # 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.
+      def skip_after_filter(*filters)
+        for filter in filters.flatten
+          write_inheritable_attribute("after_filters", read_inheritable_attribute("after_filters") - [ filter ])
+        end
+      end
-      
-      # Returns all the before filters for this class and all its ancestors.

trunk/actionpack/test/controller/filters_test.rb

@@ -100 +100 @@
-  class PrependingController < TestController
-    prepend_before_filter :wonderful_life
+    skip_before_filter :fire_flash
-
-    private
@@ -226 +227 @@
-  
-  def test_prepending_filter
-fire_flash, :
+
-  end
-