Changeset 5129

Timestamp:

09/17/06 16:20:32 (2 years ago)

Author:

david

Message:

Added proper getters and setters for content type and charset [DHH] Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (5 diffs)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/rescue.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/response.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/action_pack_assertions_test.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/content_type_test.rb (added)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (3 diffs)
• trunk/actionpack/test/fixtures/content_type (added)
• trunk/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml (added)
• trunk/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml (added)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH]
+
+* Added proper getters and setters for content type and charset [DHH]. Example of what we used to do:
+
+    response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
+  
+  ...now:
+  
+    response.content_type = Mime::ATOM
+    response.charset      = "utf-8"
-
-* Updated prototype.js to 1.5.0_rc1 with latest fixes. [Rick Olson]

trunk/actionpack/lib/action_controller/base.rb

@@ -273 +273 @@
-    cattr_accessor :param_parsers
-
+    # Controls the default charset for all renders.
+    @@default_charset = "utf-8"
+    cattr_accessor :default_charset
+
-    # Template root determines the base from which template references will be made. So a call to render("test/template")
-    # will be converted to "#{template_root}/test/template.rhtml".
@@ -421 +425 @@
-        send(method, *arguments)
-
+        assign_default_content_type_and_charset
-        response
-      ensure
@@ -704 +709 @@
-
-        if content_type = options[:content_type]
-headers["Content-Type"]
+response.content_type
-        end
-
@@ -794 +799 @@
-
-      def render_javascript(javascript, status = nil) #:nodoc:
-headers['Content-Type'] = 'text/javascript; charset=UTF-8'
+content_type = Mime::JS
-        render_text(javascript, status)
-      end
-
-      def render_xml(xml, status = nil) #:nodoc:
-headers['Content-Type'] = 'application/xml'
+content_type = Mime::XML
-        render_text(xml, status)
-      end
@@ -1035 +1040 @@
-      end
-
+      def assign_default_content_type_and_charset
+        response.content_type ||= Mime::HTML
+        response.charset      ||= self.class.default_charset
+      end
+
-      def action_methods
-        self.class.action_methods

trunk/actionpack/lib/action_controller/caching.rb

@@ -211 +211 @@
-            if extention = action_cache_path.extension
-              content_type = Mime::EXTENSION_LOOKUP[extention]
-headers['Content-Type']
+content_type
-            end
-          end

trunk/actionpack/lib/action_controller/rescue.rb

@@ -72 +72 @@
-        @template.instance_variable_set("@contents", @template.render_file(template_path_for_local_rescue(exception), false))
-    
-@headers["Content-Type"] = "text/html"
+response.content_type = Mime::HTML
-        render_file(rescues_path("layout"), response_code_for_rescue(exception))
-      end

trunk/actionpack/lib/action_controller/response.rb

@@ -6 +6 @@
-    def initialize
-      @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.merge("cookie" => []), [], []
+    end
+
+    def content_type=(mime_type)
+      @headers["Content-Type"] = charset ? "#{mime_type}; charset=#{charset}" : mime_type
+    end
+    
+    def content_type
+      content_type = String(@headers["Content-Type"]).split(";")[0]
+      content_type.blank? ? nil : content_type
+    end
+    
+    def charset=(encoding)
+      @headers["Content-Type"] = "#{content_type || "text/html"}; charset=#{encoding}"
+    end
+    
+    def charset
+      charset = String(@headers["Content-Type"]).split(";")[1]
+      charset.blank? ? nil : charset.strip.split("=")[1]
-    end
-

trunk/actionpack/lib/action_view/base.rb

@@ -2 +2 @@
-
-module ActionView #:nodoc:
-
-  class ActionViewError < StandardError #:nodoc:
-  end
@@ -442 +441 @@
-          body = case extension.to_sym
-            when :rxml
+              "@controller.response.content_type ||= 'application/xml'\n" +
-              "xml = Builder::XmlMarkup.new(:indent => 2)\n" +
-              "@controller.headers['Content-Type'] ||= 'application/xml'\n" +
-              template
-            when :rjs
-headers['Content-Type']
+response.content_type
-              "update_page do |page|\n#{template}\nend"
-          end

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -569 +569 @@
-  def test_rendering_xml_sets_content_type
-    assert_deprecated(/render/) { process :hello_xml_world }
-
+; charset=utf-8
-  end
-
@@ -575 +575 @@
-    @response.headers['Content-Type'] = 'application/pdf'
-    assert_deprecated(/render/) { process :hello_xml_world }
-
+; charset=utf-8
-  end
-
@@ -581 +581 @@
-  def test_render_text_with_custom_content_type
-    get :render_text_with_custom_content_type
-
+; charset=utf-8
-  end
-end

trunk/actionpack/test/controller/new_render_test.rb

@@ -262 +262 @@
-  def yield_content_for
-    render :action => "content_for", :layout => "yield"
+  end
+
+  def render_content_type_from_body
+    response.content_type = Mime::RSS
+    render :text => "hello world!"
-  end
-
@@ -573 +578 @@
-    get :update_page
-    assert_template nil
-UTF
+utf
-    assert_equal 2, @response.body.split($/).length
-  end
@@ -580 +585 @@
-    get :update_page_with_instance_variables
-    assert_template nil
-UTF
+utf
-    assert_match /balance/, @response.body
-    assert_match /\$37/, @response.body