Changeset 6517

Timestamp:

04/12/07 20:25:32 (1 year ago)

Author:

rick

Message:

The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/mime_responds.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/request.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_view/base.rb (modified) (7 diffs)
• trunk/actionpack/test/controller/mime_responds_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/render_test.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick]
-
-* Allow layouts with extension of .html.erb.  Closes #8032 [Josh Knowles]

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
-
+template_name.include?('.') ? template_name : 
-          template_type = (template_name =~ /layouts/i) ? 'layout' : 'template'
-          raise(MissingTemplate, "Missing #{template_type} #{full_template_path}")

trunk/actionpack/lib/action_controller/mime_responds.rb

@@ -108 +108 @@
-    
-    class Responder #:nodoc:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      
-      def initialize(block_binding)
@@ -133 +139 @@
-        if block_given?
-          @responses[mime_type] = Proc.new do
-
+
+
+
+
-            block.call
-          end

trunk/actionpack/lib/action_controller/request.rb

@@ -9 +9 @@
-    # such as { 'RAILS_ENV' => 'production' }.
-    attr_reader :env
+
+    attr_accessor :format
-
-    # Returns the HTTP request method as a lowercase symbol (:get, for example). Note, HEAD is returned as :get
@@ -92 +94 @@
-    #   GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
-    def format
-
+@format ||= 
-    end
-

trunk/actionpack/lib/action_view/base.rb

@@ -159 +159 @@
-    attr_reader :logger, :response, :headers, :view_paths
-    attr_internal :cookies, :flash, :headers, :params, :request, :response, :session
+    
+    attr_writer :template_format
-
-    # Specify trim mode for the ERB compiler. Defaults to '-'.
@@ -208 +210 @@
-    @@cached_template_extension = {}
-
+    # Order of template handers checked by #file_exists? depending on the current #template_format
+    DEFAULT_TEMPLATE_HANDLER_PREFERENCE = %w(erb rhtml builder rxml javascript delegate)
+    TEMPLATE_HANDLER_PREFERENCES = {
+      :js       => %w(javascript erb rhtml builder rxml delegate),
+      :xml      => %w(builder rxml erb rhtml javascript delegate),
+      :delegate => %w(delegate)
+    }
+
-    class ObjectWrapper < Struct.new(:value) #:nodoc:
-    end
@@ -230 +240 @@
-    # return the rendered template as a string.
-    def self.register_template_handler(extension, klass)
+      TEMPLATE_HANDLER_PREFERENCES[extension.to_sym] = TEMPLATE_HANDLER_PREFERENCES[:delegate]
-      @@template_handlers[extension] = klass
-    end
@@ -332 +343 @@
-
-    def pick_template_extension(template_path)#:nodoc:
-      formatted_template_path = "#{template_path}.#{template_format}"
-      if @@cache_template_extensions
-
+
+
-      else
-, formatted_template_path
+
-      end
-    end
-
-    def delegate_template_exists?(template_path)#:nodoc:
-
-
-
-
-
-
-
+
+
+
+
-    def erb_template_exists?(template_path)#:nodoc:
-
-
-
-
+
+
+
-    def builder_template_exists?(template_path)#:nodoc:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    def javascript_template_exists?(template_path)#:nodoc:
-
-
-
-
-
-
-
-
+
-    end
-
@@ -372 +379 @@
-      template_file_name, template_file_extension = path_and_extension(template_path)
-      if template_file_extension
-
+ && template_file_extension
-      else
-        formatted_template_path = "#{template_path}.#{template_format}"
-cached_template_extension(formatted_template_path) ||
-  formatted_template_exists?(formatted_template_path) |
-%w(erb rhtml builder rxml javascript delegate).any? do |template_type|
-send("#{template_type}_template_exists?", template_path)
+return true if cached_template_extension(formatted_template_path)
+template_handler_preferences.each do |template_type
+if extension = send("#{template_type}_template_exists?", formatted_template_path)
+return "#{template_format}.#{extension}"
-          end
+        end
+        template_handler_preferences.each do |template_type|
+          if extension = send("#{template_type}_template_exists?", template_path)
+            return extension
+          end
+        end
+        nil
-      end
-    end
@@ -388 +402 @@
-    end
-
+    # symbolized version of the :format parameter of the request, or :html by default.
-    def template_format
-
-
-
-
-
-
-
-
+
+
+
+
+
-    end
-
@@ -435 +447 @@
-
-      # Determines the template's file extension, such as rhtml, rxml, or rjs.
-
-
-
-
-
-
-
-
+
+
+
-        else
-          raise ActionViewError, "No erb, builder, rhtml, rxml, rjs or delegate template found for #{template_path} in #{@view_paths.inspect}"

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -289 +289 @@
-  end
-  
-all_types_with
+rjs_type_skips
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
-    get :all_types_with_layout
-    assert_equal 'RJS for all_types_with_layout', @response.body
-
+
+
+
-    @request.env["HTTP_ACCEPT"] = "text/html"
-    get :all_types_with_layout
@@ -344 +346 @@
-          @action = args.first[:action]
-        end
-@action
+"#{@action} - #{@template.template_format}"
-      end
-    end
-
-    get :using_defaults
-
+ - html
-
-    get :using_defaults, :format => "xml"
-.xml.builder
+ - xml
-  end
-end

trunk/actionpack/test/controller/render_test.rb

@@ -362 +362 @@
-    assert_equal '<test>passed formatted html erb</test>', @response.body
-  end
+  
+  def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
+    @request.env["HTTP_ACCEPT"] = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
+    get :formatted_xml_erb
+    assert_equal '<test>passed formatted html erb</test>', @response.body
+  end
-
-  protected

trunk/actionpack/test/controller/request_test.rb

@@ -310 +310 @@
-  end
-
-
+xml_
-    @request.instance_eval { @parameters = { :format => 'xml' } }
-    assert_equal Mime::XML, @request.format
-
+
+
+
-    @request.instance_eval { @parameters = { :format => 'xhtml' } }
-    assert_equal Mime::HTML, @request.format
-
+
+
+
-    @request.instance_eval { @parameters = { :format => 'txt' } }
-    assert_equal Mime::TEXT, @request.format
-
+
+
+
-    @request.instance_eval { @parameters = { :format => nil } }
-    @request.env["HTTP_ACCEPT"] = "text/javascript"