oj 3.6.6 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e115cf6ad860db71f8e6da0bfeffd4fe3a14fb57cf172c4e63a5ed763920d9
-  data.tar.gz: d410b8c08e883052ae23e82b58f491a814244c5da1285588de6cf0b565514deb
+  metadata.gz: 07f971139aede75d733d478ac64e4ecab5717b96df11fa251f64099ff070ad7d
+  data.tar.gz: 74c66fb18be035b5a6de58e2c7cef899eb85376d4b2f1be6b93dda18b458c791
 SHA512:
-  metadata.gz: 3e9ad858b8013d6b342d1e2e5288cba4cbb7d00f9229fd3dbcafc90a83396ea112014cbf9f6df5dc0f3c32bed6a36be99fc405a8f1ad527c18801d62657c3e43
-  data.tar.gz: e822f75524cf73cf586bc61a8519ecfc1ff0282e764673d4f38daac08dc30731a7ad3c9617445ad30379c0fadd1c7234899c4f7ae34e1c844dda15bbb8fc02de
+  metadata.gz: 5df299170f6aaa4dc85aa3b558a23d30603b3294960dc1fb23894cc9838d0a8d41cb54cc4b317e641047bb6671c712a6c0673fa05baf7e50c272a6e3cca5338a
+  data.tar.gz: 821d826ede14244308a4eff3b2e1ca9d968777ce14eae00649ac2ee51d039664b3ec26237a80bb1f2c9790cda9d2fade906ecfc60a92b7a4e5eb5b1bf2ce6dde

data/ext/oj/stream_writer.c

@@ -271,7 +271,7 @@ stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
 	oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
 	break;
     case 2:
-	if (Qnil == argv[0]) {
+	if (Qnil == argv[1]) {
 	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
 	} else {
 	    rb_check_type(argv[1], T_STRING);

data/lib/oj/version.rb

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

data/test/{crash.rb → big.rb}

@@ -1,22 +1,15 @@
-#!/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 'active_support'
+#require 'active_support/core_ext'
+#require 'active_support/json'
 require 'oj'
 
-Oj.optimize_rails
+#Oj.optimize_rails
+Oj.mimic_JSON
 
 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)
-  }
+#Oj.dump(h)
+puts JSON.pretty_generate(h)
+#puts JSON.fast_generate(h)
 #puts JSON.generate(h)
+

data/test/foo.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+$: << '.'
+$: << '../lib'
+$: << '../ext'
+
+require 'oj'
+
+Oj.default_options = {mode: :strict}
+json = Oj.dump({ aggregations: { hashtags: { buckets: Array.new(100) { { key: 'foo', count: 100 } } } } }, mode: :strict)
+
+def expect(a,b)
+  puts "*** #{a} != #{b}" unless a == b
+end
+
+def dig(obj, *path)
+  return obj if path.empty?
+  
+  if obj.is_a?(Array)
+    obj.each { |v|
+      r = dig(v, *path)
+      return r unless r.nil?
+    }
+  end
+  return nil unless obj.is_a?(Hash)
+  
+  dig(obj[path[0]], *path[1..-1])
+end
+
+1000.times do |i|
+  Oj::Doc.open(json) do |doc|
+    # this always passes
+    doc.each_child('/aggregations/hashtags/buckets') do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+
+    # load any other json using Oj.load
+    # this will pass
+    other = Oj.load(json)
+    dig(other, 'aggregations', 'hashtags', 'buckets').each do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+    GC.start
+    doc.each_child('/aggregations/hashtags/buckets') do |bucket|
+      # This is where it fails!!!! It will be some other object (even an rspec matcher in some cases)
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+
+    # this always passes if it gets this far
+    dig(other, 'aggregations', 'hashtags', 'buckets').each do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.6.7
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-26 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/Compatibility.md
+- pages/Options.md
 - pages/Custom.md
+- pages/Compatibility.md
+- pages/WAB.md
+- pages/Security.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
@@ -175,9 +175,9 @@ files:
 - 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/big.rb
 - test/files.rb
+- test/foo.rb
 - test/helper.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
@@ -270,85 +270,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 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/activerecord/result_test.rb
+- test/perf_file.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_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/json_gem/json_generator_test.rb
+- test/json_gem/json_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/json_fixtures_test.rb
+- test/tests_mimic_addition.rb
+- test/test_wab.rb
+- test/activesupport4/test_helper.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/activerecord/result_test.rb
+- test/_test_active.rb
+- test/test_file.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/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/perf_compat.rb
 - test/helper.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_after.rb
 - test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_as_json.rb
 - test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_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_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/perf.rb
-- test/perf_compat.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_before.rb
+- test/sample_json.rb
+- test/test_debian.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/perf_wab.rb
+- test/test_writer.rb
+- test/test_fast.rb
+- test/sample/line.rb
 - test/sample/change.rb
 - test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
+- test/sample/text.rb
 - test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.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/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/test_hash.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/sample/file.rb
+- test/files.rb
+- test/big.rb
+- test/perf_saj.rb
+- test/foo.rb
 - test/tests_mimic.rb
-- test/tests_mimic_addition.rb
+- test/perf_strict.rb
+- test/test_various.rb
+- test/_test_mimic_rails.rb
+- test/perf_simple.rb

data/test/bug.rb

@@ -1,25 +0,0 @@
-#!/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}"
-