diff options
author | wycats <wycats@gmail.com> | 2010-05-16 10:25:55 +0400 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-05-16 22:44:43 +0400 |
commit | 64d109e3539ad600f58536d3ecabd2f87b67fd1c (patch) | |
tree | 4b1deedbd5e33dd5410b1a37e9895f7a254c751a /actionpack/lib/action_view.rb | |
parent | af0d1a88157942c6e6398dbf73891cff1e152405 (diff) | |
download | rails-64d109e3539ad600f58536d3ecabd2f87b67fd1c.tar.gz rails-64d109e3539ad600f58536d3ecabd2f87b67fd1c.tar.bz2 rails-64d109e3539ad600f58536d3ecabd2f87b67fd1c.zip |
Significantly improved internal encoding heuristics and support.
* Default Encoding.default_internal to UTF-8
* Eliminated the use of file-wide magic comments to coerce code evaluated inside the file
* Read templates as BINARY, use default_external or template-wide magic comments
inside the Template to set the initial encoding
* This means that template handlers in Ruby 1.9 will receive Strings encoded
in default_internal (UTF-8 by default)
* Create a better Exception for encoding issues, and use it when the template
source has bytes that are not compatible with the specified encoding
* Allow template handlers to opt-into handling BINARY. If they do so, they
need to do some of their own manual encoding work
* Added a "Configuration Gotchas" section to the intro Rails Guide instructing
users to use UTF-8 for everything
* Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid
$KCODE value is used
Also:
* Fixed a few tests that were assert() rather than assert_equal() and
were caught by Minitest requiring a String for the message
* Fixed a test where an assert_select was misformed, also caught by
Minitest being more restrictive
* Fixed a test where a Rack response was returning a String rather
than an Enumerable
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r-- | actionpack/lib/action_view.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 5e3b2ec51b..9f56cca869 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -51,7 +51,9 @@ module ActionView autoload :MissingTemplate, 'action_view/template/error' autoload :ActionViewError, 'action_view/template/error' - autoload :TemplateError, 'action_view/template/error' + autoload :EncodingError, 'action_view/template/error' + autoload :TemplateError, 'action_view/template/error' + autoload :WrongEncodingError, 'action_view/template/error' autoload :TemplateHandler, 'action_view/template' autoload :TemplateHandlers, 'action_view/template' @@ -59,7 +61,7 @@ module ActionView autoload :TestCase, 'action_view/test_case' - ENCODING_FLAG = "#.*coding[:=]\s*(\S+)[ \t]*" + ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*' end require 'active_support/i18n' |