selma 0.4.6.1 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef17ad0cd3cc5b7d66af208adc138aa4734c76744d051f88889c9e145bd2373
-  data.tar.gz: 9b50370bff0ce06af4613c474c3a5f376b5cb1b73c6845c6e3133a56f37f56dc
+  metadata.gz: 04f8ef6623b5a28c62d64f3077842e262321580e998e90ba458735e5d7a13395
+  data.tar.gz: 132e7e538f36ad7399fb6edb7c09ece5fb16a9bd94da3a3a18339c0ad4057888
 SHA512:
-  metadata.gz: c45623b754d466caef138dfc09c091d4c9fb4dbee8d1b1d606cd9275cecc3c05d8a320cee984227dda691182b7790f41ff62f8e11dd2600ca0af31c469972923
-  data.tar.gz: 2304b49efa07fe47d225c557c5c6d1c1d7d14cb4ab2553700f3ab74af9babc639cb5b52fd20d84c6d74e47d506c9649b8c44f0ba0c5f26853e8eda9e085d6c63
+  metadata.gz: 06a3709aed3c7793b4010174866d4866bedd848cd2e2ca1553dff603e21790c8982d79a0ba72b6c2c5668639da76efd745aff2fbfe496442bbbb5c14cdf0a431
+  data.tar.gz: 86a393c4df2090cdba7f75001ebb81f9262c3f65e9fc897bc5d6fa6a8147e3f37e97118f7787fac22acd86baa241ba3b934e42062df1888e774c768cf3a24729

data/Cargo.lock

@@ -516,18 +516,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.100"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f2ba20be84b32fad6b0ce397764bcdd0f2dca4431cf7035f6a6721e5747565"
+checksum = "1ba2704ccfa7875c91792c57a9aa7c3caac524d3036c122e36eeddad6f6e7c6f"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.100"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecae2bdcb118ee721d9a3929f89e8578237fade298dfcf8c928609aa88abc48"
+checksum = "c73585ec80c217b7a81257ca9bb89b191b5e452ec4b9106dc4c2e4e96a822242"
 dependencies = [
  "bindgen",
  "lazy_static",

data/ext/selma/src/html/text_chunk.rs

@@ -6,6 +6,26 @@ use magnus::{exception, method, Error, Module, RClass, Symbol, Value};
 
 struct HTMLTextChunk {
     text_chunk: NativeRefWrap<TextChunk<'static>>,
+    buffer: String,
+}
+
+macro_rules! clone_buffer_if_not_empty {
+    ($binding:expr, $buffer:expr) => {
+        if !$binding.buffer.is_empty() {
+            $buffer.clone_from(&$binding.buffer);
+        }
+    };
+}
+
+// if this is the first time we're processing this text chunk (buffer is empty),
+// we carry on. Otherwise, we need to use the buffer text, not the text chunk,
+// because lol-html is not designed in such a way to keep track of text chunks.
+macro_rules! set_text_chunk_to_buffer {
+    ($text_chunk:expr, $buffer:expr) => {
+        if !$buffer.is_empty() {
+            $text_chunk.set_str($buffer);
+        }
+    };
 }
 
 #[magnus::wrap(class = "Selma::HTML::TextChunk")]
@@ -18,6 +38,7 @@ impl SelmaHTMLTextChunk {
     pub fn new(ref_wrap: NativeRefWrap<TextChunk<'static>>) -> Self {
         Self(RefCell::new(HTMLTextChunk {
             text_chunk: ref_wrap,
+            buffer: String::new(),
         }))
     }
 
@@ -96,16 +117,25 @@ impl SelmaHTMLTextChunk {
 
     fn replace(&self, args: &[Value]) -> Result<String, Error> {
         let mut binding = self.0.borrow_mut();
+        let mut buffer = String::new();
+
+        clone_buffer_if_not_empty!(binding, buffer);
+
         let text_chunk = binding.text_chunk.get_mut().unwrap();
 
+        set_text_chunk_to_buffer!(text_chunk, buffer);
+
         let (text_str, content_type) = match crate::scan_text_args(args) {
             Ok((text_str, content_type)) => (text_str, content_type),
             Err(err) => return Err(err),
         };
-
         text_chunk.replace(&text_str, content_type);
 
-        Ok(text_chunk.as_str().to_string())
+        text_chunk.set_str(text_str.clone());
+
+        binding.buffer = text_chunk.as_str().to_string();
+
+        Ok(text_str)
     }
 }
 

data/ext/selma/src/rewriter.rs

@@ -540,7 +540,8 @@ impl SelmaRewriter {
         // prevents missing `handle_text_chunk` function
         let content = text_chunk.as_str();
 
-        // seems that sometimes lol-html returns blank text / EOLs?
+        // lol-html sometimes returns blank text if
+        // last_in_text_node() is true
         if content.is_empty() {
             return Ok(());
         }

data/lib/selma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Selma
-  VERSION = "0.4.6.1"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selma
 version: !ruby/object:Gem::Version
-  version: 0.4.6.1
+  version: 0.4.7
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys