selma 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b5e70ce5e954bbd53e8df94b58facb21a78174562f001ce328f9d3ba4b09a3
-  data.tar.gz: 4360c58ce183593b8b5ec8c2bc2a15090aa5ed86f3e8a69b5975111274e01749
+  metadata.gz: a29ac9fb9f7bbc7ee99e9e4623eaabc643ba45b7704abb2e56447678d330cdeb
+  data.tar.gz: 5951e00f9578423a30bcd776c6ed0eec757198982b07e47a970114d233cdec79
 SHA512:
-  metadata.gz: 9528b3320b2bbe90bf17ee1cffe17e6ab65f58ebae1c8edda77f61d2c4b8e8c08782b4bf11cbbaae50610c44aa0dc69c58ca70c4c943a96af84285db167929bd
-  data.tar.gz: 8cf5ebd4259fa09b07b7908a2de795746a45cf7fc25eb3243affe373e0c90a04760cd2d8798367ffc3abe343e5b499a9253b2f01ac195843a067c8cbc88701a5
+  metadata.gz: cd24427d87ea37ce92ced5ce7cc5e0ce8600422176da18180d3043db6da455de93542da935a475b4c32cde28511bbc4de4b3648aa671f8ca085d645bfbdcb11a
+  data.tar.gz: 76875117c04b1fa5a5dba4fd53526caa4980a3249130b1783073d59cc2d9efc698b0437650241e66bc6d8b4cf01062f2b97692ec8a0b35b2e631c8faa41ed813

data/ext/selma/src/rewriter.rs

@@ -304,7 +304,7 @@ impl SelmaRewriter {
             }
         };
 
-        let handlers = &binding.handlers;
+        let handlers: &Vec<Handler> = &binding.handlers;
 
         match Self::perform_handler_rewrite(
             self,
@@ -372,6 +372,9 @@ impl SelmaRewriter {
         // TODO: this should ideally be done ahead of time on `initialize`, not on every `#rewrite` call
         let mut element_content_handlers: Vec<(Cow<Selector>, ElementContentHandlers)> = vec![];
 
+        // have sanitization happen first
+        element_content_handlers.extend(sanitizer_element_content_handlers);
+
         handlers.iter().for_each(|handler| {
             let element_stack: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::new(vec![]));
 
@@ -439,37 +442,23 @@ impl SelmaRewriter {
 
                 let closure_element_stack = element_stack.clone();
 
-                el.end_tag_handlers()
-                    .unwrap()
-                    .push(Box::new(move |_end_tag| {
-                        let mut stack = closure_element_stack.as_ref().borrow_mut();
-                        stack.pop();
+                if let Some(end_tag_handlers) = el.end_tag_handlers() {
+                    end_tag_handlers.push(Box::new(move |_end_tag| {
+                        closure_element_stack.as_ref().borrow_mut().pop();
                         Ok(())
                     }));
+                }
 
                 Ok(())
             }));
         });
 
-        let rewritten_html = Self::run_rewrite(
+        Self::run_rewrite(
             self,
             sanitizer_document_content_handlers,
             element_content_handlers,
             html.as_bytes(),
-        );
-
-        // sanitization must happen separately, because text chunks
-        // could potentially have rewritten the html. ideally we'd
-        // be able to sanitize around the `process_text_handlers` call
-        match rewritten_html {
-            Ok(rewritten_html) => Self::run_rewrite(
-                self,
-                vec![],
-                sanitizer_element_content_handlers,
-                rewritten_html.as_slice(),
-            ),
-            Err(err) => Err(err),
-        }
+        )
     }
 
     fn run_rewrite(

data/lib/selma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selma
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys