json 2.2.0-java → 2.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cbe28120a7a65d91699b5ad5e8f0c3b1c2c0895cc1bfd1d27de93513da6276c
-  data.tar.gz: a79ed2632e93ef7dc2df67f197d56d4be671c61e94ebe59c298cc5d6bde668a3
+  metadata.gz: 7dedc6571d595948f39fafcb3a5b5f57a93baac5c7d71aa22743a713b2fc6408
+  data.tar.gz: 810d86047c05bb8dab727f6b624e30aba7d63711d694d8840eb2c716bffb4708
 SHA512:
-  metadata.gz: 711bab89dfc319519f4f5818e87de1d1f12a4e4542b193e5dfdff50a0db12c31fe453a4353666257689b8d3ba2a3456bc818e65065f97e8ca2574add40b7b300
-  data.tar.gz: 64b77395e18b73007922ea755f58048dc68262eaf040c12c944ed89fd422db468ed8ccce3c9904a65c6b58fd4848b5462e920cac9039140dfa1cf28db54decfe
+  metadata.gz: 47f0e1b42974dab1836d3acf3ec4f3a821475dddea2d393e168ad7385d9f894b9c9fc4eec453f803a702bedc0daf25d5274cd741ec3ff63ab67f6ab11183b3d1
+  data.tar.gz: aedd907a306c70eb77f610128ad3f208729ca9a6ff743e7f6e0a8100fe13d7c52963359c78b17144a0a1ec49c7a98588067fb14c3c950291dc932896ffffe371

data/lib/json/add/bigdecimal.rb

@@ -23,7 +23,7 @@ class BigDecimal
   end
 
   # return the JSON value
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end

data/lib/json/add/complex.rb

@@ -23,7 +23,7 @@ class Complex
   end
 
   # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end

data/lib/json/add/rational.rb

@@ -22,7 +22,7 @@ class Rational
   end
 
   # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end

data/lib/json/add/regexp.rb

@@ -24,7 +24,7 @@ class Regexp
 
   # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
   # (Regexp or String) as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end

data/lib/json/common.rb

@@ -153,7 +153,7 @@ module JSON
   # * *object_class*: Defaults to Hash
   # * *array_class*: Defaults to Array
   def parse(source, opts = {})
-    Parser.new(source, opts).parse
+    Parser.new(source, **(opts||{})).parse
   end
 
   # Parse the JSON document _source_ into a Ruby data structure and return it.
@@ -176,7 +176,7 @@ module JSON
       :max_nesting  => false,
       :allow_nan    => true
     }.merge(opts)
-    Parser.new(source, opts).parse
+    Parser.new(source, **(opts||{})).parse
   end
 
   # Generate a JSON document from the Ruby data structure _obj_ and return

data/lib/json/pure/generator.rb

@@ -250,7 +250,8 @@ module JSON
           if respond_to?(name)
             __send__(name)
           else
-            instance_variable_get("@#{name}")
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
           end
         end
 

data/lib/json/pure/parser.rb

@@ -197,7 +197,15 @@ module JSON
       def parse_value
         case
         when scan(FLOAT)
-          @decimal_class && @decimal_class.new(self[1]) || Float(self[1])
+          if @decimal_class then
+            if @decimal_class == BigDecimal then
+              BigDecimal(self[1])
+            else
+              @decimal_class.new(self[1]) || Float(self[1])
+            end
+          else
+            Float(self[1])
+          end
         when scan(INTEGER)
           Integer(self[1])
         when scan(TRUE)

data/lib/json/version.rb

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

data/tests/json_common_interface_test.rb

@@ -27,15 +27,15 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   end
 
   def test_parser
-    assert_match /::Parser\z/, JSON.parser.name
+    assert_match(/::Parser\z/, JSON.parser.name)
   end
 
   def test_generator
-    assert_match /::Generator\z/, JSON.generator.name
+    assert_match(/::Generator\z/, JSON.generator.name)
   end
 
   def test_state
-    assert_match /::Generator::State\z/, JSON.state.name
+    assert_match(/::Generator::State\z/, JSON.state.name)
   end
 
   def test_create_id
@@ -56,7 +56,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   end
 
   def test_parse_bang
-    assert_equal [ 1, NaN, 3, ], JSON.parse!('[ 1, NaN, 3 ]')
+    assert_equal [ 1, Infinity, 3, ], JSON.parse!('[ 1, Infinity, 3 ]')
   end
 
   def test_generate

data/tests/json_generator_test.rb

@@ -40,6 +40,44 @@ class JSONGeneratorTest < Test::Unit::TestCase
 EOT
   end
 
+  def silence
+    v = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = v
+  end
+
+  def test_remove_const_segv
+    return if RUBY_ENGINE == 'jruby'
+    stress = GC.stress
+    const = JSON::SAFE_STATE_PROTOTYPE.dup
+
+    bignum_too_long_to_embed_as_string = 1234567890123456789012345
+    expect = bignum_too_long_to_embed_as_string.to_s
+    GC.stress = true
+
+    10.times do |i|
+      tmp = bignum_too_long_to_embed_as_string.to_json
+      raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
+    end
+
+    silence do
+      JSON.const_set :SAFE_STATE_PROTOTYPE, nil
+    end
+
+    10.times do |i|
+      assert_raise TypeError do
+        bignum_too_long_to_embed_as_string.to_json
+      end
+    end
+  ensure
+    GC.stress = stress
+    silence do
+      JSON.const_set :SAFE_STATE_PROTOTYPE, const
+    end
+  end if JSON.const_defined?("Ext")
+
   def test_generate
     json = generate(@hash)
     assert_equal(parse(@json2), parse(json))
@@ -374,4 +412,10 @@ EOT
       assert_equal '["foo"]', JSON.generate([s.new('foo')])
     end
   end
+
+  if defined?(Encoding)
+    def test_nonutf8_encoding
+      assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
+    end
+  end
 end

data/tests/json_parser_test.rb

@@ -91,27 +91,27 @@ class JSONParserTest < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { parse('+23') }
     assert_raise(JSON::ParserError) { parse('.23') }
     assert_raise(JSON::ParserError) { parse('023') }
-    assert_equal 23, parse('23')
-    assert_equal -23, parse('-23')
-    assert_equal_float 3.141, parse('3.141')
-    assert_equal_float -3.141, parse('-3.141')
-    assert_equal_float 3.141, parse('3141e-3')
-    assert_equal_float 3.141, parse('3141.1e-3')
-    assert_equal_float 3.141, parse('3141E-3')
-    assert_equal_float 3.141, parse('3141.0E-3')
-    assert_equal_float -3.141, parse('-3141.0e-3')
-    assert_equal_float -3.141, parse('-3141e-3')
+    assert_equal(23, parse('23'))
+    assert_equal(-23, parse('-23'))
+    assert_equal_float(3.141, parse('3.141'))
+    assert_equal_float(-3.141, parse('-3.141'))
+    assert_equal_float(3.141, parse('3141e-3'))
+    assert_equal_float(3.141, parse('3141.1e-3'))
+    assert_equal_float(3.141, parse('3141E-3'))
+    assert_equal_float(3.141, parse('3141.0E-3'))
+    assert_equal_float(-3.141, parse('-3141.0e-3'))
+    assert_equal_float(-3.141, parse('-3141e-3'))
     assert_raise(ParserError) { parse('NaN') }
     assert parse('NaN', :allow_nan => true).nan?
     assert_raise(ParserError) { parse('Infinity') }
-    assert_equal 1.0/0, parse('Infinity', :allow_nan => true)
+    assert_equal(1.0/0, parse('Infinity', :allow_nan => true))
     assert_raise(ParserError) { parse('-Infinity') }
-    assert_equal -1.0/0, parse('-Infinity', :allow_nan => true)
+    assert_equal(-1.0/0, parse('-Infinity', :allow_nan => true))
   end
 
   def test_parse_bigdecimals
-    assert_equal(BigDecimal,                                 JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"].class)
-    assert_equal(BigDecimal.new("0.901234567890123456789E1"),JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"]      )
+    assert_equal(BigDecimal,                             JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"].class)
+    assert_equal(BigDecimal("0.901234567890123456789E1"),JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"]      )
   end
 
   if Array.method_defined?(:permutation)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ files:
 - tests/json_parser_test.rb
 - tests/json_string_matching_test.rb
 - tests/test_helper.rb
-homepage: http://json-jruby.rubyforge.org/
+homepage: http://flori.github.com/json
 licenses:
 - Ruby
 metadata: {}
@@ -128,8 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: json-jruby
-rubygems_version: 2.7.6
+rubyforge_project:
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: JSON implementation for JRuby