sin_deep_merge 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecfab1fe791f3186e8e8b2e6875388570960c3f16d6f09d7e99503c7963b722
-  data.tar.gz: e5dee299cedfbe2d99eb7483232563b5a9ec00e734de70adcef2fa394a2e3ea3
+  metadata.gz: d0c1f294bf953936c294c496a3a116a9222505b60ea83fe910f0d6b70de0f409
+  data.tar.gz: e0da19c5cc03fa03c639da9e99eb816620c48b52aff1ccfcfdde45fb84443a6c
 SHA512:
-  metadata.gz: 3dabb3b0aadbf33d484012d0b788edb0652fe6b1dd81caa895dfec5901574fc06dc5824b9ff6527007610f58378ccc04982bdd16259520e086a747766b8b4f60
-  data.tar.gz: 5f460016c5fb13809dbf0f5778627e2d857a9f42655d76caa3de5fc7088e06d1f9ff6bb0de1607be8a8616d604951542525a5a7bc52614292608749736217ada
+  metadata.gz: ba916aff9607573eea347b6b400b8b84fb4797810b557e4f6cb6f5704712828c06c575b0973e69c11664542635463307455b1abfa9ee000f2fb8acfee32c417b
+  data.tar.gz: 2fe051716c036e3908eaa65051fede2bf57acaa8518636e86596d6df0881d5e7f76544492fb45611a600ab2495ec298e2665b5b9a75feaf703fed712a1acd53b

data/ext/java/sin_deep_merge/SinDeepMergeLibrary.java

@@ -15,38 +15,51 @@ public class SinDeepMergeLibrary implements Library {
     }
 
     @JRubyMethod(name = "deep_merge", required = 1)
-    public static IRubyObject deepMerge(ThreadContext context, IRubyObject self, IRubyObject other, Block block) {
+    public static IRubyObject deepMerge(
+            ThreadContext context, IRubyObject self, IRubyObject other, Block block) {
         RubyHash selfHash = self.convertToHash();
         RubyHash dupedHash = (RubyHash) selfHash.dup();
         RubyHash otherHash = other.convertToHash();
-        deepMergeHashes(context, dupedHash, otherHash, block);
+        deepMergeHashes(context, dupedHash, otherHash, block, false);
         return dupedHash;
     }
 
     @JRubyMethod(name = "deep_merge!", required = 1)
-    public static IRubyObject deepMergeBang(ThreadContext context, IRubyObject self, IRubyObject other, Block block) {
+    public static IRubyObject deepMergeBang(
+            ThreadContext context, IRubyObject self, IRubyObject other, Block block) {
         RubyHash selfHash = self.convertToHash();
+        if (selfHash.isFrozen()) {
+            throw context.runtime.newFrozenError("Hash");
+        }
         RubyHash otherHash = other.convertToHash();
-        deepMergeHashes(context, selfHash, otherHash, block);
+        deepMergeHashes(context, selfHash, otherHash, block, true);
         return selfHash;
     }
 
-    private static void deepMergeHashes(ThreadContext context, RubyHash self, RubyHash other, Block block) {
+    private static void deepMergeHashes(
+            ThreadContext context,
+            RubyHash self,
+            RubyHash other,
+            Block block,
+            boolean destructive) {
         for (Object k : other.keySet()) {
             IRubyObject key = (IRubyObject) k;
-            IRubyObject currentVal = self.op_aref(context, key);
-            IRubyObject otherVal = other.op_aref(context, key);
+            IRubyObject currentVal = self.fastARef(key);
+            IRubyObject otherVal = other.fastARef(key);
 
-            if (currentVal.isNil()) {
+            if (currentVal == null) {
                 self.op_aset(context, key, otherVal);
             } else if (currentVal instanceof RubyHash && otherVal instanceof RubyHash) {
                 RubyHash currentHash = (RubyHash) currentVal;
-                currentHash = (RubyHash) currentHash.dup();
                 RubyHash otherHash = (RubyHash) otherVal;
-                deepMergeHashes(context, currentHash, otherHash, block);
+                if (!destructive) {
+                    currentHash = (RubyHash) currentHash.dup();
+                }
+                deepMergeHashes(context, currentHash, otherHash, block, destructive);
                 self.op_aset(context, key, currentHash);
             } else if (block.isGiven()) {
-                IRubyObject result = block.call(context, new IRubyObject[] { key, currentVal, otherVal });
+                IRubyObject result =
+                        block.call(context, new IRubyObject[] {key, currentVal, otherVal});
                 self.op_aset(context, key, result);
             } else {
                 self.op_aset(context, key, otherVal);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sin_deep_merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2026-02-21 00:00:00.000000000 Z
 dependencies: []
 description: Merge deeply nested hashes faster than DeepMerge or ActiveSupport
 email:
@@ -19,15 +19,15 @@ extra_rdoc_files: []
 files:
 - ext/java/sin_deep_merge/SinDeepMergeLibrary.java
 - lib/sin_deep_merge/sin_deep_merge.jar
-homepage: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.0
+homepage: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.1
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.0
-  source_code_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.0
-  changelog_uri: https://github.com/cadenza-tech/sin_deep_merge/blob/v1.0.0/CHANGELOG.md
+  homepage_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.1
+  source_code_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.1
+  changelog_uri: https://github.com/cadenza-tech/sin_deep_merge/blob/v1.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/cadenza-tech/sin_deep_merge/issues
-  documentation_uri: https://rubydoc.info/gems/sin_deep_merge/1.0.0
+  documentation_uri: https://rubydoc.info/gems/sin_deep_merge/1.0.1
   funding_uri: https://patreon.com/CadenzaTech
   rubygems_mfa_required: 'true'
 post_install_message: