Changeset 6499

Timestamp:

04/02/07 00:02:11 (2 years ago)

Author:

rick

Message:

Change ActionView template defaults. Look for templates using the request format first, such as show.html.erb or show.xml.builder, before looking for the old defaults like show.erb or show.builder [Rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (8 diffs)
• trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/fixtures/test/formatted_html_erb.html.erb (added)
• trunk/actionpack/test/fixtures/test/formatted_xml_erb.builder (added)
• trunk/actionpack/test/fixtures/test/formatted_xml_erb.html.erb (added)
• trunk/actionpack/test/fixtures/test/formatted_xml_erb.xml.erb (added)
• trunk/actionpack/test/template/base_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Change ActionView template defaults.  Look for templates using the request format first, such as "show.html.erb" or "show.xml.builder", before looking for the old defaults like "show.erb" or "show.builder" [Rick]
-
-* Highlight helper highlights one or many terms in a single pass.  [Jeremy Kemper]

trunk/actionpack/lib/action_controller/base.rb

@@ -1226 +1226 @@
-      def assert_existence_of_template_file(template_name)
-        unless template_exists?(template_name) || ignore_missing_templates
-'erb'
+"#{@template.send(:template_format)}.erb"
-          template_type = (template_name =~ /layouts/i) ? 'layout' : 'template'
-          raise(MissingTemplate, "Missing #{template_type} #{full_template_path}")

trunk/actionpack/lib/action_view/base.rb

@@ -253 +253 @@
-          template_extension = pick_template_extension(template_path).to_s
-          template_file_name = full_template_path(template_path, template_extension)
+          template_extension.gsub!(/^\w+\./, '') # strip off any formats
-        end
-      else
@@ -331 +332 @@
-
-    def pick_template_extension(template_path)#:nodoc:
+      formatted_template_path = "#{template_path}.#{template_format}"
-      if @@cache_template_extensions
-template_path] ||= find_template_extension_for(
+formatted_template_path] ||= find_template_extension_for(template_path, formatted_
-      else
-
+, formatted_template_path
-      end
-    end
@@ -358 +360 @@
-    def javascript_template_exists?(template_path)#:nodoc:
-      template_exists?(template_path, :rjs)
+    end
+
+    def formatted_template_exists?(formatted_template_exists)
+      [:erb, :builder, :rjs].each do |ext|
+        return ext if template_exists?(formatted_template_exists, ext)
+      end
+      nil
-    end
-
@@ -365 +374 @@
-        template_exists?(template_file_name, template_file_extension)
-      else
-
-
-
-
+
+
+
+
+
+
-      end
-    end
@@ -375 +386 @@
-    def file_public?(template_path)#:nodoc:
-      template_path.split('/').last[0,1] != '_'
+    end
+
+    def template_format
+      if @template_format != false
+        # check controller.respond_to?(:request) in case its an ActionMailer::Base, or some other sneaky class.
+        @template_format = controller.respond_to?(:request) ? false : :html
+        if controller && controller.respond_to?(:request) && controller.request && controller.request.format
+          @template_format = controller.request.format == Mime::ALL ? :html : controller.request.format.to_sym
+        end
+      end
+      @template_format
-    end
-
@@ -390 +412 @@
-      end
-
+      # Splits the path and extension from the given template_path and returns as an array.
-      def path_and_extension(template_path)
-        template_path_without_extension = template_path.sub(/\.(\w+)$/, '')
@@ -395 +418 @@
-      end
-
-
-
+
+
+
+
-      end
-      
@@ -405 +430 @@
-
-      # Determines the template's file extension, such as rhtml, rxml, or rjs.
-
+
+
-        if match = delegate_template_exists?(template_path)
-          match.first.to_sym
-
-
+
+
+
-        elsif javascript_template_exists?(template_path): :rjs
-        else

trunk/actionpack/test/controller/render_test.rb

@@ -121 +121 @@
-           :locals => { "local_name" => name }
-    ActionView::Base.local_assigns_support_string_keys = false
+  end
+
+  def formatted_html_erb
+  end
+
+  def formatted_xml_erb
-  end
-
@@ -342 +348 @@
-  end
-
+  def test_should_render_formatted_template
+    get :formatted_html_erb
+    assert_equal 'formatted html erb', @response.body
+  end
+  
+  def test_should_render_formatted_xml_erb_template
+    get :formatted_xml_erb, :format => :xml
+    assert_equal '<test>passed formatted xml erb</test>', @response.body
+  end
+  
+  def test_should_render_formatted_html_erb_template
+    get :formatted_xml_erb
+    assert_equal '<test>passed formatted html erb</test>', @response.body
+  end
-
-  protected

trunk/actionpack/test/template/base_test.rb

@@ -15 +15 @@
-    end
-    
+    def test_should_find_formatted_erb_extension
+      @template.expects(:delegate_template_exists?).with('foo').returns(nil)
+      @template.expects(:formatted_template_exists?).with('foo.html').returns("erb")
+      assert_equal "html.erb", @template.send(:find_template_extension_for, 'foo')
+    end
+    
-    def test_should_find_erb_extension
-      @template.expects(:delegate_template_exists?).with('foo').returns(nil)
+      @template.expects(:formatted_template_exists?).with('foo.html').returns(nil)
-      @template.expects(:erb_template_exists?).with('foo').returns(:erb)
-      assert_equal :erb, @template.send(:find_template_extension_for, 'foo')
@@ -23 +30 @@
-    def test_should_find_builder_extension
-      @template.expects(:delegate_template_exists?).with('foo').returns(nil)
+      @template.expects(:formatted_template_exists?).with('foo.html').returns(nil)
-      @template.expects(:erb_template_exists?).with('foo').returns(nil)
-      @template.expects(:builder_template_exists?).with('foo').returns(:builder)
@@ -30 +38 @@
-    def test_should_find_javascript_extension
-      @template.expects(:delegate_template_exists?).with('foo').returns(nil)
+      @template.expects(:formatted_template_exists?).with('foo.html').returns(nil)
-      @template.expects(:erb_template_exists?).with('foo').returns(nil)
-      @template.expects(:builder_template_exists?).with('foo').returns(nil)