oj 2.18.3 → 2.18.4

data/test/test_various.rb

@@ -6,6 +6,12 @@ $: << File.dirname(__FILE__)
 require 'helper'
 
 class Juice < Minitest::Test
+  def gen_whitespaced_string(length = Random.new.rand(100))
+    whitespace_chars = [" ", "\t", "\f", "\n", "\r"]
+    result = ""
+    length.times { result << whitespace_chars.sample }
+    result
+  end
 
   module TestModule
   end
@@ -128,6 +134,7 @@ class Juice < Minitest::Test
       :use_to_json=>false,
       :use_as_json=>false,
       :nilnil=>true,
+      :empty_string=>true,
       :allow_gc=>false,
       :quirks_mode=>false,
       :allow_invalid_unicode=>true,
@@ -1299,6 +1306,21 @@ class Juice < Minitest::Test
     assert_equal(nil, obj)
   end
 
+  def test_empty_string_true
+    10.times do
+      result = Oj.load(gen_whitespaced_string, :empty_string => true)
+      assert_nil(result)
+    end
+  end
+
+  def test_empty_string_false
+    10.times do
+      assert_raises(Oj::ParseError) do
+        Oj.load(gen_whitespaced_string, :empty_string => false)
+      end
+    end
+  end
+
   def test_quirks_null_mode
     assert_raises(Oj::ParseError) { Oj.load("null", :quirks_mode => false) }
     assert_equal(nil, Oj.load("null", :quirks_mode => true))

data/test/test_writer.rb

@@ -44,6 +44,14 @@ class OjWriter < Minitest::Test
     assert_equal("{}\n", w.to_s)
   end
 
+  def test_string_writer_push_null_value_with_key
+    w = Oj::StringWriter.new(:indent => 0, :mode => :compat)
+    w.push_object()
+    w.push_value(nil, 'nothing')
+    w.pop()
+    assert_equal(%|{"nothing":null}\n|, w.to_s)
+  end
+
   def test_string_writer_nested_object
     w = Oj::StringWriter.new(:indent => 0)
     w.push_object()
@@ -289,4 +297,12 @@ class OjWriter < Minitest::Test
     assert_equal(%|{"a1":{},"a2":{"b":{}},"a3":{"a4":37}}\n|, output.string())
   end
 
+  def test_stream_writer_push_null_value_with_key
+    output = StringIO.open("", "w+")
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    w.push_object()
+    w.push_value(nil, 'nothing')
+    w.pop()
+    assert_equal(%|{"nothing":null}\n|, output.string())
+  end
 end # OjWriter

data/test/x_test.rb

@@ -0,0 +1,185 @@
+
+$: << File.expand_path("../../oj/ext", __FILE__)
+$: << File.expand_path("../../oj/lib", __FILE__)
+
+require 'rubygems'
+require 'sqlite3'
+require 'terminal-table'
+require 'oj'
+require 'rails/all'
+require 'benchmark'
+begin
+  require 'benchmark/memory'
+rescue LoadError => e
+end
+
+OJ_1 = { mode: :object, use_as_json: false, float_precision: 16, bigdecimal_as_decimal: false, nan: :null }
+OJ_2 = { mode: :compat, use_as_json: false, float_precision: 16, bigdecimal_as_decimal: false, nan: :null, time_format: :xmlschema, second_precision: 3 }
+OJ_3 = { mode: :compat, use_as_json: true,  float_precision: 16, bigdecimal_as_decimal: false, nan: :null, time_format: :xmlschema, second_precision: 3 }
+
+# test data
+class Colors
+  include Enumerable
+  def each
+    yield 'red'
+    yield 'green'
+    yield 'blue'
+  end
+end
+
+Struct.new('Customer', :name, :address)
+
+fork { exit 99 }
+Process.wait
+
+ActiveRecord::Base.logger = Logger.new(STDERR)
+ActiveRecord::Base.logger.level = 1
+
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database:':memory:'
+)
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Schema.define do
+  create_table :users do |table|
+    table.column :name, :string
+  end
+end
+
+class User < ActiveRecord::Base
+  validates :name, presence: true
+end
+
+user = User.new
+user.valid?
+
+TEST_DATA = {
+  Regexp: /test/,
+  FalseClass: false,
+  NilClass: nil,
+  Object: Object.new,
+  TrueClass: true,
+  String: 'abc',
+  StringChinese: '二胡',
+  Numeric: 1,
+  Symbol: :sym,
+  Time: Time.new,
+  Array: [],
+  Hash: {},
+  HashNotEmpty: {a: 1},
+  Date: Date.new,
+  DateTime: DateTime.new,
+  Enumerable: Colors.new,
+  BigDecimal: '1'.to_d/3,
+  BigDecimalInfinity: '0.5'.to_d/0,
+  Struct: Struct::Customer.new('Dave', '123 Main'),
+  Float: 1.0/3,
+  FloatInfinity: 0.5/0,
+  Range: (1..10),
+  'Process::Status': $?,
+  'ActiveSupport::TimeWithZone': Time.utc(2005,2,1,15,15,10).in_time_zone('Hawaii'),
+  'ActiveModel::Errors': user.errors,
+  'ActiveSupport::Duration': 1.month.ago,
+  'ActiveSupport::Multibyte::Chars': 'über'.mb_chars,
+  'ActiveRecord::Relation': User.where(name: 'aaa'),
+
+  # 'ActionDispatch::Journey::GTG::TransitionTable': TODO,
+}
+
+# helper
+def compare(expected, result) 
+  if result.is_a? Exception
+    '💀'
+  else
+    if expected != result
+      puts "*** expected: #{expected}"
+      puts "***   actual: #{result}"
+    end
+    expected == result ? '👌' : '❌'
+  end
+end
+
+# def compare(expected, result) 
+#   if result.is_a? Exception
+#     'Error'
+#   else
+#     expected == result ? 'Ok' : 'Fail'
+#   end
+# end
+
+# actual tests
+test_result = TEST_DATA.map do |key, val|
+  to_json_result = val.to_json
+  
+  json_generate_result = begin 
+    JSON.generate(val)
+  rescue JSON::GeneratorError => e
+    e
+  end
+
+  Oj.default_options = OJ_1
+  oj_dump_result_1 = begin
+    if key == :DateTime
+      Exception.new('Unknown error')
+    else
+      Oj.dump(val)
+    end
+  rescue NoMemoryError => e
+    e
+  end
+
+  Oj.default_options = OJ_2
+  oj_dump_result_2 = begin
+    Oj.dump(val)
+  rescue NoMemoryError => e
+    e
+  end
+
+  Oj.default_options = OJ_3
+  oj_dump_result_3 = begin
+    Oj.dump(val)
+  rescue NoMemoryError => e
+    e
+  end
+
+  [key, {
+     to_json_result: to_json_result,
+     #json_generate: compare(to_json_result, json_generate_result),
+     #oj_dump_1: compare(to_json_result, oj_dump_result_1),
+     oj_dump_2: compare(to_json_result, oj_dump_result_2),
+     #oj_dump_3: compare(to_json_result, oj_dump_result_3),
+   }]
+end.to_h
+
+# format output
+rows = test_result.map do |key, val|
+  [key, val[:json_generate], val[:oj_dump_1], val[:oj_dump_2], val[:oj_dump_3]]
+end
+
+puts "\nComparing Rails to_json with other JSON implementations\n"
+puts Terminal::Table.new headings: ['class', 'JSON.generate', 'Oj.dump (object)', 'Oj.dump (compat)', 'Oj.dump (compat, as_json)'], rows: rows
+
+Oj.default_options = OJ_3
+
+obj = TEST_DATA
+
+puts "\n"
+
+=begin
+if Benchmark.respond_to?(:memory)
+  Benchmark.memory do |x|
+    x.report('to_json:'){ 10_000.times { obj.to_json } }
+    x.report('Oj:') { 10_000.times { Oj.dump(obj) } }
+    x.compare!
+  end
+  puts "---------------------------------------------\n\n"
+end
+
+Benchmark.benchmark(Benchmark::CAPTION, 14, Benchmark::FORMAT) do |x|
+  x.report('to_json:'){ 10_000.times { obj.to_json } }
+  x.report('Oj:') { 10_000.times { Oj.dump(obj) } }
+end
+=end
+puts "\n"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.18.3
+  version: 2.18.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
@@ -69,6 +69,7 @@ files:
 - ext/oj/circarray.h
 - ext/oj/compat.c
 - ext/oj/dump.c
+- ext/oj/dump_custom.c
 - ext/oj/encode.h
 - ext/oj/err.c
 - ext/oj/err.h
@@ -113,10 +114,6 @@ files:
 - test/bug_fast.rb
 - test/bug_load.rb
 - test/crash.rb
-- test/curl/curl_oj.rb
-- test/curl/get_oj.rb
-- test/curl/just_curl.rb
-- test/curl/just_oj.rb
 - test/example.rb
 - test/files.rb
 - test/foo.rb
@@ -132,7 +129,9 @@ files:
 - test/isolated/test_mimic_rails_before.rb
 - test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
+- test/mem.rb
 - test/mod.rb
+- test/omit.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -143,6 +142,7 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/rails.rb
+- test/rails_datetime_test.rb
 - test/russian.rb
 - test/sample.rb
 - test/sample/change.rb
@@ -160,6 +160,7 @@ files:
 - test/sample_json.rb
 - test/struct.rb
 - test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
 - test/test_fast.rb
 - test/test_file.rb
@@ -173,6 +174,7 @@ files:
 - test/test_various.rb
 - test/test_writer.rb
 - test/write_timebars.rb
+- test/x_test.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -200,73 +202,74 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activesupport_datetime_test.rb
-- test/bug.rb
-- test/bug2.rb
-- test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
-- test/crash.rb
-- test/curl/curl_oj.rb
-- test/curl/get_oj.rb
-- test/curl/just_curl.rb
-- test/curl/just_oj.rb
-- test/example.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
-- test/io.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
-- test/isolated/test_mimic_redefine.rb
-- test/mod.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.rb
 - test/perf_object.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/rails.rb
+- test/test_hash.rb
+- test/test_custom.rb
+- test/bug3.rb
+- test/write_timebars.rb
+- test/test_writer.rb
 - test/russian.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
+- test/rails_datetime_test.rb
+- test/omit.rb
+- test/test_gc.rb
+- test/_test_active_mimic.rb
+- test/test_serializer.rb
 - test/sample/file.rb
 - test/sample/group.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
 - test/sample/hasprops.rb
 - test/sample/layer.rb
+- test/sample/text.rb
+- test/sample/doc.rb
 - test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
+- test/sample/dir.rb
 - test/sample/shape.rb
-- test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/struct.rb
-- test/test_compat.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_hash.rb
+- test/sample/change.rb
+- test/crash.rb
+- test/io.rb
 - test/test_object.rb
+- test/struct.rb
+- test/mod.rb
+- test/sample.rb
+- test/perf_scp.rb
+- test/bug2.rb
 - test/test_saj.rb
-- test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
+- test/perf_saj.rb
+- test/perf_simple.rb
+- test/perf_fast.rb
+- test/example.rb
+- test/_test_active.rb
+- test/perf_compat.rb
 - test/test_various.rb
-- test/test_writer.rb
-- test/write_timebars.rb
+- test/activesupport_datetime_test.rb
+- test/test_scp.rb
+- test/bug_load.rb
+- test/files.rb
+- test/x_test.rb
+- test/foo.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_redefine.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_define.rb
+- test/_test_mimic_rails.rb
+- test/test_file.rb
+- test/bug.rb
+- test/mem.rb
+- test/sample_json.rb
+- test/test_debian.rb
+- test/test_fast.rb
+- test/rails.rb
+- test/perf_file.rb
+- test/test_compat.rb
+- test/helper.rb
+- test/perf.rb
+- test/bug_fast.rb
+- test/perf_strict.rb