oj 3.7.9 → 3.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73661a33c10dd2efe5e942e8eb7b584a065803d5ab0516c7362210e0b7f6ce29
-  data.tar.gz: 6091f05664c4f290858f86efb405b1e17732b1eecb7ccb1829c1d2944a6a5a8c
+  metadata.gz: 19c25560b508ae039d9d517cb5eacb44b658e1359e11e95317b51ff94581ea6d
+  data.tar.gz: 2ea2c2a50e8cf6d14a7c19427def90fefc460fbb626226c6299a91c8890fbeaf
 SHA512:
-  metadata.gz: 3a54eb58d01658e36c63f29128c47e026ce05687261465793f4328146807d5b32a4af6c8286f3f4dbe176e1bd1613214ea6e260051ee0477abd1e7ab27173fa7
-  data.tar.gz: b90c7c8e526636640b5b346fad295fe4b0a7c97671e7acafd5e55ee71b9e6f0727c0dae9eeec58dc1b8729040f91ea14717e6cadb13bce65bf7f428bbfe6cb6e
+  metadata.gz: 91ee09165357ad4955030f2d395f61578375c70672245483831d1c291fe76b50c1166c4d6d75435d4961a6aac394d03069320cb8e15e6b352cf6c634d5ab0b5d
+  data.tar.gz: ea098163b5b4297777de3dcdfc1468673114ba264fd7f2733620ffe14d3ef784384ac0b8fa8c0482f5303b5c4f47164943462266af91d1662ed4eeee5d893656

data/ext/oj/util.c

@@ -74,7 +74,7 @@ sec_as_time(int64_t secs, TimeInfo ti) {
 	    y = secs / SECS_PER_YEAR;
 	    secs = secs - y * SECS_PER_YEAR;
 	    y++;
-	    leap = true;
+	    leap = false;
 	}
     } else if (secs < SECS_PER_LEAP_CENT) { // first century in 400 years is a leap century (one extra day)
 	qy = secs / SECS_PER_QUAD_YEAR;

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'rails'
+require 'active_support'
+require 'active_support/json'
+require 'oj'
+
+x = {"a": BigDecimal("1.1"), "t": Time.now}
+
+#ActiveSupport.encode_big_decimal_as_string = false
+
+Oj.optimize_rails
+
+puts "to_json #{x.to_json}"
+
+Oj.default_options = { bigdecimal_as_decimal: true}
+#puts Oj.default_options
+
+puts "to_json #{x.to_json}"
+

data/test/crash.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+#$VERBOSE = true
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_support/json'
+require 'oj'
+
+Oj.optimize_rails
+
+h = {:type=>:record, :name=>:group, :namespace=>"com.salsify.identity", :fields=>[{:name=>"id", :type=>{:name=>:salsify_uuid, :type=>:fixed, :namespace=>"com.salsify", :size=>38}}, {:name=>"type", :type=>"string", :default=>"groups"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"name", :type=>"string"}, {:name=>"policy", :type=>[:null, {:type=>:record, :name=>:policy, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"policies"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"name", :type=>"string"}, {:name=>"statements", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:statement, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"statements"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"action", :type=>{:name=>"__statement_action_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:manage, :read]}}, {:name=>"resource", :type=>{:name=>"__statement_resource_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:product, :digital_asset]}}, {:name=>"conditions", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:condition, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"conditions"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"operator", :type=>{:name=>"__condition_operator_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:equals]}}, {:name=>"attribute_type", :type=>{:name=>"__condition_attribute_type_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:resource]}}, {:name=>"value", :type=>"string"}, {:name=>"attribute", :type=>[:null, {:type=>:record, :name=>:reference, :namespace=>"com.salsify", :fields=>[{:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :doc=>"snake_case, plural name for the resource type"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}]}], :default=>nil}, {:name=>"broken", :type=>[:null, "boolean"], :default=>nil}]}}}]}}}]}], :default=>nil}]}
+
+100000.times {
+   JSON.pretty_generate(h)
+  }
+#puts JSON.generate(h)

data/test/test_various.rb

@@ -420,6 +420,14 @@ class Juice < Minitest::Test
     assert_equal('-2208987661.000000000', json)
   end
 
+  def test_time_years
+    (-2020..2020).each { |year|
+      s = "%04d-03-01T15:14:13Z" % [year]
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema)
+      assert_equal(s, json[1..-2])
+    }
+  end
+
   # Class
   def test_class_null
     json = Oj.dump(Juice, :mode => :null)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.9
+  version: 3.7.10
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-03-14 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/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
 - LICENSE
 - README.md
@@ -177,9 +177,9 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bar.rb
+- test/bug.rb
+- test/crash.rb
 - test/files.rb
-- test/foo.rb
 - test/helper.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
@@ -243,7 +243,6 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
-- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -278,82 +277,81 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/foo.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activerecord/result_test.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/bug.rb
+- test/crash.rb
+- test/files.rb
 - test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.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_redefine.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
 - test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_fixtures_test.rb
 - test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
 - test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
+- test/perf_saj.rb
 - test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/perf_wab.rb
 - test/sample/change.rb
-- test/sample/text.rb
+- test/sample/dir.rb
 - test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
 - test/sample/file.rb
-- test/sample/rect.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
+- test/sample/layer.rb
 - test/sample/line.rb
-- test/sample/dir.rb
 - test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/zoo.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- test/tests_mimic_addition.rb
-- test/test_writer.rb
-- test/perf.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
+- test/sample.rb
+- test/sample_json.rb
+- test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
+- test/test_fast.rb
+- test/test_file.rb
 - test/test_gc.rb
-- test/files.rb
+- test/test_hash.rb
+- test/test_integer_range.rb
+- test/test_null.rb
+- test/test_object.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
 - test/test_various.rb
+- test/test_wab.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb

data/test/bar.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << 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 'oj'
-
-#Oj.load_file(ARGV[0], mode: :strict) { |obj|
-#  puts Oj.dump(obj, indent: 2)
-#}
-
-data = open('invalid_unicode.data').read
-
-puts data
-
-puts Oj.dump(data)
-
-Oj.mimic_JSON
-puts Oj.dump(data, escape_mode: :json)
-
-puts Oj.default_options

data/test/foo.rb

@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << 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 'oj'
-require 'tracer'
-
-#Tracer.on
-
-class MyParser
-  attr_accessor :enum
-
-  def initialize
-    @io = StringIO.new
-    @writer = Oj::StreamWriter.new(@io)
-
-    json_string = Oj.dump({ records: 1.upto(2).map{|i| { id: i, name: "record_#{i}" }} }, mode: :strict)
-    @test_json = StringIO.new(json_string)
-
-    @enum = Enumerator.new do |yielder|
-      @yielder = yielder
-      Oj.sc_parse(self, @test_json)
-    end
-  end
-
-  # Stream parsing methods
-  def hash_start
-    @writer.push_object
-  end
-
-  def hash_end
-    @writer.pop unless @io.eof
-  end
-
-  def hash_key(key)
-    @writer.push_key(key)
-  end
-
-  def hash_set(h, key, value)
-    @writer.push_value(value)
-  end
-
-  def array_start
-    @writer.push_array
-  end
-
-  def array_end
-    @writer.pop
-  end
-
-  def array_append(a, value)
-    yield_data
-  end
-
-  def add_value(value);end
-
-  def yield_data
-    @writer.pop_all
-    @yielder << @io.string
-    @io.reopen("")
-    array_start
-  end
-end
-
-#puts MyParser.new.enum.to_a
-
-puts "------------"
-
-MyError = Class.new(StandardError)
-
-MyParser.new.enum.each.with_index do |r, i|
-  puts "========="
-  raise MyError.new('hello')
-  #raise StopIteration if i == 0
-  #break if i >= 4
-end
-
-#{"records":[{"id":1,"name":"record_1"},{"id":2,"name":"record_2"},{"id":3,"name":"record_3"},{"id":4,"name":"record_4"},{"id":5,"name":"record_5"},{"id":6,"name":"record_6"},{"id":7,"name":"record_7"},{"id":8,"name":"record_8"},{"id":9,"name":"record_9"},{"id":10,"name":"record_10"},{"id":11,"name":"record_11"},{"id":12,"name":"record_12"},{"id":13,"name":"record_13"},{"id":14,"name":"record_14"},{"id":15,"name":"record_15"},{"id":16,"name":"record_16"},{"id":17,"name":"record_17"},{"id":18,"name":"record_18"},{"id":19,"name":"record_19"},{"id":20,"name":"record_20"},{"id":21,"name":"record_21"},{"id":22,"name":"record_22"},{"id":23,"name":"record_23"},{"id":24,"name":"record_24"},{"id":25,"name":"record_25"}]}

data/test/zoo.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-#require 'json'
-
-$: << File.dirname(__FILE__)
-require 'helper'
-require 'oj'
-
-Oj.mimic_JSON
-puts "\u3074"
-
-puts JSON.dump(["\u3074"])
-puts JSON.generate(["\u3074"])