sghtmltopdf 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2407abed524ac92ff4eedd07820136364dc3165ab456cbac689a069cefab60e
-  data.tar.gz: b851afb780f94f122526e0225b893daee84ce274d600a6a443944f1299b3e4f1
+  metadata.gz: de56b0b878dc4ce3c0150d6f2b51e506820b28cd2bcc0577b57b8335ec6e3a90
+  data.tar.gz: 0f91a87de49fb27ea32d627873be0c4fe743c54ea38f69ce94f696c2d5791a17
 SHA512:
-  metadata.gz: 1e4ea096b42a680a212b681e9822606e20feec07661ad20ca8bfab04533cab58213b58c7c3f63f1c790c73b23361203355f3e54574dc794974c0fc610aab502a
-  data.tar.gz: 892059d9f349d9073e3e53eb2b342d316083f634506c03662e75cafefcb5f94c506f5c62445fa0611eb7a3dd54acdb21f90ac01b42adf807fb5116df62d4e9ad
+  metadata.gz: 89dd71b47c89519290464731545bddee9fc7aa0364f8809db73478eec7a451834f453fce779698cad431a7d63aca40231c7ffd0e33dd4b543be0804d826bf0a5
+  data.tar.gz: 5f5444730f3d61dcc1efbf8c0925ca41b1868203460cbc6c53b9da6dae2c88c0e30d341df578313c276e69a574d4bd7d24d1f0ec32b7252b0beb44a76a3026c1

data/Cargo.lock

@@ -32,6 +32,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.8"
@@ -228,6 +234,12 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "data-url"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
+
 [[package]]
 name = "derive_more"
 version = "2.1.1"
@@ -279,6 +291,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "euclid"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "fast-srgb8"
 version = "1.0.0"
@@ -316,6 +337,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+
 [[package]]
 name = "font-types"
 version = "0.12.2"
@@ -437,6 +464,12 @@ dependencies = [
  "quick-error",
 ]
 
+[[package]]
+name = "imagesize"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -452,6 +485,17 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
+[[package]]
+name = "kurbo"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "smallvec",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -643,9 +687,9 @@ dependencies = [
 
 [[package]]
 name = "pdf-writer"
-version = "0.15.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e456864a7a304047bff84977dc6fb162bd956475d40ba50b2dcecaada7f753"
+checksum = "5df03c7d216de06f93f398ef06f1385a60f2c597bb96f8195c8d98e08a26b1d5"
 dependencies = [
  "bitflags",
  "itoa",
@@ -712,6 +756,12 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "png"
 version = "0.18.1"
@@ -1000,7 +1050,7 @@ dependencies = [
 
 [[package]]
 name = "sghtmltopdf"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "magnus",
  "rb-sys",
@@ -1009,7 +1059,7 @@ dependencies = [
 
 [[package]]
 name = "sghtmltopdf-core"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "base64",
  "clap",
@@ -1029,6 +1079,7 @@ dependencies = [
  "self_cell",
  "skrifa",
  "subsetter",
+ "svg2pdf",
  "taffy",
  "ureq",
 ]
@@ -1057,6 +1108,15 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
 
+[[package]]
+name = "simplecss"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "siphasher"
 version = "1.0.3"
@@ -1094,6 +1154,15 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+dependencies = [
+ "float-cmp",
+]
+
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -1139,6 +1208,29 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
+[[package]]
+name = "svg2pdf"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e50dc062439cc1a396181059c80932a6e6bd731b130e674c597c0c8874b6df22"
+dependencies = [
+ "log",
+ "miniz_oxide",
+ "once_cell",
+ "pdf-writer",
+ "usvg",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
+dependencies = [
+ "kurbo",
+ "siphasher",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.119"
@@ -1182,6 +1274,17 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
+[[package]]
+name = "tiny-skia-path"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.12.0"
@@ -1238,6 +1341,28 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "usvg"
+version = "0.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
+dependencies = [
+ "base64",
+ "data-url",
+ "flate2",
+ "imagesize",
+ "kurbo",
+ "log",
+ "pico-args",
+ "roxmltree",
+ "simplecss",
+ "siphasher",
+ "strict-num",
+ "svgtypes",
+ "tiny-skia-path",
+ "xmlwriter",
+]
+
 [[package]]
 name = "utf8-zero"
 version = "0.8.1"
@@ -1356,6 +1481,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "xmlwriter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+
 [[package]]
 name = "zeroize"
 version = "1.9.0"

data/ext/sghtmltopdf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sghtmltopdf"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 publish = false
 description = "Ruby binding for sghtmltopdf (see bindings/ruby)"
@@ -15,6 +15,8 @@ magnus = { version = "0.8", features = ["rb-sys"] }
 # GVL解放(`rb_thread_call_without_gvl`)はmagnusに無いので直接呼ぶ。
 rb-sys = "0.9"
 # HTTPサーバ(tiny_http)は要らないので`server` featureは外す。
+# `svg`はCLIと同じ既定に揃える(gemからもSVGを描画できるようにする)。
 sghtmltopdf-core = { path = "../../../../core", default-features = false, features = [
     "cli",
+    "svg",
 ] }

data/ext/sghtmltopdf/src/callback_sink.rs

@@ -8,7 +8,7 @@
 //! 走らせると深さ200弱でスタックを溢れさせる。しかもGVLを解放した状態で
 //! ガードページに触れるため、プロセスが落ちるのではなくスレッドが固まる。
 //!
-//! そこでレンダリングは[`sghtmltopdf_core::cli::STACK_SIZE`]のスタックを
+//! そこでレンダリングは[`sghtmltopdf_core::render_stack::STACK_SIZE`]のスタックを
 //! 明示的に確保した専用スレッドで走らせ、確定したチャンクはチャネル越しに
 //! 元のスレッドへ渡す。Rubyへ触れるのは元のスレッドだけに限る。
 //!
@@ -292,7 +292,8 @@ pub fn pump_to_block<F>(
 where
     F: FnOnce(ChannelSink) -> Result<(), sghtmltopdf_core::cli::CliError> + Send + 'static,
 {
-    use sghtmltopdf_core::cli::{CliError, STACK_SIZE};
+    use sghtmltopdf_core::cli::CliError;
+    use sghtmltopdf_core::render_stack::STACK_SIZE;
 
     // どちらも容量0のrendezvous。レンダリング側は1チャンクごとに
     // ブロックの完了を待つ。

data/ext/sghtmltopdf/src/lib.rs

@@ -14,6 +14,7 @@ use std::path::PathBuf;
 use magnus::rb_sys::AsRawValue;
 use magnus::{block::Proc, function, prelude::*, Error, RString, Ruby};
 use sghtmltopdf_core::cli::{self, convert};
+use sghtmltopdf_core::render_stack;
 use sghtmltopdf_core::sink::{FileSink, MemorySink};
 
 use callback_sink::{pump_to_block, BlockSlot, PendingUnwind, ValueSlot};
@@ -36,7 +37,7 @@ fn render_inner(html: Vec<u8>, argv: Vec<String>) -> Result<RString, Error> {
     // レイアウト・描画の再帰に耐えられないため(`callback_sink`のモジュール
     // doc参照)。この経路はRubyへコールバックしないので、そのまま移せる。
     let pdf = gvl::without_gvl(move || {
-        cli::with_render_stack(move || {
+        render_stack::with_render_stack(move || {
             convert::render_to_memory(&args, &fonts, Cursor::new(html), MemorySink::new())
         })
     })
@@ -69,7 +70,7 @@ fn render_to_file_inner(html: Vec<u8>, argv: Vec<String>, path: String) -> Resul
     })?;
 
     gvl::without_gvl(move || {
-        cli::with_render_stack(move || convert::render(&args, &fonts, Cursor::new(html), sink))
+        render_stack::with_render_stack(move || convert::render(&args, &fonts, Cursor::new(html), sink))
     })
     .map_err(|e| errors::to_ruby(&ruby, e))?;
     Ok(())

data/lib/sghtmltopdf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sghtmltopdf
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sghtmltopdf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yo_waka