Changeset 9080

Timestamp:

03/23/08 01:48:17 (6 months ago)

Author:

rick

Message:

Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice. [rick]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice.  [rick]
-
-* Refactor filters to use Active Support callbacks.  #11235 [Josh Peek]

trunk/actionpack/lib/action_controller/filters.rb

@@ -265 +265 @@
-      def skip_filter_in_chain(*filters, &test)
-        filters, conditions = extract_options(filters)
+        filters.each do |filter|
+          if callback = find_callback(filter) then delete(callback) end
+        end if conditions.empty?
-        update_filter_in_chain(filters, :skip => conditions, &test)
-      end

trunk/actionpack/test/controller/filters_test.rb

@@ -159 +159 @@
-  end
-
+  class SkippingAndLimitedController < TestController
+    skip_before_filter :ensure_login
+    before_filter :ensure_login, :only => :index
+
+    def index
+      render :text => 'ok'
+    end
+    
+    def public
+    end
+  end
+  
+  class SkippingAndReorderingController < TestController
+    skip_before_filter :ensure_login
+    before_filter :find_record
+    before_filter :ensure_login
+
+    private
+      def find_record
+        @ran_filter ||= []
+        @ran_filter << "find_record"
+      end
+  end
+
-  class ConditionalSkippingController < TestController
-    skip_before_filter :ensure_login, :only => [ :login ]
@@ -565 +589 @@
-    response = test_process(PrependingBeforeAndAfterController)
-    assert_equal %w( before_all between_before_all_and_after_all after_all ), response.template.assigns["ran_filter"]
+  end
+  
+  def test_skipping_and_limiting_controller
+    assert_equal %w( ensure_login ), test_process(SkippingAndLimitedController, "index").template.assigns["ran_filter"]
+    assert_nil test_process(SkippingAndLimitedController, "public").template.assigns["ran_filter"]
+  end
+
+  def test_skipping_and_reordering_controller
+    assert_equal %w( find_record ensure_login ), test_process(SkippingAndReorderingController, "index").template.assigns["ran_filter"]
-  end
-