css_inline 0.22.1-x86_64-linux → 0.23.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd2f649b631a269a948367abd803cd20283211325d833ca7adb15620870d389
-  data.tar.gz: 9c6ed07bbcc38089ed075119753cbc44d454210a8f10abea4642b69c8a5a6231
+  metadata.gz: f856424bb823350abac20fc97badd15ceecb5c0a62c6c7ca5e691457759cd69a
+  data.tar.gz: 6626b3203f393f7d890d646df3f9fb399541633cda6daa76dd8d4a569eb36825
 SHA512:
-  metadata.gz: 3f049aad785b6a3f4e042ac6af2e6b663879eb98ba4d588683394f914d1a50e220c438feadcf1c8919662c518db0805575892382bf97ac406c7f7c9e8aea7e0b
-  data.tar.gz: ee728e31098e0f7566048228ff7b7839c60c8a124bee150e871f14a27f7b87100a6e2d5c763d14a0b775e6f51e3c1b3183cef9759d48390fe8b0332da46a74ab
+  metadata.gz: 2926928cd617c4c3a27845d8e23a1c1fd668dc65a5f830215aa83f284cd98f19155aaa963f1b88c89b7f1b21dfcca3bd979339f577ac9905a1211f73a3b86bd2
+  data.tar.gz: e2cd325653025892a5f63a0c57043269d84429bc7da64b3f7c597bba337915e62796e882f33db68a29e92621f2f35008e7f4c84d8645384b6b755d1aea54b773

data/README.md

@@ -161,6 +161,7 @@ The module functions accept the same keyword arguments, for example `CSSInline.i
 - `remove_inlined_selectors`. Remove inlined selectors from `<style>` blocks. Default: `false`
 - `apply_width_attributes`. Add `width` HTML attributes from CSS `width` properties on `table`, `td`, `th` and `img`. Default: `false`
 - `apply_height_attributes`. Add `height` HTML attributes from CSS `height` properties on `table`, `td`, `th` and `img`. Default: `false`
+- `resolve_css_variables`. Replace `var()` references with the values of the custom properties they refer to and drop the `--*` declarations. Default: `false`
 
 To skip CSS inlining for an HTML tag, add the `data-css-inline="ignore"` attribute to it:
 
@@ -282,7 +283,7 @@ end
 `premailer` fails on "Realistic email 2" with `ArgumentError: Cannot parse 0 calc((100% - 500px) / 2)`.
 
 Inputs come from [`benchmarks/benchmarks.json`](https://github.com/Stranger6667/css-inline/blob/master/benchmarks/benchmarks.json): Basic usage is `simple`, Realistic email 1 and 2 are `big_email_1` and `big_email_2`, GitHub Page is `big_page`.
-The benchmark code is in [`test/bench.rb`](https://github.com/Stranger6667/css-inline/blob/master/bindings/ruby/test/bench.rb) and uses [`benchmark-ips`](https://github.com/evanphx/benchmark-ips) (5 s per case; `roadie` completes one run on the GitHub page in that time).
+The benchmark code is in [`test/bench.rb`](https://github.com/Stranger6667/css-inline/blob/master/crates/css-inline-ruby/test/bench.rb) and uses [`benchmark-ips`](https://github.com/evanphx/benchmark-ips) (5 s per case; `roadie` completes one run on the GitHub page in that time).
 We measured these results with stable `rustc 1.99` on Ruby `3.4.8`, Ryzen 9 9950X.
 
 ## Further reading

data/src/lib.rs

@@ -0,0 +1,325 @@
+//! Ruby bindings for css-inline
+#![warn(
+    clippy::pedantic,
+    clippy::doc_markdown,
+    clippy::redundant_closure,
+    clippy::explicit_iter_loop,
+    clippy::match_same_arms,
+    clippy::needless_borrow,
+    clippy::print_stdout,
+    clippy::arithmetic_side_effects,
+    clippy::cast_possible_truncation,
+    clippy::unwrap_used,
+    clippy::map_unwrap_or,
+    clippy::trivially_copy_pass_by_ref,
+    clippy::needless_pass_by_value,
+    missing_debug_implementations,
+    trivial_casts,
+    trivial_numeric_casts,
+    unreachable_pub,
+    unused_extern_crates,
+    unused_import_braces,
+    unused_qualifications,
+    variant_size_differences,
+    rust_2018_idioms,
+    rust_2018_compatibility,
+    rust_2021_compatibility
+)]
+use css_inline as rust_inline;
+use magnus::{
+    DataTypeFunctions, RHash, Ruby, TryConvert, TypedData, Value, function, method,
+    prelude::*,
+    scan_args::{Args, get_kwargs, scan_args},
+    typed_data::Obj,
+};
+use rayon::prelude::*;
+use std::{
+    borrow::Cow,
+    num::NonZeroUsize,
+    sync::{Arc, Mutex},
+};
+
+type RubyResult<T> = Result<T, magnus::Error>;
+
+#[allow(clippy::struct_excessive_bools)]
+struct Options {
+    /// Whether to inline CSS from "style" tags.
+    ///
+    /// Sometimes HTML may include a lot of boilerplate styles, that are not applicable in every
+    /// scenario, and it is useful to ignore them and use `extra_css` instead.
+    inline_style_tags: Option<bool>,
+    /// Keep "style" tags after inlining.
+    keep_style_tags: Option<bool>,
+    /// Keep "link" tags after inlining.
+    keep_link_tags: Option<bool>,
+    /// Keep "at-rules" after inlining.
+    keep_at_rules: Option<bool>,
+    /// Remove trailing semicolons and spaces between properties and values.
+    minify_css: Option<bool>,
+    /// Used for loading external stylesheets via relative URLs.
+    base_url: Option<String>,
+    /// Whether remote stylesheets should be loaded or not.
+    load_remote_stylesheets: Option<bool>,
+    /// An LRU Cache for external stylesheets.
+    cache: Option<Obj<StylesheetCache>>,
+    /// Additional CSS to inline.
+    extra_css: Option<String>,
+    /// Pre-allocate capacity for HTML nodes during parsing.
+    /// It can improve performance when you have an estimate of the number of nodes in your HTML document.
+    preallocate_node_capacity: Option<usize>,
+    /// Remove selectors that were successfully inlined from inline `<style>` blocks.
+    remove_inlined_selectors: Option<bool>,
+    /// Apply `width` HTML attributes from CSS `width` properties on supported elements.
+    apply_width_attributes: Option<bool>,
+    /// Apply `height` HTML attributes from CSS `height` properties on supported elements.
+    apply_height_attributes: Option<bool>,
+    /// Substitute `var()` references with the values of the custom properties they refer to
+    /// and drop the `--*` declarations from the inlined styles.
+    resolve_css_variables: Option<bool>,
+}
+
+impl TryConvert for Options {
+    fn try_convert(v: Value) -> Result<Self, magnus::Error> {
+        let h = RHash::try_convert(v)?;
+        let ruby = Ruby::get_with(v);
+        Ok(Self {
+            inline_style_tags: h.aref::<_, Option<bool>>(ruby.to_symbol("inline_style_tags"))?,
+            keep_style_tags: h.aref::<_, Option<bool>>(ruby.to_symbol("keep_style_tags"))?,
+            keep_link_tags: h.aref::<_, Option<bool>>(ruby.to_symbol("keep_link_tags"))?,
+            keep_at_rules: h.aref::<_, Option<bool>>(ruby.to_symbol("keep_at_rules"))?,
+            minify_css: h.aref::<_, Option<bool>>(ruby.to_symbol("minify_css"))?,
+            base_url: h.aref::<_, Option<String>>(ruby.to_symbol("base_url"))?,
+            load_remote_stylesheets: h
+                .aref::<_, Option<bool>>(ruby.to_symbol("load_remote_stylesheets"))?,
+            cache: h.aref::<_, Option<Obj<StylesheetCache>>>(ruby.to_symbol("cache"))?,
+            extra_css: h.aref::<_, Option<String>>(ruby.to_symbol("extra_css"))?,
+            preallocate_node_capacity: h
+                .aref::<_, Option<usize>>(ruby.to_symbol("preallocate_node_capacity"))?,
+            remove_inlined_selectors: h
+                .aref::<_, Option<bool>>(ruby.to_symbol("remove_inlined_selectors"))?,
+            apply_width_attributes: h
+                .aref::<_, Option<bool>>(ruby.to_symbol("apply_width_attributes"))?,
+            apply_height_attributes: h
+                .aref::<_, Option<bool>>(ruby.to_symbol("apply_height_attributes"))?,
+            resolve_css_variables: h
+                .aref::<_, Option<bool>>(ruby.to_symbol("resolve_css_variables"))?,
+        })
+    }
+}
+
+fn parse_options<Req>(
+    args: &Args<Req, (), (), (), RHash, ()>,
+) -> RubyResult<rust_inline::InlineOptions<'static>> {
+    let kwargs: Options = Options::try_convert(args.keywords.as_value())?;
+    Ok(rust_inline::InlineOptions {
+        inline_style_tags: kwargs.inline_style_tags.unwrap_or(true),
+        keep_style_tags: kwargs.keep_style_tags.unwrap_or(false),
+        keep_link_tags: kwargs.keep_link_tags.unwrap_or(false),
+        keep_at_rules: kwargs.keep_at_rules.unwrap_or(false),
+        minify_css: kwargs.minify_css.unwrap_or(false),
+        base_url: parse_url(kwargs.base_url)?,
+        load_remote_stylesheets: kwargs.load_remote_stylesheets.unwrap_or(true),
+        cache: kwargs
+            .cache
+            .map(|cache| Mutex::new(rust_inline::StylesheetCache::new(cache.size))),
+        extra_css: kwargs.extra_css.map(Cow::Owned),
+        preallocate_node_capacity: kwargs.preallocate_node_capacity.unwrap_or(32),
+        resolver: Arc::new(rust_inline::DefaultStylesheetResolver),
+        remove_inlined_selectors: kwargs.remove_inlined_selectors.unwrap_or(false),
+        apply_width_attributes: kwargs.apply_width_attributes.unwrap_or(false),
+        apply_height_attributes: kwargs.apply_height_attributes.unwrap_or(false),
+        resolve_css_variables: kwargs.resolve_css_variables.unwrap_or(false),
+    })
+}
+
+#[derive(DataTypeFunctions, TypedData)]
+#[magnus(class = "CSSInline::StylesheetCache")]
+struct StylesheetCache {
+    size: NonZeroUsize,
+}
+
+impl StylesheetCache {
+    fn new(args: &[Value]) -> RubyResult<StylesheetCache> {
+        fn error() -> magnus::Error {
+            let ruby = Ruby::get().expect("Always called from a Ruby thread");
+            magnus::Error::new(
+                ruby.exception_arg_error(),
+                "Cache size must be an integer greater than zero",
+            )
+        }
+
+        let args: Args<(), (), (), (), RHash, ()> = scan_args::<(), _, _, _, RHash, _>(args)?;
+        let kwargs = get_kwargs::<_, (), (Option<usize>,), ()>(args.keywords, &[], &["size"])
+            .map_err(|_| error())?;
+        let size = NonZeroUsize::new(kwargs.optional.0.unwrap_or(8)).ok_or_else(error)?;
+        Ok(StylesheetCache { size })
+    }
+}
+
+#[magnus::wrap(class = "CSSInline::CSSInliner")]
+struct CSSInliner {
+    inner: rust_inline::CSSInliner<'static>,
+}
+
+struct InlineErrorWrapper(rust_inline::InlineError);
+
+impl From<InlineErrorWrapper> for magnus::Error {
+    fn from(error: InlineErrorWrapper) -> Self {
+        let ruby = Ruby::get().expect("Always called from a Ruby thread");
+        match error.0 {
+            rust_inline::InlineError::IO(error) => {
+                magnus::Error::new(ruby.exception_arg_error(), error.to_string())
+            }
+            rust_inline::InlineError::Network { error, location } => {
+                magnus::Error::new(ruby.exception_arg_error(), format!("{error}: {location}"))
+            }
+            rust_inline::InlineError::ParseError(message) => {
+                magnus::Error::new(ruby.exception_arg_error(), message.to_string())
+            }
+            rust_inline::InlineError::MissingStyleSheet { .. } => {
+                magnus::Error::new(ruby.exception_arg_error(), error.0.to_string())
+            }
+        }
+    }
+}
+
+struct UrlError {
+    error: rust_inline::ParseError,
+    url: String,
+}
+
+impl From<UrlError> for magnus::Error {
+    fn from(error: UrlError) -> magnus::Error {
+        let ruby = Ruby::get().expect("Always called from a Ruby thread");
+        magnus::Error::new(
+            ruby.exception_arg_error(),
+            format!("{}: {}", error.error, error.url),
+        )
+    }
+}
+
+fn parse_url(url: Option<String>) -> RubyResult<Option<rust_inline::Url>> {
+    Ok(if let Some(url) = url {
+        Some(rust_inline::Url::parse(url.as_str()).map_err(|error| UrlError { error, url })?)
+    } else {
+        None
+    })
+}
+
+impl CSSInliner {
+    fn new(args: &[Value]) -> RubyResult<CSSInliner> {
+        let args = scan_args::<(), _, _, _, _, _>(args)?;
+        let options = parse_options(&args)?;
+        Ok(CSSInliner {
+            inner: rust_inline::CSSInliner::new(options),
+        })
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn inline(&self, html: String) -> RubyResult<String> {
+        Ok(self.inner.inline(&html).map_err(InlineErrorWrapper)?)
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn inline_fragment(&self, html: String, css: String) -> RubyResult<String> {
+        Ok(self
+            .inner
+            .inline_fragment(&html, &css)
+            .map_err(InlineErrorWrapper)?)
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn inline_many(&self, html: Vec<String>) -> RubyResult<Vec<String>> {
+        inline_many_impl(&html, &self.inner)
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn inline_many_fragments(
+        &self,
+        html: Vec<String>,
+        css: Vec<String>,
+    ) -> RubyResult<Vec<String>> {
+        inline_many_fragments_impl(&html, &css, &self.inner)
+    }
+}
+
+fn inline(args: &[Value]) -> RubyResult<String> {
+    let args = scan_args::<(String,), _, _, _, _, _>(args)?;
+    let options = parse_options(&args)?;
+    let html = args.required.0;
+    Ok(rust_inline::CSSInliner::new(options)
+        .inline(&html)
+        .map_err(InlineErrorWrapper)?)
+}
+
+fn inline_fragment(args: &[Value]) -> RubyResult<String> {
+    let args = scan_args::<(String, String), _, _, _, _, _>(args)?;
+    let options = parse_options(&args)?;
+    let html = args.required.0;
+    let css = args.required.1;
+    Ok(rust_inline::CSSInliner::new(options)
+        .inline_fragment(&html, &css)
+        .map_err(InlineErrorWrapper)?)
+}
+
+fn inline_many(args: &[Value]) -> RubyResult<Vec<String>> {
+    let args = scan_args::<(Vec<String>,), _, _, _, _, _>(args)?;
+    let options = parse_options(&args)?;
+    let inliner = rust_inline::CSSInliner::new(options);
+    inline_many_impl(&args.required.0, &inliner)
+}
+
+fn inline_many_impl(
+    htmls: &[String],
+    inliner: &rust_inline::CSSInliner<'static>,
+) -> RubyResult<Vec<String>> {
+    let output: Result<Vec<_>, _> = htmls.par_iter().map(|html| inliner.inline(html)).collect();
+    Ok(output.map_err(InlineErrorWrapper)?)
+}
+
+fn inline_many_fragments(args: &[Value]) -> RubyResult<Vec<String>> {
+    let args = scan_args::<(Vec<String>, Vec<String>), _, _, _, _, _>(args)?;
+    let options = parse_options(&args)?;
+    let inliner = rust_inline::CSSInliner::new(options);
+    inline_many_fragments_impl(&args.required.0, &args.required.1, &inliner)
+}
+
+fn inline_many_fragments_impl(
+    htmls: &[String],
+    css: &[String],
+    inliner: &rust_inline::CSSInliner<'static>,
+) -> RubyResult<Vec<String>> {
+    let output: Result<Vec<_>, _> = htmls
+        .par_iter()
+        .zip(css)
+        .map(|(html, css)| inliner.inline_fragment(html, css))
+        .collect();
+    Ok(output.map_err(InlineErrorWrapper)?)
+}
+
+#[magnus::init(name = "css_inline")]
+fn init(ruby: &Ruby) -> RubyResult<()> {
+    let module = ruby.define_module("CSSInline")?;
+
+    module.define_module_function("inline", function!(inline, -1))?;
+    module.define_module_function("inline_fragment", function!(inline_fragment, -1))?;
+    module.define_module_function("inline_many", function!(inline_many, -1))?;
+    module.define_module_function(
+        "inline_many_fragments",
+        function!(inline_many_fragments, -1),
+    )?;
+
+    let class = module.define_class("CSSInliner", ruby.class_object())?;
+    class.define_singleton_method("new", function!(CSSInliner::new, -1))?;
+    class.define_method("inline", method!(CSSInliner::inline, 1))?;
+    class.define_method("inline_fragment", method!(CSSInliner::inline_fragment, 2))?;
+    class.define_method("inline_many", method!(CSSInliner::inline_many, 1))?;
+    class.define_method(
+        "inline_many_fragments",
+        method!(CSSInliner::inline_many_fragments, 2),
+    )?;
+
+    let class = module.define_class("StylesheetCache", ruby.class_object())?;
+    class.define_singleton_method("new", function!(StylesheetCache::new, -1))?;
+    Ok(())
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_inline
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: x86_64-linux
 authors:
 - Dmitry Dygalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-10-14 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -33,21 +33,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Cargo.lock
-- Cargo.toml
 - README.md
 - lib/css_inline.rb
 - lib/css_inline/3.2/css_inline.so
 - lib/css_inline/3.3/css_inline.so
 - lib/css_inline/3.4/css_inline.so
 - lib/css_inline/4.0/css_inline.so
+- src/lib.rs
 homepage: https://github.com/Stranger6667/css-inline
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/Stranger6667/css-inline/issues
-  changelog_uri: https://github.com/Stranger6667/css-inline/tree/master/bindings/ruby/CHANGELOG.md
-  source_code_uri: https://github.com/Stranger6667/css-inline/tree/master/bindings/ruby
+  changelog_uri: https://github.com/Stranger6667/css-inline/tree/master/crates/css-inline-ruby/CHANGELOG.md
+  source_code_uri: https://github.com/Stranger6667/css-inline/tree/master/crates/css-inline-ruby
   funding_uri: https://github.com/sponsors/Stranger6667/
 post_install_message: 
 rdoc_options: