Revert sanitization reordering (restore old behavior)

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![]));
 
@@ -451,25 +454,12 @@ impl SelmaRewriter {
             }));
         });
 
-        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(

lib/selma/version.rb

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

test/selma_rewriter_match_element_test.rb

@@ -30,8 +30,8 @@ def test_that_it_works_with_sanitizer
     frag = "<malarky><strong><junk>Wow!</junk></strong></malarky>"
     modified_doc = Selma::Rewriter.new(sanitizer: sanitizer, handlers: [Handler.new]).rewrite(frag)
 
-    # note that sanitization occurs *after* rewriting
-    assert_equal("<strong>Wow!</strong>", modified_doc)
+    # note that sanitization does not effect rewriting
+    assert_equal("<strong class=\"boldy\">Wow!</strong>", modified_doc)
   end
 
   class FirstRewrite

test/selma_rewriter_test.rb

@@ -92,7 +92,7 @@ def handle_text_chunk(text)
     end
   end
 
-  def test_rewritten_text_chunk_is_still_sanitized
+  def test_rewritten_text_chunk_is_not_sanitized
     initial_html = "<p>Hey there, @gjtorikian is here.</p>"
 
     sanitizer_config = Selma::Sanitizer.new({
@@ -107,7 +107,7 @@ def test_rewritten_text_chunk_is_still_sanitized
     rewriter = Selma::Rewriter.new(sanitizer: sanitizer_config, handlers: [ElementRewriter.new])
     result = rewriter.rewrite(initial_html)
 
-    # `class` is sanitized out
-    assert_equal("<p>Hey there, <a href=\"https://yetto.app/gjtorikian\">@gjtorikian</a> is here.</p>", result)
+    # `class` is not sanitized out
+    assert_equal("<p>Hey there, <a href=\"https://yetto.app/gjtorikian\" class=\"user-mention\">@gjtorikian</a> is here.</p>", result)
   end
 end