oj 3.7.5 → 3.7.6

data/test/rails_datetime_test.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'sqlite3'
+require "rails/all"
+require "active_model"
+
+date = DateTime.now
+
+puts date.to_json
+
+require "oj"
+
+puts "OJ.dump(DateTime.now)"
+puts
+puts Oj.dump(DateTime.now)
+puts
+

data/test/russian.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+s = %|{"response":[{"id":7250,"from_id":1382722,"owner_id":1382722,"date":1415964230,"post_type":"post","text":"Сдается комната в 2-х комнатной квартире с декабря месяца в Люберцах. (р-он Красная Горка)\nСдается желательно семейной паре (можно рассмотреть и другие варианты). \nв комнате одна большая . Стол, Шкаф, комод.\nДля проживания все есть. в Соседней комнате проживают два парня (из Чувашии)\nДо города можно доехать на маршрутке (20 мин.) на против дома остановка, на электричке (до электрички 15-20 мин. пешком) или на автобусе\nЦена 15 тыс. за комнату + коммунальные услуги\nЗвоните 8\/903\/012-34-25 венера","comments":{"count":0},"likes":{"count":1},"reposts":{"count":0}}]}|
+
+r = Oj.load(s)
+
+text = r["response"][0]["text"]
+puts "#{text}"
+puts "#{text.encoding}"

data/test/struct.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# 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
+
+$VERBOSE = true
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+A = Struct.new(:a,:b,:c,:d)
+B = Struct.new(:e,:f)
+
+obj = [A.new(55, B.new(1, 'X'), B.new(2, 'Y'), 3)]
+
+s = Oj.dump(obj, :mode => :object)
+
+100000.times do
+  Oj.load(s, :mode => :object)
+  # ds = Oj.dump(o, :mode => :object)
+  # if ds != s
+  #   puts ds
+  #   raise "holy crap"
+  # end
+end

data/test/test_serializer.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+Oj.mimic_JSON
+
+require 'rails/all'
+require 'active_model'
+require 'active_model_serializers'
+require 'active_support/json'
+
+#Oj.mimic_JSON
+
+class Category
+  include ActiveModel::Model
+  include ActiveModel::SerializerSupport
+
+  attr_accessor :id, :name
+
+  def initialize(id, name)
+    @id   = id
+    @name = name
+  end
+end
+
+class CategorySerializer < ActiveModel::Serializer
+  attributes :id, :name
+end
+
+class MimicRails < Minitest::Test
+
+  def test_dump_object
+    Oj.default_options= {:indent => 0}
+    category = Category.new(1, 'test')
+    serializer = CategorySerializer.new(category)
+
+    json = serializer.to_json()
+    puts "*** serializer.to_json() #{serializer.to_json()}"
+    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
+
+    json = serializer.as_json()
+    puts "*** serializer.as_json() #{serializer.as_json()}"
+    assert_equal({"category" => {:id => 1, :name => "test"}}, json)
+
+    json = JSON.dump(serializer)
+    puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
+    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
+  end
+
+end # MimicRails

data/test/write_timebars.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'stringio'
+require 'oj'
+
+
+filename = File.join(File.dirname(__FILE__), 'day.json')
+File.open(filename, "w") do |f|
+  w = Oj::StreamWriter.new(f, :indent => -1)
+  390.times do |i|
+    w.push_object()
+    w.push_value(12, 'msgType')
+    w.push_value(1, 'version')
+    w.push_value(1_400_074_200 + i * 60, 'bar')
+    w.push_value('TBC', 'source')
+    w.push_array('timebars')
+    w.push_object()
+    w.push_value('aapl_24', 'asset')
+    w.push_value(91.87, 'close')
+    w.pop()
+    w.pop()
+    w.pop()
+  end
+  f.write("\n")
+end
+

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: 3.7.5
+  version: 3.7.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Modes.md
-- pages/Advanced.md
-- pages/Options.md
 - pages/Custom.md
-- pages/Compatibility.md
 - pages/WAB.md
-- pages/Security.md
+- pages/Advanced.md
+- pages/Rails.md
 - pages/Encoding.md
+- pages/Security.md
+- pages/Options.md
+- pages/Compatibility.md
+- pages/Modes.md
 - pages/JsonGem.md
-- pages/Rails.md
 files:
 - LICENSE
 - README.md
@@ -175,10 +175,17 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/big.rb
+- test/bug.rb
+- test/bug2.rb
+- test/bug3.rb
+- test/bug_fast.rb
+- test/bug_load.rb
+- test/crash.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
@@ -187,6 +194,7 @@ files:
 - 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/json_gem/json_addition_test.rb
 - test/json_gem/json_common_interface_test.rb
@@ -199,6 +207,8 @@ files:
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
 - test/mem.rb
+- test/mod.rb
+- test/omit.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -209,6 +219,9 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/rails.rb
+- test/rails_datetime_test.rb
+- test/russian.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -223,6 +236,7 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
+- test/struct.rb
 - test/test_compat.rb
 - test/test_custom.rb
 - test/test_debian.rb
@@ -235,6 +249,7 @@ files:
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
+- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_wab.rb
@@ -242,6 +257,8 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/write_timebars.rb
+- test/x_test.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -277,82 +294,99 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/perf_file.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport4/decoding_test.rb
+- test/perf_object.rb
 - test/test_hash.rb
-- test/perf.rb
-- test/test_object.rb
-- test/test_null.rb
-- test/test_compat.rb
 - test/test_custom.rb
-- test/perf_scp.rb
-- test/test_integer_range.rb
-- test/test_gc.rb
-- test/sample.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/test_helper.rb
+- test/bug3.rb
 - test/json_gem/json_generator_test.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_parser_test.rb
+- test/json_gem/json_ext_parser_test.rb
 - test/json_gem/json_encoding_test.rb
 - test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/test_helper.rb
+- test/json_gem/json_string_matching_test.rb
 - test/json_gem/json_fixtures_test.rb
+- test/write_timebars.rb
+- test/test_writer.rb
+- test/russian.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/dir.rb
+- test/sample/shape.rb
+- test/sample/change.rb
+- test/activerecord/result_test.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/tests_mimic_addition.rb
+- test/test_saj.rb
+- test/test_strict.rb
+- test/perf_saj.rb
+- test/perf_simple.rb
+- test/perf_fast.rb
 - test/test_wab.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activerecord/result_test.rb
-- test/_test_active.rb
-- test/test_file.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
 - test/tests.rb
-- test/_test_active_mimic.rb
-- test/perf_object.rb
-- test/test_strict.rb
-- test/test_scp.rb
-- test/perf_wab.rb
-- test/test_saj.rb
-- test/mem.rb
+- test/example.rb
+- test/_test_active.rb
 - test/perf_compat.rb
-- test/helper.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_define.rb
+- test/test_various.rb
+- test/test_null.rb
+- test/test_integer_range.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_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_as_json.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/perf_wab.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/decoding_test.rb
+- test/bug.rb
+- test/mem.rb
 - test/sample_json.rb
 - test/test_debian.rb
-- test/perf_fast.rb
-- test/test_writer.rb
 - test/test_fast.rb
-- test/sample/line.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/text.rb
-- test/sample/layer.rb
-- test/sample/rect.rb
-- test/sample/group.rb
-- test/sample/oval.rb
-- test/sample/doc.rb
-- test/sample/hasprops.rb
-- test/sample/shape.rb
-- test/sample/file.rb
-- test/files.rb
-- test/big.rb
-- test/perf_saj.rb
-- test/foo.rb
+- test/rails.rb
+- test/perf_file.rb
+- test/test_compat.rb
+- test/helper.rb
 - test/tests_mimic.rb
+- test/perf.rb
+- test/bug_fast.rb
 - test/perf_strict.rb
-- test/test_various.rb
-- test/_test_mimic_rails.rb
-- test/perf_simple.rb