kreuzberg 4.0.0.pre.rc.15 → 4.0.0.pre.rc.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac94696cb48598d98ae55f75c69c59e1d248577b965a3921e21998ee33d2352
-  data.tar.gz: 684e9f74a5f0d5c2c52677fec3cec493707b084dc77815396b237864dfeded90
+  metadata.gz: f91977b1472bb6211f3ac2efad274e8cbc77dc5ed9832529eccbebeae1f74b4f
+  data.tar.gz: b8a32377a80cfec656e8ddd65576dc220f497fc65b7b45b307db54a0b3b4a274
 SHA512:
-  metadata.gz: 6ed0b13217aad741e169850f155a28f921a37a41ffa95fb12a733798b49625f7a9db030eae90ddf00ee3e367b5a563a426fa301c8a16604c8ad5ca3ba78432fc
-  data.tar.gz: 6c3acf2fb24f573a65e81fdac91f3735a6e2335c340d79a453d73fb43b63b807a8b9e93bbbba38a8c55550be72f0f503513b142238a1c3965e279d8ed522b3ae
+  metadata.gz: cb391d9f82848e0b19b0c8df2cce7db455d1b73ba5e5c6dd63a2cc87732d8dd0cd6596ca7f9b305061d9400db95c5890292efbd16af7e55a9434f3f29a337642
+  data.tar.gz: 9e41afcc217e00d9feb3f8c4adecb7152743227f2c77f4bcfd9fd5e3d4b64b01171d3bdbb2b1290e10d2efdf13cdb53feb8fee01a95b6ba4d87ea76425b56692

data/.rubocop.yml

@@ -52,6 +52,7 @@ Metrics/AbcSize:
   Exclude:
     - 'spec/**/*'
     - 'examples/**/*'
+    - 'lib/kreuzberg/config.rb'
 
 Naming/FileName:
   Enabled: true
@@ -99,6 +100,10 @@ Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/kreuzberg/config.rb'
 
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/kreuzberg/config.rb'
+
 RSpec/RepeatedExampleGroupBody:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kreuzberg (4.0.0.pre.rc.15)
+    kreuzberg (4.0.0.pre.rc.17)
 
 GEM
   remote: https://rubygems.org/
@@ -33,7 +33,7 @@ GEM
     ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     fileutils (1.8.0)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     json (2.18.0)
     language_server-protocol (3.17.0.5)
@@ -137,6 +137,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES

data/ext/kreuzberg_rb/native/Cargo.lock

@@ -2354,7 +2354,7 @@ dependencies = [
 
 [[package]]
 name = "kreuzberg-rb"
-version = "4.0.0-rc.15"
+version = "4.0.0-rc.17"
 dependencies = [
  "async-trait",
  "html-to-markdown-rs",

data/ext/kreuzberg_rb/native/Cargo.toml

@@ -7,7 +7,7 @@ rb-sys = { path = "../../../vendor/rb-sys" }
 
 [package]
 name = "kreuzberg-rb"
-version = "4.0.0-rc.15"
+version = "4.0.0-rc.17"
 edition = "2024"
 rust-version = "1.91"
 authors = ["Na'aman Hirschfeld <nhirschfeld@gmail.com>"]

data/ext/kreuzberg_rb/native/build.rs

@@ -1,52 +1,75 @@
-#[cfg(target_os = "macos")]
-fn main() {
-    if let Ok(cargo_manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        let lib_path = std::path::Path::new(&cargo_manifest_dir)
-            .parent()
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .map(|p| p.join("target/release"))
-            .expect("Failed to construct lib path");
-        println!("cargo:rustc-link-search={}", lib_path.display());
-    }
-    println!("cargo:rustc-link-arg=-Wl,-undefined,dynamic_lookup");
-    println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path");
-    println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path/.");
-}
+use std::env;
+use std::path::PathBuf;
 
-#[cfg(target_os = "linux")]
 fn main() {
-    if let Ok(cargo_manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        let lib_path = std::path::Path::new(&cargo_manifest_dir)
-            .parent()
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .map(|p| p.join("target/release"))
-            .expect("Failed to construct lib path");
-        println!("cargo:rustc-link-search={}", lib_path.display());
+    let target = env::var("TARGET").unwrap();
+    let profile = env::var("PROFILE").unwrap_or_else(|_| "release".to_string());
+
+    // Try to locate kreuzberg-ffi library built alongside this crate
+    let cargo_manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let manifest_path = PathBuf::from(&cargo_manifest_dir);
+
+    // Prefer host target layout, but include target-triple layout for cross builds.
+    // IMPORTANT: Only search lib directories, NOT deps directories.
+    // The deps/ directories may contain dylibs with hardcoded install_name paths,
+    // which causes load errors on macOS when users install the gem.
+    if let Some(packages_root) = manifest_path
+        .parent()
+        .and_then(|p| p.parent())
+        .and_then(|p| p.parent())
+        .and_then(|p| p.parent())
+        .and_then(|p| p.parent())
+    {
+        let host_lib_dir = packages_root.join("target").join(&profile);
+        let target_lib_dir = packages_root.join("target").join(&target).join(&profile);
+
+        // Try to find the static library and link it directly on Unix-like systems
+        // to avoid the linker preferring dylib over static lib.
+        if !target.contains("windows") {
+            let static_lib_name = if target.contains("windows") {
+                "kreuzberg_ffi.lib"
+            } else {
+                "libkreuzberg_ffi.a"
+            };
+
+            // Check both host and target lib directories for the static library
+            for lib_dir in [&host_lib_dir, &target_lib_dir] {
+                let static_lib = lib_dir.join(static_lib_name);
+                if static_lib.exists() {
+                    // Found static library, link it directly by passing the full path
+                    println!("cargo:rustc-link-arg={}", static_lib.display());
+                    // Don't add the library search path or -l flag
+                    // Jump to platform-specific configuration
+                    if target.contains("darwin") {
+                        println!("cargo:rustc-link-arg=-Wl,-undefined,dynamic_lookup");
+                        println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path");
+                    } else if target.contains("linux") {
+                        println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN");
+                    }
+                    println!("cargo:rerun-if-changed=build.rs");
+                    return;
+                }
+            }
+        }
+
+        // Fallback: Add search paths and use standard linking
+        for dir in [host_lib_dir, target_lib_dir] {
+            if dir.exists() {
+                println!("cargo:rustc-link-search=native={}", dir.display());
+            }
+        }
     }
-    println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN");
-    println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN/.");
-}
 
-#[cfg(target_os = "windows")]
-fn main() {
-    if let Ok(cargo_manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        let lib_path = std::path::Path::new(&cargo_manifest_dir)
-            .parent()
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .and_then(|p| p.parent())
-            .map(|p| p.join("target/release"))
-            .expect("Failed to construct lib path");
-        println!("cargo:rustc-link-search={}", lib_path.display());
+    // Link the kreuzberg-ffi library
+    // When kreuzberg-ffi is built, its symbols become available for linking
+    println!("cargo:rustc-link-lib=static=kreuzberg_ffi");
+
+    if target.contains("darwin") {
+        println!("cargo:rustc-link-arg=-Wl,-undefined,dynamic_lookup");
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path");
+    } else if target.contains("linux") {
+        println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN");
     }
-}
 
-#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
-fn main() {}
+    println!("cargo:rerun-if-changed=build.rs");
+}