diff options
| -rw-r--r-- | lib/json/common.rb | 8 | ||||
| -rw-r--r-- | tests/test_json_encoding.rb | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb index d5444b9..44e659f 100644 --- a/lib/json/common.rb +++ b/lib/json/common.rb @@ -1,5 +1,4 @@ require 'json/version' -require 'iconv' module JSON class << self @@ -343,7 +342,12 @@ module JSON # Shortuct for iconv. def self.iconv(to, from, string) - Iconv.iconv(to, from, string).first + if String.method_defined?(:encode) + string.encode(to, from) + else + require 'iconv' + Iconv.iconv(to, from, string).first + end end end diff --git a/tests/test_json_encoding.rb b/tests/test_json_encoding.rb index fdea329..cdeca58 100644 --- a/tests/test_json_encoding.rb +++ b/tests/test_json_encoding.rb @@ -7,7 +7,6 @@ when 'pure' then require 'json/pure' when 'ext' then require 'json/ext' else require 'json' end -require 'iconv' class TC_JSONEncoding < Test::Unit::TestCase include JSON @@ -15,19 +14,21 @@ class TC_JSONEncoding < Test::Unit::TestCase def setup @utf_8 = '["© ≠ €!"]' @parsed = [ "© ≠ €!" ] - @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first) @generated = '["\u00a9 \u2260 \u20ac!"]' - if defined?(::Encoding) + if String.method_defined?(:encode) + @utf_16_data = [@parsed.first.encode('utf-16be', 'utf-8')] @utf_8_ascii_8bit = @utf_8.dup.force_encoding(Encoding::ASCII_8BIT) - @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8) + @utf_16be = @utf_8.encode('utf-16be', 'utf-8') @utf_16be_ascii_8bit = @utf_16be.dup.force_encoding(Encoding::ASCII_8BIT) - @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8) + @utf_16le = @utf_8.encode('utf-16le', 'utf-8') @utf_16le_ascii_8bit = @utf_16le.dup.force_encoding(Encoding::ASCII_8BIT) - @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8) + @utf_32be = @utf_8.encode('utf-32be', 'utf-8') @utf_32be_ascii_8bit = @utf_32be.dup.force_encoding(Encoding::ASCII_8BIT) - @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8) + @utf_32le = @utf_8.encode('utf-32le', 'utf-8') @utf_32le_ascii_8bit = @utf_32le.dup.force_encoding(Encoding::ASCII_8BIT) else + require 'iconv' + @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first) @utf_8_ascii_8bit = @utf_8.dup @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8) @utf_16be_ascii_8bit = @utf_16be.dup |