typst 0.14.2 → 0.14.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e9d8a961dbfb1f5c4b2abcc506c2a4b8d51aa65bc628837f853c1d1cf27b769
-  data.tar.gz: c9268f5475181810a42292ae8f85df0d8943462e48912568ba37e1896071b689
+  metadata.gz: 77a2b80d3ddc7e3b8a2fd44c365b3a7c9464383894bb3a61e869d87085baa8a2
+  data.tar.gz: ce2e709afe2b9b76f73292ec13df74815ac0ff7dc7fc4636a58d73b7122ad391
 SHA512:
-  metadata.gz: bb05e491212ca31f0d4b9dd61fd42338117abc3b0f692c18767763705c592ebcbbc2b55592c3f3f9465183e9979390e462d635c070cbd548b48ac47c72dd4c8d
-  data.tar.gz: 0e7efcc12d9b6ad8720441b604ec6c31053341ec5094544d7dcb2313577afd344c5bbf386d37105f06988cd80fcea6b7c324a19f699ef580b0d18a9208db6d89
+  metadata.gz: b0e845ea82c232ed88b4dd6c159b814aad54199ff85829a7edb18a42346abf887e138345efca9e1ab1a2ca8b379b161bda3448162cd128f811b342815a7f0b85
+  data.tar.gz: 73c99e328ea7aa5ba58d574b7b7770b86355f97787e2df6de4a4578913ae7d72082e11309309ae2ccd2f3882ceba26a482e60de8b25dc188a78e678ca41c99b7

data/Rakefile

@@ -1,12 +1,10 @@
 require "bundler/gem_tasks"
-require "rake/extensiontask"
+require "rb_sys/extensiontask"
 require "rake/testtask"
-require 'rake_compiler_dock'
-require "rubygems/package_task"
-require "bundler"
 
 CROSS_PLATFORMS = %w[
   aarch64-linux
+  aarch64-linux-musl
   arm64-darwin
   x64-mingw-ucrt
   x86_64-darwin
@@ -18,9 +16,7 @@ spec = Bundler.load_gemspec("typst.gemspec")
 
 Gem::PackageTask.new(spec).define
 
-RakeCompilerDock.set_ruby_cc_version("~> 3.0")
-
-Rake::ExtensionTask.new("typst", spec) do |ext|
+RbSys::ExtensionTask.new("typst", spec) do |ext|
   ext.lib_dir = "lib/typst"
   ext.source_pattern = "*.{rs,toml}"
   ext.cross_compile = true

data/ext/typst/Cargo.toml

@@ -21,13 +21,11 @@ filetime = "0.2.22" #
 flate2 = "1" #
 fontdb = "0.15.0" #
 log = "0.4.20" #
-magnus = { version = "0.7.1" }
+magnus = { version = "0.8.2" }
 pathdiff = "0.2"
 same-file = "1" #
 siphasher = "1.0" #
 tar = "0.4" #
-#typst = { git = "https://github.com/typst/typst.git", tag = "v0.13.0" }
-#typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.13.0" }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
@@ -51,4 +49,4 @@ walkdir = "2.4.0"
 
 # enable rb-sys feature to test against Ruby head. This is only needed if you
 # want to work with the unreleased, in-development, next version of Ruby
-rb-sys = { version = "0.9.119", default-features = false, features = ["stable-api-compiled-fallback"] }
+rb-sys = { version = "0.9.123", default-features = false, features = ["stable-api-compiled-fallback"] }

data/ext/typst/src/lib.rs

@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 
-use magnus::{define_module, function, exception, Error }; //, IntoValue};
-use magnus::{prelude::*};
+use magnus::{function, prelude::*, Error, Ruby};
 
 use std::collections::HashMap;
 use query::{query as typst_query, QueryCommand, SerializationFormat};
@@ -15,6 +14,7 @@ mod query;
 mod world;
 
 fn to_html(
+    ruby: &Ruby,
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
@@ -23,11 +23,11 @@ fn to_html(
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let root = if let Some(root) = root {
         root.canonicalize()
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
     } else if let Some(dir) = input.parent() {
         dir.into()
     } else {
@@ -35,12 +35,12 @@ fn to_html(
     };
 
     let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let mut default_fonts = Vec::new();
     for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
         let path = entry
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
             .into_path();
         let Some(extension) = path.extension() else {
             continue;
@@ -72,16 +72,17 @@ fn to_html(
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
         .build()
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
         .compile(Some("html"), None, &Vec::new())
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
 }
 
 fn to_svg(
+    ruby: &Ruby,
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
@@ -90,11 +91,11 @@ fn to_svg(
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let root = if let Some(root) = root {
         root.canonicalize()
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
     } else if let Some(dir) = input.parent() {
         dir.into()
     } else {
@@ -102,12 +103,12 @@ fn to_svg(
     };
 
     let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let mut default_fonts = Vec::new();
     for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
         let path = entry
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
             .into_path();
         let Some(extension) = path.extension() else {
             continue;
@@ -126,16 +127,17 @@ fn to_svg(
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
         .build()
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let svg_bytes = world
         .compile(Some("svg"), None, &Vec::new())
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(svg_bytes)
 }
 
 fn to_png(
+    ruby: &Ruby,
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
@@ -144,11 +146,11 @@ fn to_png(
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let root = if let Some(root) = root {
         root.canonicalize()
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
     } else if let Some(dir) = input.parent() {
         dir.into()
     } else {
@@ -156,12 +158,12 @@ fn to_png(
     };
 
     let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let mut default_fonts = Vec::new();
     for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
         let path = entry
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
             .into_path();
         let Some(extension) = path.extension() else {
             continue;
@@ -180,16 +182,17 @@ fn to_png(
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
         .build()
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
         .compile(Some("png"), None, &Vec::new())
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
 }
 
 fn to_pdf(
+    ruby: &Ruby,
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
@@ -198,11 +201,11 @@ fn to_pdf(
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let root = if let Some(root) = root {
         root.canonicalize()
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
     } else if let Some(dir) = input.parent() {
         dir.into()
     } else {
@@ -210,12 +213,12 @@ fn to_pdf(
     };
 
     let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let mut default_fonts = Vec::new();
     for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
         let path = entry
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
             .into_path();
         let Some(extension) = path.extension() else {
             continue;
@@ -234,16 +237,17 @@ fn to_pdf(
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
         .build()
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let pdf_bytes = world
         .compile(Some("pdf"), None, &Vec::new())
-        .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+        .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(pdf_bytes)
 }
 
 fn query(
+    ruby: &Ruby,
     selector: String,
     field: Option<String>,
     one: bool,
@@ -258,15 +262,15 @@ fn query(
     let format = match format.unwrap().to_ascii_lowercase().as_str() {
         "json" => SerializationFormat::Json,
         "yaml" => SerializationFormat::Yaml,
-        _ => return Err(magnus::Error::new(exception::arg_error(), "unsupported serialization format"))?,
+        _ => return Err(magnus::Error::new(ruby.exception_arg_error(), "unsupported serialization format"))?,
     };
 
     let input = input.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let root = if let Some(root) = root {
         root.canonicalize()
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
     } else if let Some(dir) = input.parent() {
         dir.into()
     } else {
@@ -274,12 +278,12 @@ fn query(
     };
 
     let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?;
+        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
 
     let mut default_fonts = Vec::new();
     for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
         let path = entry
-            .map_err(|err| magnus::Error::new(exception::arg_error(), err.to_string()))?
+            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
             .into_path();
         let Some(extension) = path.extension() else {
             continue;
@@ -298,7 +302,7 @@ fn query(
     .font_paths(font_paths)
     .ignore_system_fonts(ignore_system_fonts)
     .build()
-    .map_err(|msg| magnus::Error::new(exception::arg_error(), msg.to_string()))?;
+    .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let result = typst_query(
         &mut world,
@@ -312,15 +316,15 @@ fn query(
 
     match result {
         Ok(data) => Ok(data),
-        Err(msg) => Err(magnus::Error::new(exception::arg_error(), msg.to_string())),
+        Err(msg) => Err(magnus::Error::new(ruby.exception_arg_error(), msg.to_string())),
     }
 }
 
 #[magnus::init]
-fn init() -> Result<(), Error> {
+fn init(ruby: &Ruby) -> Result<(), Error> {
     env_logger::init();
 
-    let module = define_module("Typst")?;
+    let module = ruby.define_module("Typst")?;
     module.define_singleton_method("_to_pdf", function!(to_pdf, 6))?;
     module.define_singleton_method("_to_svg", function!(to_svg, 6))?;
     module.define_singleton_method("_to_png", function!(to_png, 6))?;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typst
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.2.1
 platform: ruby
 authors:
 - Flinn
@@ -18,7 +18,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.119
+        version: 0.9.123
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.119
+        version: 0.9.123
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,6 @@ files:
 - lib/query.rb
 - lib/typst.rb
 - lib/typst/typst.bundle
-- lib/typst/typst.so
 homepage: https://github.com/actsasflinn/typst-rb
 licenses:
 - Apache-2.0
@@ -133,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby binding to typst, a new markup-based typesetting system that is powerful
   and easy to learn.