json 2.5.1 → 2.6.0

data/ext/json/ext/parser/parser.h

@@ -13,6 +13,10 @@
 #include "st.h"
 #endif
 
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
+#endif
+
 #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
 
 /* unicode */
@@ -63,7 +67,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
-static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd);
+static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int symbolize);
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static VALUE convert_encoding(VALUE source);
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);

data/ext/json/ext/parser/parser.rl

@@ -452,17 +452,29 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     }
 }
 
-static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
+static const size_t MAX_STACK_BUFFER_SIZE = 128;
+static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int symbolize)
 {
-    char *p = string, *pe = string, *unescape;
+    VALUE result = Qnil;
+    size_t bufferSize = stringEnd - string;
+    char *p = string, *pe = string, *unescape, *bufferStart, *buffer;
     int unescape_len;
     char buf[4];
 
+    if (bufferSize > MAX_STACK_BUFFER_SIZE) {
+      bufferStart = buffer = ALLOC_N(char, bufferSize);
+    } else {
+      bufferStart = buffer = ALLOCA_N(char, bufferSize);
+    }
+
     while (pe < stringEnd) {
         if (*pe == '\\') {
             unescape = (char *) "?";
             unescape_len = 1;
-            if (pe > p) rb_str_buf_cat(result, p, pe - p);
+            if (pe > p) {
+              MEMCPY(buffer, p, char, pe - p);
+              buffer += pe - p;
+            }
             switch (*++pe) {
                 case 'n':
                     unescape = (char *) "\n";
@@ -487,6 +499,9 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
+                      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
+                        free(bufferStart);
+                      }
                       rb_enc_raise(
                         EXC_ENCODING eParserError,
                         "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
@@ -497,6 +512,9 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
                             if (pe > stringEnd - 6) {
+                              if (bufferSize > MAX_STACK_BUFFER_SIZE) {
+                                free(bufferStart);
+                              }
                               rb_enc_raise(
                                 EXC_ENCODING eParserError,
                                 "%u: incomplete surrogate pair at '%s'", __LINE__, p
@@ -520,13 +538,55 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     p = pe;
                     continue;
             }
-            rb_str_buf_cat(result, unescape, unescape_len);
+            MEMCPY(buffer, unescape, char, unescape_len);
+            buffer += unescape_len;
             p = ++pe;
         } else {
             pe++;
         }
     }
-    rb_str_buf_cat(result, p, pe - p);
+
+    if (pe > p) {
+      MEMCPY(buffer, p, char, pe - p);
+      buffer += pe - p;
+    }
+
+# ifdef HAVE_RB_ENC_INTERNED_STR
+      if (intern) {
+        result = rb_enc_interned_str(bufferStart, (long)(buffer - bufferStart), rb_utf8_encoding());
+      } else {
+        result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
+      }
+      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
+        free(bufferStart);
+      }
+# else
+      result = rb_utf8_str_new(bufferStart, (long)(buffer - bufferStart));
+
+      if (bufferSize > MAX_STACK_BUFFER_SIZE) {
+        free(bufferStart);
+      }
+
+      if (intern) {
+  # if STR_UMINUS_DEDUPE_FROZEN
+        // Starting from MRI 2.8 it is preferable to freeze the string
+        // before deduplication so that it can be interned directly
+        // otherwise it would be duplicated first which is wasteful.
+        result = rb_funcall(rb_str_freeze(result), i_uminus, 0);
+  # elif STR_UMINUS_DEDUPE
+        // MRI 2.5 and older do not deduplicate strings that are already
+        // frozen.
+        result = rb_funcall(result, i_uminus, 0);
+  # else
+        result = rb_str_freeze(result);
+  # endif
+      }
+# endif
+
+    if (symbolize) {
+      result = rb_str_intern(result);
+    }
+
     return result;
 }
 
@@ -537,12 +597,11 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
     write data;
 
     action parse_string {
-        *result = json_string_unescape(*result, json->memo + 1, p);
+        *result = json_string_unescape(json->memo + 1, p, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
         if (NIL_P(*result)) {
             fhold;
             fbreak;
         } else {
-            FORCE_UTF8(*result);
             fexec p + 1;
         }
     }
@@ -569,7 +628,6 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
     int cs = EVIL;
     VALUE match_string;
 
-    *result = rb_str_buf_new(0);
     %% write init;
     json->memo = p;
     %% write exec;
@@ -585,26 +643,6 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
           }
     }
 
-    if (json->symbolize_names && json->parsing_name) {
-      *result = rb_str_intern(*result);
-    } else if (RB_TYPE_P(*result, T_STRING)) {
-# if STR_UMINUS_DEDUPE_FROZEN
-      if (json->freeze) {
-        // Starting from MRI 2.8 it is preferable to freeze the string
-        // before deduplication so that it can be interned directly
-        // otherwise it would be duplicated first which is wasteful.
-        *result = rb_funcall(rb_str_freeze(*result), i_uminus, 0);
-      }
-# elif STR_UMINUS_DEDUPE
-      if (json->freeze) {
-        // MRI 2.5 and older do not deduplicate strings that are already
-        // frozen.
-        *result = rb_funcall(*result, i_uminus, 0);
-      }
-# else
-      rb_str_resize(*result, RSTRING_LEN(*result));
-# endif
-    }
     if (cs >= JSON_string_first_final) {
         return p + 1;
     } else {

data/json.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"]
   s.files = [
     "CHANGES.md",
-    "Gemfile",
     "LICENSE",
     "README.md",
     "VERSION",
@@ -48,13 +47,12 @@ Gem::Specification.new do |s|
     "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",
-  ] + Dir["tests/**/*"]
+  ]
   s.homepage = "http://flori.github.com/json"
   s.metadata = {
     'bug_tracker_uri'   => 'https://github.com/flori/json/issues',
@@ -65,9 +63,5 @@ Gem::Specification.new do |s|
     'wiki_uri'          => 'https://github.com/flori/json/wiki'
   }
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
-  s.test_files = ["tests/test_helper.rb"]
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "test-unit"
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3")
 end

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.5.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,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 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-14 00:00:00.000000000 Z
+dependencies: []
 description: This is a JSON implementation as a Ruby extension in C.
 email: flori@ping.de
 executables: []
@@ -49,7 +21,6 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGES.md
-- Gemfile
 - LICENSE
 - README.md
 - VERSION
@@ -82,62 +53,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/lib/core_assertions.rb
-- tests/lib/envutil.rb
-- tests/lib/find_executable.rb
-- tests/lib/helper.rb
-- tests/ractor_test.rb
-- tests/test_helper.rb
 homepage: http://flori.github.com/json
 licenses:
 - Ruby
@@ -160,16 +80,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.2
+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."
-    }
-}