oj 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4e0a767653f34a793b28037b299f5580e6b24cec56edbc7c01add6067a8a8f
-  data.tar.gz: ec009f0e9ce5bb255dd11325ccfbeef78d9cb35bb0e0bdba9cc718e3f511e85d
+  metadata.gz: 21e115cf6ad860db71f8e6da0bfeffd4fe3a14fb57cf172c4e63a5ed763920d9
+  data.tar.gz: d410b8c08e883052ae23e82b58f491a814244c5da1285588de6cf0b565514deb
 SHA512:
-  metadata.gz: c457ef279848a3ccaacb4c28e60f6433f5a5735fcec526d29cda2557ebef7edb112d0d9b548027832eff669ccf74a795d3fda77bc59d25babb9637f9f81bc433
-  data.tar.gz: 397a8d2c6666228766180aca8482c9f528fa31c240638708d68c92ccc1d96ac2f3d513ad4a0e838012c04ba536328063b7a7e00e63366fd1f86fc408d3af5f7e
+  metadata.gz: 3e9ad858b8013d6b342d1e2e5288cba4cbb7d00f9229fd3dbcafc90a83396ea112014cbf9f6df5dc0f3c32bed6a36be99fc405a8f1ad527c18801d62657c3e43
+  data.tar.gz: e822f75524cf73cf586bc61a8519ecfc1ff0282e764673d4f38daac08dc30731a7ad3c9617445ad30379c0fadd1c7234899c4f7ae34e1c844dda15bbb8fc02de

data/README.md

@@ -67,7 +67,7 @@ See [{file:CHANGELOG.md}](CHANGELOG.md)
 
 - *RubyGems* *repo*: https://rubygems.org/gems/oj
 
-Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Oj gem.
+Follow [@peterohler on Twitter](http://twitter.com/peterohler) for announcements and news about the Oj gem.
 
 #### Performance Comparisons
 

data/ext/oj/dump.c

@@ -347,13 +347,14 @@ oj_dump_time(VALUE obj, Out out, int withZone) {
     char	*dot;
     int		neg = 0;
     long	one = 1000000000;
-    time_t	sec;
+    long long	sec;
     long long	nsec;
 
 #if HAS_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
-	sec = ts.tv_sec;
+
+	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
     }
 #else

data/ext/oj/extconf.rb

@@ -20,7 +20,14 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => (!is_windows && 'ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
+  'HAS_RB_TIME_TIMESPEC' => (!is_windows &&
+			     !['arm-linux-gnueabi',
+			       'arm-linux-gnueabihf',
+			       'i386-linux-gnu',
+			       'mips-linux-gnu',
+			       'mipsel-linux-gnu'].include?(platform) &&
+			     'ruby' == type &&
+			     ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,

data/ext/oj/oj.c

@@ -1691,6 +1691,7 @@ Init_oj() {
     xss_safe_sym = ID2SYM(rb_intern("xss_safe"));		rb_gc_register_address(&xss_safe_sym);
 
     oj_slash_string = rb_str_new2("/");				rb_gc_register_address(&oj_slash_string);
+    OBJ_FREEZE(oj_slash_string);
 
     oj_default_options.mode = ObjectMode;
 

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '3.6.5'
+  VERSION = '3.6.6'
 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/{big.rb → crash.rb}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-16 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/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
@@ -175,9 +175,9 @@ 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/crash.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.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- 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/_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/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/activesupport4/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/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/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/isolated/shared.rb
-- test/isolated/test_mimic_before.rb
-- test/sample_json.rb
-- test/test_debian.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/perf_fast.rb
-- test/test_writer.rb
-- test/test_fast.rb
-- test/sample/line.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/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/file.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/line.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
 - test/sample/shape.rb
-- test/sample/file.rb
-- test/files.rb
-- test/big.rb
-- test/perf_saj.rb
-- test/foo.rb
-- test/tests_mimic.rb
-- test/perf_strict.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_mimic_rails.rb
-- test/perf_simple.rb
+- test/test_wab.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb

data/test/foo.rb

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