Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor refactor. Refs #263

This commit is contained in:
Pavel Chipiga 2012-07-27 13:47:23 +03:00
parent 566cd8209b
commit b476f7248c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ext/core/string.rb
View File

@ -7,13 +7,12 @@ class String
if ascii_only? # no need to encode if ascii
force_encoding(default_encoding)
else # should encode
options = {:invalid => :replace, :undef => :replace, :replace => ''}
if (detected = detect_encoding) && detected[:encoding]
force_encoding(detected[:encoding])
encode!(default_encoding, detected[:encoding], :invalid => :replace, :undef => :replace, :replace => '')
force_encoding(detected[:encoding]).encode!(default_encoding, detected[:encoding], options)
end
# re-encode through UTF-16 to filter incorrect symbols
encode!(Encoding::UTF_16, default_encoding, :invalid => :replace, :undef => :replace, :replace => '')
encode!(default_encoding, Encoding::UTF_16)
encode!(Encoding::UTF_16, default_encoding, options).encode!(default_encoding, Encoding::UTF_16)
raise unless valid_encoding? # check result
end
rescue