json_pure 2.4.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccaf5d00b6462faaa558a21e868626904f051a833eea93e81e2ae2e3cdc9dfd0
-  data.tar.gz: 63d055fcb71de6f94d7c2632aba540f5450631a96813a7eee962939a0957b43d
+  metadata.gz: 820b895dd3defc1917ad0da99381fdca3700739b928f9bc5a2f47a9b9360e67d
+  data.tar.gz: 9568c251727c4ec133f4cc63fcec532bfe3c2b755c52f9477431aa82a6f432e3
 SHA512:
-  metadata.gz: 7f40f310a0c21b71b936caa11fa219f24a746719d4e7f10c07a2dc7747a741943344a639ad21b404964413d00fe3f9a74c97e936d3fe82a1a36c23aae522724e
-  data.tar.gz: 53cc02a7433b9d08cd7f6ba48bce2de608c8daac160e662fa8cf14d65173b9402527390a521aa90a1679fb0ee67f4e9a25b1e3cf4baeb7765c7adc12439f13fc
+  metadata.gz: 3cf9b62dd6f1339be3470d108aa0a984262a26e1d1f9bc933742d6ea93ed3e8fb87bd08f40b2de2977e1e372b8e05c626447a5e7b5dfdacf748fc4a5cc34a585
+  data.tar.gz: 7976e0e160a7c36cf7c7c9f2f0a6c9b8487b0a6b8928f0528be18c4077ff901e8ba132cbac1f44e545efb219cb67cba8e88bd058be554ecd91cc4e006c700ab7

data/CHANGES.md

@@ -1,5 +1,24 @@
 # Changes
 
+### 2021-10-24 (2.6.1)
+
+* Restore version.rb with 2.6.1
+
+### 2021-10-14 (2.6.0)
+
+* Use `rb_enc_interned_str` if available to reduce allocations in `freeze: true` mode. #451.
+* Bump required_ruby_version to 2.3.
+* Fix compatibility with `GC.compact`.
+* Fix some compilation warnings. #469
+
+## 2020-12-22 (2.5.1)
+
+* Restore the compatibility for constants of JSON class.
+
+## 2020-12-22 (2.5.0)
+
+* Ready to Ractor-safe at Ruby 3.0.
+
 ## 2020-12-17 (2.4.1)
 
 * Restore version.rb with 2.4.1
@@ -75,7 +94,7 @@
 
 ## 2015-09-11 (2.0.0)
   * Now complies to newest JSON RFC 7159.
-  * Implements compatibiliy to ruby 2.4 integer unification.
+  * Implements compatibility to ruby 2.4 integer unification.
   * Drops support for old rubies whose life has ended, that is rubies < 2.0.
     Also see https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/
   * There were still some mentions of dual GPL licensing in the source, but JSON
@@ -116,9 +135,9 @@
 ## 2013-02-04 (1.7.7)
   * Security fix for JSON create_additions default value and
     `JSON::GenericObject`. It should not be possible to create additions unless
-    explicitely requested by setting the create_additions argument to true or
+    explicitly requested by setting the create_additions argument to true or
     using the JSON.load/dump interface. If `JSON::GenericObject` is supposed to
-    be automatically deserialised, this has to be explicitely enabled by
+    be automatically deserialised, this has to be explicitly enabled by
     setting
         JSON::GenericObject.json_creatable = true
     as well.
@@ -264,7 +283,7 @@
 ## 2010-04-23 (1.4.0)
   * Major speed improvements and building with simplified
     directory/file-structure.
-  * Extension should at least be comapatible with MRI, YARV and Rubinius.
+  * Extension should at least be compatible with MRI, YARV and Rubinius.
 
 ## 2010-04-07 (1.2.4)
   * Triger const_missing callback to make Rails' dynamic class loading work.
@@ -282,7 +301,7 @@
     strings in object names/keys.
 
 ## 2009-10-01 (1.2.0)
-  * `fast_generate` now raises an exeception for nan and infinite floats.
+  * `fast_generate` now raises an exception for nan and infinite floats.
   * On Ruby 1.8 json supports parsing of UTF-8, UTF-16BE, UTF-16LE, UTF-32BE,
     and UTF-32LE JSON documents now. Under Ruby 1.9 the M17n conversion
     functions are used to convert from all supported encodings. ASCII-8BIT

data/README.md

@@ -1,6 +1,6 @@
 # JSON implementation for Ruby
 
-[![Travis Widget](http://travis-ci.org/flori/json.svg?branch=master)](https://travis-ci.org/flori/json)
+[![CI](https://github.com/flori/json/actions/workflows/ci.yml/badge.svg)](https://github.com/flori/json/actions/workflows/ci.yml)
 
 ## Description
 
@@ -267,7 +267,7 @@ the `pp` library's `pp` methods.
 
 The script `tools/server.rb` contains a small example if you want to test, how
 receiving a JSON object from a webrick server in your browser with the
-javasript prototype library http://www.prototypejs.org works.
+JavaScript prototype library http://www.prototypejs.org works.
 
 ## Speed Comparisons
 
@@ -294,7 +294,7 @@ extension:
 ```
 
 In the table above 1 is `JSON::Ext::Parser`, 2 is `YAML.load` with YAML
-compatbile JSON document, 3 is is `JSON::Pure::Parser`, and 4 is
+compatible JSON document, 3 is is `JSON::Pure::Parser`, and 4 is
 `ActiveSupport::JSON.decode`. The ActiveSupport JSON-decoder converts the
 input first to YAML and then uses the YAML-parser, the conversion seems to
 slow it down so much that it is only as fast as the `JSON::Pure::Parser`!

data/VERSION

@@ -1 +1 @@
-2.4.1
+2.6.1

data/json_pure.gemspec

@@ -11,10 +11,9 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de".freeze
 
   s.extra_rdoc_files = ["README.md".freeze]
-  s.rdoc_options = ["--title".freeze, "JSON implemention for ruby".freeze, "--main".freeze, "README.md".freeze]
+  s.rdoc_options = ["--title".freeze, "JSON implementation for ruby".freeze, "--main".freeze, "README.md".freeze]
   s.files = [
     "CHANGES.md".freeze,
-    "Gemfile".freeze,
     "LICENSE".freeze,
     "README.md".freeze,
     "VERSION".freeze,
@@ -36,13 +35,12 @@ Gem::Specification.new do |s|
     "lib/json/add/time.rb".freeze,
     "lib/json/common.rb".freeze,
     "lib/json/ext.rb".freeze,
-    "lib/json/ext/.keep".freeze,
     "lib/json/generic_object.rb".freeze,
     "lib/json/pure.rb".freeze,
     "lib/json/pure/generator.rb".freeze,
     "lib/json/pure/parser.rb".freeze,
     "lib/json/version.rb".freeze,
-  ] + Dir["tests/**/*"]
+  ]
   s.homepage = "http://flori.github.com/json".freeze
   s.metadata = {
     'bug_tracker_uri'   => 'https://github.com/flori/json/issues',
@@ -53,9 +51,5 @@ Gem::Specification.new do |s|
     'wiki_uri'          => 'https://github.com/flori/json/wiki'
   }
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.test_files = ["./tests/test_helper.rb".freeze]
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "test-unit"
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
 end

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.4.1'
+  VERSION         = '2.6.1'
   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,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json_pure
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-10-24 00:00:00.000000000 Z
+dependencies: []
 description: This is a JSON implementation in pure Ruby.
 email: flori@ping.de
 executables: []
@@ -45,9 +17,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- "./tests/test_helper.rb"
 - CHANGES.md
-- Gemfile
 - LICENSE
 - README.md
 - VERSION
@@ -69,57 +39,11 @@ files:
 - lib/json/add/time.rb
 - lib/json/common.rb
 - lib/json/ext.rb
-- lib/json/ext/.keep
 - lib/json/generic_object.rb
 - lib/json/pure.rb
 - 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
@@ -133,7 +57,7 @@ metadata:
 post_install_message:
 rdoc_options:
 - "--title"
-- JSON implemention for ruby
+- JSON implementation for ruby
 - "--main"
 - README.md
 require_paths:
@@ -142,16 +66,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.2.1
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: JSON Implementation for Ruby
-test_files:
-- "./tests/test_helper.rb"
+test_files: []

data/Gemfile

@@ -1,14 +0,0 @@
-# vim: set ft=ruby:
-
-source 'https://rubygems.org'
-
-case ENV['JSON']
-when 'ext', nil
-  if ENV['RUBY_ENGINE'] == 'jruby'
-    gemspec :name => 'json-java'
-  else
-    gemspec :name => 'json'
-  end
-when 'pure'
-  gemspec :name => 'json_pure'
-end

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."
-    }
-}