Changeset 5126

Timestamp:

09/16/06 01:31:17 (3 years ago)

Author:

bitsweat

Message:

Declare file extensions exempt from layouts. Closes #6219.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/layout_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Declare file extensions exempt from layouts.  #6219 [brandon]
+    Example: ActionController::Base.exempt_from_layout 'rpdf'
-
-* Add chained replace/update support for assert_select_rjs [Rick Olson]

trunk/actionpack/lib/action_controller/base.rb

@@ -316 +316 @@
-    attr_accessor :action_name
-
+    # Templates that are exempt from layouts
+    @@exempt_from_layout = Set.new([/\.rjs$/])
+
-    class << self
-      # Factory for the standard create, process loop where the controller is discarded after processing.
@@ -395 +398 @@
-          filtered_parameters
-        end
+      end
+
+      # Don't render layouts for templates with the given extensions.
+      def exempt_from_layout(*extensions)
+        regexps = extensions.collect do |extension|
+          extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
+        end
+        @@exempt_from_layout.merge regexps
-      end
-    end
@@ -1095 +1106 @@
-
-      def template_exempt_from_layout?(template_name = default_template_name)
-
+
+
+
+
-      end
-

trunk/actionpack/test/controller/layout_test.rb

@@ -73 +73 @@
-end
-
+class ExemptFromLayoutTest < Test::Unit::TestCase
+  def setup
+    @controller = LayoutTest.new
+  end
+
+  def test_rjs_exempt_from_layout
+    assert @controller.send(:template_exempt_from_layout?, 'test.rjs')
+  end
+
+  def test_rhtml_and_rxml_not_exempt_from_layout
+    assert !@controller.send(:template_exempt_from_layout?, 'test.rhtml')
+    assert !@controller.send(:template_exempt_from_layout?, 'test.rxml')
+  end
+
+  def test_other_extension_not_exempt_from_layout
+    assert !@controller.send(:template_exempt_from_layout?, 'test.random')
+  end
+
+  def test_add_extension_to_exempt_from_layout
+    ['rpdf', :rpdf].each do |ext|
+      assert_nothing_raised do
+        ActionController::Base.exempt_from_layout ext
+      end
+      assert @controller.send(:template_exempt_from_layout?, "test.#{ext}")
+    end
+  end
+
+  def test_add_regexp_to_exempt_from_layout
+    ActionController::Base.exempt_from_layout /\.rdoc/
+    assert @controller.send(:template_exempt_from_layout?, 'test.rdoc')
+  end
+end
+
-
-class DefaultLayoutController < LayoutTest