himg 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83698e3a0f0875ed07ac2d68ac0b8e7aeda05fc20e53026b57bab1b3c77289fa
-  data.tar.gz: 55318699fee2f69974a5b4b20f23d4f6ea6c7eefab067aa33ee80f712fb9a2cc
+  metadata.gz: d65ada02141e4fdd397d4c58def4e7fd658202563a2bbc31b548801b08198d4b
+  data.tar.gz: b7c9cc37243b8f790dfb977a6d6e5c215104e4a6a0f03cbc63308191d7ba7e73
 SHA512:
-  metadata.gz: 409a23fe6d6a410e45907a4d3c69be809da4c0ed88bdeaa63c89d3cb4fe45041bafe8d52fb78d8007c7a6a9b461e069232aa1b7e5a73a893ef039bb9abb4dd6f
-  data.tar.gz: 3780996822f05a2de3c14e05d6a3ab778851450a8db0eb48271e5f89321eca7e79696b562280e9eb1fd57d48a5cfd84c2246f7c7ee71ca77b633e8ba21c12227
+  metadata.gz: d21cb8a714e462c08b36a000275eb9b4c840ab2bb049f8c7bcacb5b978a4404f36d0431b867b019fee864130b1895ef026b81257d6ce0199dec0adef8ecf5578
+  data.tar.gz: a96a262c6dc6e4a42bb8b6bcdacb47f24203d3e5d74673880b6851f76a01421e373c2a3e074f2cbb697e58c69b1e9eb1a3284824853821601c3e694c5bd127a3

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [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

data/Cargo.lock

@@ -1094,7 +1094,7 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "himg"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "anyrender",
  "anyrender_vello",

data/Cargo.toml

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

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.9"
+version = "0.0.10"
 edition = "2024"
 authors = ["James Edwards-Jones <git@jamedjo.co.uk>"]
 license = "MIT"

data/ext/himg/src/lib.rs

@@ -45,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/lib/himg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Himg
-  VERSION = "0.0.9"
+  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
@@ -19,6 +19,7 @@ end
 module Himg
   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, 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)

metadata

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