himg 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625354e25f75ba2a83205c62b3cf2cc6fbe883d48c701a09703e863cc647cea3
-  data.tar.gz: 775eac3d3644b056adadea5c2075698c8c9bdce680cdca4478edf7add902c51b
+  metadata.gz: d65ada02141e4fdd397d4c58def4e7fd658202563a2bbc31b548801b08198d4b
+  data.tar.gz: b7c9cc37243b8f790dfb977a6d6e5c215104e4a6a0f03cbc63308191d7ba7e73
 SHA512:
-  metadata.gz: 8e5d7496bc2008a8864b0b53412fbe1455e4761124cf5870d5ee271ac4e0c241828129a29dfbce83c2c1747d5c4e5914017da644c64cf4dff0cc9a6f90817e76
-  data.tar.gz: dbb75e11cf3b155287b5af1b2cefb5f305c56ba1001c212df6beaa862d48f09888ee6a48b40c111aaddfd3fdaf3645651d764a9d33a33e45c8cbfb8bf0c09ace
+  metadata.gz: d21cb8a714e462c08b36a000275eb9b4c840ab2bb049f8c7bcacb5b978a4404f36d0431b867b019fee864130b1895ef026b81257d6ce0199dec0adef8ecf5578
+  data.tar.gz: a96a262c6dc6e4a42bb8b6bcdacb47f24203d3e5d74673880b6851f76a01421e373c2a3e074f2cbb697e58c69b1e9eb1a3284824853821601c3e694c5bd127a3

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [Unreleased]
 
 
+## [0.0.10] - 2025-08-01
+
+- Fixed himg require from native extension
+- Catch rust panics and wrap with ruby Error
+- GpuNotFound error extending Himg::Error
+
+## [0.0.9] - 2025-07-31
+
+- Returned to CPU-only rendering by default
+- Added `gpu` option to enable GPU rendering 
+- Updated to latest blitz to fix blue/green colour swap on images
+
 ## [0.0.8] - 2025-07-31
 
 - Return to GPU rendering by default: quality is low with CPU rendering.

data/Cargo.lock

@@ -89,6 +89,18 @@ dependencies = [
  "wgpu",
 ]
 
+[[package]]
+name = "anyrender_vello_cpu"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83dfa407bbe89c99cf990a933aeab4e1d499c38a465c3f316066a1dd3eb5614"
+dependencies = [
+ "anyrender",
+ "kurbo",
+ "peniko",
+ "vello_cpu",
+]
+
 [[package]]
 name = "app_units"
 version = "0.7.8"
@@ -211,9 +223,9 @@ dependencies = [
 
 [[package]]
 name = "blitz-dom"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b715adfa6d85cad5da636aac5785d40e26dcf3f4195403fe8c46be501b77d72"
+checksum = "145a503f45b2284a75ca1e715dbbef4d1ccf1eeace85330e29a2ae12a01d1263"
 dependencies = [
  "accesskit",
  "app_units",
@@ -223,6 +235,7 @@ dependencies = [
  "color",
  "cursor-icon",
  "euclid",
+ "fastrand",
  "html-escape",
  "image",
  "keyboard-types",
@@ -248,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "blitz-html"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a31ccea6ee542133f13ef11344c0a8fdcdc99285f30046e97b5b4478720705"
+checksum = "52d34dae2ab4e90c0ccfa6470be7e455f897ae702c85d248fccdc807e375426d"
 dependencies = [
  "blitz-dom",
  "blitz-traits",
@@ -260,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "blitz-net"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b0b681ed5c32d0c3dafc2288cf10b9aa46e08de1a58350e5842d4d761c33ae"
+checksum = "e2a5ebc8993e3985097716262d4d496c18d3324727109e3c865071776dfe38b1"
 dependencies = [
  "blitz-traits",
  "data-url",
@@ -272,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "blitz-paint"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b26d3c0645d2b502ec7b3984354b3c42a2af7e4bde92ed5d189ac160e4e1f5"
+checksum = "9d62c7953382622298402412535db1796aaa83c71600bfc77fa7627a39aa722d"
 dependencies = [
  "anyrender",
  "anyrender_svg",
@@ -293,15 +306,16 @@ dependencies = [
 
 [[package]]
 name = "blitz-traits"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f559ae4a8b1c7dafc09df5e1249f8a27c6b9a20658a15041128d202334e8e2c2"
+checksum = "4cb0235930120526087ce9d69fa2d6828e3fb078c61dde43231acec7968376bf"
 dependencies = [
  "bitflags 2.9.1",
  "bytes",
  "cursor-icon",
  "http",
  "keyboard-types",
+ "serde",
  "smol_str",
  "url",
 ]
@@ -412,6 +426,9 @@ name = "color"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ae467d04a8a8aea5d9a49018a6ade2e4221d92968e8ce55a48c0b1164e5f698"
+dependencies = [
+ "bytemuck",
+]
 
 [[package]]
 name = "color_quant"
@@ -1077,10 +1094,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "himg"
-version = "0.0.8"
+version = "0.0.10"
 dependencies = [
  "anyrender",
  "anyrender_vello",
+ "anyrender_vello_cpu",
  "blitz-dom",
  "blitz-html",
  "blitz-net",
@@ -2065,6 +2083,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f9529efd019889b2a205193c14ffb6e2839b54ed9d2720674f10f4b04d87ac9"
 dependencies = [
+ "bytemuck",
  "color",
  "kurbo",
  "smallvec",
@@ -2951,9 +2970,9 @@ checksum = "500f379645e8a87fd03fe88607a5edcb0d8e4e423baa74ba52db198a06a0c261"
 
 [[package]]
 name = "stylo_taffy"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94014fa36fdc4698a0b36179385d70810b6f0825b90c1df52de2aa5ee670328a"
+checksum = "dce8876a33e0f3b16916b2b4da1cdbb64b9985d5ae61033d23024d95e45569ac"
 dependencies = [
  "stylo",
  "taffy",
@@ -3539,6 +3558,28 @@ dependencies = [
  "wgpu",
 ]
 
+[[package]]
+name = "vello_common"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b5e49f2836e87b6bd3d8f70324696f22b5f7dfdc836caeab463fff05957c1b1"
+dependencies = [
+ "bytemuck",
+ "peniko",
+ "png",
+ "skrifa",
+ "smallvec",
+]
+
+[[package]]
+name = "vello_cpu"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a45e0a6b777abb4354e15146ecf95bac03aada7a85024fd47762f56095b32896"
+dependencies = [
+ "vello_common",
+]
+
 [[package]]
 name = "vello_encoding"
 version = "0.5.0"

data/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/himg"]
 resolver = "2"
+
+[profile.profiling]
+inherits = "release"
+debug = true

data/README.md

@@ -67,6 +67,7 @@ bundle add himg
 |base_url | Where relative paths are relative to for linked resources (stylesheets, images, fonts, etc) | string | nil |
 |disable_fetch | Disables fetching linked resources from disk and network| bool | false |
 |fetch_timeout | Timeout in seconds for fetching resources | float | 10.0 |
+|gpu | Use GPU renderer instead of CPU renderer | bool | false |
 
 
 ### Passing options to a Rails view template
@@ -217,6 +218,7 @@ To play nicely with Rails a template handler is registered, which Rails' `defaul
   - http://localhost:3000/users/jamedjo.himg will also render the same png
   - http://localhost:3000/users/jamedjo will render an HTML page with opengraph meta tags
 6. To install this gem onto your local machine, run `bundle exec rake install`.
+7. To simulate a headless server environment without a GPU, use `WGPU_BACKEND=empty bundle exec rspec`
 
 ### Run cargo example directly generate image in Rust
 

data/ext/himg/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "himg"
 description = "ruby bindings to expose a blitz html->png pipeline"
-version = "0.0.8"
+version = "0.0.10"
 edition = "2024"
 authors = ["James Edwards-Jones <git@jamedjo.co.uk>"]
 license = "MIT"
@@ -14,13 +14,14 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 magnus = { version = "0.7.1" }
 rb-sys = { version = "0.9", features = ["stable-api-compiled-fallback"] }
-blitz-traits = { version = "0.1.0-rc.1" }
-blitz-dom = { version = "0.1.0-rc.1" }
-blitz-net = { version = "0.1.0-rc.1" }
-blitz-paint = { version = "0.1.0-rc.1" }
+blitz-traits = { version = "0.1.0-rc.2" }
+blitz-dom = { version = "0.1.0-rc.2" }
+blitz-net = { version = "0.1.0-rc.2" }
+blitz-paint = { version = "0.1.0-rc.2" }
 anyrender = { version = "0.5.0" }
 anyrender_vello = { version = "0.5.0" }
-blitz-html = { version = "0.1.0-rc.1" }
+anyrender_vello_cpu = { version = "0.5.1" }
+blitz-html = { version = "0.1.0-rc.2" }
 tokio = { version = "1.46", features =  ["rt-multi-thread", "macros"] }
 png = "0.17"
 openssl = { version = "0.10", features = ["vendored"] }

data/ext/himg/examples/file.rs

@@ -35,6 +35,7 @@ async fn main() {
         color_scheme: ColorScheme::Light,
         disable_fetch: false,
         fetch_timeout: 10.0,
+        gpu: false,
         base_url: Some(base_url),
     };
 

data/ext/himg/src/html_to_image.rs

@@ -1,6 +1,7 @@
 use blitz_html::HtmlDocument;
 use blitz_dom::DocumentConfig;
 use anyrender_vello::VelloImageRenderer;
+use anyrender_vello_cpu::VelloCpuImageRenderer;
 use anyrender::render_to_buffer;
 use blitz_paint::paint_scene;
 use blitz_traits::shell::{Viewport};
@@ -79,17 +80,31 @@ pub async fn html_to_image(
     }
 
     // Render document to RGBA buffer
-    let buffer = render_to_buffer::<VelloImageRenderer, _>(
-        |scene| paint_scene(
-            scene,
-            document.as_ref(),
-            render_size.hidpi_scale,
+    let buffer = if options.gpu {
+        render_to_buffer::<VelloImageRenderer, _>(
+            |scene| paint_scene(
+                scene,
+                document.as_ref(),
+                render_size.hidpi_scale,
+                render_size.scaled_width(),
+                render_size.scaled_height(),
+            ),
             render_size.scaled_width(),
             render_size.scaled_height(),
-        ),
-        render_size.scaled_width(),
-        render_size.scaled_height(),
-    );
+        )
+    } else {
+        render_to_buffer::<VelloCpuImageRenderer, _>(
+            |scene| paint_scene(
+                scene,
+                document.as_ref(),
+                render_size.hidpi_scale,
+                render_size.scaled_width(),
+                render_size.scaled_height(),
+            ),
+            render_size.scaled_width(),
+            render_size.scaled_height(),
+        )
+    };
 
     logger.log("Rendered to buffer");
 

data/ext/himg/src/lib.rs

@@ -34,6 +34,7 @@ impl Options {
             base_url: hash.lookup("base_url")?,
             disable_fetch: hash.lookup2("disable_fetch", defaults.disable_fetch)?,
             fetch_timeout: hash.lookup2("fetch_timeout", defaults.fetch_timeout)?,
+            gpu: hash.lookup2("gpu", defaults.gpu)?,
             color_scheme: defaults.color_scheme,
         };
 
@@ -44,10 +45,30 @@ impl Options {
 pub fn render_blocking_rb(ruby: &Ruby, html: String, options: Option<RHash>) -> Result<RString, Error> {
     let options = Options::from_ruby(options)?;
     let exception_class = ExceptionClass::from_value(magnus::eval("Himg::Error").unwrap()).unwrap();
+    let gpu_not_found_class = ExceptionClass::from_value(magnus::eval("Himg::GpuNotFound").unwrap()).unwrap();
 
-    match render_blocking(html, options) {
-        Ok(data) => Ok(ruby.str_from_slice(&data)),
-        Err(e) => Err(Error::new(exception_class, format!("{}", e))),
+    let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+        render_blocking(html, options)
+    }));
+
+    match result {
+        Ok(Ok(data)) => Ok(ruby.str_from_slice(&data)),
+        Ok(Err(e)) => Err(Error::new(exception_class, format!("{}", e))),
+        Err(panic) => {
+            let msg = if let Some(s) = panic.downcast_ref::<String>() {
+                s.clone()
+            } else if let Some(s) = panic.downcast_ref::<&str>() {
+                s.to_string()
+            } else {
+                "Unknown panic".to_string()
+            };
+
+            if msg.contains("No compatible device found") {
+                Err(Error::new(gpu_not_found_class, msg))
+            } else {
+                Err(Error::new(exception_class, format!("Panic: {}", msg)))
+            }
+        }
     }
 }
 

data/ext/himg/src/options.rs

@@ -8,6 +8,7 @@ pub struct Options {
     pub color_scheme: ColorScheme,
     pub disable_fetch: bool,
     pub fetch_timeout: f64,
+    pub gpu: bool,
     pub base_url: Option<String>,
     pub truncate: bool,
     pub verbose: bool,
@@ -26,6 +27,7 @@ impl Options {
             base_url: None,
             disable_fetch:  false,
             fetch_timeout: 10.0,
+            gpu: false,
             color_scheme: ColorScheme::Light,
         }
     }

data/lib/himg/cli.rb

@@ -12,6 +12,7 @@ module Himg
     option :verbose, type: :boolean, desc: "Enables detailed logging for debugging and profiling.", default: false
     option :disable_fetch, type: :boolean, desc: "Skip fetching file/http resources (stylesheets, images, fonts, etc)", default: false
     option :fetch_timeout, type: :numeric, desc: "Timeout in seconds for fetching resources", default: 10
+    option :gpu, type: :boolean, desc: "Use GPU renderer instead of CPU renderer", default: false
     option :http_headers, desc: "HTTP Headers to use when fetching remote resource"
     option :base_url, desc: "Base URL used to resolve relative URLs"
 

data/lib/himg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Himg
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/lib/himg.rb

@@ -8,7 +8,7 @@ require "himg/railtie" if defined?(Rails::Railtie)
 # Fall back to loading the non-versioned extension if version-specific loading fails.
 begin
   RUBY_VERSION =~ /(\d+\.\d+)/
-  require "#{Regexp.last_match(1)}/himg/himg"
+  require "himg/#{Regexp.last_match(1)}/himg"
 rescue LoadError
   require "himg/himg"
 end
@@ -17,10 +17,11 @@ end
 #
 # Converts HTML to an Image for a minimal subset of HTML and CSS
 module Himg
-  RENDER_OPTIONS = %i[width height truncate verbose].freeze
+  RENDER_OPTIONS = %i[width height truncate verbose base_url disable_fetch fetch_timeout gpu].freeze
   class Error < StandardError; end
+  class GpuNotFound < Error; end
 
-  def self.render(html, width: 720, height: 405, truncate: true, verbose: false, base_url: nil, disable_fetch: false, fetch_timeout: 10)
-    render_to_string(html, "width" => width.to_i, "height" => height.to_i, "truncate" => truncate, "verbose" => verbose, "base_url" => BaseUrl.new(base_url).to_s, "disable_fetch" => disable_fetch, "fetch_timeout" => fetch_timeout.to_f)
+  def self.render(html, width: 720, height: 405, truncate: true, verbose: false, base_url: nil, disable_fetch: false, fetch_timeout: 10, gpu: false)
+    render_to_string(html, "width" => width.to_i, "height" => height.to_i, "truncate" => truncate, "verbose" => verbose, "base_url" => BaseUrl.new(base_url).to_s, "disable_fetch" => disable_fetch, "fetch_timeout" => fetch_timeout.to_f, "gpu" => gpu)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: himg
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - James Edwards-Jones