oj 3.13.5 → 3.13.9

data/ext/oj/usual.c

@@ -39,7 +39,7 @@ typedef struct _col {
 typedef union _key {
     struct {
         int16_t len;
-        char    buf[22];
+        char    buf[30];
     };
     struct {
         int16_t xlen;  // should be the same as len
@@ -209,21 +209,21 @@ static void push(ojParser p, VALUE v) {
 static VALUE cache_key(ojParser p, Key kp) {
     Delegate d = (Delegate)p->ctx;
 
-    if ((size_t)kp->len < sizeof(kp->buf) - 1) {
+    if ((size_t)kp->len < sizeof(kp->buf)) {
         return cache_intern(d->key_cache, kp->buf, kp->len);
     }
     return cache_intern(d->key_cache, kp->key, kp->len);
 }
 
 static VALUE str_key(ojParser p, Key kp) {
-    if ((size_t)kp->len < sizeof(kp->buf) - 1) {
+    if ((size_t)kp->len < sizeof(kp->buf)) {
         return rb_str_freeze(rb_utf8_str_new(kp->buf, kp->len));
     }
     return rb_str_freeze(rb_utf8_str_new(kp->key, kp->len));
 }
 
 static VALUE sym_key(ojParser p, Key kp) {
-    if ((size_t)kp->len < sizeof(kp->buf) - 1) {
+    if ((size_t)kp->len < sizeof(kp->buf)) {
         return rb_str_freeze(rb_str_intern(rb_utf8_str_new(kp->buf, kp->len)));
     }
     return rb_str_freeze(rb_str_intern(rb_utf8_str_new(kp->key, kp->len)));
@@ -232,7 +232,7 @@ static VALUE sym_key(ojParser p, Key kp) {
 static ID get_attr_id(ojParser p, Key kp) {
     Delegate d = (Delegate)p->ctx;
 
-    if ((size_t)kp->len < sizeof(kp->buf) - 1) {
+    if ((size_t)kp->len < sizeof(kp->buf)) {
         return (ID)cache_intern(d->attr_cache, kp->buf, kp->len);
     }
     return (ID)cache_intern(d->attr_cache, kp->key, kp->len);
@@ -253,7 +253,7 @@ static void push_key(ojParser p) {
         d->kend  = d->khead + cap;
     }
     d->ktail->len = klen;
-    if (klen <= sizeof(d->ktail->buf) + 1) {
+    if (klen < sizeof(d->ktail->buf)) {
         memcpy(d->ktail->buf, key, klen);
         d->ktail->buf[klen] = '\0';
     } else {
@@ -336,7 +336,7 @@ static void close_object(ojParser p) {
 #if HAVE_RB_HASH_BULK_INSERT
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         *vp = d->get_key(p, kp);
-        if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+        if (sizeof(kp->buf) <= (size_t)kp->len) {
             xfree(kp->key);
         }
     }
@@ -344,7 +344,7 @@ static void close_object(ojParser p) {
 #else
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
-        if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+        if (sizeof(kp->buf) <= (size_t)kp->len) {
             xfree(kp->key);
         }
     }
@@ -368,7 +368,7 @@ static void close_object_class(ojParser p) {
 
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
-        if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+        if (sizeof(kp->buf) <= (size_t)kp->len) {
             xfree(kp->key);
         }
     }
@@ -396,7 +396,7 @@ static void close_object_create(ojParser p) {
 #if HAVE_RB_HASH_BULK_INSERT
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -404,7 +404,7 @@ static void close_object_create(ojParser p) {
 #else
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -413,7 +413,7 @@ static void close_object_create(ojParser p) {
             obj = rb_class_new_instance(0, NULL, d->hash_class);
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -428,7 +428,7 @@ static void close_object_create(ojParser p) {
 #if HAVE_RB_HASH_BULK_INSERT
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -436,7 +436,7 @@ static void close_object_create(ojParser p) {
 #else
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(arg, d->get_key(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -446,7 +446,7 @@ static void close_object_create(ojParser p) {
             obj = rb_class_new_instance(0, NULL, clas);
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_ivar_set(obj, get_attr_id(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
+                if (sizeof(kp->buf) <= (size_t)kp->len) {
                     xfree(kp->key);
                 }
             }
@@ -537,7 +537,7 @@ static void add_float_key(ojParser p) {
 static void add_float_as_big(ojParser p) {
     char buf[64];
 
-    // fails on ubuntu
+    // snprintf fails on ubuntu and macOS for long double
     // snprintf(buf, sizeof(buf), "%Lg", p->num.dub);
     sprintf(buf, "%Lg", p->num.dub);
     push(p, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(buf)));
@@ -546,7 +546,9 @@ static void add_float_as_big(ojParser p) {
 static void add_float_as_big_key(ojParser p) {
     char buf[64];
 
-    snprintf(buf, sizeof(buf), "%Lg", p->num.dub);
+    // snprintf fails on ubuntu and macOS for long double
+    // snprintf(buf, sizeof(buf), "%Lg", p->num.dub);
+    sprintf(buf, "%Lg", p->num.dub);
     push_key(p);
     push2(p, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(buf)));
 }

data/lib/oj/version.rb

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

data/test/bar.rb

@@ -1,35 +1,16 @@
 #!/usr/bin/env ruby
 
-$: << 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 'active_support'
-require "active_support/json"
-
-$s = "\u2014 & \n \u{1F618}"
-
-=begin
-def check(label)
-  puts "\n--- #{label} --------------------"
-
-  ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
-  puts "with standard_json == true: t.to_json - #{$t.to_json}"
-  ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
-  puts "with standard_json == false: t.to_json - #{$t.to_json}"
-end
-
-check('Before Oj')
-=end
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'oj'
 
-ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false
-puts "ActiveSupport.encode(s) - #{ActiveSupport::JSON.encode($s)}"
+json = %|[{"x12345678901234567890": true}]|
 
-Oj.optimize_rails
-Oj.default_options = { mode: :rails }
+p = Oj::Parser.new(:usual)
+p.cache_keys = false
+p.symbol_keys = true
+x = p.parse(json)
 
-puts "Oj.dump(s) - #{Oj.dump($s)}"
+pp x

data/test/bug.rb

@@ -0,0 +1,16 @@
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+
+#require 'bundler/setup'
+require 'oj'
+require 'active_support'
+require 'active_support/time_with_zone'
+require 'tzinfo'
+
+puts ActiveSupport::TimeWithZone
+
+json = File.read('./bug.json')
+
+Oj.load(json)

data/test/foo.rb

@@ -1,13 +1,20 @@
 #!/usr/bin/env ruby
 
-require 'oj'
-
-Oj::default_options = {cache_str: 0, cache_keys: true, mode: :strict}
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
 
-puts "Ruby version: #{RUBY_VERSION}"
-puts "Oj version: #{Oj::VERSION}"
-
-puts "cache_keys: #{Oj::default_options[:cache_keys]}"
-puts "cache_str: #{Oj::default_options[:cache_str]}"
+# require 'json'
+require 'oj'
+Oj.mimic_JSON
 
-Oj.load('{"":""}').each_pair {|k,v| puts "k.frozen?: #{k.frozen?}\nv.frozen?: #{v.frozen?}"}
+source = %( {"a": 1, "b": 2} )
+puts "JSON.load, no symbolize => OK"
+pp JSON.load( source )
+puts "JSON.load, do symbolize => KO: keys are not symbols"
+#pp JSON.load( source, nil, symbolize_names: true, create_additions: false )
+pp JSON.load( source, nil, symbolize_names: true, create_additions: false )
+puts "JSON.parse, no symbolize => OK"
+pp JSON.parse( source )
+puts "JSON.parse, do symbolize => OK"
+pp JSON.parse( source, symbolize_names: true )

data/test/test_fast.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 
@@ -36,6 +36,17 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_leaf_of_existing_path
+    json = %{{"foo": 1, "fizz": true}}
+    Oj::Doc.open(json) do |doc|
+      %w(/foo/bar /fizz/bar).each do |path|
+        assert_nil(doc.fetch(path))
+        assert_equal(:default, doc.fetch(path, :default))
+        refute(doc.exists?(path))
+      end
+    end
+  end
+
   def test_true
     json = %{true}
     Oj::Doc.open(json) do |doc|
@@ -282,11 +293,11 @@ class DocTest < Minitest::Test
        ['/nothing', nil],
        ['/array/10', nil],
       ].each do |path,val|
-	if val.nil?
-	  assert_nil(doc.fetch(path))
-	else
+        if val.nil?
+          assert_nil(doc.fetch(path))
+        else
           assert_equal(val, doc.fetch(path))
-	end
+        end
       end
     end
     # verify empty hash and arrays return nil when a member is requested
@@ -313,7 +324,7 @@ class DocTest < Minitest::Test
     end
   end
 
-  def test_exisits
+  def test_exists
     Oj::Doc.open(@json1) do |doc|
       [['/array/1', true],
        ['/array/1', true],
@@ -322,7 +333,7 @@ class DocTest < Minitest::Test
        ['/array/3', false],
        ['/nothing', false],
       ].each do |path,val|
-        assert_equal(val, doc.exists?(path))
+        assert_equal(val, doc.exists?(path), "failed for #{path.inspect}")
       end
     end
   end

data/test/test_parser_usual.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -73,9 +73,14 @@ class UsualTest < Minitest::Test
     assert_equal({a: true, b: false}, doc)
   end
 
-  def test_capacity
+  def test_strings
     p = Oj::Parser.new(:usual)
-    p.capacity = 1000
+    doc = p.parse('{"ぴ": "", "ぴ ": "x", "c": "ぴーたー", "d": " ぴーたー "}')
+    assert_equal({'ぴ' => '', 'ぴ ' => 'x', 'c' => 'ぴーたー', 'd' => ' ぴーたー '}, doc)
+  end
+
+  def test_capacity
+    p = Oj::Parser.new(:usual, capacity: 1000)
     assert_equal(4096, p.capacity)
     p.capacity = 5000
     assert_equal(5000, p.capacity)
@@ -181,8 +186,7 @@ class UsualTest < Minitest::Test
   end
 
   def test_missing_class
-    p = Oj::Parser.new(:usual)
-    p.create_id = '^'
+    p = Oj::Parser.new(:usual, create_id: '^')
     json = '{"a":true,"^":"Auto","b":false}'
     doc = p.parse(json)
     assert_equal(Hash, doc.class)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.5
+  version: 3.13.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,6 +79,9 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
+- LICENSE
+- CHANGELOG.md
+- RELEASE_NOTES.md
 - pages/Advanced.md
 - pages/Compatibility.md
 - pages/Custom.md
@@ -198,6 +201,7 @@ files:
 - test/activesupport6/time_zone_test_helpers.rb
 - test/bar.rb
 - test/baz.rb
+- test/bug.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -329,6 +333,7 @@ test_files:
 - test/activesupport6/time_zone_test_helpers.rb
 - test/bar.rb
 - test/baz.rb
+- test/bug.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb