oj 3.13.9 → 3.13.12

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module.
-  VERSION = '3.13.9'
+  VERSION = '3.13.12'
 end

data/pages/JsonGem.md

@@ -1,3 +1,18 @@
+# JSON Quickstart
+
+To have Oj universally "take over" many methods on the JSON constant (`load`, `parse`, etc.) with
+their faster Oj counterparts, in a mode that is compatible with the json gem:
+
+```ruby
+Oj.mimic_JSON()
+```
+
+If the project does not already use the json gem, `JSON` will become available.
+If the project does require the json gem, `Oj.mimic_JSON()` should be invoked after the
+json gem has been required.
+
+For more details and options, read on...
+
 # Oj JSON Gem Compatibility
 
 The `:compat` mode mimics the json gem. The json gem is built around the use

data/pages/Modes.md

@@ -39,7 +39,8 @@ if a non-native type is encountered instead of raising an Exception.
 The `:compat` mode mimics the json gem. The json gem is built around the use
 of the `to_json(*)` method defined for a class. Oj attempts to provide the
 same functionality by being a drop in replacement with a few
-exceptions. [{file:JsonGem.md}](JsonGem.md) includes more details on
+exceptions. To universally replace many `JSON` methods with their faster Oj counterparts,
+simply run `Oj.mimic_json`. [{file:JsonGem.md}](JsonGem.md) includes more details on
 compatibility and use.
 
 ## :rails Mode
@@ -108,11 +109,11 @@ information.
 | :float_precision       | Fixnum  |       x |       x |         |         |         |       x |         |
 | :hash_class            | Class   |         |         |       x |       x |         |       x |         |
 | :ignore                | Array   |         |         |         |         |       x |       x |         |
-| :indent                | Integer |       x |       x |       3 |       4 |       x |       x |       x |
+| :indent                | Integer |       x |       x |       4 |       4 |       x |       x |       x |
 | :indent_str            | String  |         |         |       x |       x |         |       x |         |
 | :integer_range         | Range   |       x |       x |       x |       x |       x |       x |       x |
 | :match_string          | Hash    |         |         |       x |       x |         |       x |         |
-| :max_nesting           | Fixnum  |       4 |       4 |       x |         |       5 |       4 |         |
+| :max_nesting           | Fixnum  |       5 |       5 |       x |         |       5 |       5 |         |
 | :mode                  | Symbol  |       - |       - |       - |       - |       - |       - |         |
 | :nan                   | Symbol  |         |         |         |         |         |       x |         |
 | :nilnil                | Boolean |         |         |         |         |         |       x |         |
@@ -140,6 +141,8 @@ information.
  3. By default the bigdecimal_as decimal is not set and the default encoding
     for Rails is as a string. Setting the value to true will encode a
     BigDecimal as a number which breaks compatibility.
+    Note: after version 3.11.3 both `Oj.generate` and `JSON.generate`
+    will not honour this option in Rails Mode, detais on https://github.com/ohler55/oj/pull/716.
 
  4. The integer indent value in the default options will be honored by since
     the json gem expects a String type the indent in calls to 'to_json()',

data/pages/Rails.md

@@ -1,3 +1,15 @@
+# Rails Quickstart
+
+To universally replace Rails' use of the json gem with Oj, and also
+have Oj "take over" many methods on the JSON constant (`load`, `parse`, etc.) with
+their faster Oj counterparts, add this to an initializer:
+
+```ruby
+Oj.optimize_rails()
+```
+
+For more details and options, read on...
+
 # Oj Rails Compatibility
 
 The `:rails` mode mimics the ActiveSupport version 5 encoder. Rails and

data/test/bar.rb

@@ -6,11 +6,4 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'oj'
 
-json = %|[{"x12345678901234567890": true}]|
-
-p = Oj::Parser.new(:usual)
-p.cache_keys = false
-p.symbol_keys = true
-x = p.parse(json)
-
-pp x
+Oj.load(%|{"time":"2021-08-16 12:12:15","a":"5","b":"5"|)

data/test/foo.rb

@@ -4,17 +4,74 @@ $: << '.'
 $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
-# require 'json'
-require 'oj'
-Oj.mimic_JSON
+require "oj"
+require "socket"
+require 'io/nonblock'
 
-source = %( {"a": 1, "b": 2} )
-puts "JSON.load, no symbolize => OK"
-pp JSON.load( source )
-puts "JSON.load, do symbolize => KO: keys are not symbols"
-#pp JSON.load( source, nil, symbolize_names: true, create_additions: false )
-pp JSON.load( source, nil, symbolize_names: true, create_additions: false )
-puts "JSON.parse, no symbolize => OK"
-pp JSON.parse( source )
-puts "JSON.parse, do symbolize => OK"
-pp JSON.parse( source, symbolize_names: true )
+#pid = spawn("nc -d 0.1 -l 5000", out: "/dev/null")
+pid = spawn("nc -i 1 -l 7777", out: "/dev/null")
+at_exit { Process.kill 9, pid }
+sleep 0.2
+s = Socket.tcp("localhost", 7777)
+s.nonblock = false
+1_000_000.times do |x|
+  Oj.to_stream(s, { x: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]})
+end
+
+=begin
+IO.pipe do |r, w|
+  if fork
+    r.close
+    #w.nonblock = false
+    1_000_000.times do |i|
+      begin
+	Oj.to_stream(w, { x: i})
+      rescue IOError => e
+	puts "*** #{i} raised #{e.class}: #{e}"
+	IO.select(nil, [w])
+	retry
+      end
+      w.puts
+    end
+  else
+    w.close
+    sleep(0.1)
+    r.each_line { |b|
+      #print b
+    }
+    r.close
+    Process.exit(0)
+  end
+end
+=end
+
+=begin
+IO.pipe do |r, w|
+  if fork
+    r.close
+    #w.nonblock = false
+    a = []
+    10_000.times do |i|
+      a << i
+    end
+    begin
+      Oj.to_stream(w, a, indent: 2)
+    rescue IOError => e
+      puts "*** raised #{e.class}: #{e}"
+      puts "*** fileno: #{w.fileno}"
+      puts "*** is an IO?: #{w.kind_of?(IO)}"
+      IO.select(nil, [w])
+      retry
+    end
+    w.puts
+  else
+    w.close
+    sleep(0.5)
+    r.each_line { |b|
+      #print b
+    }
+    r.close
+    Process.exit(0)
+  end
+end
+=end

data/test/perf_dump.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'oj'
+
+$verbose = false
+$indent = 2
+$iter = 100_000
+$size = 2
+
+opts = OptionParser.new
+opts.on("-v", "verbose")                                    { $verbose = true }
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
+opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
+  'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
+  'f' => nil,     # nil
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+Oj.default_options = { :indent => $indent, :mode => :strict }
+
+if 0 < $size
+  o = $obj
+  $obj = []
+  (4 * $size).times do
+    $obj << o
+  end
+end
+
+$json = Oj.dump($obj)
+GC.start
+start = Time.now
+$iter.times { Oj.dump($obj) }
+duration = Time.now - start
+puts "Dumped #{$json.length} byte JSON #{$iter} times in %0.3f seconds or %0.3f iteration/sec." % [duration, $iter / duration]

data/test/test_fast.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8
 # frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
@@ -395,6 +396,19 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_nested_each_child
+    h = {}
+    Oj::Doc.open('{"a":1,"c":[2],"d":3}') do |doc|
+      doc.each_child('/') do |child|
+        h[child.path] = child.fetch
+        child.each_child do |grandchild|
+          h[grandchild.path] = grandchild.fetch
+        end
+      end
+    end
+    assert_equal({"/a"=>1, "/c"=>[2], "/c/1"=>2, "/d"=>3}, h)
+  end
+
   def test_size
     Oj::Doc.open('[1,2,3]') do |doc|
       assert_equal(4, doc.size)
@@ -491,6 +505,11 @@ class DocTest < Minitest::Test
     assert_equal({'/a/x' => 2, '/b/y' => 4}, results)
   end
 
+  def test_doc_empty
+    result = Oj::Doc.open("") { |doc| doc.each_child {} }
+    assert_nil(result)
+  end
+
   def test_comment
     json = %{{
   "x"/*one*/:/*two*/true,//three

data/test/test_object.rb

@@ -221,6 +221,13 @@ class ObjectJuice < Minitest::Test
 
   def teardown
     Oj.default_options = @default_options
+#=begin
+    if '3.1.0' <= RUBY_VERSION && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
+      #Oj::debug_odd("teardown before GC.verify_compaction_references")
+      GC.verify_compaction_references(double_heap: true, toward: :empty)
+      #Oj::debug_odd("teardown after GC.verify_compaction_references")
+    end
+#=end
   end
 
   def test_nil
@@ -948,6 +955,11 @@ class ObjectJuice < Minitest::Test
 
   def test_odd_date
     dump_and_load(Date.new(2012, 6, 19), false)
+
+    Oj.register_odd(Date, Date, :jd, :jd)
+    json = Oj.dump(Date.new(2015, 3, 7), :mode => :object)
+    assert_equal(%|{"^O":"Date","jd":2457089}|, json)
+    dump_and_load(Date.new(2012, 6, 19), false)
   end
 
   def test_odd_datetime
@@ -972,13 +984,6 @@ class ObjectJuice < Minitest::Test
     dump_and_load(s, false)
   end
 
-  def test_odd_date_replaced
-    Oj.register_odd(Date, Date, :jd, :jd)
-    json = Oj.dump(Date.new(2015, 3, 7), :mode => :object)
-    assert_equal(%|{"^O":"Date","jd":2457089}|, json)
-    dump_and_load(Date.new(2012, 6, 19), false)
-  end
-
   def test_odd_raw
     Oj.register_odd_raw(Raw, Raw, :create, :to_json)
     json = Oj.dump(Raw.new(%|{"a":1}|), :mode => :object)

data/test/test_saj.rb

@@ -180,7 +180,7 @@ class SajTest < Minitest::Test
     assert_equal([:add_value, 12345, nil], handler.calls.first)
     type, message, line, column = handler.calls.last
     assert_equal([:error, 1, 6], [type, line, column])
-    assert_match(%r{invalid format, extra characters at line 1, column 6 \[(?:[a-z\.]+/)*saj\.c:\d+\]}, message)
+    assert_match(%r{invalid format, extra characters at line 1, column 6 \[(?:[A-Za-z]:\/)?(?:[a-z\.]+/)*saj\.c:\d+\]}, message)
   end
 
 end

data/test/test_various.rb

@@ -528,7 +528,7 @@ class Juice < Minitest::Test
     assert_equal(58, obj.y)
   end
 
-# Stream Deeply Nested
+  # Stream Deeply Nested
   def test_deep_nest_dump
     begin
       a = []
@@ -541,7 +541,7 @@ class Juice < Minitest::Test
     assert(false, "*** expected an exception")
   end
 
-# Stream IO
+  # Stream IO
   def test_io_string
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     output = StringIO.open("", "w+")
@@ -553,6 +553,9 @@ class Juice < Minitest::Test
   end
 
   def test_io_file
+    # Windows does not support fork
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, "w") { |f|
@@ -564,6 +567,28 @@ class Juice < Minitest::Test
     assert_equal(src, obj)
   end
 
+  def test_io_stream
+    IO.pipe do |r, w|
+      if fork
+	r.close
+	#w.nonblock = false
+	a = []
+	10_000.times do |i|
+	  a << i
+	end
+	Oj.to_stream(w, a, indent: 2)
+	w.close
+      else
+	w.close
+	sleep(0.1) # to force a busy
+	cnt = 0
+	r.each_line { cnt += 1 }
+	r.close
+	Process.exit(0)
+      end
+    end
+  end
+
 # comments
   def test_comment_slash
     json = %{{

data/test/tests.rb

@@ -18,7 +18,6 @@ require 'test_object'
 require 'test_saj'
 require 'test_scp'
 require 'test_strict'
-require 'test_various'
 require 'test_rails'
 require 'test_wab'
 require 'test_writer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.9
+  version: 3.13.12
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -117,6 +117,7 @@ files:
 - ext/oj/dump_object.c
 - ext/oj/dump_strict.c
 - ext/oj/encode.h
+- ext/oj/encoder.c
 - ext/oj/err.c
 - ext/oj/err.h
 - ext/oj/extconf.rb
@@ -227,6 +228,7 @@ files:
 - test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
+- test/perf_dump.rb
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
@@ -306,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
@@ -359,6 +361,7 @@ test_files:
 - test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
+- test/perf_dump.rb
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb