json 1.7.2-java → 1.7.3-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/json/common.rb +4 -1
- data/lib/json/ext/generator.jar +0 -0
- data/lib/json/ext/parser.jar +0 -0
- data/lib/json/version.rb +1 -1
- metadata +1 -1
data/lib/json/common.rb
CHANGED
|
@@ -405,7 +405,10 @@ module JSON
|
|
|
405
405
|
end
|
|
406
406
|
|
|
407
407
|
# Shortuct for iconv.
|
|
408
|
-
if ::String.method_defined?(:encode)
|
|
408
|
+
if ::String.method_defined?(:encode) &&
|
|
409
|
+
# XXX Rubinius doesn't support ruby 1.9 encoding yet
|
|
410
|
+
defined?(RUBY_ENGINE) && RUBY_ENGINE != 'rbx'
|
|
411
|
+
then
|
|
409
412
|
# Encodes string using Ruby's _String.encode_
|
|
410
413
|
def self.iconv(to, from, string)
|
|
411
414
|
string.encode(to, from)
|
data/lib/json/ext/generator.jar
CHANGED
|
Binary file
|
data/lib/json/ext/parser.jar
CHANGED
|
Binary file
|
data/lib/json/version.rb
CHANGED