chore: Replace attohttpc with reqwest

Stranger6667 · Stranger6667 · commit a7514b4d2a39 · 2024-01-01T13:58:34.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - A way to customize resolving remote stylesheets.
 
+### Changed
+
+- Replace `attohttpc` with `reqwest` to simplify implementing non-blocking stylesheet resolving in the future release.
+
 ## [0.12.0] - 2023-12-28
 
 ### Changed
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ fn main() -> css_inline::Result<()> {
     let inliner = css_inline::CSSInliner::options()
         .load_remote_stylesheets(false)
         .build();
-    let inlined = inliner.inline(HTML);
+    let inlined = inliner.inline(HTML)?;
     // Do something with inlined HTML, e.g. send an email
     Ok(())
 }
diff --git a/bindings/javascript/__test__/index.spec.ts b/bindings/javascript/__test__/index.spec.ts
@@ -49,7 +49,7 @@ test("invalid href", (t) => {
     );
   });
   t.is(error.code, "GenericFailure");
-  t.is(error.message, "Invalid base URL: http:");
+  t.is(error.message, "builder error: empty host: http:");
 });
 
 test("invalid style", (t) => {
diff --git a/bindings/python/tests-py/test_inlining.py b/bindings/python/tests-py/test_inlining.py
@@ -95,7 +95,7 @@ def test_invalid_base_url():
 
 
 def test_invalid_href():
-    with pytest.raises(ValueError, match="Invalid base URL: http:"):
+    with pytest.raises(ValueError, match="builder error: empty host: http:"):
         css_inline.inline(
             """<html>
     <head>
diff --git a/bindings/ruby/spec/css_inline_spec.rb b/bindings/ruby/spec/css_inline_spec.rb
@@ -79,7 +79,7 @@ def make_html(style, body)
         </body>
         </html>
         ''')
-    }.to raise_error('Invalid base URL: http:')
+    }.to raise_error('builder error: empty host: http:')
   end
 
   it 'Shows the CSS parsing errors' do
diff --git a/css-inline/Cargo.toml b/css-inline/Cargo.toml
@@ -24,19 +24,16 @@ name = "css-inline"
 [features]
 default = ["cli", "http", "file"]
 cli = ["pico-args", "rayon"]
-http = ["attohttpc"]
+http = ["reqwest"]
 file = []
 
 [dependencies]
-attohttpc = { version = "0.24", default-features = false, features = [
-  "compress",
-  "tls-rustls",
-], optional = true }
 cssparser = "0.31.2"
 html5ever = "0.26.0"
 indexmap = "2.1"
 pico-args = { version = "0.3", optional = true }
 rayon = { version = "1.7", optional = true }
+reqwest = { version = "0.11.23", optional = true, default-features = false, features = ["rustls-tls", "blocking"] }
 rustc-hash = "1.1.0"
 selectors = "0.25.0"
 smallvec = "1"
diff --git a/css-inline/src/error.rs b/css-inline/src/error.rs
@@ -23,7 +23,7 @@ pub enum InlineError {
     #[cfg(feature = "http")]
     Network {
         /// Original network error.
-        error: attohttpc::Error,
+        error: reqwest::Error,
         /// The stylesheet location caused the error.
         location: String,
     },
diff --git a/css-inline/src/lib.rs b/css-inline/src/lib.rs
@@ -403,6 +403,7 @@ pub fn inline(html: &str) -> Result<String> {
 }
 
 /// Shortcut for inlining CSS with default parameters and writing the output to a generic writer.
+///
 /// # Errors
 ///
 /// Inlining might fail for the following reasons:
diff --git a/css-inline/src/main.rs b/css-inline/src/main.rs
@@ -1,6 +1,3 @@
-use css_inline::DefaultStylesheetResolver;
-use std::sync::Arc;
-
 #[cfg(not(feature = "cli"))]
 fn main() {
     eprintln!("`css-inline` CLI is only available with the `cli` feature");
@@ -9,7 +6,7 @@ fn main() {
 
 #[cfg(feature = "cli")]
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    use css_inline::{CSSInliner, InlineOptions};
+    use css_inline::{CSSInliner, DefaultStylesheetResolver, InlineOptions};
     use rayon::prelude::*;
     use std::{
         borrow::Cow,
@@ -18,7 +15,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         fs::{read_to_string, File},
         io::{self, Read, Write},
         path::Path,
-        sync::atomic::{AtomicI32, Ordering},
+        sync::{
+            atomic::{AtomicI32, Ordering},
+            Arc,
+        },
     };
 
     const VERSION_MESSAGE: &[u8] =
diff --git a/css-inline/src/resolver.rs b/css-inline/src/resolver.rs
@@ -79,9 +79,9 @@ impl StylesheetResolver for DefaultStylesheetResolver {
             error,
             location: url.to_string(),
         };
-        let request =
-            attohttpc::RequestBuilder::try_new(attohttpc::Method::GET, url).map_err(into_error)?;
-        let response = request.send().map_err(into_error)?;
-        response.text().map_err(into_error)
+        reqwest::blocking::get(url)
+            .map_err(into_error)?
+            .text()
+            .map_err(into_error)
     }
 }
diff --git a/css-inline/tests/test_inlining.rs b/css-inline/tests/test_inlining.rs
@@ -663,7 +663,7 @@ fn remote_network_stylesheet_invalid_url() {
 </html>"#;
     let error = inline(html).expect_err("Should fail");
     #[cfg(feature = "http")]
-    let expected = "Invalid base URL: http:";
+    let expected = "builder error: empty host: http:";
     #[cfg(not(feature = "http"))]
     let expected = "Loading external URLs requires the `http` feature";
     assert_eq!(error.to_string(), expected);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ fn main() -> css_inline::Result<()> {`
`88`	`88`	`let inliner = css_inline::CSSInliner::options()`
`89`	`89`	`.load_remote_stylesheets(false)`
`90`	`90`	`.build();`
`91`		`- let inlined = inliner.inline(HTML);`
	`91`	`+ let inlined = inliner.inline(HTML)?;`
`92`	`92`	`// Do something with inlined HTML, e.g. send an email`
`93`	`93`	`Ok(())`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,7 @@ pub fn inline(html: &str) -> Result<String> {`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`/// Shortcut for inlining CSS with default parameters and writing the output to a generic writer.`
	`406`	`+///`
`406`	`407`	`/// # Errors`
`407`	`408`	`///`
`408`	`409`	`/// Inlining might fail for the following reasons:`
Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,9 @@ impl StylesheetResolver for DefaultStylesheetResolver {`
`79`	`79`	`error,`
`80`	`80`	`location: url.to_string(),`
`81`	`81`	`};`
`82`		`- let request =`
`83`		`- attohttpc::RequestBuilder::try_new(attohttpc::Method::GET, url).map_err(into_error)?;`
`84`		`- let response = request.send().map_err(into_error)?;`
`85`		`- response.text().map_err(into_error)`
	`82`	`+ reqwest::blocking::get(url)`
	`83`	`+ .map_err(into_error)?`
	`84`	`+ .text()`
	`85`	`+ .map_err(into_error)`
`86`	`86`	`}`
`87`	`87`	`}`