json 2.3.1 → 2.6.2

data/lib/json/pure/generator.rb

@@ -37,20 +37,26 @@ module JSON
     '\\'  =>  '\\\\',
   } # :nodoc:
 
+  ESCAPE_SLASH_MAP = MAP.merge(
+    '/'  =>  '\\/',
+  )
+
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
-  def utf8_to_json(string) # :nodoc:
+  def utf8_to_json(string, escape_slash = false) # :nodoc:
     string = string.dup
     string.force_encoding(::Encoding::ASCII_8BIT)
-    string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+    map = escape_slash ? ESCAPE_SLASH_MAP : MAP
+    string.gsub!(/[\/"\\\x0-\x1f]/) { map[$&] || $& }
     string.force_encoding(::Encoding::UTF_8)
     string
   end
 
-  def utf8_to_json_ascii(string) # :nodoc:
+  def utf8_to_json_ascii(string, escape_slash = false) # :nodoc:
     string = string.dup
     string.force_encoding(::Encoding::ASCII_8BIT)
-    string.gsub!(/["\\\x0-\x1f]/n) { MAP[$&] }
+    map = escape_slash ? ESCAPE_SLASH_MAP : MAP
+    string.gsub!(/[\/"\\\x0-\x1f]/n) { map[$&] || $& }
     string.gsub!(/(
       (?:
        [\xc2-\xdf][\x80-\xbf]    |
@@ -109,6 +115,7 @@ module JSON
         # * *space_before*: a string that is put before a : pair delimiter (default: ''),
         # * *object_nl*: a string that is put at the end of a JSON object (default: ''),
         # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+        # * *escape_slash*: true if forward slash (/) should be escaped (default: false)
         # * *check_circular*: is deprecated now, use the :max_nesting option instead,
         # * *max_nesting*: sets the maximum level of data structure nesting in
         #   the generated JSON, max_nesting = 0 if no maximum should be checked.
@@ -123,6 +130,7 @@ module JSON
           @array_nl              = ''
           @allow_nan             = false
           @ascii_only            = false
+          @escape_slash          = false
           @buffer_initial_length = 1024
           configure opts
         end
@@ -148,6 +156,10 @@ module JSON
         # the generated JSON, max_nesting = 0 if no maximum is checked.
         attr_accessor :max_nesting
 
+        # If this attribute is set to true, forward slashes will be escaped in
+        # all json strings.
+        attr_accessor :escape_slash
+
         # :stopdoc:
         attr_reader :buffer_initial_length
 
@@ -187,6 +199,11 @@ module JSON
           @ascii_only
         end
 
+        # Returns true, if forward slashes are escaped. Otherwise returns false.
+        def escape_slash?
+          @escape_slash
+        end
+
         # Configure this State instance with the Hash _opts_, and return
         # itself.
         def configure(opts)
@@ -209,6 +226,7 @@ module JSON
           @ascii_only            = opts[:ascii_only] if opts.key?(:ascii_only)
           @depth                 = opts[:depth] || 0
           @buffer_initial_length ||= opts[:buffer_initial_length]
+          @escape_slash          = !!opts[:escape_slash] if opts.key?(:escape_slash)
 
           if !opts.key?(:max_nesting) # defaults to 100
             @max_nesting = 100
@@ -314,8 +332,10 @@ module JSON
               first = false
             }
             depth = state.depth -= 1
-            result << state.object_nl
-            result << state.indent * depth if indent
+            unless first
+              result << state.object_nl
+              result << state.indent * depth if indent
+            end
             result << '}'
             result
           end
@@ -399,9 +419,9 @@ module JSON
               string = encode(::Encoding::UTF_8)
             end
             if state.ascii_only?
-              '"' << JSON.utf8_to_json_ascii(string) << '"'
+              '"' << JSON.utf8_to_json_ascii(string, state.escape_slash) << '"'
             else
-              '"' << JSON.utf8_to_json(string) << '"'
+              '"' << JSON.utf8_to_json(string, state.escape_slash) << '"'
             end
           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
 
@@ -61,6 +61,8 @@ module JSON
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
       #   defiance of RFC 7159 to be parsed by the Parser. This option defaults
       #   to false.
+      # * *freeze*: If set to true, all parsed objects will be frozen. Parsed
+      #   string will be deduplicated if possible.
       # * *symbolize_names*: If set to true, returns symbols for the names
       #   (keys) in a JSON object. Otherwise strings are returned, which is
       #   also the default. It's not possible to use this option in
@@ -86,6 +88,7 @@ module JSON
         end
         @allow_nan = !!opts[:allow_nan]
         @symbolize_names = !!opts[:symbolize_names]
+        @freeze = !!opts[:freeze]
         if opts.key?(:create_additions)
           @create_additions = !!opts[:create_additions]
         else
@@ -120,6 +123,7 @@ module JSON
           obj = parse_value
           UNPARSED.equal?(obj) and raise ParserError,
             "source is not valid JSON!"
+          obj.freeze if @freeze
         end
         while !eos? && skip(IGNORE) do end
         eos? or raise ParserError, "source is not valid JSON!"
@@ -161,6 +165,7 @@ module JSON
         EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT
       end
 
+      STR_UMINUS = ''.respond_to?(:-@)
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
@@ -180,6 +185,15 @@ module JSON
           if string.respond_to?(:force_encoding)
             string.force_encoding(::Encoding::UTF_8)
           end
+
+          if @freeze
+            if STR_UMINUS
+              string = -string
+            else
+              string.freeze
+            end
+          end
+
           if @create_additions and @match_string
             for (regexp, klass) in @match_string
               klass.json_creatable? or next
@@ -242,8 +256,10 @@ module JSON
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @array_class.new
         delim = false
-        until eos?
+        loop do
           case
+          when eos?
+            raise ParserError, "unexpected end of string while parsing array"
           when !UNPARSED.equal?(value = parse_value)
             delim = false
             result << value
@@ -274,8 +290,10 @@ module JSON
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @object_class.new
         delim = false
-        until eos?
+        loop do
           case
+          when eos?
+            raise ParserError, "unexpected end of string while parsing object"
           when !UNPARSED.equal?(string = parse_string)
             skip(IGNORE)
             unless scan(PAIR_DELIMITER)

data/lib/json/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.3.1'
+  VERSION         = '2.6.2'
   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

@@ -107,6 +107,89 @@ require 'json/common'
 #   ruby # => nil
 #   ruby.class # => NilClass
 #
+# ==== Parsing Options
+#
+# ====== Input Options
+#
+# Option +max_nesting+ (\Integer) specifies the maximum nesting depth allowed;
+# defaults to +100+; specify +false+ to disable depth checking.
+#
+# With the default, +false+:
+#   source = '[0, [1, [2, [3]]]]'
+#   ruby = JSON.parse(source)
+#   ruby # => [0, [1, [2, [3]]]]
+# Too deep:
+#   # Raises JSON::NestingError (nesting of 2 is too deep):
+#   JSON.parse(source, {max_nesting: 1})
+# Bad value:
+#   # Raises TypeError (wrong argument type Symbol (expected Fixnum)):
+#   JSON.parse(source, {max_nesting: :foo})
+#
+# ---
+#
+# Option +allow_nan+ (boolean) specifies whether to allow
+# NaN, Infinity, and MinusInfinity in +source+;
+# defaults to +false+.
+#
+# With the default, +false+:
+#   # Raises JSON::ParserError (225: unexpected token at '[NaN]'):
+#   JSON.parse('[NaN]')
+#   # Raises JSON::ParserError (232: unexpected token at '[Infinity]'):
+#   JSON.parse('[Infinity]')
+#   # Raises JSON::ParserError (248: unexpected token at '[-Infinity]'):
+#   JSON.parse('[-Infinity]')
+# Allow:
+#   source = '[NaN, Infinity, -Infinity]'
+#   ruby = JSON.parse(source, {allow_nan: true})
+#   ruby # => [NaN, Infinity, -Infinity]
+#
+# ====== Output Options
+#
+# Option +symbolize_names+ (boolean) specifies whether returned \Hash keys
+# should be Symbols;
+# defaults to +false+ (use Strings).
+#
+# With the default, +false+:
+#   source = '{"a": "foo", "b": 1.0, "c": true, "d": false, "e": null}'
+#   ruby = JSON.parse(source)
+#   ruby # => {"a"=>"foo", "b"=>1.0, "c"=>true, "d"=>false, "e"=>nil}
+# Use Symbols:
+#   ruby = JSON.parse(source, {symbolize_names: true})
+#   ruby # => {:a=>"foo", :b=>1.0, :c=>true, :d=>false, :e=>nil}
+#
+# ---
+#
+# Option +object_class+ (\Class) specifies the Ruby class to be used
+# for each \JSON object;
+# defaults to \Hash.
+#
+# With the default, \Hash:
+#   source = '{"a": "foo", "b": 1.0, "c": true, "d": false, "e": null}'
+#   ruby = JSON.parse(source)
+#   ruby.class # => Hash
+# Use class \OpenStruct:
+#   ruby = JSON.parse(source, {object_class: OpenStruct})
+#   ruby # => #<OpenStruct a="foo", b=1.0, c=true, d=false, e=nil>
+#
+# ---
+#
+# Option +array_class+ (\Class) specifies the Ruby class to be used
+# for each \JSON array;
+# defaults to \Array.
+#
+# With the default, \Array:
+#   source = '["foo", 1.0, true, false, null]'
+#   ruby = JSON.parse(source)
+#   ruby.class # => Array
+# Use class \Set:
+#   ruby = JSON.parse(source, {array_class: Set})
+#   ruby # => #<Set: {"foo", 1.0, true, false, nil}>
+#
+# ---
+#
+# Option +create_additions+ (boolean) specifies whether to use \JSON additions in parsing.
+# See {\JSON Additions}[#module-JSON-label-JSON+Additions].
+#
 # === Generating \JSON
 #
 # To generate a Ruby \String containing \JSON data,
@@ -169,6 +252,94 @@ require 'json/common'
 #   JSON.generate(Complex(0, 0)) # => '"0+0i"'
 #   JSON.generate(Dir.new('.')) # => '"#<Dir>"'
 #
+# ==== Generating Options
+#
+# ====== Input Options
+#
+# Option +allow_nan+ (boolean) specifies whether
+# +NaN+, +Infinity+, and <tt>-Infinity</tt> may be generated;
+# defaults to +false+.
+#
+# With the default, +false+:
+#   # Raises JSON::GeneratorError (920: NaN not allowed in JSON):
+#   JSON.generate(JSON::NaN)
+#   # Raises JSON::GeneratorError (917: Infinity not allowed in JSON):
+#   JSON.generate(JSON::Infinity)
+#   # Raises JSON::GeneratorError (917: -Infinity not allowed in JSON):
+#   JSON.generate(JSON::MinusInfinity)
+#
+# Allow:
+#   ruby = [Float::NaN, Float::Infinity, Float::MinusInfinity]
+#   JSON.generate(ruby, allow_nan: true) # => '[NaN,Infinity,-Infinity]'
+#
+# ---
+#
+# Option +max_nesting+ (\Integer) specifies the maximum nesting depth
+# in +obj+; defaults to +100+.
+#
+# With the default, +100+:
+#   obj = [[[[[[0]]]]]]
+#   JSON.generate(obj) # => '[[[[[[0]]]]]]'
+#
+# Too deep:
+#   # Raises JSON::NestingError (nesting of 2 is too deep):
+#   JSON.generate(obj, max_nesting: 2)
+#
+# ====== Output Options
+#
+# The default formatting options generate the most compact
+# \JSON data, all on one line and with no whitespace.
+#
+# You can use these formatting options to generate
+# \JSON data in a more open format, using whitespace.
+# See also JSON.pretty_generate.
+#
+# - Option +array_nl+ (\String) specifies a string (usually a newline)
+#   to be inserted after each \JSON array; defaults to the empty \String, <tt>''</tt>.
+# - Option +object_nl+ (\String) specifies a string (usually a newline)
+#   to be inserted after each \JSON object; defaults to the empty \String, <tt>''</tt>.
+# - Option +indent+ (\String) specifies the string (usually spaces) to be
+#   used for indentation; defaults to the empty \String, <tt>''</tt>;
+#   defaults to the empty \String, <tt>''</tt>;
+#   has no effect unless options +array_nl+ or +object_nl+ specify newlines.
+# - Option +space+ (\String) specifies a string (usually a space) to be
+#   inserted after the colon in each \JSON object's pair;
+#   defaults to the empty \String, <tt>''</tt>.
+# - Option +space_before+ (\String) specifies a string (usually a space) to be
+#   inserted before the colon in each \JSON object's pair;
+#   defaults to the empty \String, <tt>''</tt>.
+#
+# In this example, +obj+ is used first to generate the shortest
+# \JSON data (no whitespace), then again with all formatting options
+# specified:
+#
+#   obj = {foo: [:bar, :baz], bat: {bam: 0, bad: 1}}
+#   json = JSON.generate(obj)
+#   puts 'Compact:', json
+#   opts = {
+#     array_nl: "\n",
+#     object_nl: "\n",
+#     indent: '  ',
+#     space_before: ' ',
+#     space: ' '
+#   }
+#   puts 'Open:', JSON.generate(obj, opts)
+#
+# Output:
+#   Compact:
+#   {"foo":["bar","baz"],"bat":{"bam":0,"bad":1}}
+#   Open:
+#   {
+#     "foo" : [
+#       "bar",
+#       "baz"
+#   ],
+#     "bat" : {
+#       "bam" : 0,
+#       "bad" : 1
+#     }
+#   }
+#
 # == \JSON Additions
 #
 # When you "round trip" a non-\String object from Ruby to \JSON and back,
@@ -322,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.3.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-30 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: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  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: 2022-05-16 00:00:00.000000000 Z
+dependencies: []
 description: This is a JSON implementation as a Ruby extension in C.
 email: flori@ping.de
 executables: []
@@ -54,15 +20,10 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGES.md
-- Gemfile
-- README-json-jruby.md
+- LICENSE
 - README.md
-- Rakefile
 - VERSION
-- diagrams/.keep
 - ext/json/ext/fbuffer/fbuffer.h
 - ext/json/ext/generator/depend
 - ext/json/ext/generator/extconf.rb
@@ -74,23 +35,7 @@ files:
 - ext/json/ext/parser/parser.h
 - ext/json/ext/parser/parser.rl
 - ext/json/extconf.rb
-- install.rb
-- java/src/json/ext/ByteListTranscoder.java
-- java/src/json/ext/Generator.java
-- java/src/json/ext/GeneratorMethods.java
-- java/src/json/ext/GeneratorService.java
-- java/src/json/ext/GeneratorState.java
-- java/src/json/ext/OptionsReader.java
-- java/src/json/ext/Parser.java
-- java/src/json/ext/Parser.rl
-- java/src/json/ext/ParserService.java
-- java/src/json/ext/RuntimeInfo.java
-- java/src/json/ext/StringDecoder.java
-- java/src/json/ext/StringEncoder.java
-- java/src/json/ext/Utils.java
-- json-java.gemspec
 - json.gemspec
-- json_pure.gemspec
 - lib/json.rb
 - lib/json/add/bigdecimal.rb
 - lib/json/add/complex.rb
@@ -108,57 +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
-- references/rfc7159.txt
-- 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/fail3.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
-- tools/diff.sh
-- tools/fuzz.rb
-- tools/server.rb
 homepage: http://flori.github.com/json
 licenses:
 - Ruby
@@ -172,7 +71,7 @@ metadata:
 post_install_message:
 rdoc_options:
 - "--title"
-- JSON implemention for Ruby
+- JSON implementation for Ruby
 - "--main"
 - README.md
 require_paths:
@@ -181,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.1.2
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: JSON Implementation for Ruby
-test_files:
-- tests/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,18 +0,0 @@
-.*.sw[pon]
-*.bundle
-coverage
-tags
-pkg
-.nfs.*
-.idea
-java/Json.iml
-Gemfile.lock
-.rvmrc
-*.rbc
-.rbx
-.AppleDouble
-.DS_Store
-*/**/Makefile
-*/**/*.o
-.byebug_history
-*.log

data/.travis.yml

@@ -1,26 +0,0 @@
-# Passes arguments to bundle install (http://gembundler.com/man/bundle-install.1.html)
-#bundler_args: --binstubs
-language: ruby
-
-# Specify which ruby versions you wish to run your tests on, each version will be used
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7.0-preview3
-  - ruby-head
-  - jruby
-  - jruby-9.2.7.0
-  - truffleruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby
-    - rvm: jruby-9.2.7.0
-    - rvm: truffleruby
-script: "bundle exec rake"
-sudo: false

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/README-json-jruby.md

@@ -1,33 +0,0 @@
-JSON-JRuby
-==========
-
-JSON-JRuby is a port of Florian Frank's native
-[`json` library](http://json.rubyforge.org/) to JRuby.
-It aims to be a perfect drop-in replacement for `json_pure`.
-
-
-Development version
-===================
-
-The latest version is available from the
-[Git repository](http://github.com/mernen/json-jruby/tree):
-
-    git clone git://github.com/mernen/json-jruby.git
-
-
-Compiling
-=========
-
-You'll need JRuby version 1.2 or greater to build JSON-JRuby.
-Its path must be set on the `jruby.dir` property of
-`nbproject/project.properties` (defaults to `../jruby`).
-
-Additionally, you'll need [Ant](http://ant.apache.org/), and
-[Ragel](http://www.cs.queensu.ca/~thurston/ragel/) 6.4 or greater.
-
-Then, from the folder where the sources are located, type:
-
-    ant clean jar
-
-to clean any leftovers from previous builds and generate the `.jar` files.
-To generate a RubyGem, specify the `gem` action rather than `jar`.