json 1.8.3-java → 1.8.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b84f10e4844be3576a540bca0579e5fa2bb21e3
-  data.tar.gz: cdf565ce241f4401646ee8309f5c0debf3c19f95
+  metadata.gz: 220ac0461bacfc9f8c43a48c6a167cd8d3dfea7e
+  data.tar.gz: 221775a3c15d8972d4e724a0c541f85a0ffd5102
 SHA512:
-  metadata.gz: 5440ee9016069daef51e6820dfe4b759fd96f61911b0ecad27752e050142e161f9682d2463953b61153536aaf7006d2d09fd1db89c8c033a27a726cda12eb07e
-  data.tar.gz: 6b010a26f908b22e93c4914a625292d71d39ed968c6b8ee9652018ec28988248cdcacd9d527b136359c6ea9aa6c2c5cb50abacf4c664882e0f9f6337fc4d2fb6
+  metadata.gz: d2932d989adf5cc35e70b662cff2af267fe2fbb6ad5bce8929ba8c763cf35d15eb48d2d509322c1f1fa8ca76b96f9a00091c09a77c5d5e4ce2dfb66433ac5cd8
+  data.tar.gz: 558bbf908ecd5d08e22247659ebedb39e74b99077aef75533afa92e17f86c669eff97db9a5c9308fa1e7dc0ed3892ddae5c7b410b7b35c80e84615b9b9fdc606

data/lib/json/pure/generator.rb

@@ -363,7 +363,11 @@ module JSON
               result << state.space_before
               result << ':'
               result << state.space
-              result << value.to_json(state)
+              if value.respond_to?(:to_json)
+                result << value.to_json(state)
+              else
+                result << %{"#{String(value)}"}
+              end
               first = false
             }
             depth = state.depth -= 1
@@ -398,7 +402,11 @@ module JSON
             each { |value|
               result << delim unless first
               result << state.indent * depth if indent
-              result << value.to_json(state)
+              if value.respond_to?(:to_json)
+                result << value.to_json(state)
+              else
+                result << %{"#{String(value)}"}
+              end
               first = false
             }
             depth = state.depth -= 1

data/lib/json/version.rb

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

data/tests/test_json.rb

@@ -7,20 +7,6 @@ require 'stringio'
 require 'tempfile'
 require 'ostruct'
 
-unless Array.method_defined?(:permutation)
-  begin
-    require 'enumerator'
-    require 'permutation'
-    class Array
-      def permutation
-        Permutation.for(self).to_enum.map { |x| x.project }
-      end
-    end
-  rescue LoadError
-    warn "Skipping permutation tests."
-  end
-end
-
 class TestJSON < Test::Unit::TestCase
   include JSON
 
@@ -146,26 +132,6 @@ class TestJSON < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { JSON.parse('[ 1, ]', :quirks_mode => true) }
   end
 
-  if Array.method_defined?(:permutation)
-    def test_parse_more_complex_arrays
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        json = pretty_generate(perm)
-        assert_equal perm, parse(json)
-      end
-    end
-
-    def test_parse_complex_objects
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        s = "a"
-        orig_obj = perm.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
-        json = pretty_generate(orig_obj)
-        assert_equal orig_obj, parse(json)
-      end
-    end
-  end
-
   def test_parse_arrays
     assert_equal([1,2,3], parse('[1,2,3]'))
     assert_equal([1.2,2,3], parse('[1.2,2,3]'))

data/tests/test_json_generate.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+# frozen_string_literal: false
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
@@ -334,4 +335,14 @@ EOT
       assert_equal true, JSON.generate(["\xea"])
     end
   end
+
+  def test_string_subclass
+    s = Class.new(String) do
+      def to_s; self; end
+      undef to_json
+    end
+    assert_nothing_raised(SystemStackError) do
+      assert_equal '["foo"]', JSON.generate([s.new('foo')])
+    end
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
-dependencies: []
+date: 2017-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  name: test-unit
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com
 executables: []
@@ -89,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: json-jruby
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: JSON implementation for JRuby