blake3-rb 1.5.4.1 → 1.5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bfa02f801439d4336e9cc5d1c6f66b3fea5ee900fa327c98a76006289610cb
-  data.tar.gz: a84aff893fc9fb311103464071c2628fe398feb370f8afb2092c8a72663fd473
+  metadata.gz: 6434507643a1bd262f562044a1a022c3ffd4348e82a217dde88ee360036c69cd
+  data.tar.gz: 0bd45e1cecd30ed52d4358961397a4c11997bbdf00dced6df48958e77756476d
 SHA512:
-  metadata.gz: f55aad4696d2c13f956472e3193c68501fef7f1a698d86757bb251d533c6a44d2799d24842053e49ddab0f2ca01462d34583daf8fd9a61513a0341ac0bfde95c
-  data.tar.gz: 06ffcdbc95270b3ae7b3b7a9ff242cd5cb9388aef94d8e7fcfc669d24e357d2913b09f1566eb24785c55e39044fa971c342eb97dfee343f16bc8161e13434e06
+  metadata.gz: c45295e7fec2446bb51925c42674a340a5db9155ea4f0b7f280b49b29e4728c15e91b8017ce99f0f358d42a4cf48e09db12c98b3205999429707a82de7ac3ea1
+  data.tar.gz: 7e690b4cc449d9289f84919614187ccd7b9f2a226b4264c00e507847e43586b049182d0c80fc9d489311d4d78c5fdbdba90ae84307f3d123e282a6b09c02c8ea

data/ext/digest/blake3_ext/extconf.rb

@@ -3,4 +3,23 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("digest/blake3/blake3_ext")
+# Detect when DIGEST_USE_RB_EXT_RESOLVE_SYMBOL is defined truthy,
+# which indicates rb_ext_resolve_symbol("digest.so", "rb_digest_wrap_metadata")
+# will work with the version of Digest we're building against.
+digest_use_rb_ext_resolve_symbol = try_compile(<<~C)
+  #include <ruby/digest.h>
+
+  #if !defined(DIGEST_USE_RB_EXT_RESOLVE_SYMBOL)
+  # error DIGEST_USE_RB_EXT_RESOLVE_SYMBOL not defined
+  #endif
+  #if !DIGEST_USE_RB_EXT_RESOLVE_SYMBOL
+  # error DIGEST_USE_RB_EXT_RESOLVE_SYMBOL is 0
+  #endif
+C
+puts("digest_use_rb_ext_resolve_symbol=#{digest_use_rb_ext_resolve_symbol}")
+
+create_rust_makefile("digest/blake3/blake3_ext") do |r|
+  if digest_use_rb_ext_resolve_symbol
+    r.extra_rustflags = ["--cfg digest_use_rb_ext_resolve_symbol"]
+  end
+end

data/ext/digest/blake3_ext/src/bindings.rs

@@ -1,7 +1,6 @@
+use rb_sys::{size_t, VALUE};
 use std::ffi::{c_int, c_uchar, c_void};
 
-use rb_sys::{rb_data_object_wrap, rb_obj_freeze, size_t, VALUE};
-
 pub const RUBY_DIGEST_API_VERSION: c_int = 3;
 
 pub type RbDigestHashInitFuncT = unsafe extern "C" fn(*mut c_void) -> c_int;
@@ -20,7 +19,40 @@ pub struct RbDigestMetadataT {
     pub finish_func: RbDigestHashFinishFuncT,
 }
 
+#[cfg(digest_use_rb_ext_resolve_symbol)]
+pub unsafe fn rb_digest_make_metadata(meta: &'static RbDigestMetadataT) -> VALUE {
+    static mut WRAPPER: Option<unsafe extern "C" fn(&'static RbDigestMetadataT) -> VALUE> = None;
+
+    unsafe fn load_wrapper() {
+        use rb_sys::rb_ext_resolve_symbol;
+        use std::ffi::c_char;
+        use std::sync::Once;
+
+        static INIT: Once = Once::new();
+
+        INIT.call_once(|| {
+            let lib_name = "digest.so\0".as_ptr() as *const c_char;
+            let symbol_name = "rb_digest_wrap_metadata\0".as_ptr() as *const c_char;
+            let symbol_ptr = rb_ext_resolve_symbol(lib_name, symbol_name);
+
+            if !symbol_ptr.is_null() {
+                WRAPPER = Some(std::mem::transmute(symbol_ptr));
+            } else {
+                panic!("Failed to resolve rb_digest_wrap_metadata");
+            }
+        });
+    }
+
+    load_wrapper();
+    if let Some(wrapper) = WRAPPER {
+        return wrapper(meta);
+    }
+    panic!("Failed to resolve rb_digest_wrap_metadata");
+}
+
+#[cfg(not(digest_use_rb_ext_resolve_symbol))]
 pub unsafe fn rb_digest_make_metadata(meta: &'static RbDigestMetadataT) -> VALUE {
+    use rb_sys::{rb_data_object_wrap, rb_obj_freeze};
     let data = rb_data_object_wrap(
         0 as VALUE,
         meta as *const RbDigestMetadataT as *mut c_void,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blake3-rb
 version: !ruby/object:Gem::Version
-  version: 1.5.4.1
+  version: 1.5.4.3
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Blake3 hash function bindings for Ruby.