deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rails 2.3.5

Browse source 
Upgrade to Rails 2.3.5.
Also work around this bug:
 https://rails.lighthouseapp.com/projects/8994/tickets/3524
created by the aforementioned
Rails release.
This commit is contained in:
Jacques Distler 2009-11-30 19:38:34 -06:00
parent a6429f8c22
commit e3832c6f79
187 changed files with 2316 additions and 891 deletions
Download patch file Download diff file Expand all files Collapse all files

24
vendor/rails/activesupport/test/multibyte_utils_test.rb vendored
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)
@ -120,22 +120,18 @@ class MultibyteUtilsTest < ActiveSupport::TestCase
end
if 'string'.respond_to?(:encoding)
def with_encoding(enc)
before = Encoding.default_internal
KCODE_TO_ENCODING = Hash.new(Encoding::BINARY).
update('UTF8' => Encoding::UTF_8, 'SJIS' => Encoding::Shift_JIS)
def with_encoding(enc)
before = Encoding.default_external
silence_warnings { Encoding.default_external = KCODE_TO_ENCODING[enc] }
case enc
when 'UTF8'
Encoding.default_internal = Encoding::UTF_8
when 'SJIS'
Encoding.default_internal = Encoding::Shift_JIS
else
Encoding.default_internal = Encoding::BINARY
end
yield
Encoding.default_internal = before
silence_warnings { Encoding.default_external = before }
end
else
alias with_encoding with_kcode
end
end
end