oj 3.11.0 → 3.16.5

data/test/foo.rb

@@ -1,52 +1,26 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
-$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
-%w(lib ext).each do |dir|
-  $: << File.join($oj_dir, dir)
-end
-
-require 'json'
-
-t = [Time.now.utc]
-
-puts "t.to_json - #{t.to_json}"
-
-puts "--- active support"
-
-require 'active_support'
-require "active_support/json"
-
-ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
-
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+$LOAD_PATH << '.'
+$LOAD_PATH << File.join(__dir__, '../lib')
+$LOAD_PATH << File.join(__dir__, '../ext')
 
 require 'oj'
 
-t = [Time.now.utc]
-
-puts "-----------------------"
-
-#puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
-
-#Oj.mimic_JSON
-
-#puts "Oj - t.as_json - #{t.as_json}"
-
-puts "--- active support"
-
-require 'active_support'
-require "active_support/json"
+reader, writer = IO.pipe
 
-ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+thread =
+  Thread.new do
+    5.times do |id|
+      Oj.to_stream(writer, { "id" => id })
+      sleep(1)
+    end
 
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+    writer.close
+  end
 
-puts "--- optimize"
-Oj.optimize_rails
+p = Oj::Parser.new(:usual)
+p.load(reader) { |data| puts "#{Time.now} -- ID: #{data["id"]}" }
 
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+reader.close
+thread.join

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
 # required. That can be set in the RUBYOPT environment variable.
 # export RUBYOPT=-w
@@ -13,14 +15,25 @@ require 'minitest/autorun'
 require 'stringio'
 require 'date'
 require 'bigdecimal'
-require 'pp'
 require 'oj'
 
+def verify_gc_compaction
+  # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+  # move objects around, helping to find object movement bugs.
+  if defined?(GC.verify_compaction_references) == 'method' && RbConfig::CONFIG['host_os'] !~ /(mingw|mswin)/
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2.0')
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+    else
+      GC.verify_compaction_references(double_heap: true, toward: :empty)
+    end
+  end
+end
+
 $ruby = RUBY_DESCRIPTION.split(' ')[0]
 $ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
 
 class Range
-  def to_hash()
-    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  def to_hash
+    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => exclude_end? }
   end
 end

data/test/isolated/shared.rb

@@ -21,7 +21,7 @@ class SharedMimicTest < Minitest::Test
     alias == eql?
 
     def as_json()
-      {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
+      {"json_class" => self.class.to_s, "x" => @x, "y" => @y}
     end
 
     def self.json_create(h)
@@ -207,7 +207,6 @@ class SharedMimicTest < Minitest::Test
 --],#
 --"a"~:*1#
 }} == json)
-
   end
 
 # fast_generate
@@ -261,6 +260,8 @@ class SharedMimicTest < Minitest::Test
     obj = JSON.parse(json, :create_additions => true)
     JSON.create_id = 'json_class'
     assert_equal(jam, obj)
+
+    assert_nothing_raised { JSON.create_id = nil }
   end
   def test_parse_bang
     json = %{{"a":1,"b":[true,false]}}

data/test/json_gem/json_addition_test.rb

@@ -191,9 +191,9 @@ class JSONAdditionTest < Test::Unit::TestCase
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
     d = DateTime.parse(now.utc.to_s) # of = 0
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1, 24))
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12, 24))
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
   end
 

data/test/json_gem/json_common_interface_test.rb

@@ -29,7 +29,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
     #@json = '{"a":2,"b":5.23683071,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
     #'"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
     @json = '{"a":2,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
-	    '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
+            '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 
   def test_index
@@ -43,15 +43,15 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   # functionality and perform better.
 
   def test_parser
-    assert_match /::Parser\z/, JSON.parser.name
+    assert_match(/::Parser\z/, JSON.parser.name)
   end
 
   def test_generator
-    assert_match /::Generator\z/, JSON.generator.name
+    assert_match(/::Generator\z/, JSON.generator.name)
   end
 
   def test_state
-    assert_match /::Generator::State\z/, JSON.state.name
+    assert_match(/::Generator::State\z/, JSON.state.name)
   end
 
   # This doesn't have anything to do with JSON parsing or generation. It seems
@@ -128,8 +128,10 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
     too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
     assert_equal too_deep, JSON.dump(eval(too_deep))
     assert_kind_of String, Marshal.dump(eval(too_deep))
-    assert_raise(ArgumentError) { JSON.dump(eval(too_deep), 100) }
-    assert_raise(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
+    if RUBY_ENGINE != 'truffleruby'
+      assert_raise(ArgumentError) { JSON.dump(eval(too_deep), 100) }
+      assert_raise(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
+    end
     assert_equal too_deep, JSON.dump(eval(too_deep), 101)
     assert_kind_of String, Marshal.dump(eval(too_deep), 101)
     output = StringIO.new

data/test/json_gem/json_ext_parser_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 #frozen_string_literal: false
+
 require 'json_gem/test_helper'
 
 class JSONExtParserTest < Test::Unit::TestCase

data/test/json_gem/json_fixtures_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 #frozen_string_literal: false
+
 require 'json_gem/test_helper'
 
 class JSONFixturesTest < Test::Unit::TestCase
@@ -16,7 +17,7 @@ class JSONFixturesTest < Test::Unit::TestCase
     for name, source in @passed
       begin
         assert JSON.parse(source),
-          "Did not pass for fixture '#{name}': #{source.inspect}"
+               "Did not pass for fixture '#{name}': #{source.inspect}"
       rescue => e
         warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
         raise e
@@ -27,7 +28,7 @@ class JSONFixturesTest < Test::Unit::TestCase
   def test_failing
     for name, source in @failed
       assert_raise(JSON::ParserError, JSON::NestingError,
-        "Did not fail for fixture '#{name}': #{source.inspect}") do
+                   "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end

data/test/json_gem/json_generator_test.rb

@@ -22,24 +22,24 @@ class JSONGeneratorTest < Test::Unit::TestCase
     }
     @json2 = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
-    @json3 = <<'EOT'.chomp
-{
-  "a": 2,
-  "b": 3.141,
-  "c": "c",
-  "d": [
-    1,
-    "b",
-    3.14
-  ],
-  "e": {
-    "foo": "bar"
-  },
-  "g": "\"\u0000\u001f",
-  "h": 1000.0,
-  "i": 0.001
-}
-EOT
+    @json3 = <<~'EOT'.chomp
+      {
+        "a": 2,
+        "b": 3.141,
+        "c": "c",
+        "d": [
+          1,
+          "b",
+          3.14
+        ],
+        "e": {
+          "foo": "bar"
+        },
+        "g": "\"\u0000\u001f",
+        "h": 1000.0,
+        "i": 0.001
+      }
+    EOT
   end
 
   def test_generate
@@ -64,27 +64,29 @@ EOT
     parsed_json = JSON.parse(json)
     assert_equal(@hash, parsed_json)
     json = JSON.pretty_generate({1=>2})
-    assert_equal(<<'EOT'.chomp, json)
-{
-  "1": 2
-}
-EOT
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+        "1": 2
+      }
+    EOT
     parsed_json = JSON.parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_equal '666', JSON.pretty_generate(666)
+    json_nil_opts = JSON.pretty_generate({1=>2}, nil)
+    assert_equal json, json_nil_opts
   end
 
   def test_generate_custom
     state = JSON::State.new(:space_before => " ", :space => "   ", :indent => "<i>", :object_nl => "\n", :array_nl => "<a_nl>")
-    json = JSON.generate({1=>{2=>3,4=>[5,6]}}, state)
-    assert_equal(<<'EOT'.chomp, json)
-{
-<i>"1" :   {
-<i><i>"2" :   3,
-<i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
-<i>}
-}
-EOT
+    json = JSON.generate({1=>{2=>3, 4=>[5, 6]}}, state)
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+      <i>"1" :   {
+      <i><i>"2" :   3,
+      <i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
+      <i>}
+      }
+    EOT
   end
 
   def test_fast_generate
@@ -113,7 +115,7 @@ EOT
   end
 
   # TBD Implement JSON.state to return state class.
-  # set state attibutes from defaults
+  # set state attributes from defaults
   # implement methods
   # circular should use circular in defaults or maybe always set to true, allow changes with [:check_circular]=
   def test_states
@@ -136,6 +138,12 @@ EOT
 
   def test_pretty_state
     state = JSON::PRETTY_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "\n",
@@ -147,11 +155,17 @@ EOT
       :object_nl             => "\n",
       :space                 => " ",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_safe_state
     state = JSON::SAFE_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -163,11 +177,17 @@ EOT
       :object_nl             => "",
       :space                 => "",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_fast_state
     state = JSON::FAST_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -179,7 +199,7 @@ EOT
       :object_nl             => "",
       :space                 => "",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_allow_nan
@@ -280,7 +300,9 @@ EOT
     assert_equal '2', state.indent
   end
 
-  if defined?(JSON::Ext::Generator)
+  if defined?(JSON::Ext::Generator) && Process.respond_to?(:fork)
+    # forking to avoid modifying core class of a parent process and
+    # introducing race conditions of tests are run in parallel
     def test_broken_bignum # [ruby-core:38867]
       pid = fork do
         x = 1 << 64
@@ -297,9 +319,6 @@ EOT
       end
       _, status = Process.waitpid2(pid)
       assert status.success?
-    rescue NotImplementedError
-      # forking to avoid modifying core class of a parent process and
-      # introducing race conditions of tests are run in parallel
     end
   end
 
@@ -339,7 +358,7 @@ EOT
     too_deep_ary = eval too_deep
     assert_raise(JSON::NestingError) { JSON.generate too_deep_ary }
     assert_raise(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
-    ok = JSON.generate too_deep_ary, :max_nesting => 101
+    ok = JSON.generate too_deep_ary, :max_nesting => 102
     assert_equal too_deep, ok
     ok = JSON.generate too_deep_ary, :max_nesting => nil
     assert_equal too_deep, ok
@@ -380,4 +399,15 @@ EOT
       assert_equal '["foo"]', JSON.generate([s.new('foo')])
     end
   end
+
+  def test_invalid_to_json
+    omit if REAL_JSON_GEM
+
+    data = Object.new
+    def data.to_json(*)
+      nil
+    end
+
+    assert_raises(TypeError) { JSON.generate(data) }
+  end
 end

data/test/json_gem/json_generic_object_test.rb

@@ -29,26 +29,26 @@ class JSONGenericObjectTest < Test::Unit::TestCase
 
   def test_parse_json
     x = JSON(
-        '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-        :create_additions => true
-             )
-    assert_kind_of Hash,
-      JSON(
         '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
         :create_additions => true
       )
+    assert_kind_of Hash,
+                   JSON(
+                     '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                     :create_additions => true
+                   )
     switch_json_creatable do
       assert_equal @go, l =
-        JSON(
-          '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-             :create_additions => true
-        )
+                          JSON(
+                            '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                            :create_additions => true
+                          )
       assert_equal 1, l.a
       assert_equal @go,
-        l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
       assert_equal 1, l.a
       assert_equal JSON::GenericObject[:a => JSON::GenericObject[:b => 2]],
-        l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
       assert_equal 2, l.a.b
     end
   end

data/test/json_gem/json_parser_test.rb

@@ -31,7 +31,7 @@ class JSONParserTest < Test::Unit::TestCase
     }
     assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
     assert_include(e.message, json, bug10705)
-  end if defined?(Encoding::UTF_8)
+  end if defined?(Encoding::UTF_8) and defined?(JSON::Ext::Parser)
 
   def test_parsing
     parser = JSON::Parser.new('"test"')
@@ -95,21 +95,21 @@ class JSONParserTest < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { JSON.parse('.23') }
     assert_raise(JSON::ParserError) { JSON.parse('023') }
     assert_equal 23, JSON.parse('23')
-    assert_equal -23, JSON.parse('-23')
+    assert_equal(-23, JSON.parse('-23'))
     assert_equal_float 3.141, JSON.parse('3.141')
-    assert_equal_float -3.141, JSON.parse('-3.141')
+    assert_equal_float(-3.141, JSON.parse('-3.141'))
     assert_equal_float 3.141, JSON.parse('3141e-3')
     assert_equal_float 3.141, JSON.parse('3141.1e-3')
     assert_equal_float 3.141, JSON.parse('3141E-3')
     assert_equal_float 3.141, JSON.parse('3141.0E-3')
-    assert_equal_float -3.141, JSON.parse('-3141.0e-3')
-    assert_equal_float -3.141, JSON.parse('-3141e-3')
+    assert_equal_float(-3.141, JSON.parse('-3141.0e-3'))
+    assert_equal_float(-3.141, JSON.parse('-3141e-3'))
     assert_raise(JSON::ParserError) { JSON.parse('NaN') }
     assert JSON.parse('NaN', :allow_nan => true).nan?
     assert_raise(JSON::ParserError) { JSON.parse('Infinity') }
     assert_equal 1.0/0, JSON.parse('Infinity', :allow_nan => true)
     assert_raise(JSON::ParserError) { JSON.parse('-Infinity') }
-    assert_equal -1.0/0, JSON.parse('-Infinity', :allow_nan => true)
+    assert_equal(-1.0/0, JSON.parse('-Infinity', :allow_nan => true))
   end
 
   if Array.method_defined?(:permutation)
@@ -133,17 +133,17 @@ class JSONParserTest < Test::Unit::TestCase
   end
 
   def test_parse_arrays
-    assert_equal([1,2,3], JSON.parse('[1,2,3]'))
-    assert_equal([1.2,2,3], JSON.parse('[1.2,2,3]'))
-    assert_equal([[],[[],[]]], JSON.parse('[[],[[],[]]]'))
+    assert_equal([1, 2, 3], JSON.parse('[1,2,3]'))
+    assert_equal([1.2, 2, 3], JSON.parse('[1.2,2,3]'))
+    assert_equal([[], [[], []]], JSON.parse('[[],[[],[]]]'))
     assert_equal([], JSON.parse('[]'))
     assert_equal([], JSON.parse('  [  ]  '))
     assert_equal([1], JSON.parse('[1]'))
     assert_equal([1], JSON.parse('  [ 1  ]  '))
     ary = [[1], ["foo"], [3.14], [4711.0], [2.718], [nil],
-      [[1, -2, 3]], [false], [true]]
+           [[1, -2, 3]], [false], [true]]
     assert_equal(ary,
-      JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
+                 JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
     assert_equal(ary, JSON.parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2]\s
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
@@ -208,51 +208,51 @@ class JSONParserTest < Test::Unit::TestCase
 
   def test_symbolize_names
     assert_equal({ "foo" => "bar", "baz" => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}'))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}'))
     assert_equal({ :foo => "bar", :baz => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
     assert_raise(ArgumentError) do
       JSON.parse('{}', :symbolize_names => true, :create_additions => true)
     end
   end
 
   def test_parse_comments
-    json = <<EOT
-{
-  "key1":"value1", // eol comment
-  "key2":"value2"  /* multi line
-                    *  comment */,
-  "key3":"value3"  /* multi line
-                    // nested eol comment
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1", // eol comment
+        "key2":"value2"  /* multi line
+                          *  comment */,
+        "key3":"value3"  /* multi line
+                          // nested eol comment
+                          *  comment */
+      }
+    EOT
     assert_equal(
       { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
       JSON.parse(json))
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                    // nested eol comment
-                    /* illegal nested multi line comment */
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                          // nested eol comment
+                          /* illegal nested multi line comment */
+                          *  comment */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                   // nested eol comment
-                   closed multi comment */
-                   and again, throw an Error */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                         // nested eol comment
+                         closed multi comment */
+                         and again, throw an Error */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /*/*/
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /*/*/
+      }
+    EOT
     assert_equal({ "key1" => "value1" }, JSON.parse(json))
   end
 
@@ -269,6 +269,13 @@ EOT
     assert_equal too_deep_ary, ok
     ok = JSON.parse too_deep, :max_nesting => 0
     assert_equal too_deep_ary, ok
+
+    unless ENV['REAL_JSON_GEM']
+      # max_nesting should be reset to 0 if not included in options
+      # This behavior is not compatible with Ruby standard JSON gem
+      ok = JSON.parse too_deep, {}
+      assert_equal too_deep_ary, ok
+    end
   end
 
   def test_backslash
@@ -341,7 +348,7 @@ EOT
 
   def test_parse_array_custom_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArray)
-    assert_equal([1,2], res)
+    assert_equal([1, 2], res)
     assert_equal(SubArray, res.class)
     assert res.shifted?
   end
@@ -349,7 +356,7 @@ EOT
   def test_parse_array_custom_non_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArrayWrapper)
     assert_equal(SubArrayWrapper, res.class)
-    assert_equal([1,2], res.data)
+    assert_equal([1, 2], res.data)
     assert res.shifted?
   end
 
@@ -435,7 +442,7 @@ EOT
     assert obj_again['foo']['bar']
     assert_equal obj, obj_again
     assert_equal ["foo"],
-      JSON(JSON(SubArray2["foo"]), :create_additions => true)
+                 JSON(JSON(SubArray2["foo"]), :create_additions => true)
   end
 
   def test_generate_core_subclasses_with_default_to_json

data/test/json_gem/json_string_matching_test.rb

@@ -28,15 +28,15 @@ class JSONStringMatchingTest < Test::Unit::TestCase
     t_json = [ t ].to_json
     time_regexp = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/
     assert_equal [ t ],
-      JSON.parse(
-        t_json,
-        :create_additions => true,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :create_additions => true,
+                   :match_string => { time_regexp => TestTime }
+                 )
     assert_equal [ t.strftime('%FT%T%z') ],
-      JSON.parse(
-        t_json,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :match_string => { time_regexp => TestTime }
+                 )
   end
 end