diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2010-08-06 15:00:34 -0500 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2010-08-06 15:00:34 -0500 |
| commit | 5134758321b26cd1934003d80953520914eb7abd (patch) | |
| tree | 95ec01e909023cf66a3b0c47d8efd6ea98d3470f /lib/json | |
| parent | 736a0dc10d08f09bc42c9c37e277da929dc3d465 (diff) | |
| parent | 9c19d632fa7071a93eead3aa544dde3e791ad9c4 (diff) | |
| download | json-1.4.4-java.tar.gz | |
Merge remote branch 'flori/master'v1.4.4-java
Diffstat (limited to 'lib/json')
| -rw-r--r-- | lib/json/pure/parser.rb | 17 | ||||
| -rw-r--r-- | lib/json/version.rb | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb index f6de8d1..41b8ac7 100644 --- a/lib/json/pure/parser.rb +++ b/lib/json/pure/parser.rb @@ -70,24 +70,25 @@ module JSON # * *array_class*: Defaults to Array def initialize(source, opts = {}) if defined?(::Encoding) - if source.encoding == Encoding::ASCII_8BIT + if source.encoding == ::Encoding::ASCII_8BIT b = source[0, 4].bytes.to_a source = case when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0 - source.dup.force_encoding(Encoding::UTF_32BE).encode!(Encoding::UTF_8) + source.dup.force_encoding(::Encoding::UTF_32BE).encode!(::Encoding::UTF_8) when b.size >= 4 && b[0] == 0 && b[2] == 0 - source.dup.force_encoding(Encoding::UTF_16BE).encode!(Encoding::UTF_8) + source.dup.force_encoding(::Encoding::UTF_16BE).encode!(::Encoding::UTF_8) when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0 - source.dup.force_encoding(Encoding::UTF_32LE).encode!(Encoding::UTF_8) + source.dup.force_encoding(::Encoding::UTF_32LE).encode!(::Encoding::UTF_8) + when b.size >= 4 && b[1] == 0 && b[3] == 0 - source.dup.force_encoding(Encoding::UTF_16LE).encode!(Encoding::UTF_8) + source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8) else source.dup end else - source = source.encode(Encoding::UTF_8) + source = source.encode(::Encoding::UTF_8) end - source.force_encoding(Encoding::ASCII_8BIT) + source.force_encoding(::Encoding::ASCII_8BIT) else b = source source = case @@ -180,7 +181,7 @@ module JSON end end if string.respond_to?(:force_encoding) - string.force_encoding(Encoding::UTF_8) + string.force_encoding(::Encoding::UTF_8) end string else diff --git a/lib/json/version.rb b/lib/json/version.rb index a06d157..ab4972c 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.4.3' + VERSION = '1.4.4' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: |