selma 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8f57d5ae3f09a9457ea5a2ed3bd8db347bbb2b4d696cd660e53fe7dd77b3e1
-  data.tar.gz: 7722be4f78d25760464a28679cd92cede4ae0013ef1f5a170a68945e500270f3
+  metadata.gz: ee5c02252f9d3c815aea09d7a79070ae69a4b6c167227f01195faad8c99f52da
+  data.tar.gz: 5e06f14ecd535c95cdda8c1869a1a255833ab3cc3c41dd4e2ca311b07ca8b4ff
 SHA512:
-  metadata.gz: afd41b0e75bec3fa4f6ffffa20a3b8642fcbf3338fe2e9fa1439dfa54cb70a007d86fe15f9c6c78f1815d45305309f2ccef19987165e2e8c30018286d6d94576
-  data.tar.gz: e07f434d483f5ef6b7181c4f4197b258a83b35958eda0c5c1cb216a2bf407a9cd3b6adbc59dc6e280990397bb40f21712520d4190b4076e881a79645af01833f
+  metadata.gz: 9e550b2bf33e7c57ee1f3cc07be5d5a0ab042959ffad69736ab13cd3e5ca3dca773855ac04f786b286c8917896ef5c7a50d9737f5ec4a85caf804a1d142d59be
+  data.tar.gz: 8e98daa7579c0f25ce65426813de1989235c18b86e0ee2519b72430fad7f5274c08c38971aff40305df8664c97ef6f369912abcf36509d9b1130b3025655a8ab

data/Cargo.lock

@@ -15,20 +15,20 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.62.0"
+version = "0.66.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722"
+checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "cexpr",
  "clang-sys",
  "lazy_static",
@@ -39,7 +39,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -50,15 +50,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cexpr"
@@ -116,7 +116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -134,24 +134,24 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "0.4.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
+checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
 dependencies = [
  "dtoa",
 ]
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
@@ -179,7 +179,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -246,9 +246,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.145"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
@@ -262,17 +262,17 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lol_html"
-version = "1.0.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce59b33732efed2480f7d15722ed56905e81004b402196a738f7532ff44d9798"
+checksum = "10662f7aad081ec900fd735be33076da75e0389400277dc3734e2b0aa02bb115"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.4.0",
  "cfg-if",
  "cssparser",
  "encoding_rs",
@@ -288,24 +288,25 @@ dependencies = [
 
 [[package]]
 name = "magnus"
-version = "0.5.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8dc14463c2552e753ef562961f486ca76f17a857c121db40e9f3ade3f35ab81"
+checksum = "4778544796676e8428e9c622460ebf284bea52d8b10db3aeb449d8b5e61b3a13"
 dependencies = [
  "magnus-macros",
  "rb-sys",
  "rb-sys-env",
+ "seq-macro",
 ]
 
 [[package]]
 name = "magnus-macros"
-version = "0.4.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc17af1d45442c011aa579d727ec6cff8a69aea8a6bbad26736e7112d749bfb"
+checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -316,9 +317,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "mime"
@@ -434,18 +435,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.59"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -503,18 +504,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.78"
+version = "0.9.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91447d8cbb45afb5c915bad4dd44bd4b4e9be37648122409ceca75302cb81683"
+checksum = "a3e6bf79bf4c711917cacfaf46dfab4314dbfdd89a8ee3ec4b98336cd23f1ebf"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.78"
+version = "0.9.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20673c1cfbd57b2db6c066b796352f07d241c45b210fd15b269dec54fa240380"
+checksum = "5482a1ed4cde58dddaf162b6aebcb5c25645822547832b8be101f2acd40bcdd6"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -522,7 +523,7 @@ dependencies = [
  "quote",
  "regex",
  "shell-words",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -533,9 +534,21 @@ checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
 
 [[package]]
 name = "regex"
-version = "1.8.3"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -544,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
 
 [[package]]
 name = "rustc-hash"
@@ -601,9 +614,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "seq-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "servo_arc"
@@ -623,21 +642,21 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "stable_deref_trait"
@@ -658,9 +677,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -675,29 +694,29 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "version_check"

data/README.md

@@ -164,6 +164,9 @@ The `element` argument in `handle_element` has the following methods:
 - `prepend(content, as: content_type)`: prepends `content` to the element's inner content, i.e. inserts content right after the element's start tag. `content_type` is either `:text` or `:html` and determines how the content will be applied.
 - `append(content, as: content_type)`: appends `content` to the element's inner content, i.e. inserts content right before the element's end tag. `content_type` is either `:text` or `:html` and determines how the content will be applied.
 - `set_inner_content`: Replaces inner content of the element with `content`. `content_type` is either `:text` or `:html` and determines how the content will be applied.
+- `remove`: Removes the element and its inner content.
+- `remove_and_keep_content`: Removes the element, but keeps its content. I.e. remove start and end tags of the element.
+- `removed?`: A bool which identifies if the element has been removed or replaced with some content.
 
 #### `text_chunk` methods
 

data/ext/selma/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 enum-iterator = "1.4"
 escapist = "0.0.2"
-magnus = "0.5"
-lol_html = "1.0"
+magnus = "0.6"
+lol_html = "1.2"
 
 [lib]
 name = "selma"

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

@@ -215,12 +215,41 @@ impl SelmaHTMLElement {
 
         Ok(())
     }
+
+    fn remove(&self) {
+        let mut binding = self.0.borrow_mut();
+
+        if let Ok(e) = binding.element.get_mut() {
+            e.remove()
+        }
+    }
+
+    fn remove_and_keep_content(&self) {
+        let mut binding = self.0.borrow_mut();
+
+        if let Ok(e) = binding.element.get_mut() {
+            e.remove_and_keep_content()
+        }
+    }
+
+    fn is_removed(&self) -> Result<bool, Error> {
+        let binding = self.0.borrow();
+
+        if let Ok(e) = binding.element.get() {
+            Ok(e.removed())
+        } else {
+            Err(Error::new(
+                exception::runtime_error(),
+                "`is_removed` is not available",
+            ))
+        }
+    }
 }
 
 pub fn init(c_html: RClass) -> Result<(), Error> {
     let c_element = c_html
-        .define_class("Element", Default::default())
-        .expect("cannot find class Selma::HTML::Element");
+        .define_class("Element", magnus::class::object())
+        .expect("cannot define class Selma::HTML::Element");
 
     c_element.define_method("tag_name", method!(SelmaHTMLElement::tag_name, 0))?;
     c_element.define_method("tag_name=", method!(SelmaHTMLElement::set_tag_name, 1))?;
@@ -250,5 +279,12 @@ pub fn init(c_html: RClass) -> Result<(), Error> {
         method!(SelmaHTMLElement::set_inner_content, -1),
     )?;
 
+    c_element.define_method("remove", method!(SelmaHTMLElement::remove, 0))?;
+    c_element.define_method(
+        "remove_and_keep_content",
+        method!(SelmaHTMLElement::remove_and_keep_content, 0),
+    )?;
+    c_element.define_method("removed?", method!(SelmaHTMLElement::is_removed, 0))?;
+
     Ok(())
 }

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

@@ -26,8 +26,8 @@ impl SelmaHTMLEndTag {
 
 pub fn init(c_html: RClass) -> Result<(), Error> {
     let c_end_tag = c_html
-        .define_class("EndTag", Default::default())
-        .expect("cannot find class Selma::HTML::EndTag");
+        .define_class("EndTag", magnus::class::object())
+        .expect("cannot define class Selma::HTML::EndTag");
 
     c_end_tag.define_method("tag_name", method!(SelmaHTMLEndTag::tag_name, 0))?;
 

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

@@ -99,8 +99,8 @@ impl SelmaHTMLTextChunk {
 
 pub fn init(c_html: RClass) -> Result<(), Error> {
     let c_text_chunk = c_html
-        .define_class("TextChunk", Default::default())
-        .expect("cannot find class Selma::HTML::TextChunk");
+        .define_class("TextChunk", magnus::class::object())
+        .expect("cannot define class Selma::HTML::TextChunk");
 
     c_text_chunk.define_method("to_s", method!(SelmaHTMLTextChunk::to_s, 0))?;
     c_text_chunk.define_method("content", method!(SelmaHTMLTextChunk::to_s, 0))?;

data/ext/selma/src/html.rs

@@ -5,7 +5,9 @@ use magnus::{Error, Module, RModule};
 pub(crate) struct SelmaHTML {}
 
 pub fn init(m_selma: RModule) -> Result<(), Error> {
-    let c_html = m_selma.define_class("HTML", Default::default()).unwrap();
+    let c_html = m_selma
+        .define_class("HTML", magnus::class::object())
+        .expect("cannot define class Selma::HTML");
 
     element::init(c_html).expect("cannot define Selma::HTML::Element class");
     end_tag::init(c_html).expect("cannot define Selma::HTML::EndTag class");

data/ext/selma/src/lib.rs

@@ -9,7 +9,6 @@ pub mod rewriter;
 pub mod sanitizer;
 pub mod selector;
 pub mod tags;
-pub mod wrapped_struct;
 
 #[allow(clippy::let_unit_value)]
 fn scan_text_args(args: &[Value]) -> Result<(String, ContentType), magnus::Error> {

data/ext/selma/src/rewriter.rs

@@ -3,7 +3,12 @@ use lol_html::{
     html_content::{Element, TextChunk},
     text, DocumentContentHandlers, ElementContentHandlers, HtmlRewriter, Selector, Settings,
 };
-use magnus::{exception, function, method, scan_args, Module, Object, RArray, RModule, Value};
+use magnus::{
+    exception, function, method, scan_args,
+    typed_data::Obj,
+    value::{Opaque, ReprValue},
+    Module, Object, RArray, RModule, Ruby, Value,
+};
 
 use std::{borrow::Cow, cell::RefCell, primitive::str, rc::Rc};
 
@@ -12,31 +17,30 @@ use crate::{
     sanitizer::SelmaSanitizer,
     selector::SelmaSelector,
     tags::Tag,
-    wrapped_struct::WrappedStruct,
 };
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Handler {
-    rb_handler: Value,
-    rb_selector: WrappedStruct<SelmaSelector>,
-
-    total_element_handler_calls: usize,
-    total_elapsed_element_handlers: f64,
+    rb_handler: Opaque<Value>,
+    rb_selector: Opaque<Obj<SelmaSelector>>,
+    // total_element_handler_calls: usize,
+    // total_elapsed_element_handlers: f64,
 
-    total_text_handler_calls: usize,
-    total_elapsed_text_handlers: f64,
+    // total_text_handler_calls: usize,
+    // total_elapsed_text_handlers: f64,
 }
 
 pub struct Rewriter {
     sanitizer: Option<SelmaSanitizer>,
     handlers: Vec<Handler>,
-
-    total_elapsed: f64,
+    // total_elapsed: f64,
 }
 
 #[magnus::wrap(class = "Selma::Rewriter")]
 pub struct SelmaRewriter(std::cell::RefCell<Rewriter>);
 
+type RewriterValues = (Option<Option<Obj<SelmaSanitizer>>>, Option<RArray>);
+
 impl SelmaRewriter {
     const SELMA_ON_END_TAG: &str = "on_end_tag";
     const SELMA_HANDLE_ELEMENT: &str = "handle_element";
@@ -53,15 +57,15 @@ impl SelmaRewriter {
         let sanitizer = match rb_sanitizer {
             None => {
                 let default_sanitizer = SelmaSanitizer::new(&[])?;
-                let wrapped_sanitizer = WrappedStruct::from(default_sanitizer);
+                let wrapped_sanitizer = Obj::wrap(default_sanitizer);
                 wrapped_sanitizer.funcall::<&str, (), Value>("setup", ())?;
-                Some(wrapped_sanitizer.get().unwrap().to_owned())
+                Some(wrapped_sanitizer.get().to_owned())
             }
             Some(sanitizer_value) => match sanitizer_value {
                 None => None,
                 Some(sanitizer) => {
                     sanitizer.funcall::<&str, (), Value>("setup", ())?;
-                    Some(sanitizer.get().unwrap().to_owned())
+                    Some(sanitizer.get().to_owned())
                 }
             },
         };
@@ -86,24 +90,23 @@ impl SelmaRewriter {
                         ));
                     }
 
-                    let rb_selector: WrappedStruct<SelmaSelector> =
-                        match rb_handler.funcall("selector", ()) {
-                            Err(err) => {
-                                return Err(magnus::Error::new(
-                                    exception::type_error(),
-                                    format!("Error instantiating selector: {err:?}"),
-                                ));
-                            }
-                            Ok(rb_selector) => rb_selector,
-                        };
+                    let rb_selector: Obj<SelmaSelector> = match rb_handler.funcall("selector", ()) {
+                        Err(err) => {
+                            return Err(magnus::Error::new(
+                                exception::type_error(),
+                                format!("Error instantiating selector: {err:?}"),
+                            ));
+                        }
+                        Ok(rb_selector) => rb_selector,
+                    };
                     let handler = Handler {
-                        rb_handler,
-                        rb_selector,
-                        total_element_handler_calls: 0,
-                        total_elapsed_element_handlers: 0.0,
+                        rb_handler: Opaque::from(rb_handler),
+                        rb_selector: Opaque::from(rb_selector),
+                        // total_element_handler_calls: 0,
+                        // total_elapsed_element_handlers: 0.0,
 
-                        total_text_handler_calls: 0,
-                        total_elapsed_text_handlers: 0.0,
+                        // total_text_handler_calls: 0,
+                        // total_elapsed_text_handlers: 0.0,
                     };
                     handlers.push(handler);
                 }
@@ -121,20 +124,12 @@ impl SelmaRewriter {
         Ok(Self(std::cell::RefCell::new(Rewriter {
             sanitizer,
             handlers,
-            total_elapsed: 0.0,
+            // total_elapsed: 0.0,
         })))
     }
 
     #[allow(clippy::let_unit_value)]
-    fn scan_parse_args(
-        args: &[Value],
-    ) -> Result<
-        (
-            Option<Option<WrappedStruct<SelmaSanitizer>>>,
-            Option<RArray>,
-        ),
-        magnus::Error,
-    > {
+    fn scan_parse_args(args: &[Value]) -> Result<RewriterValues, magnus::Error> {
         let args = scan_args::scan_args(args)?;
         let _: () = args.required;
         let _: () = args.optional;
@@ -145,10 +140,7 @@ impl SelmaRewriter {
         let kwargs = scan_args::get_kwargs::<
             _,
             (),
-            (
-                Option<Option<WrappedStruct<SelmaSanitizer>>>,
-                Option<RArray>,
-            ),
+            (Option<Option<Obj<SelmaSanitizer>>>, Option<RArray>),
             (),
         >(args.keywords, &[], &["sanitizer", "handlers"])?;
         let (rb_sanitizer, rb_handlers) = kwargs.optional;
@@ -270,7 +262,9 @@ impl SelmaRewriter {
         handlers.iter().for_each(|handler| {
             let element_stack: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::new(vec![]));
 
-            let selector = handler.rb_selector.get_static().unwrap();
+            let ruby = Ruby::get().unwrap();
+
+            let selector = ruby.get_inner(handler.rb_selector);
 
             // TODO: test final raise by simulating errors
             if selector.match_element().is_some() {
@@ -280,7 +274,7 @@ impl SelmaRewriter {
                     selector.match_element().unwrap(),
                     move |el| {
                         match Self::process_element_handlers(
-                            handler.rb_handler,
+                            ruby.get_inner(handler.rb_handler),
                             el,
                             &closure_element_stack.borrow(),
                         ) {
@@ -311,7 +305,9 @@ impl SelmaRewriter {
                             }
                         }
 
-                        match Self::process_text_handlers(handler.rb_handler, text) {
+                        let ruby = Ruby::get().unwrap();
+                        match Self::process_text_handlers(ruby.get_inner(handler.rb_handler), text)
+                        {
                             Ok(_) => Ok(()),
                             Err(err) => Err(err.to_string().into()),
                         }
@@ -421,8 +417,8 @@ impl SelmaRewriter {
 
 pub fn init(m_selma: RModule) -> Result<(), magnus::Error> {
     let c_rewriter = m_selma
-        .define_class("Rewriter", Default::default())
-        .expect("cannot find class Selma::Rewriter");
+        .define_class("Rewriter", magnus::class::object())
+        .expect("cannot define class Selma::Rewriter");
 
     c_rewriter.define_singleton_method("new", function!(SelmaRewriter::new, -1))?;
     c_rewriter

data/ext/selma/src/sanitizer.rs

@@ -4,9 +4,13 @@ use lol_html::{
     errors::AttributeNameError,
     html_content::{Comment, ContentType, Doctype, Element, EndTag},
 };
-use magnus::{class, function, method, scan_args, Module, Object, RArray, RHash, RModule, Value};
+use magnus::{
+    class, function, method, scan_args,
+    value::{Opaque, ReprValue},
+    Module, Object, RArray, RHash, RModule, Ruby, Value,
+};
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 struct ElementSanitizer {
     allowed_attrs: Vec<String>,
     required_attrs: Vec<String>,
@@ -14,19 +18,7 @@ struct ElementSanitizer {
     protocol_sanitizers: HashMap<String, Vec<String>>,
 }
 
-impl Default for ElementSanitizer {
-    fn default() -> Self {
-        ElementSanitizer {
-            allowed_attrs: vec![],
-            allowed_classes: vec![],
-            required_attrs: vec![],
-
-            protocol_sanitizers: HashMap::new(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Sanitizer {
     flags: [u8; crate::tags::Tag::TAG_COUNT],
     allowed_attrs: Vec<String>,
@@ -36,10 +28,10 @@ pub struct Sanitizer {
     pub escape_tagfilter: bool,
     pub allow_comments: bool,
     pub allow_doctype: bool,
-    config: RHash,
+    config: Opaque<RHash>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 #[magnus::wrap(class = "Selma::Sanitizer")]
 pub struct SelmaSanitizer(std::cell::RefCell<Sanitizer>);
 
@@ -77,14 +69,15 @@ impl SelmaSanitizer {
             escape_tagfilter: true,
             allow_comments: false,
             allow_doctype: true,
-            config,
+            config: config.into(),
         })))
     }
 
     fn get_config(&self) -> Result<RHash, magnus::Error> {
         let binding = self.0.borrow();
+        let ruby = Ruby::get().unwrap();
 
-        Ok(binding.config)
+        Ok(ruby.get_inner(binding.config))
     }
 
     /// Toggle a sanitizer option on or off.
@@ -308,9 +301,9 @@ impl SelmaSanitizer {
                     let mut buf = String::new();
                     // ...then, escape any special characters, for security
                     if attr_name == "href" {
-                        escapist::escape_href(&mut buf, unescaped_attr_val.as_str());
+                        escapist::escape_href(&mut buf, unescaped_attr_val.as_str()).unwrap();
                     } else {
-                        escapist::escape_html(&mut buf, unescaped_attr_val.as_str());
+                        escapist::escape_html(&mut buf, unescaped_attr_val.as_str()).unwrap();
                     };
 
                     match element.set_attribute(attr_name, &buf) {
@@ -554,7 +547,9 @@ impl SelmaSanitizer {
 }
 
 pub fn init(m_selma: RModule) -> Result<(), magnus::Error> {
-    let c_sanitizer = m_selma.define_class("Sanitizer", Default::default())?;
+    let c_sanitizer = m_selma
+        .define_class("Sanitizer", magnus::class::object())
+        .expect("cannot define class Selma::Sanitizer");
 
     c_sanitizer.define_singleton_method("new", function!(SelmaSanitizer::new, -1))?;
     c_sanitizer.define_method("config", method!(SelmaSanitizer::get_config, 0))?;

data/ext/selma/src/selector.rs

@@ -8,6 +8,8 @@ pub struct SelmaSelector {
     ignore_text_within: Option<Vec<String>>,
 }
 
+type SelectorMatches = (Option<String>, Option<String>, Option<Vec<String>>);
+
 impl SelmaSelector {
     fn new(args: &[Value]) -> Result<Self, Error> {
         let (match_element, match_text_within, rb_ignore_text_within) =
@@ -63,9 +65,7 @@ impl SelmaSelector {
     }
 
     #[allow(clippy::let_unit_value)]
-    fn scan_parse_args(
-        args: &[Value],
-    ) -> Result<(Option<String>, Option<String>, Option<Vec<String>>), Error> {
+    fn scan_parse_args(args: &[Value]) -> Result<SelectorMatches, Error> {
         let args = scan_args::scan_args(args)?;
         let _: () = args.required;
         let _: () = args.optional;
@@ -103,7 +103,7 @@ impl SelmaSelector {
 
 pub fn init(m_selma: RModule) -> Result<(), Error> {
     let c_selector = m_selma
-        .define_class("Selector", Default::default())
+        .define_class("Selector", magnus::class::object())
         .expect("cannot define class Selma::Selector");
 
     c_selector.define_singleton_method("new", function!(SelmaSelector::new, -1))?;

data/lib/selma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selma
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -76,7 +76,6 @@ files:
 - ext/selma/src/sanitizer.rs
 - ext/selma/src/selector.rs
 - ext/selma/src/tags.rs
-- ext/selma/src/wrapped_struct.rs
 - lib/selma.rb
 - lib/selma/extension.rb
 - lib/selma/html.rb
@@ -112,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: Selma selects and matches HTML nodes using CSS rules. Backed by Rust's lol_html

data/ext/selma/src/wrapped_struct.rs

@@ -1,92 +0,0 @@
-use magnus::{error::Error, exception, gc, value::Value, RTypedData, TryConvert, TypedData};
-use std::{marker::PhantomData, ops::Deref};
-
-// NOTE: My Rust isn't good enough to know what any of this does,
-// but it was taken from https://cs.github.com/bytecodealliance/wasmtime-rb/blob/a843e4b4582a945f2c881b8bd3e2b87688ab5509/ext/src/helpers/wrapped_struct.rs#L4
-
-/// A small wrapper for `RTypedData` that keeps track of the concrete struct
-/// type, and the underlying [`Value`] for GC purposes.
-#[derive(Debug)]
-#[repr(transparent)]
-pub struct WrappedStruct<T: TypedData> {
-    inner: RTypedData,
-    phantom: PhantomData<T>,
-}
-
-impl<T: TypedData> Clone for WrappedStruct<T> {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner,
-            phantom: PhantomData,
-        }
-    }
-}
-impl<T: TypedData> Copy for WrappedStruct<T> {}
-
-impl<T: TypedData> WrappedStruct<T> {
-    /// Gets the underlying struct.
-    pub fn get(&self) -> Result<&T, Error> {
-        self.inner.try_convert()
-    }
-
-    /// Gets the underlying struct with a `'static` lifetime.
-    pub fn get_static(&self) -> Result<&'static T, Error> {
-        self.inner.try_convert()
-    }
-
-    /// Get the Ruby [`Value`] for this struct.
-    pub fn to_value(self) -> Value {
-        self.inner.into()
-    }
-
-    /// Marks the Ruby [`Value`] for GC.
-    pub fn mark(&self) {
-        gc::mark(&self.inner.into());
-    }
-}
-
-impl<T: TypedData> From<WrappedStruct<T>> for Value {
-    fn from(wrapped_struct: WrappedStruct<T>) -> Self {
-        wrapped_struct.to_value()
-    }
-}
-
-impl<T: TypedData> Deref for WrappedStruct<T> {
-    type Target = RTypedData;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<T: TypedData> From<T> for WrappedStruct<T> {
-    fn from(t: T) -> Self {
-        Self {
-            inner: RTypedData::wrap(t),
-            phantom: PhantomData,
-        }
-    }
-}
-
-impl<T> TryConvert for WrappedStruct<T>
-where
-    T: TypedData,
-{
-    fn try_convert(val: Value) -> Result<Self, Error> {
-        let inner = RTypedData::from_value(val).ok_or_else(|| {
-            Error::new(
-                exception::type_error(),
-                format!(
-                    "no implicit conversion of {} into {}",
-                    unsafe { val.classname() },
-                    T::class()
-                ),
-            )
-        })?;
-
-        Ok(Self {
-            inner,
-            phantom: PhantomData,
-        })
-    }
-}