json 2.4.0-java → 2.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0ed6ed8147c1e99dd585403ea77d2ddfe044b2039ebdeea1226fdbf39459fa
-  data.tar.gz: f3c2584779ff507b86dd9df78dcc2ae9fe4b1904952db719985327609896108e
+  metadata.gz: '08d64ed0d9aa72d181203add925545e460e68ab0c9589cc50186ff2ef85211a7'
+  data.tar.gz: 98c567e47395cb39adb38629d5d139f77e7d5c884c96e9dee4c3e5d90ee6f842
 SHA512:
-  metadata.gz: bf55f870a11035a308017c8d8555335f410ba7780c419926e0a334ef3ed475027ea2eb12408cf1eceab347e77960127516667f8aa50c9549032e593da6de0a5e
-  data.tar.gz: a25e1338acfc66cec81e6e27f130f85c178b5962bc7a9b153c479001ec72cc23fb6ae5ac80299bbefad30cec89b90b73906e758253cdf91dca1041a135b1d5e1
+  metadata.gz: ffc1cd18ab2cdbce97ccb592eaf87876e1aff224de2533bbcdea16e530d22a9d02ace8b268dd16a19e4e3a358893da588e9191e1440aec20c16e6f5adff94b02
+  data.tar.gz: 13859869ef94c1ff854df0ca2781dffd9a0473a40f8cf3ec0457df20356329c16d4af987b74f6607a2dedf414c22ce668ea92eff12ff6386546b6c6b006d39df

data/lib/json/common.rb

@@ -71,22 +71,30 @@ module JSON
       end
       self.state = generator::State
       const_set :State, self.state
-      const_set :SAFE_STATE_PROTOTYPE, State.new
-      const_set :FAST_STATE_PROTOTYPE, State.new(
+      const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
+      const_set :FAST_STATE_PROTOTYPE, create_fast_state
+      const_set :PRETTY_STATE_PROTOTYPE, create_pretty_state
+    ensure
+      $VERBOSE = old
+    end
+
+    def create_fast_state
+      State.new(
         :indent         => '',
         :space          => '',
         :object_nl      => "",
         :array_nl       => "",
         :max_nesting    => false
       )
-      const_set :PRETTY_STATE_PROTOTYPE, State.new(
+    end
+
+    def create_pretty_state
+      State.new(
         :indent         => '  ',
         :space          => ' ',
         :object_nl      => "\n",
         :array_nl       => "\n"
       )
-    ensure
-      $VERBOSE = old
     end
 
     # Returns the JSON generator module that is used by JSON. This is
@@ -98,13 +106,26 @@ module JSON
     # either JSON::Ext::Generator::State or JSON::Pure::Generator::State:
     #   JSON.state # => JSON::Ext::Generator::State
     attr_accessor :state
+  end
+
+  DEFAULT_CREATE_ID = 'json_class'.freeze
+  private_constant :DEFAULT_CREATE_ID
+
+  CREATE_ID_TLS_KEY = "JSON.create_id".freeze
+  private_constant :CREATE_ID_TLS_KEY
+
+  # Sets create identifier, which is used to decide if the _json_create_
+  # hook of a class should be called; initial value is +json_class+:
+  #   JSON.create_id # => 'json_class'
+  def self.create_id=(new_value)
+    Thread.current[CREATE_ID_TLS_KEY] = new_value.dup.freeze
+  end
 
-    # Sets or returns create identifier, which is used to decide if the _json_create_
-    # hook of a class should be called; initial value is +json_class+:
-    #   JSON.create_id # => 'json_class'
-    attr_accessor :create_id
+  # Returns the current create identifier.
+  # See also JSON.create_id=.
+  def self.create_id
+    Thread.current[CREATE_ID_TLS_KEY] || DEFAULT_CREATE_ID
   end
-  self.create_id = 'json_class'
 
   NaN           = 0.0/0
 
@@ -276,7 +297,7 @@ module JSON
     if State === opts
       state, opts = opts, nil
     else
-      state = SAFE_STATE_PROTOTYPE.dup
+      state = State.new
     end
     if opts
       if opts.respond_to? :to_hash
@@ -315,7 +336,7 @@ module JSON
     if State === opts
       state, opts = opts, nil
     else
-      state = FAST_STATE_PROTOTYPE.dup
+      state = JSON.create_fast_state
     end
     if opts
       if opts.respond_to? :to_hash
@@ -370,7 +391,7 @@ module JSON
     if State === opts
       state, opts = opts, nil
     else
-      state = PRETTY_STATE_PROTOTYPE.dup
+      state = JSON.create_pretty_state
     end
     if opts
       if opts.respond_to? :to_hash

data/lib/json/pure/parser.rb

@@ -45,7 +45,7 @@ module JSON
           /(?=\*/)      # single slash before this comment's end
          )*
            \*/               # the End of this comment
-           |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
+           |[ \t\r\n]+       # whitespaces: space, horizontal tab, lf, cr
         )+
       )mx
 

data/lib/json/version.rb

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

data/lib/json.rb

@@ -493,7 +493,7 @@ require 'json/common'
 #   json = JSON.generate(ruby0) # {"json_class":"Customer","v":["Dave","123 Main"]}
 #   ruby1 = JSON.parse(json, create_additions: true) # #<struct Customer name="Dave", address="123 Main">
 #   ruby1.class # Customer
-  #
+#
 # \Symbol:
 #   require 'json/add/symbol'
 #   ruby0 = :foo # foo

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: rake
-  type: :development
-  prerelease: false
-  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'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  name: test-unit
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+date: 2021-10-14 00:00:00.000000000 Z
+dependencies: []
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com
 executables: []
@@ -75,51 +41,6 @@ files:
 - lib/json/pure/generator.rb
 - lib/json/pure/parser.rb
 - lib/json/version.rb
-- tests/fixtures/fail10.json
-- tests/fixtures/fail11.json
-- tests/fixtures/fail12.json
-- tests/fixtures/fail13.json
-- tests/fixtures/fail14.json
-- tests/fixtures/fail18.json
-- tests/fixtures/fail19.json
-- tests/fixtures/fail2.json
-- tests/fixtures/fail20.json
-- tests/fixtures/fail21.json
-- tests/fixtures/fail22.json
-- tests/fixtures/fail23.json
-- tests/fixtures/fail24.json
-- tests/fixtures/fail25.json
-- tests/fixtures/fail27.json
-- tests/fixtures/fail28.json
-- tests/fixtures/fail29.json
-- tests/fixtures/fail3.json
-- tests/fixtures/fail30.json
-- tests/fixtures/fail31.json
-- tests/fixtures/fail32.json
-- tests/fixtures/fail4.json
-- tests/fixtures/fail5.json
-- tests/fixtures/fail6.json
-- tests/fixtures/fail7.json
-- tests/fixtures/fail8.json
-- tests/fixtures/fail9.json
-- tests/fixtures/obsolete_fail1.json
-- tests/fixtures/pass1.json
-- tests/fixtures/pass15.json
-- tests/fixtures/pass16.json
-- tests/fixtures/pass17.json
-- tests/fixtures/pass2.json
-- tests/fixtures/pass26.json
-- tests/fixtures/pass3.json
-- tests/json_addition_test.rb
-- tests/json_common_interface_test.rb
-- tests/json_encoding_test.rb
-- tests/json_ext_parser_test.rb
-- tests/json_fixtures_test.rb
-- tests/json_generator_test.rb
-- tests/json_generic_object_test.rb
-- tests/json_parser_test.rb
-- tests/json_string_matching_test.rb
-- tests/test_helper.rb
 homepage: http://flori.github.com/json
 licenses:
 - Ruby
@@ -138,16 +59,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: JSON Implementation for Ruby
-test_files:
-- tests/test_helper.rb
+test_files: []

data/tests/fixtures/fail10.json

@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"

data/tests/fixtures/fail11.json

@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}

data/tests/fixtures/fail12.json

@@ -1 +0,0 @@
-{"Illegal invocation": alert()}

data/tests/fixtures/fail13.json

@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}

data/tests/fixtures/fail14.json

@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}

data/tests/fixtures/fail18.json

@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]

data/tests/fixtures/fail19.json

@@ -1 +0,0 @@
-{"Missing colon" null}

data/tests/fixtures/fail2.json

@@ -1 +0,0 @@
-["Unclosed array"

data/tests/fixtures/fail20.json

@@ -1 +0,0 @@
-{"Double colon":: null}

data/tests/fixtures/fail21.json

@@ -1 +0,0 @@
-{"Comma instead of colon", null}

data/tests/fixtures/fail22.json

@@ -1 +0,0 @@
-["Colon instead of comma": false]

data/tests/fixtures/fail23.json

@@ -1 +0,0 @@
-["Bad value", truth]

data/tests/fixtures/fail24.json

@@ -1 +0,0 @@
-['single quote']

data/tests/fixtures/fail25.json

@@ -1 +0,0 @@
-["tab	character	in	string	"]

data/tests/fixtures/fail27.json

@@ -1,2 +0,0 @@
-["line
-break"]

data/tests/fixtures/fail28.json

@@ -1,2 +0,0 @@
-["line\
-break"]

data/tests/fixtures/fail29.json

@@ -1 +0,0 @@
-{

data/tests/fixtures/fail3.json

@@ -1 +0,0 @@
-{unquoted_key: "keys must be quoted"}

data/tests/fixtures/fail30.json

@@ -1 +0,0 @@
-[

data/tests/fixtures/fail31.json

@@ -1 +0,0 @@
-[1, 2, 3,

data/tests/fixtures/fail32.json

@@ -1 +0,0 @@
-{"foo": "bar"

data/tests/fixtures/fail4.json

@@ -1 +0,0 @@
-["extra comma",]

data/tests/fixtures/fail5.json

@@ -1 +0,0 @@
-["double extra comma",,]

data/tests/fixtures/fail6.json

@@ -1 +0,0 @@
-[   , "<-- missing value"]

data/tests/fixtures/fail7.json

@@ -1 +0,0 @@
-["Comma after the close"],

data/tests/fixtures/fail8.json

@@ -1 +0,0 @@
-["Extra close"]]

data/tests/fixtures/fail9.json

@@ -1 +0,0 @@
-{"Extra comma": true,}

data/tests/fixtures/obsolete_fail1.json

@@ -1 +0,0 @@
-"A JSON payload should be an object or array, not a string."

data/tests/fixtures/pass1.json

@@ -1,56 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E666,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],
-        "compact": [1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066
-
-
-,"rosebud"]

data/tests/fixtures/pass15.json

@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]

data/tests/fixtures/pass16.json

@@ -1 +0,0 @@
-["Illegal backslash escape: \'"]

data/tests/fixtures/pass17.json

@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]

data/tests/fixtures/pass2.json

@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]

data/tests/fixtures/pass26.json

@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]

data/tests/fixtures/pass3.json

@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}

data/tests/json_addition_test.rb

@@ -1,199 +0,0 @@
-#frozen_string_literal: false
-require 'test_helper'
-require 'json/add/core'
-require 'json/add/complex'
-require 'json/add/rational'
-require 'json/add/bigdecimal'
-require 'json/add/ostruct'
-require 'json/add/set'
-require 'date'
-
-class JSONAdditionTest < Test::Unit::TestCase
-  include JSON
-
-  class A
-    def initialize(a)
-      @a = a
-    end
-
-    attr_reader :a
-
-    def ==(other)
-      a == other.a
-    end
-
-    def self.json_create(object)
-      new(*object['args'])
-    end
-
-    def to_json(*args)
-      {
-        'json_class'  => self.class.name,
-        'args'        => [ @a ],
-      }.to_json(*args)
-    end
-  end
-
-  class A2 < A
-    def to_json(*args)
-      {
-        'json_class'  => self.class.name,
-        'args'        => [ @a ],
-      }.to_json(*args)
-    end
-  end
-
-  class B
-    def self.json_creatable?
-      false
-    end
-
-    def to_json(*args)
-      {
-        'json_class'  => self.class.name,
-      }.to_json(*args)
-    end
-  end
-
-  class C
-    def self.json_creatable?
-      false
-    end
-
-    def to_json(*args)
-      {
-        'json_class'  => 'JSONAdditionTest::Nix',
-      }.to_json(*args)
-    end
-  end
-
-  def test_extended_json
-    a = A.new(666)
-    assert A.json_creatable?
-    json = generate(a)
-    a_again = parse(json, :create_additions => true)
-    assert_kind_of a.class, a_again
-    assert_equal a, a_again
-  end
-
-  def test_extended_json_default
-    a = A.new(666)
-    assert A.json_creatable?
-    json = generate(a)
-    a_hash = parse(json)
-    assert_kind_of Hash, a_hash
-  end
-
-  def test_extended_json_disabled
-    a = A.new(666)
-    assert A.json_creatable?
-    json = generate(a)
-    a_again = parse(json, :create_additions => true)
-    assert_kind_of a.class, a_again
-    assert_equal a, a_again
-    a_hash = parse(json, :create_additions => false)
-    assert_kind_of Hash, a_hash
-    assert_equal(
-      {"args"=>[666], "json_class"=>"JSONAdditionTest::A"}.sort_by { |k,| k },
-      a_hash.sort_by { |k,| k }
-    )
-  end
-
-  def test_extended_json_fail1
-    b = B.new
-    assert !B.json_creatable?
-    json = generate(b)
-    assert_equal({ "json_class"=>"JSONAdditionTest::B" }, parse(json))
-  end
-
-  def test_extended_json_fail2
-    c = C.new
-    assert !C.json_creatable?
-    json = generate(c)
-    assert_raise(ArgumentError, NameError) { parse(json, :create_additions => true) }
-  end
-
-  def test_raw_strings
-    raw = ''
-    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
-    raw_array = []
-    for i in 0..255
-      raw << i
-      raw_array << i
-    end
-    json = raw.to_json_raw
-    json_raw_object = raw.to_json_raw_object
-    hash = { 'json_class' => 'String', 'raw'=> raw_array }
-    assert_equal hash, json_raw_object
-    assert_match(/\A\{.*\}\z/, json)
-    assert_match(/"json_class":"String"/, json)
-    assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json)
-    raw_again = parse(json, :create_additions => true)
-    assert_equal raw, raw_again
-  end
-
-  MyJsonStruct = Struct.new 'MyJsonStruct', :foo, :bar
-
-  def test_core
-    t = Time.now
-    assert_equal t, JSON(JSON(t), :create_additions => true)
-    d = Date.today
-    assert_equal d, JSON(JSON(d), :create_additions => true)
-    d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)
-    assert_equal d, JSON(JSON(d), :create_additions => true)
-    assert_equal 1..10, JSON(JSON(1..10), :create_additions => true)
-    assert_equal 1...10, JSON(JSON(1...10), :create_additions => true)
-    assert_equal "a".."c", JSON(JSON("a".."c"), :create_additions => true)
-    assert_equal "a"..."c", JSON(JSON("a"..."c"), :create_additions => true)
-    s = MyJsonStruct.new 4711, 'foot'
-    assert_equal s, JSON(JSON(s), :create_additions => true)
-    struct = Struct.new :foo, :bar
-    s = struct.new 4711, 'foot'
-    assert_raise(JSONError) { JSON(s) }
-    begin
-      raise TypeError, "test me"
-    rescue TypeError => e
-      e_json = JSON.generate e
-      e_again = JSON e_json, :create_additions => true
-      assert_kind_of TypeError, e_again
-      assert_equal e.message, e_again.message
-      assert_equal e.backtrace, e_again.backtrace
-    end
-    assert_equal(/foo/, JSON(JSON(/foo/), :create_additions => true))
-    assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true))
-  end
-
-  def test_utc_datetime
-    now = Time.now
-    d = DateTime.parse(now.to_s, :create_additions => true) # usual case
-    assert_equal d, parse(d.to_json, :create_additions => true)
-    d = DateTime.parse(now.utc.to_s) # of = 0
-    assert_equal d, parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
-    assert_equal d, parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
-    assert_equal d, parse(d.to_json, :create_additions => true)
-  end
-
-  def test_rational_complex
-    assert_equal Rational(2, 9), parse(JSON(Rational(2, 9)), :create_additions => true)
-    assert_equal Complex(2, 9), parse(JSON(Complex(2, 9)), :create_additions => true)
-  end
-
-  def test_bigdecimal
-    assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23)), :create_additions => true)
-    assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666)), :create_additions => true)
-  end
-
-  def test_ostruct
-    o = OpenStruct.new
-    # XXX this won't work; o.foo = { :bar => true }
-    o.foo = { 'bar' => true }
-    assert_equal o, parse(JSON(o), :create_additions => true)
-  end
-
-  def test_set
-    s = Set.new([:a, :b, :c, :a])
-    assert_equal s, JSON.parse(JSON(s), :create_additions => true)
-  end
-end