oj 3.16.4 → 3.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd443226b6fbe558bd4a01e5e4e2c150149e697c22c1676007f67923b9832682
-  data.tar.gz: 0a46ac536c4fccaeac2bddde9ff8ef8d50343f5eeff3455b36c5bfb762aef073
+  metadata.gz: 95bab421dc901891ec12dc755e78eb02c517e34f205894c8cedeca3bc68401f6
+  data.tar.gz: 61707536ecd3a9a558df8872a3ce7b60fc04c47dbd6d7da703bd0605cf2e73bb
 SHA512:
-  metadata.gz: 49e28b9151a1c84d9f97adcea6af90acd1141a194858f29e633bf5e2e1965bb5fab783c015e343f569692e6351ad3957059135f05eb50022b79ee799ae0a306a
-  data.tar.gz: 74f69e8e14c39aee7128f8b7dc23fa1fa60a8df383dec844257e67c6e7f34c58d430ac77bc06571e8d52a29f857ee0162cba8ad1e93ac8bc1f7c2ad0260a0002
+  metadata.gz: a46a5aabda78c3da10739e31f403a8606de5129106dce4a8a26f84c66f3b7f63abc448944476e8780a00ba155a3f4fac00b83e92af7bfbaee9e177834351cf5d
+  data.tar.gz: da32618ab105131c9a30527ad5d9a1624b5f229f1e0fc06fa258732af4f3b1eb21fd45a8d8980513eede69a61ac823ddb465b5d465630dd0f8928720f7ec8e3d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.16.6 - 2024-09-09
+
+- Fixed issue with Rails 7.2 that changed the order of calls to to_json and as_json.
+
+## 3.16.5 - 2024-08-07
+
+- Fixed Oj::Parser so that block procedures work correctly.
+
 ## 3.16.4 - 2024-06-08
 
 - Fixed Oj::Parse EOF issue on larger stream input.

data/ext/oj/mimic_json.c

@@ -905,7 +905,9 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
     }
     oj_mimic_json_methods(json);
 
-    rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);
+    if (!rb_const_defined(rb_cObject, rb_intern("ActiveSupport"))) {
+        rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);
+    }
 
     rb_gv_set("$VERBOSE", verbose);
 

data/ext/oj/usual.c

@@ -289,9 +289,14 @@ static void close_object(ojParser p) {
     }
     rb_hash_bulk_insert(d->vtail - head, head, obj);
     d->ktail = d->khead + c->ki;
+
     d->vtail = head;
     head--;
     *head = obj;
+    if (1 == d->vtail - d->vhead && rb_block_given_p()) {
+        d->vtail = d->vhead;
+        rb_yield(obj);
+    }
 }
 
 static void close_object_class(ojParser p) {
@@ -572,7 +577,18 @@ static VALUE result(ojParser p) {
     Usual d = (Usual)p->ctx;
 
     if (d->vhead < d->vtail) {
-        return *d->vhead;
+        long            cnt = d->vtail - d->vhead;
+        volatile VALUE  ary;
+        volatile VALUE *vp;
+
+        if (1 == cnt) {
+            return *d->vhead;
+        }
+        ary = rb_ary_new();
+        for (vp = d->vhead; vp < d->vtail; vp++) {
+            rb_ary_push(ary, *vp);
+        }
+        return ary;
     }
     if (d->raise_on_empty) {
         rb_raise(oj_parse_error_class, "empty string");

data/lib/oj/mimic.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: false
 
 require 'bigdecimal'
-begin
-  require 'ostruct'
-rescue Exception
-  # ignore
-end
+require 'ostruct'
 
 module Oj
 

data/lib/oj/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.4'
+  VERSION = '3.16.6'
 end

data/test/activesupport7/abstract_unit.rb

@@ -19,7 +19,10 @@ require "active_support"
 Thread.abort_on_exception = true
 
 # Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
+if ActiveSupport::Deprecation.respond_to?(:debug)
+  # Rails 7.2 does not have ActiveSupport::Deprecation.debug
+  ActiveSupport::Deprecation.debug = true
+end
 
 # Default to old to_time behavior but allow running tests with new behavior
 ActiveSupport.to_time_preserves_timezone = ENV["PRESERVE_TIMEZONES"] == "1"

data/test/foo.rb

@@ -5,10 +5,22 @@ $LOAD_PATH << '.'
 $LOAD_PATH << File.join(__dir__, '../lib')
 $LOAD_PATH << File.join(__dir__, '../ext')
 
-require 'json'
 require 'oj'
-require 'oj/json'
 
-Oj.mimic_JSON
+reader, writer = IO.pipe
 
-JSON.parse("[]")
+thread =
+  Thread.new do
+    5.times do |id|
+      Oj.to_stream(writer, { "id" => id })
+      sleep(1)
+    end
+
+    writer.close
+  end
+
+p = Oj::Parser.new(:usual)
+p.load(reader) { |data| puts "#{Time.now} -- ID: #{data["id"]}" }
+
+reader.close
+thread.join

data/test/test_parser_usual.rb

@@ -114,6 +114,30 @@ class UsualTest < Minitest::Test
     assert_equal(Float, doc.class)
   end
 
+  def test_multi_parse
+    p = Oj::Parser.new(:usual)
+    out = []
+    p.parse('{"a":1}{"b":{"x":2}} {"c":3}') { |j| out.push(j) }
+    assert_equal([{'a'=>1}, {'b'=>{'x'=>2}},{'c'=>3}], out)
+  end
+
+  def test_multi_load
+    p = Oj::Parser.new(:usual)
+    out = []
+    r, w = IO.pipe
+    thread = Thread.new do
+      ['{"a":1}', '{"b":{"x"', ':2}}{"c":', '3}'].each { |seg|
+        w.write(seg)
+        sleep(0.1)
+      }
+      w.close
+    end
+    p.load(r) { |j| out.push(j) }
+    r.close
+    thread.join
+    assert_equal([{'a'=>1}, {'b'=>{'x'=>2}},{'c'=>3}], out)
+  end
+
   def test_omit_null
     p = Oj::Parser.new(:usual)
     p.omit_null = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.16.4
+  version: 3.16.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-08 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.