sin_deep_merge 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f86d72174db71ca316daedc141b1f1fec4e054b5314e5851b5aee51f0f02d5e
-  data.tar.gz: e25960ef3be771806d62ed9fbfa5a4891381914d214354d87476cb82a5a99cc3
+  metadata.gz: 3bb7df970ff6b8fc3a6f34f10d72fe39667ce8e24cab4d3861efa18e8148370c
+  data.tar.gz: 8a8f34ab4a057967869cd813506e06b8b9a67d792fa7b4f2f532288850d557c2
 SHA512:
-  metadata.gz: 9e253d1cf691d416a70bc6d7359a13915693de31887b0f07a02fa2f94667afba49d452dc7ef09e476705616d418e830c232b5c1574d0c7802e876da4865f071d
-  data.tar.gz: 9d263593d442a3613136719ffaf07d7c3047fa0624904b235d555b8709edbf45faae1de133f70b4ab48b28e524c8eef9f6d94977524a5a75eb8fb636eda7fcf6
+  metadata.gz: 0164c6eb5e5cf99174c26d49ac44638367a0f4373804d6a5c7afc85b149ba51cb6abf32b30644f98c2b0e345a1264d4e40037ca2f84fcf06897c6c4bb0e06a9b
+  data.tar.gz: 1cda779bfbf3e02582d535f4a8b645178a148952a97c55896a82eeb0d9751e82d118dd9f1343e23c170953468ba21185b06090383d936e17aa870e3c343e6efe

data/ext/sin_deep_merge/sin_deep_merge.c

@@ -1,11 +1,16 @@
 #include <ruby.h>
 
+static ID id_call;
+static ID id_to_hash;
+
 typedef struct {
   VALUE hash;
   VALUE block;
+  int destructive;
+  int block_given;
 } deep_merge_context;
 
-static VALUE deep_merge_hashes(VALUE self, VALUE other, VALUE block);
+static VALUE deep_merge_hashes(VALUE self, VALUE other, VALUE block, int destructive);
 
 static int deep_merge_iter(VALUE key, VALUE other_val, VALUE data) {
   deep_merge_context *ctx = (deep_merge_context *)data;
@@ -14,10 +19,16 @@ static int deep_merge_iter(VALUE key, VALUE other_val, VALUE data) {
   if (current_val == Qundef) {
     rb_hash_aset(ctx->hash, key, other_val);
   } else if (RB_TYPE_P(current_val, T_HASH) && RB_TYPE_P(other_val, T_HASH)) {
-    VALUE merged = deep_merge_hashes(rb_obj_dup(current_val), other_val, ctx->block);
+    VALUE merged;
+    if (ctx->destructive) {
+      merged = deep_merge_hashes(current_val, other_val, ctx->block, 1);
+    } else {
+      merged = deep_merge_hashes(rb_obj_dup(current_val), other_val, ctx->block, 0);
+    }
     rb_hash_aset(ctx->hash, key, merged);
-  } else if (!NIL_P(ctx->block)) {
-    VALUE result = rb_funcall(ctx->block, rb_intern("call"), 3, key, current_val, other_val);
+  } else if (ctx->block_given) {
+    VALUE args[3] = {key, current_val, other_val};
+    VALUE result = rb_proc_call(ctx->block, rb_ary_new_from_values(3, args));
     rb_hash_aset(ctx->hash, key, result);
   } else {
     rb_hash_aset(ctx->hash, key, other_val);
@@ -26,8 +37,9 @@ static int deep_merge_iter(VALUE key, VALUE other_val, VALUE data) {
   return ST_CONTINUE;
 }
 
-static VALUE deep_merge_hashes(VALUE self, VALUE other, VALUE block) {
-  deep_merge_context ctx = {self, block};
+static VALUE deep_merge_hashes(VALUE self, VALUE other, VALUE block, int destructive) {
+  int block_given = !NIL_P(block);
+  deep_merge_context ctx = {self, block, destructive, block_given};
 
   rb_hash_foreach(other, deep_merge_iter, (VALUE)&ctx);
 
@@ -37,22 +49,35 @@ static VALUE deep_merge_hashes(VALUE self, VALUE other, VALUE block) {
 static VALUE hash_deep_merge_bang(int argc, VALUE *argv, VALUE self) {
   VALUE other;
   rb_scan_args(argc, argv, "1", &other);
-  other = rb_funcall(other, rb_intern("to_hash"), 0);
+  other = rb_funcall(other, id_to_hash, 0);
   VALUE block = Qnil;
   if (rb_block_given_p()) {
     block = rb_block_proc();
   }
 
-  deep_merge_hashes(self, other, block);
+  deep_merge_hashes(self, other, block, 1);
 
   return self;
 }
 
 static VALUE hash_deep_merge(int argc, VALUE *argv, VALUE self) {
-  return hash_deep_merge_bang(argc, argv, rb_obj_dup(self));
+  VALUE other;
+  rb_scan_args(argc, argv, "1", &other);
+  other = rb_funcall(other, id_to_hash, 0);
+  VALUE block = Qnil;
+  if (rb_block_given_p()) {
+    block = rb_block_proc();
+  }
+
+  VALUE duplicated = rb_obj_dup(self);
+  deep_merge_hashes(duplicated, other, block, 0);
+
+  return duplicated;
 }
 
 void Init_sin_deep_merge(void) {
+  id_call = rb_intern("call");
+  id_to_hash = rb_intern("to_hash");
   rb_define_method(rb_cHash, "deep_merge", RUBY_METHOD_FUNC(hash_deep_merge), -1);
   rb_define_method(rb_cHash, "deep_merge!", RUBY_METHOD_FUNC(hash_deep_merge_bang), -1);
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sin_deep_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Masahiro
 bindir: exe
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 1980-01-02 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/sin_deep_merge/extconf.rb
 - ext/sin_deep_merge/sin_deep_merge.c
-homepage: https://github.com/cadenza-tech/sin_deep_merge/tree/v0.0.2
+homepage: https://github.com/cadenza-tech/sin_deep_merge/tree/v1.0.0
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v0.0.2
-  source_code_uri: https://github.com/cadenza-tech/sin_deep_merge/tree/v0.0.2
-  changelog_uri: https://github.com/cadenza-tech/sin_deep_merge/blob/v0.0.2/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/cadenza-tech/sin_deep_merge/issues
-  documentation_uri: https://rubydoc.info/gems/sin_deep_merge/0.0.2
+  documentation_uri: https://rubydoc.info/gems/sin_deep_merge/1.0.0
   funding_uri: https://patreon.com/CadenzaTech
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Merge deeply nested hashes faster than DeepMerge or ActiveSupport
 test_files: []