json 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae21d647db9c8291ae1fd3137d82feff3c0f7d575c244bd23902332179ef660b
-  data.tar.gz: d51e458a1de384797e9a11ca9413f74ff58f067e4478a4d54d220527387914fd
+  metadata.gz: dcc1346522e82980a0a5891f93738a33d0d367b0013e22440a85282b6d56721e
+  data.tar.gz: a7d4a06c398e9a550664e29096f85eaab0f7007bac945e69d3b869b24df2017b
 SHA512:
-  metadata.gz: f7b8eaa3f4cb78f26cdb0a4629529372baa32b9e30f16bcfe8955581e6e886561f3da4b396fd711a1ffdad04dec9657f4f0953bf4283a99d9c5243353272ad11
-  data.tar.gz: fe145361cd4b6bfd2fdb038ae5ab373d9f641893f43dab26460bc085833687ce78e105f2b18cff2c11d4cf974a32da082954d0117fffbeb8f75548272392201b
+  metadata.gz: 91235d83102ee7de2a1263a6b4d351fa61a3fa9440a31dc00cd391995721e333e609ab569f93ec9b2ad9e6b68a721d96a18af8e515d77d11c81d7626b82ab0f3
+  data.tar.gz: f2dcfe70be72b2df3567ee35bc3f4ecbf170ed6022362bc31cab151609ec3e3a0ef7aa339e81c0816987b25c7132fa222e1a51bc19af8cf4bf8143d66d5ed157

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 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.
@@ -79,7 +83,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
@@ -120,9 +124,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.
@@ -268,7 +272,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.
@@ -286,7 +290,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.5.0
+2.6.0

data/ext/json/ext/generator/generator.c

@@ -1,11 +1,6 @@
 #include "../fbuffer/fbuffer.h"
 #include "generator.h"
 
-#ifdef HAVE_RUBY_ENCODING_H
-static VALUE CEncoding_UTF_8;
-static ID i_encoding, i_encode;
-#endif
-
 static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
              mHash, mArray,
 #ifdef RUBY_INTEGER_UNIFICATION
@@ -948,7 +943,7 @@ static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
     fbuffer_append_char(buffer, '"');
 #ifdef HAVE_RUBY_ENCODING_H
     if (!enc_utf8_compatible_p(rb_enc_get(obj))) {
-        obj = rb_str_encode(obj, CEncoding_UTF_8, 0, Qnil);
+        obj = rb_str_export_to_enc(obj, rb_utf8_encoding());
     }
 #endif
     if (state->ascii_only) {
@@ -1610,9 +1605,4 @@ void Init_generator(void)
     i_match = rb_intern("match");
     i_keys = rb_intern("keys");
     i_dup = rb_intern("dup");
-#ifdef HAVE_RUBY_ENCODING_H
-    CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
-    i_encoding = rb_intern("encoding");
-    i_encode = rb_intern("encode");
-#endif
 }

data/ext/json/ext/parser/extconf.rb

@@ -2,6 +2,7 @@
 require 'mkmf'
 
 have_func("rb_enc_raise", "ruby.h")
+have_func("rb_enc_interned_str", "ruby.h")
 
 # checking if String#-@ (str_uminus) dedupes... '
 begin