github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Encoding.default_external, not _internal

Browse Source
This commit is contained in:
Jeremy Kemper
2009-09-13 04:43:41 -07:00
parent dbe9fa03df
commit 91ffddca57
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/multibyte/utils.rb
View File

@@ -5,7 +5,7 @@ module ActiveSupport #:nodoc:
if Kernel.const_defined?(:Encoding)
# Returns a regular expression that matches valid characters in the current encoding
def self.valid_character
VALID_CHARACTER[Encoding.default_internal.to_s]
VALID_CHARACTER[Encoding.default_external.to_s]
end
else
def self.valid_character
@@ -58,4 +58,4 @@ module ActiveSupport #:nodoc:
end
end
end
end
end

16
activesupport/test/multibyte_utils_test.rb
View File

@@ -103,11 +103,11 @@ class MultibyteUtilsTest < ActiveSupport::TestCase
if Kernel.const_defined?(:Encoding)
def example(key)
STRINGS[key].force_encoding(Encoding.default_internal)
STRINGS[key].force_encoding(Encoding.default_external)
end
def examples
STRINGS.values.map { |s| s.force_encoding(Encoding.default_internal) }
STRINGS.values.map { |s| s.force_encoding(Encoding.default_external) }
end
else
def example(key)
@@ -121,21 +121,21 @@ class MultibyteUtilsTest < ActiveSupport::TestCase
if 'string'.respond_to?(:encoding)
def with_encoding(enc)
before = Encoding.default_internal
before = Encoding.default_external
case enc
when 'UTF8'
Encoding.default_internal = Encoding::UTF_8
Encoding.default_external = Encoding::UTF_8
when 'SJIS'
Encoding.default_internal = Encoding::Shift_JIS
Encoding.default_external = Encoding::Shift_JIS
else
Encoding.default_internal = Encoding::BINARY
Encoding.default_external = Encoding::BINARY
end
yield
Encoding.default_internal = before
Encoding.default_external = before
end
else
alias with_encoding with_kcode
end
end
end