json 1.7.2 → 1.7.3

data/CHANGES

@@ -1,3 +1,5 @@
+2012-05-12 (1.7.3)
+  * Work around Rubinius encoding issues using iconv for conversion instead.
 2012-05-11 (1.7.2)
   * Fix some encoding issues, that cause problems for  the pure and the
     extension variant in jruby 1.9 mode.

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.3

data/json.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "1.7.2"
+  s.version = "1.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]

data/json_pure.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "json_pure"
-  s.version = "1.7.2"
+  s.version = "1.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]

data/lib/json/common.rb

@@ -405,7 +405,10 @@ module JSON
   end
 
   # Shortuct for iconv.
-  if ::String.method_defined?(:encode)
+  if ::String.method_defined?(:encode) &&
+    # XXX Rubinius doesn't support ruby 1.9 encoding yet
+    defined?(RUBY_ENGINE) && RUBY_ENGINE != 'rbx'
+  then
     # Encodes string using Ruby's _String.encode_
     def self.iconv(to, from, string)
       string.encode(to, from)

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.7.2'
+  VERSION         = '1.7.3'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3438040522195116142
+      hash: -431368956158651635
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: