update 3rd-party dependencies and bump version number

do not crash the app if reqwest throws, add support for deflate & brotli

.github/workflows/build_gnu_linux.yml

@@ -3,6 +3,17 @@ name: GNU/Linux
 on:
   push:
     branches: [ master ]
+    paths-ignore:
+    - 'assets/'
+    - 'dist/'
+    - 'docs/'
+    - 'snap/'
+    - '.adr-dir'
+    - 'Dockerfile'
+    - 'LICENSE'
+    - 'Makefile'
+    - 'monolith.nuspec'
+    - 'README.md'
 
 jobs:
   build:
@@ -17,6 +28,8 @@ jobs:
 
     steps:
     - run: git config --global core.autocrlf false
+
     - uses: actions/checkout@v2
+
     - name: Build
       run: cargo build --all --locked --verbose

.github/workflows/build_macos.yml

@@ -3,6 +3,17 @@ name: macOS
 on:
   push:
     branches: [ master ]
+    paths-ignore:
+    - 'assets/'
+    - 'dist/'
+    - 'docs/'
+    - 'snap/'
+    - '.adr-dir'
+    - 'Dockerfile'
+    - 'LICENSE'
+    - 'Makefile'
+    - 'monolith.nuspec'
+    - 'README.md'
 
 jobs:
   build:
@@ -17,6 +28,8 @@ jobs:
 
     steps:
     - run: git config --global core.autocrlf false
+
     - uses: actions/checkout@v2
+
     - name: Build
       run: cargo build --all --locked --verbose

.github/workflows/build_windows.yml

@@ -3,6 +3,17 @@ name: Windows
 on:
   push:
     branches: [ master ]
+    paths-ignore:
+    - 'assets/'
+    - 'dist/'
+    - 'docs/'
+    - 'snap/'
+    - '.adr-dir'
+    - 'Dockerfile'
+    - 'LICENSE'
+    - 'Makefile'
+    - 'monolith.nuspec'
+    - 'README.md'
 
 jobs:
   build:
@@ -17,6 +28,8 @@ jobs:
 
     steps:
     - run: git config --global core.autocrlf false
+
     - uses: actions/checkout@v2
+
     - name: Build
       run: cargo build --all --locked --verbose

.github/workflows/cd.yml

@@ -1,4 +1,4 @@
-# CD GitHub Actions workflow for Monolith
+# CD GitHub Actions workflow for monolith
 
 name: CD
 
@@ -13,10 +13,13 @@ jobs:
     runs-on: windows-2019
     steps:
     - run: git config --global core.autocrlf false
+
     - name: Checkout the repository
       uses: actions/checkout@v2
+
     - name: Build the executable
       run: cargo build --release
+
     - uses: Shopify/upload-to-release@1.0.0
       with:
         name: monolith.exe
@@ -28,9 +31,10 @@ jobs:
     steps:
     - name: Checkout the repository
       uses: actions/checkout@v2
+
     - name: Prepare cross-platform environment
       run: |
-        sudo mkdir -p /cross-build
+        sudo mkdir /cross-build
         sudo touch /etc/apt/sources.list.d/armhf.list
         echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic main" | sudo tee -a /etc/apt/sources.list.d/armhf.list
         sudo apt-get update
@@ -44,8 +48,10 @@ jobs:
         echo "OPENSSL_LIB_DIR=/cross-build/usr/lib/arm-linux-gnueabihf" >> $GITHUB_ENV
         echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
         echo "RUSTFLAGS=-C linker=arm-linux-gnueabihf-gcc -L/usr/arm-linux-gnueabihf/lib -L/cross-build/usr/lib/arm-linux-gnueabihf -L/cross-build/lib/arm-linux-gnueabihf" >> $GITHUB_ENV
+
     - name: Build the executable
       run: cargo build --release --target=arm-unknown-linux-gnueabihf
+
     - name: Attach artifact to the release
       uses: Shopify/upload-to-release@1.0.0
       with:
@@ -54,15 +60,16 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
   gnu_linux_aarch64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     steps:
     - name: Checkout the repository
       uses: actions/checkout@v2
+
     - name: Prepare cross-platform environment
       run: |
-        sudo mkdir -p /cross-build
+        sudo mkdir /cross-build
         sudo touch /etc/apt/sources.list.d/arm64.list
-        echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main" | sudo tee -a /etc/apt/sources.list.d/arm64.list
+        echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main" | sudo tee -a /etc/apt/sources.list.d/arm64.list
         sudo apt-get update
         sudo apt-get install -y gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross
         sudo apt-get download libssl1.1:arm64 libssl-dev:arm64
@@ -74,8 +81,10 @@ jobs:
         echo "OPENSSL_LIB_DIR=/cross-build/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV
         echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
         echo "RUSTFLAGS=-C linker=aarch64-linux-gnu-gcc -L/usr/aarch64-linux-gnu/lib -L/cross-build/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV
+
     - name: Build the executable
       run: cargo build --release --target=aarch64-unknown-linux-gnu
+
     - name: Attach artifact to the release
       uses: Shopify/upload-to-release@1.0.0
       with:
@@ -88,8 +97,10 @@ jobs:
     steps:
     - name: Checkout the repository
       uses: actions/checkout@v2
+
     - name: Build the executable
       run: cargo build --release
+
     - uses: Shopify/upload-to-release@1.0.0
       with:
         name: monolith-gnu-linux-x86_64

.github/workflows/ci.yml

@@ -1,8 +1,21 @@
+# CI GitHub Actions workflow for monolith
+
 name: CI
 
 on:
   pull_request:
     branches: [ master ]
+    paths-ignore:
+    - 'assets/'
+    - 'dist/'
+    - 'docs/'
+    - 'snap/'
+    - '.adr-dir'
+    - 'Dockerfile'
+    - 'LICENSE'
+    - 'Makefile'
+    - 'monolith.nuspec'
+    - 'README.md'
 
 jobs:
   build_and_test:
@@ -21,11 +34,15 @@ jobs:
 
     steps:
     - run: git config --global core.autocrlf false
+
     - uses: actions/checkout@v2
+
     - name: Build
       run: cargo build --all --locked --verbose
+
     - name: Run tests
       run: cargo test --all --locked --verbose
+
     - name: Check code formatting
       run: |
         rustup component add rustfmt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monolith"
-version = "2.6.1"
+version = "2.6.2"
 authors = [
     "Sunshine <sunshine@uberspace.net>",
     "Mahdi Robatipoor <mahdi.robatipoor@gmail.com>",
@@ -23,20 +23,21 @@ license = "CC0-1.0"
 
 [dependencies]
 atty = "0.2.14" # Used for highlighting network errors
-base64 = "0.13.0"
-chrono = "0.4.19" # Used for formatting creation timestamp
-clap = "2.33.3"
-cssparser = "0.28.1"
-encoding_rs = "0.8.28"
+base64 = "0.13.0" # Used for integrity attributes
+chrono = "0.4.20" # Used for formatting creation timestamp
+clap = "3.2.16"
+cssparser = "0.29.6"
+encoding_rs = "0.8.31"
 html5ever = "0.24.1"
-regex = "1.5.4" # Used for parsing srcset and NOSCRIPT
-sha2 = "0.9.5" # Used for calculating checksums during integrity checks
+percent-encoding = "2.1.0"
+regex = "1.6.0" # Used for parsing srcset and NOSCRIPT
+sha2 = "0.10.2" # Used for calculating checksums during integrity checks
 url = "2.2.2"
 
 [dependencies.reqwest]
-version = "0.11.4"
+version = "0.11.11"
 default-features = false
-features = ["default-tls", "blocking", "gzip"]
+features = ["default-tls", "blocking", "gzip", "brotli", "deflate"]
 
 [dev-dependencies]
-assert_cmd = "1.0.7"
+assert_cmd = "2.0.4"

Dockerfile

@@ -1,18 +1,22 @@
-FROM rust
-
-WORKDIR /usr/local/src/
-RUN curl -s https://api.github.com/repos/y2z/monolith/releases/latest \
-    | grep "tarball_url.*\"," \
-    | cut -d '"' -f 4 \
-    | wget -qi - -O monolith.tar.gz
+FROM ekidd/rust-musl-builder as builder
 
+RUN curl -L -o monolith.tar.gz $(curl -s https://api.github.com/repos/y2z/monolith/releases/latest \
+                                 | grep "tarball_url.*\"," \
+                                 | cut -d '"' -f 4)
 RUN tar xfz monolith.tar.gz \
     && mv Y2Z-monolith-* monolith \
     && rm monolith.tar.gz
 
-WORKDIR /usr/local/src/monolith
-RUN ls -a
+WORKDIR monolith/
 RUN make install
 
+
+FROM alpine
+
+RUN apk update && \
+  apk add --no-cache openssl && \
+  rm -rf "/var/cache/apk/*"
+
+COPY --from=builder /home/rust/.cargo/bin/monolith /usr/bin/monolith
 WORKDIR /tmp
-CMD ["/usr/local/cargo/bin/monolith"]
+ENTRYPOINT ["/usr/bin/monolith"]

README.md

@@ -1,6 +1,6 @@
-[![Monolith Build Status for GNU/Linux](https://github.com/Y2Z/monolith/workflows/GNU%2FLinux/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AGNU%2FLinux)
-[![Monolith Build Status for macOS](https://github.com/Y2Z/monolith/workflows/macOS/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AmacOS)
-[![Monolith Build Status for Windows](https://github.com/Y2Z/monolith/workflows/Windows/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AWindows)
+[![monolith build status on GNU/Linux](https://github.com/Y2Z/monolith/workflows/GNU%2FLinux/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AGNU%2FLinux)
+[![monolith build status on macOS](https://github.com/Y2Z/monolith/workflows/macOS/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AmacOS)
+[![monolith build status on Windows](https://github.com/Y2Z/monolith/workflows/Windows/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AWindows)
 
 ```
  _____     ______________    __________      ___________________    ___
@@ -18,56 +18,97 @@ Unlike the conventional “Save page as”, `monolith` not only saves the target
 
 If compared to saving websites with `wget -mpk`, this tool embeds all assets as data URLs and therefore lets browsers render the saved page exactly the way it was on the Internet, even when no network connection is available.
 
+
 ---------------------------------------------------
 
+
 ## Installation
 
 #### Using [Cargo](https://crates.io/crates/monolith)
-    $ cargo install monolith
+
+```console
+cargo install monolith
+```
 
 #### Via [Homebrew](https://formulae.brew.sh/formula/monolith) (macOS and GNU/Linux)
-    $ brew install monolith
+
+```console
+brew install monolith
+```
+
+#### Via [MacPorts](https://ports.macports.org/port/monolith/summary) (macOS)
+
+```console
+sudo port install monolith
+```
 
 #### Using [Snapcraft](https://snapcraft.io/monolith) (GNU/Linux)
-    $ snap install monolith
+
+```console
+snap install monolith
+```
 
 #### Using [FreeBSD packages](https://svnweb.freebsd.org/ports/head/www/monolith/) (FreeBSD)
-    $ pkg install monolith
+
+```console
+pkg install monolith
+```
 
 #### Using [FreeBSD ports](https://www.freshports.org/www/monolith/) (FreeBSD)
-    $ cd /usr/ports/www/monolith/
-    $ make install clean
+
+```console
+cd /usr/ports/www/monolith/
+make install clean
+```
 
 #### Using [pkgsrc](https://pkgsrc.se/www/monolith) (NetBSD, OpenBSD, Haiku, etc)
-    $ cd /usr/pkgsrc/www/monolith
-    $ make install clean
 
-#### Using [pre-built binaries](https://github.com/Y2Z/monolith/releases) (Windows, ARM-based devices, etc)
-Every release contains pre-built binaries for Windows, GNU/Linux, as well as platforms with non-standart CPU architecture.
+```console
+cd /usr/pkgsrc/www/monolith
+make install clean
+```
 
 #### Using [containers](https://www.docker.com/)
-    $ docker build -t Y2Z/monolith .
-    $ sudo install -b utils/run-in-container.sh /usr/local/bin/monolith
 
-#### From source
+```console
+docker build -t Y2Z/monolith .
+sudo install -b dist/run-in-container.sh /usr/local/bin/monolith
+```
 
-Dependency: `libssl-dev`
+#### From [source](https://github.com/Y2Z/monolith)
+
+Dependency: `libssl`
+
+```console
+git clone https://github.com/Y2Z/monolith.git
+cd monolith
+make install
+```
+
+#### Using [pre-built binaries](https://github.com/Y2Z/monolith/releases) (Windows, ARM-based devices, etc)
+
+Every release contains pre-built binaries for Windows, GNU/Linux, as well as platforms with non-standard CPU architecture.
 
-    $ git clone https://github.com/Y2Z/monolith.git
-    $ cd monolith
-    $ make install
 
 ---------------------------------------------------
 
+
 ## Usage
-    $ monolith https://lyrics.github.io/db/P/Portishead/Dummy/Roads/ -o portishead-roads-lyrics.html
-or
 
-    $ cat index.html | monolith -aIiFfcMv -b https://original.site/ - > result.html
+```console
+monolith https://lyrics.github.io/db/P/Portishead/Dummy/Roads/ -o portishead-roads-lyrics.html
+```
+
+```console
+cat index.html | monolith -aIiFfcMv -b https://original.site/ - > result.html
+```
+
 
 ---------------------------------------------------
 
+
 ## Options
+
  - `-a`: Exclude audio sources
  - `-b`: Use custom `base URL`
  - `-c`: Exclude CSS
@@ -81,39 +122,52 @@ or
  - `-k`: Accept invalid X.509 (TLS) certificates
  - `-M`: Don't add timestamp and URL information
  - `-n`: Extract contents of NOSCRIPT elements
- - `-o`: Write output to `file`, use “-” for STDOUT
+ - `-o`: Write output to `file` (use “-” for STDOUT)
  - `-s`: Be quiet
  - `-t`: Adjust `network request timeout`
  - `-u`: Provide custom `User-Agent`
  - `-v`: Exclude videos
 
+
 ---------------------------------------------------
 
+
 ## Proxies
+
 Please set `https_proxy`, `http_proxy`, and `no_proxy` environment variables.
 
+
 ---------------------------------------------------
 
+
 ## Contributing
+
 Please open an issue if something is wrong, that helps make this project better.
 
+
 ---------------------------------------------------
 
+
 ## Related projects
+
  - Monolith Chrome Extension: https://github.com/rhysd/monolith-of-web
  - Pagesaver: https://github.com/distributed-mind/pagesaver
  - Personal WayBack Machine: https://github.com/popey/pwbm
  - Hako: https://github.com/dmpop/hako
- - Monk: https://gitlab.com/fisherdarling/monk
+ - Monk: https://github.com/monk-dev/monk
+
 
 ---------------------------------------------------
 
+
 ## License
 
 To the extent possible under law, the author(s) have dedicated all copyright related and neighboring rights to this software to the public domain worldwide.
 This software is distributed without any warranty.
 
+
 ---------------------------------------------------
 
+
 <!-- Microtext -->
 <sub>Keep in mind that `monolith` is not aware of your browser’s session</sub>

dist/run-in-container.sh

@@ -7,4 +7,4 @@ if which podman 2>&1 > /dev/null; then
     DOCKER=podman
 fi
 
-$DOCKER run --rm Y2Z/$PROG_NAME $PROG_NAME "$@"
+$DOCKER run --rm Y2Z/$PROG_NAME "$@"

docs/web-apps.md

@@ -1,10 +1,23 @@
 # Web apps that can be saved with Monolith
 
-These apps retain most or all of their functionality when saved with Monolith
+These apps retain all or most of their functionality when saved with Monolith:
 
-|Converse|https://conversejs.org|
-|:--|:--|
-|Description|An XMPP client built using web technologies|
-|Functionality retained|**full**|
-|Command to use|`monolith https://conversejs.org/fullscreen.html > conversejs.html`|
-|Monolith version used|2.2.7|
+
+## Converse
+
+| Website                | https://conversejs.org                                              |
+|:-----------------------|:--------------------------------------------------------------------|
+| Description            | An XMPP client built using web technologies                         |
+| Functionality retained | **full**                                                            |
+| Command to use         | `monolith https://conversejs.org/fullscreen.html > conversejs.html` |
+| Monolith version used  | 2.2.7                                                               |
+
+
+## Markdown Tables generator
+
+| Website                   | https://www.tablesgenerator.com                                                                |
+|:--------------------------|:-----------------------------------------------------------------------------------------------|
+| Description               | Tool for creating tables in extended Markdown format                                           |
+| Functionality retained    | **full**                                                                                       |
+| Command to use            | `monolith -I https://www.tablesgenerator.com/markdown_tables -o markdown-table-generator.html` |
+| Monolith version used     | 2.6.1                                                                                          |

src/css.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use url::Url;
 
 use crate::opts::Options;
-use crate::url::{create_data_url, resolve_url};
+use crate::url::{create_data_url, resolve_url, EMPTY_IMAGE_DATA_URL};
 use crate::utils::retrieve_asset;
 
 const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
@@ -56,14 +56,14 @@ pub fn embed_css(
 }
 
 pub fn format_ident(ident: &str) -> String {
-    let mut res: String = String::new();
+    let mut res: String = "".to_string();
     let _ = serialize_identifier(ident, &mut res);
     res = res.trim_end().to_string();
     res
 }
 
 pub fn format_quoted_string(string: &str) -> String {
-    let mut res: String = String::new();
+    let mut res: String = "".to_string();
     let _ = serialize_string(string, &mut res);
     res
 }
@@ -86,10 +86,10 @@ pub fn process_css<'a>(
     prop_name: &str,
     func_name: &str,
 ) -> Result<String, ParseError<'a, String>> {
-    let mut result: String = str!();
+    let mut result: String = "".to_string();
 
-    let mut curr_rule: String = str!(rule_name.clone());
-    let mut curr_prop: String = str!(prop_name.clone());
+    let mut curr_rule: String = rule_name.clone().to_string();
+    let mut curr_prop: String = prop_name.clone().to_string();
     let mut token: &Token;
     let mut token_offset: SourcePosition;
 
@@ -105,7 +105,7 @@ pub fn process_css<'a>(
         match *token {
             Token::Comment(_) => {
                 let token_slice = parser.slice_from(token_offset);
-                result.push_str(str!(token_slice).as_str());
+                result.push_str(token_slice);
             }
             Token::Semicolon => result.push_str(";"),
             Token::Colon => result.push_str(":"),
@@ -161,13 +161,13 @@ pub fn process_css<'a>(
             }
             // div...
             Token::Ident(ref value) => {
-                curr_rule = str!();
-                curr_prop = str!(value);
+                curr_rule = "".to_string();
+                curr_prop = value.to_string();
                 result.push_str(&format_ident(value));
             }
             // @import, @font-face, @charset, @media...
             Token::AtKeyword(ref value) => {
-                curr_rule = str!(value);
+                curr_rule = value.to_string();
                 if options.no_fonts && curr_rule == "font-face" {
                     continue;
                 }
@@ -181,7 +181,7 @@ pub fn process_css<'a>(
             Token::QuotedString(ref value) => {
                 if curr_rule == "import" {
                     // Reset current at-rule value
-                    curr_rule = str!();
+                    curr_rule = "".to_string();
 
                     // Skip empty import values
                     if value.len() == 0 {
@@ -242,7 +242,7 @@ pub fn process_css<'a>(
                         }
 
                         if options.no_images && is_image_url_prop(curr_prop.as_str()) {
-                            result.push_str(format_quoted_string(empty_image!()).as_str());
+                            result.push_str(format_quoted_string(EMPTY_IMAGE_DATA_URL).as_str());
                         } else {
                             let resolved_url: Url = resolve_url(&document_url, value);
                             match retrieve_asset(
@@ -297,7 +297,7 @@ pub fn process_css<'a>(
                 if *has_sign && *unit_value >= 0. {
                     result.push_str("+");
                 }
-                result.push_str(str!(unit_value * 100.0).as_str());
+                result.push_str(&(unit_value * 100.0).to_string());
                 result.push_str("%");
             }
             Token::Dimension {
@@ -309,12 +309,12 @@ pub fn process_css<'a>(
                 if *has_sign && *value >= 0. {
                     result.push_str("+");
                 }
-                result.push_str(str!(value).as_str());
-                result.push_str(str!(unit).as_str());
+                result.push_str(&value.to_string());
+                result.push_str(&unit.to_string());
             }
             // #selector, #id...
             Token::IDHash(ref value) => {
-                curr_rule = str!();
+                curr_rule = "".to_string();
                 result.push_str("#");
                 result.push_str(&format_ident(value));
             }
@@ -324,7 +324,7 @@ pub fn process_css<'a>(
 
                 if is_import {
                     // Reset current at-rule value
-                    curr_rule = str!();
+                    curr_rule = "".to_string();
                 }
 
                 // Skip empty url()'s
@@ -377,7 +377,7 @@ pub fn process_css<'a>(
                     }
                 } else {
                     if is_image_url_prop(curr_prop.as_str()) && options.no_images {
-                        result.push_str(format_quoted_string(empty_image!()).as_str());
+                        result.push_str(format_quoted_string(EMPTY_IMAGE_DATA_URL).as_str());
                     } else {
                         let full_url: Url = resolve_url(&document_url, value);
                         match retrieve_asset(

src/html.rs

@@ -18,7 +18,9 @@ use std::default::Default;
 use crate::css::embed_css;
 use crate::js::attr_is_event_handler;
 use crate::opts::Options;
-use crate::url::{clean_url, create_data_url, is_url_and_has_protocol, resolve_url};
+use crate::url::{
+    clean_url, create_data_url, is_url_and_has_protocol, resolve_url, EMPTY_IMAGE_DATA_URL,
+};
 use crate::utils::{parse_content_type, retrieve_asset};
 
 struct SrcSetItem<'a> {
@@ -81,7 +83,7 @@ pub fn compose_csp(options: &Options) -> String {
     let mut string_list = vec![];
 
     if options.isolate {
-        string_list.push("default-src 'unsafe-inline' data:;");
+        string_list.push("default-src 'unsafe-eval' 'unsafe-inline' data:;");
     }
 
     if options.no_css {
@@ -173,11 +175,11 @@ pub fn embed_srcset(
         }
     }
 
-    let mut result: String = str!();
+    let mut result: String = "".to_string();
     let mut i: usize = array.len();
     for part in array {
         if options.no_images {
-            result.push_str(empty_image!());
+            result.push_str(EMPTY_IMAGE_DATA_URL);
         } else {
             let image_full_url: Url = resolve_url(&document_url, part.path);
             match retrieve_asset(
@@ -205,7 +207,7 @@ pub fn embed_srcset(
                         result.push_str(image_full_url.as_ref());
                     } else {
                         // Avoid breaking the structure in case if not an HTTP(S) URL
-                        result.push_str(empty_image!());
+                        result.push_str(EMPTY_IMAGE_DATA_URL);
                     }
                 }
             }
@@ -342,7 +344,7 @@ pub fn get_node_attr(node: &Handle, attr_name: &str) -> Option<String> {
         NodeData::Element { ref attrs, .. } => {
             for attr in attrs.borrow().iter() {
                 if &*attr.name.local == attr_name {
-                    return Some(str!(&*attr.value));
+                    return Some(attr.value.to_string());
                 }
             }
             None
@@ -502,8 +504,8 @@ pub fn set_node_attr(node: &Handle, attr_name: &str, attr_value: Option<String>)
                     found_existing_attr = true;
 
                     if let Some(attr_value) = attr_value.clone() {
-                        &attrs_mut[i].value.clear();
-                        &attrs_mut[i].value.push_slice(&attr_value.as_str());
+                        let _ = &attrs_mut[i].value.clear();
+                        let _ = &attrs_mut[i].value.push_slice(&attr_value.as_str());
                     } else {
                         // Remove attr completely if attr_value is not defined
                         attrs_mut.remove(i);
@@ -827,10 +829,10 @@ pub fn walk_and_embed_assets(
                     if options.no_images {
                         // Put empty images into src and data-src attributes
                         if img_attr_src_value != None {
-                            set_node_attr(node, "src", Some(str!(empty_image!())));
+                            set_node_attr(node, "src", Some(EMPTY_IMAGE_DATA_URL.to_string()));
                         }
                         if img_attr_data_src_value != None {
-                            set_node_attr(node, "data-src", Some(str!(empty_image!())));
+                            set_node_attr(node, "data-src", Some(EMPTY_IMAGE_DATA_URL.to_string()));
                         }
                     } else {
                         if img_attr_src_value.clone().unwrap_or_default().is_empty()
@@ -840,7 +842,7 @@ pub fn walk_and_embed_assets(
                                 .is_empty()
                         {
                             // Add empty src attribute
-                            set_node_attr(node, "src", Some(str!()));
+                            set_node_attr(node, "src", Some("".to_string()));
                         } else {
                             // Add data URL src attribute
                             let img_full_url: String = if !img_attr_data_src_value
@@ -891,11 +893,11 @@ pub fn walk_and_embed_assets(
                             if let Some(input_attr_src_value) = get_node_attr(node, "src") {
                                 if options.no_images || input_attr_src_value.is_empty() {
                                     let value = if input_attr_src_value.is_empty() {
-                                        str!()
+                                        ""
                                     } else {
-                                        str!(empty_image!())
+                                        EMPTY_IMAGE_DATA_URL
                                     };
-                                    set_node_attr(node, "src", Some(value));
+                                    set_node_attr(node, "src", Some(value.to_string()));
                                 } else {
                                     retrieve_and_embed_asset(
                                         cache,
@@ -913,7 +915,7 @@ pub fn walk_and_embed_assets(
                     }
                 }
                 "image" => {
-                    let mut image_href: String = str!();
+                    let mut image_href: String = "".to_string();
 
                     if let Some(image_attr_href_value) = get_node_attr(node, "href") {
                         image_href = image_attr_href_value;
@@ -984,7 +986,11 @@ pub fn walk_and_embed_assets(
                         if parent_node_name == "picture" {
                             if !source_attr_srcset_value.is_empty() {
                                 if options.no_images {
-                                    set_node_attr(node, "srcset", Some(str!(empty_image!())));
+                                    set_node_attr(
+                                        node,
+                                        "srcset",
+                                        Some(EMPTY_IMAGE_DATA_URL.to_string()),
+                                    );
                                 } else {
                                     let resolved_srcset: String = embed_srcset(
                                         cache,
@@ -1009,7 +1015,7 @@ pub fn walk_and_embed_assets(
                         {
                             if options.no_js {
                                 // Replace with empty JS call to preserve original behavior
-                                set_node_attr(node, "href", Some(str!("javascript:;")));
+                                set_node_attr(node, "href", Some("javascript:;".to_string()));
                             }
                         } else {
                             // Don't touch mailto: links or hrefs which begin with a hash sign
@@ -1083,7 +1089,7 @@ pub fn walk_and_embed_assets(
                     if let Some(frame_attr_src_value) = get_node_attr(node, "src") {
                         if options.no_frames {
                             // Empty the src attribute
-                            set_node_attr(node, "src", Some(str!()));
+                            set_node_attr(node, "src", Some("".to_string()));
                         } else {
                             // Ignore (i)frames with empty source (they cause infinite loops)
                             if !frame_attr_src_value.trim().is_empty() {
@@ -1144,7 +1150,11 @@ pub fn walk_and_embed_assets(
                         // Skip posters with empty source
                         if !video_attr_poster_value.is_empty() {
                             if options.no_images {
-                                set_node_attr(node, "poster", Some(str!(empty_image!())));
+                                set_node_attr(
+                                    node,
+                                    "poster",
+                                    Some(EMPTY_IMAGE_DATA_URL.to_string()),
+                                );
                             } else {
                                 retrieve_and_embed_asset(
                                     cache,
@@ -1167,8 +1177,10 @@ pub fn walk_and_embed_assets(
                                 // Get contents of NOSCRIPT node
                                 let mut noscript_contents = contents.borrow_mut();
                                 // Parse contents of NOSCRIPT node as DOM
-                                let noscript_contents_dom: RcDom =
-                                    html_to_dom(&noscript_contents.as_bytes().to_vec(), str!());
+                                let noscript_contents_dom: RcDom = html_to_dom(
+                                    &noscript_contents.as_bytes().to_vec(),
+                                    "".to_string(),
+                                );
                                 // Embed assets of NOSCRIPT node contents
                                 walk_and_embed_assets(
                                     cache,

src/lib.rs

@@ -1,15 +1,6 @@
-#[macro_use]
-extern crate clap;
-
-#[macro_use]
-mod macros;
-
 pub mod css;
 pub mod html;
 pub mod js;
 pub mod opts;
 pub mod url;
 pub mod utils;
-
-#[cfg(test)]
-pub mod tests;

src/macros.rs

@@ -1,17 +0,0 @@
-#[macro_export]
-macro_rules! str {
-    () => {
-        String::new()
-    };
-    ($val: expr) => {
-        ToString::to_string(&$val)
-    };
-}
-
-#[macro_export]
-macro_rules! empty_image {
-    () => {
-"data:image/png;base64,\
-iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAQAAADY4iz3AAAAEUlEQVR42mNkwAkYR6UolgIACvgADsuK6xYAAAAASUVORK5CYII="
-    };
-}

src/main.rs

@@ -18,8 +18,6 @@ use monolith::opts::Options;
 use monolith::url::{create_data_url, resolve_url};
 use monolith::utils::retrieve_asset;
 
-mod macros;
-
 enum Output {
     Stdout(io::Stdout),
     File(fs::File),
@@ -67,7 +65,7 @@ pub fn read_stdin() -> Vec<u8> {
 
 fn main() {
     let options = Options::from_args();
-    let mut target: String = str!(&options.target.clone());
+    let mut target: String = options.target.clone();
 
     // Check if target was provided
     if target.len() == 0 {
@@ -110,8 +108,7 @@ fn main() {
                 }
             }
             Err(_err) => {
-                // Failed to parse given base URL,
-                // perhaps it's a filesystem path?
+                // Failed to parse given base URL (perhaps it's a filesystem path?)
                 let path: &Path = Path::new(&target);
 
                 if path.exists() {
@@ -170,7 +167,7 @@ fn main() {
     let mut base_url: Url = target_url.clone();
 
     let data: Vec<u8>;
-    let mut document_encoding: String = str!();
+    let mut document_encoding: String = "".to_string();
     let mut dom: RcDom;
 
     // Retrieve target document
@@ -190,7 +187,12 @@ fn main() {
                     process::exit(1);
                 }
 
-                if options.base_url.clone().unwrap_or(str!()).is_empty() {
+                if options
+                    .base_url
+                    .clone()
+                    .unwrap_or("".to_string())
+                    .is_empty()
+                {
                     base_url = final_url;
                 }
 
@@ -226,7 +228,7 @@ fn main() {
     }
 
     // Use custom base URL if specified, read and use what's in the DOM otherwise
-    let custom_base_url: String = options.base_url.clone().unwrap_or(str!());
+    let custom_base_url: String = options.base_url.clone().unwrap_or("".to_string());
     if custom_base_url.is_empty() {
         // No custom base URL is specified
         // Try to see if document has BASE element

src/opts.rs

@@ -43,9 +43,9 @@ const ENV_VAR_TERM: &str = "TERM";
 impl Options {
     pub fn from_args() -> Options {
         let app = App::new(env!("CARGO_PKG_NAME"))
-            .version(crate_version!())
-            .author(format!("\n{}", crate_authors!("\n")).as_str())
-            .about(format!("{}\n{}", ASCII, crate_description!()).as_str())
+            .version(env!("CARGO_PKG_VERSION"))
+            .author(format!("\n{}\n\n", env!("CARGO_PKG_AUTHORS").replace(':', "\n")).as_str())
+            .about(format!("{}\n{}", ASCII, env!("CARGO_PKG_DESCRIPTION")).as_str())
             .args_from_usage("-a, --no-audio 'Removes audio sources'")
             .args_from_usage("-b, --base-url=[http://localhost/] 'Sets custom base URL'")
             .args_from_usage("-c, --no-css 'Removes CSS'")
@@ -85,11 +85,11 @@ impl Options {
             .to_string();
         options.no_audio = app.is_present("no-audio");
         if let Some(base_url) = app.value_of("base-url") {
-            options.base_url = Some(str!(base_url));
+            options.base_url = Some(base_url.to_string());
         }
         options.no_css = app.is_present("no-css");
         if let Some(charset) = app.value_of("charset") {
-            options.charset = Some(str!(charset));
+            options.charset = Some(charset.to_string());
         }
         options.ignore_errors = app.is_present("ignore-errors");
         options.no_frames = app.is_present("no-frames");
@@ -107,7 +107,7 @@ impl Options {
             .parse::<u64>()
             .unwrap();
         if let Some(user_agent) = app.value_of("user-agent") {
-            options.user_agent = Some(str!(user_agent));
+            options.user_agent = Some(user_agent.to_string());
         } else {
             options.user_agent = Some(DEFAULT_USER_AGENT.to_string());
         }

src/tests/url/percent_decode.rs

@@ -1,39 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use crate::url;
-
-    #[test]
-    fn decode_unicode_characters() {
-        assert_eq!(
-            url::percent_decode(str!(
-                "%E6%A4%9C%E3%83%92%E3%83%A0%E8%A7%A3%E5%A1%97%E3%82%83%E3%83%83%20%3D%20%E3%82%B5"
-            )),
-            "検ヒム解塗ゃッ = サ"
-        );
-    }
-
-    #[test]
-    fn decode_file_url() {
-        assert_eq!(
-            url::percent_decode(str!("file:///tmp/space%20here/test%231.html")),
-            "file:///tmp/space here/test#1.html"
-        );
-    }
-
-    #[test]
-    fn plus_sign() {
-        assert_eq!(
-            url::percent_decode(str!(
-                "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
-            )),
-            "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
-        );
-    }
-}

src/tests/url/percent_encode.rs

@@ -1,16 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use crate::url;
-
-    #[test]
-    fn apostrophe() {
-        assert_eq!(url::percent_encode(str!("'")), "%27");
-    }
-}

src/url.rs

@@ -1,8 +1,12 @@
 use base64;
-use url::{form_urlencoded, Url};
+use percent_encoding::percent_decode_str;
+use url::Url;
 
 use crate::utils::{detect_media_type, parse_content_type};
 
+pub const EMPTY_IMAGE_DATA_URL: &'static str = "data:image/png;base64,\
+iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAQAAADY4iz3AAAAEUlEQVR42mNkwAkYR6UolgIACvgADsuK6xYAAAAASUVORK5CYII=";
+
 pub fn clean_url(url: Url) -> Url {
     let mut url = url.clone();
 
@@ -26,7 +30,7 @@ pub fn create_data_url(media_type: &str, charset: &str, data: &[u8], final_asset
         if !charset.trim().is_empty() && !charset.trim().eq_ignore_ascii_case("US-ASCII") {
             format!(";charset={}", charset.trim())
         } else {
-            str!()
+            "".to_string()
         };
 
     data_url.set_path(format!("{}{};base64,{}", media_type, c, base64::encode(data)).as_str());
@@ -57,7 +61,7 @@ pub fn parse_data_url(url: &Url) -> (String, String, Vec<u8>) {
     let (media_type, charset, is_base64) = parse_content_type(&content_type);
 
     // Parse raw data into vector of bytes
-    let text: String = percent_decode(data);
+    let text: String = percent_decode_str(&data).decode_utf8_lossy().to_string();
     let blob: Vec<u8> = if is_base64 {
         base64::decode(&text).unwrap_or(vec![])
     } else {
@@ -67,29 +71,6 @@ pub fn parse_data_url(url: &Url) -> (String, String, Vec<u8>) {
     (media_type, charset, blob)
 }
 
-pub fn percent_decode(input: String) -> String {
-    let input: String = input.replace("+", "%2B");
-
-    form_urlencoded::parse(input.as_bytes())
-        .map(|(key, val)| {
-            [
-                key.to_string(),
-                if val.to_string().len() == 0 {
-                    str!()
-                } else {
-                    str!('=')
-                },
-                val.to_string(),
-            ]
-            .concat()
-        })
-        .collect()
-}
-
-pub fn percent_encode(input: String) -> String {
-    form_urlencoded::byte_serialize(input.as_bytes()).collect()
-}
-
 pub fn resolve_url(from: &Url, to: &str) -> Url {
     match Url::parse(&to) {
         Ok(parsed_url) => parsed_url,

src/utils.rs

@@ -110,8 +110,8 @@ pub fn is_plaintext_media_type(media_type: &str) -> bool {
 }
 
 pub fn parse_content_type(content_type: &str) -> (String, String, bool) {
-    let mut media_type: String = str!("text/plain");
-    let mut charset: String = str!("US-ASCII");
+    let mut media_type: String = "text/plain".to_string();
+    let mut charset: String = "US-ASCII".to_string();
     let mut is_base64: bool = false;
 
     // Parse meta data
@@ -120,7 +120,7 @@ pub fn parse_content_type(content_type: &str) -> (String, String, bool) {
     for item in &content_type_items {
         if i == 0 {
             if item.trim().len() > 0 {
-                media_type = str!(item.trim());
+                media_type = item.trim().to_string();
             }
         } else {
             if item.trim().eq_ignore_ascii_case("base64") {
@@ -199,7 +199,7 @@ pub fn retrieve_asset(
                     file_blob.clone(),
                     url.clone(),
                     detect_media_type(&file_blob, url),
-                    str!(),
+                    "".to_string(),
                 ))
             }
         } else {
@@ -232,14 +232,14 @@ pub fn retrieve_asset(
             Ok((
                 cache.get(&cache_key).unwrap().to_vec(),
                 url.clone(),
-                str!(),
-                str!(),
+                "".to_string(),
+                "".to_string(),
             ))
         } else {
             // URL not in cache, we retrieve the file
             match client.get(url.as_str()).send() {
-                Ok(mut response) => {
-                    if !options.ignore_errors && response.status() != 200 {
+                Ok(response) => {
+                    if !options.ignore_errors && response.status() != reqwest::StatusCode::OK {
                         if !options.silent {
                             eprintln!(
                                 "{}{}{} ({}){}",
@@ -258,19 +258,17 @@ pub fn retrieve_asset(
                         return Err(client.get("").send().unwrap_err());
                     }
 
+                    let response_url: Url = response.url().clone();
+
                     if !options.silent {
-                        if url.as_str() == response.url().as_str() {
+                        if url.as_str() == response_url.as_str() {
                             eprintln!("{}{}", indent(depth).as_str(), &url);
                         } else {
-                            eprintln!("{}{} -> {}", indent(depth).as_str(), &url, &response.url());
+                            eprintln!("{}{} -> {}", indent(depth).as_str(), &url, &response_url);
                         }
                     }
 
-                    let new_cache_key: String = clean_url(response.url().clone()).to_string();
-
-                    // Convert response into a byte array
-                    let mut data: Vec<u8> = vec![];
-                    response.copy_to(&mut data).unwrap();
+                    let new_cache_key: String = clean_url(response_url.clone()).to_string();
 
                     // Attempt to obtain media type and charset by reading Content-Type header
                     let content_type: &str = response
@@ -281,11 +279,34 @@ pub fn retrieve_asset(
 
                     let (media_type, charset, _is_base64) = parse_content_type(&content_type);
 
+                    // Convert response into a byte array
+                    let mut data: Vec<u8> = vec![];
+                    match response.bytes() {
+                        Ok(b) => {
+                            data = b.to_vec();
+                        }
+                        Err(error) => {
+                            if !options.silent {
+                                eprintln!(
+                                    "{}{}{}{}",
+                                    indent(depth).as_str(),
+                                    if options.no_color { "" } else { ANSI_COLOR_RED },
+                                    error,
+                                    if options.no_color {
+                                        ""
+                                    } else {
+                                        ANSI_COLOR_RESET
+                                    },
+                                );
+                            }
+                        }
+                    }
+
                     // Add retrieved resource to cache
                     cache.insert(new_cache_key, data.clone());
 
                     // Return
-                    Ok((data, response.url().clone(), media_type, charset))
+                    Ok((data, response_url, media_type, charset))
                 }
                 Err(error) => {
                     if !options.silent {

tests/cli/basic.rs

@@ -77,8 +77,8 @@ mod passing {
     #[test]
     fn css_import_string() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/css/index.html");
-        let path_css: &Path = Path::new("src/tests/data/css/style.css");
+        let path_html: &Path = Path::new("tests/_data_/css/index.html");
+        let path_css: &Path = Path::new("tests/_data_/css/style.css");
 
         assert!(path_html.is_file());
         assert!(path_css.is_file());

tests/cli/data_url.rs

@@ -11,6 +11,8 @@ mod passing {
     use std::env;
     use std::process::Command;
 
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
+
     #[test]
     fn isolate_data_url() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
@@ -28,7 +30,7 @@ mod passing {
         assert_eq!(
             String::from_utf8_lossy(&out.stdout),
             "<html><head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-eval' 'unsafe-inline' data:;\"></meta>\
             </head><body>Hello, World!</body></html>\n"
         );
 
@@ -139,7 +141,7 @@ mod passing {
                 Hi\
                 </body>\
                 </html>\n",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL,
             )
         );
 

tests/cli/local_files.rs

@@ -14,15 +14,20 @@ mod passing {
     use std::process::Command;
     use url::Url;
 
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
+
     #[test]
     fn local_file_target_input_relative_target_path() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = env::current_dir()
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .replace("\\", "/");
         let out = cmd
             .arg("-M")
             .arg(format!(
-                "src{s}tests{s}data{s}basic{s}local-file.html",
+                "tests{s}_data_{s}basic{s}local-file.html",
                 s = MAIN_SEPARATOR
             ))
             .output()
@@ -34,11 +39,11 @@ mod passing {
             String::from_utf8_lossy(&out.stderr),
             format!(
                 "\
-                {file}{cwd}/src/tests/data/basic/local-file.html\n \
-                {file}{cwd}/src/tests/data/basic/local-style.css\n \
-                {file}{cwd}/src/tests/data/basic/local-style-does-not-exist.css (not found)\n \
-                {file}{cwd}/src/tests/data/basic/monolith.png (not found)\n \
-                {file}{cwd}/src/tests/data/basic/local-script.js\n\
+                {file}{cwd}/tests/_data_/basic/local-file.html\n \
+                {file}{cwd}/tests/_data_/basic/local-style.css\n \
+                {file}{cwd}/tests/_data_/basic/local-style-does-not-exist.css (not found)\n \
+                {file}{cwd}/tests/_data_/basic/monolith.png (not found)\n \
+                {file}{cwd}/tests/_data_/basic/local-script.js\n\
                 ",
                 file = file_url_protocol,
                 cwd = cwd_normalized
@@ -69,7 +74,7 @@ mod passing {
     #[test]
     fn local_file_target_input_absolute_target_path() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/basic/local-file.html");
+        let path_html: &Path = Path::new("tests/_data_/basic/local-file.html");
 
         let out = cmd
             .arg("-M")
@@ -93,7 +98,7 @@ mod passing {
             format!(
                 "\
                 <!DOCTYPE html><html lang=\"en\"><head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
+                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-eval' 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
                 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
                 <title>Local HTML file</title>\n  \
                 <link rel=\"stylesheet\" type=\"text/css\">\n  \
@@ -104,7 +109,7 @@ mod passing {
                 <script></script>\n\n\n\n\
                 </body></html>\n\
                 ",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL
             )
         );
 
@@ -115,14 +120,17 @@ mod passing {
     #[test]
     fn local_file_url_target_input() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = env::current_dir()
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .replace("\\", "/");
         let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
         let out = cmd
             .arg("-M")
             .arg("-cji")
             .arg(format!(
-                "{file}{cwd}/src/tests/data/basic/local-file.html",
+                "{file}{cwd}/tests/_data_/basic/local-file.html",
                 file = file_url_protocol,
                 cwd = cwd_normalized,
             ))
@@ -133,7 +141,7 @@ mod passing {
         assert_eq!(
             String::from_utf8_lossy(&out.stderr),
             format!(
-                "{file}{cwd}/src/tests/data/basic/local-file.html\n",
+                "{file}{cwd}/tests/_data_/basic/local-file.html\n",
                 file = file_url_protocol,
                 cwd = cwd_normalized,
             )
@@ -156,7 +164,7 @@ mod passing {
                 <script></script>\n\n\n\n\
                 </body></html>\n\
                 ",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL
             )
         );
 
@@ -167,8 +175,8 @@ mod passing {
     #[test]
     fn embed_file_url_local_asset_within_style_attribute() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/svg/index.html");
-        let path_svg: &Path = Path::new("src/tests/data/svg/image.svg");
+        let path_html: &Path = Path::new("tests/_data_/svg/index.html");
+        let path_svg: &Path = Path::new("tests/_data_/svg/image.svg");
 
         let out = cmd.arg("-M").arg(path_html.as_os_str()).output().unwrap();
 
@@ -198,21 +206,24 @@ mod passing {
     #[test]
     fn discard_integrity_for_local_files() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = env::current_dir()
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .replace("\\", "/");
         let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
         let out = cmd
             .arg("-M")
             .arg("-i")
             .arg(if cfg!(windows) {
                 format!(
-                    "{file}{cwd}/src/tests/data/integrity/index.html",
+                    "{file}{cwd}/tests/_data_/integrity/index.html",
                     file = file_url_protocol,
                     cwd = cwd_normalized,
                 )
             } else {
                 format!(
-                    "{file}{cwd}/src/tests/data/integrity/index.html",
+                    "{file}{cwd}/tests/_data_/integrity/index.html",
                     file = file_url_protocol,
                     cwd = cwd_normalized,
                 )
@@ -225,11 +236,11 @@ mod passing {
             String::from_utf8_lossy(&out.stderr),
             format!(
                 "\
-                {file}{cwd}/src/tests/data/integrity/index.html\n \
-                {file}{cwd}/src/tests/data/integrity/style.css\n \
-                {file}{cwd}/src/tests/data/integrity/style.css\n \
-                {file}{cwd}/src/tests/data/integrity/script.js\n \
-                {file}{cwd}/src/tests/data/integrity/script.js\n\
+                {file}{cwd}/tests/_data_/integrity/index.html\n \
+                {file}{cwd}/tests/_data_/integrity/style.css\n \
+                {file}{cwd}/tests/_data_/integrity/style.css\n \
+                {file}{cwd}/tests/_data_/integrity/script.js\n \
+                {file}{cwd}/tests/_data_/integrity/script.js\n\
                 ",
                 file = file_url_protocol,
                 cwd = cwd_normalized,

tests/cli/noscript.rs

@@ -17,8 +17,8 @@ mod passing {
     #[test]
     fn parse_noscript_contents() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
-        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+        let path_html: &Path = Path::new("tests/_data_/noscript/index.html");
+        let path_svg: &Path = Path::new("tests/_data_/noscript/image.svg");
 
         let out = cmd.arg("-M").arg(path_html.as_os_str()).output().unwrap();
 
@@ -48,8 +48,8 @@ mod passing {
     #[test]
     fn unwrap_noscript_contents() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
-        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+        let path_html: &Path = Path::new("tests/_data_/noscript/index.html");
+        let path_svg: &Path = Path::new("tests/_data_/noscript/image.svg");
 
         let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
 
@@ -79,8 +79,8 @@ mod passing {
     #[test]
     fn unwrap_noscript_contents_nested() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/noscript/nested.html");
-        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+        let path_html: &Path = Path::new("tests/_data_/noscript/nested.html");
+        let path_svg: &Path = Path::new("tests/_data_/noscript/image.svg");
 
         let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
 
@@ -110,8 +110,8 @@ mod passing {
     #[test]
     fn unwrap_noscript_contents_with_script() {
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-        let path_html: &Path = Path::new("src/tests/data/noscript/script.html");
-        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+        let path_html: &Path = Path::new("tests/_data_/noscript/script.html");
+        let path_svg: &Path = Path::new("tests/_data_/noscript/image.svg");
 
         let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
 

tests/cli/unusual_encodings.rs

@@ -16,12 +16,12 @@ mod passing {
     #[test]
     fn properly_save_document_with_gb2312() {
         let cwd = env::current_dir().unwrap();
-        let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = cwd.to_str().unwrap().replace("\\", "/");
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
         let out = cmd
             .arg("-M")
             .arg(format!(
-                "src{s}tests{s}data{s}unusual_encodings{s}gb2312.html",
+                "tests{s}_data_{s}unusual_encodings{s}gb2312.html",
                 s = MAIN_SEPARATOR
             ))
             .output()
@@ -32,7 +32,7 @@ mod passing {
         assert_eq!(
             String::from_utf8_lossy(&out.stderr),
             format!(
-                "{file}{cwd}/src/tests/data/unusual_encodings/gb2312.html\n",
+                "{file}{cwd}/tests/_data_/unusual_encodings/gb2312.html\n",
                 file = file_url_protocol,
                 cwd = cwd_normalized,
             )
@@ -67,7 +67,7 @@ mod passing {
     fn properly_save_document_with_gb2312_from_stdin() {
         let mut echo = Command::new("cat")
             .arg(format!(
-                "src{s}tests{s}data{s}unusual_encodings{s}gb2312.html",
+                "tests{s}_data_{s}unusual_encodings{s}gb2312.html",
                 s = MAIN_SEPARATOR
             ))
             .stdout(Stdio::piped())
@@ -111,14 +111,14 @@ mod passing {
     #[test]
     fn properly_save_document_with_gb2312_custom_charset() {
         let cwd = env::current_dir().unwrap();
-        let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = cwd.to_str().unwrap().replace("\\", "/");
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
         let out = cmd
             .arg("-M")
             .arg("-C")
             .arg("utf8")
             .arg(format!(
-                "src{s}tests{s}data{s}unusual_encodings{s}gb2312.html",
+                "tests{s}_data_{s}unusual_encodings{s}gb2312.html",
                 s = MAIN_SEPARATOR
             ))
             .output()
@@ -129,7 +129,7 @@ mod passing {
         assert_eq!(
             String::from_utf8_lossy(&out.stderr),
             format!(
-                "{file}{cwd}/src/tests/data/unusual_encodings/gb2312.html\n",
+                "{file}{cwd}/tests/_data_/unusual_encodings/gb2312.html\n",
                 file = file_url_protocol,
                 cwd = cwd_normalized,
             )
@@ -161,7 +161,7 @@ mod passing {
             .arg("-C")
             .arg("utf0")
             .arg(format!(
-                "src{s}tests{s}data{s}unusual_encodings{s}gb2312.html",
+                "tests{s}_data_{s}unusual_encodings{s}gb2312.html",
                 s = MAIN_SEPARATOR
             ))
             .output()
@@ -198,12 +198,12 @@ mod failing {
     #[test]
     fn change_iso88591_to_utf8_to_properly_display_html_entities() {
         let cwd = env::current_dir().unwrap();
-        let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/");
+        let cwd_normalized: String = cwd.to_str().unwrap().replace("\\", "/");
         let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
         let out = cmd
             .arg("-M")
             .arg(format!(
-                "src{s}tests{s}data{s}unusual_encodings{s}iso-8859-1.html",
+                "tests{s}_data_{s}unusual_encodings{s}iso-8859-1.html",
                 s = MAIN_SEPARATOR
             ))
             .output()
@@ -214,7 +214,7 @@ mod failing {
         assert_eq!(
             String::from_utf8_lossy(&out.stderr),
             format!(
-                "{file}{cwd}/src/tests/data/unusual_encodings/iso-8859-1.html\n",
+                "{file}{cwd}/tests/_data_/unusual_encodings/iso-8859-1.html\n",
                 file = file_url_protocol,
                 cwd = cwd_normalized,
             )

tests/css/embed_css.rs

@@ -11,8 +11,9 @@ mod passing {
     use reqwest::Url;
     use std::collections::HashMap;
 
-    use crate::css;
-    use crate::opts::Options;
+    use monolith::css;
+    use monolith::opts::Options;
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
 
     #[test]
     fn empty_input() {
@@ -67,7 +68,7 @@ mod passing {
                 margin-top: -20px; \
                 line-height: -1; \
                 height: calc(100vh - 10pt)",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL
             )
         );
     }
@@ -99,7 +100,7 @@ mod passing {
                 margin-top: -20px; \
                 line-height: -1; \
                 height: calc(100vh - 10pt)",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL
             )
         );
     }

tests/css/is_image_url_prop.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::css;
+    use monolith::css;
 
     #[test]
     fn backrgound() {
@@ -64,7 +64,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::css;
+    use monolith::css;
 
     #[test]
     fn empty() {

tests/html/add_favicon.rs

@@ -9,12 +9,12 @@
 mod passing {
     use html5ever::serialize::{serialize, SerializeOpts};
 
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn basic() {
         let html = "<div>text</div>";
-        let mut dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let mut dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
         dom = html::add_favicon(&dom.document, "I_AM_A_FAVICON_DATA_URL".to_string());
 

tests/html/check_integrity.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn empty_input_sha256() {
@@ -51,7 +51,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn empty_hash() {

tests/html/compose_csp.rs

@@ -7,8 +7,8 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
-    use crate::opts::Options;
+    use monolith::html;
+    use monolith::opts::Options;
 
     #[test]
     fn isolated() {
@@ -16,7 +16,10 @@ mod passing {
         options.isolate = true;
         let csp_content = html::compose_csp(&options);
 
-        assert_eq!(csp_content, "default-src 'unsafe-inline' data:;");
+        assert_eq!(
+            csp_content,
+            "default-src 'unsafe-eval' 'unsafe-inline' data:;"
+        );
     }
 
     #[test]
@@ -75,6 +78,6 @@ mod passing {
         options.no_images = true;
         let csp_content = html::compose_csp(&options);
 
-        assert_eq!(csp_content, "default-src 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;");
+        assert_eq!(csp_content, "default-src 'unsafe-eval' 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;");
     }
 }

tests/html/create_metadata_tag.rs

@@ -10,7 +10,7 @@ mod passing {
     use chrono::prelude::*;
     use reqwest::Url;
 
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn http_url() {

tests/html/embed_srcset.rs

@@ -11,8 +11,9 @@ mod passing {
     use reqwest::Url;
     use std::collections::HashMap;
 
-    use crate::html;
-    use crate::opts::Options;
+    use monolith::html;
+    use monolith::opts::Options;
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
 
     #[test]
     fn small_medium_large() {
@@ -35,9 +36,7 @@ mod passing {
             embedded_css,
             format!(
                 "{} 1x, {} 1.5x, {} 2x",
-                empty_image!(),
-                empty_image!(),
-                empty_image!(),
+                EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL,
             ),
         );
     }
@@ -61,7 +60,7 @@ mod passing {
 
         assert_eq!(
             embedded_css,
-            format!("{}, {} 1.5x", empty_image!(), empty_image!()),
+            format!("{}, {} 1.5x", EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL),
         );
     }
 
@@ -84,7 +83,7 @@ mod passing {
 
         assert_eq!(
             embedded_css,
-            format!("{} 1x, {} 2x", empty_image!(), empty_image!()),
+            format!("{} 1x, {} 2x", EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL),
         );
     }
 
@@ -109,9 +108,7 @@ mod passing {
             embedded_css,
             format!(
                 "{} 1x, {} 2x, {} 3x",
-                empty_image!(),
-                empty_image!(),
-                empty_image!()
+                EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL
             ),
         );
     }
@@ -130,8 +127,9 @@ mod failing {
     use reqwest::Url;
     use std::collections::HashMap;
 
-    use crate::html;
-    use crate::opts::Options;
+    use monolith::html;
+    use monolith::opts::Options;
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
 
     #[test]
     fn trailing_comma() {
@@ -152,7 +150,7 @@ mod failing {
 
         assert_eq!(
             embedded_css,
-            format!("{} 1x, {} 2x,", empty_image!(), empty_image!()),
+            format!("{} 1x, {} 2x,", EMPTY_IMAGE_DATA_URL, EMPTY_IMAGE_DATA_URL),
         );
     }
 }

tests/html/get_base_url.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn present() {
@@ -19,11 +19,11 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
         assert_eq!(
             html::get_base_url(&dom.document),
-            Some(str!("https://musicbrainz.org"))
+            Some("https://musicbrainz.org".to_string())
         );
     }
 
@@ -38,11 +38,11 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
         assert_eq!(
             html::get_base_url(&dom.document),
-            Some(str!("https://www.discogs.com/"))
+            Some("https://www.discogs.com/".to_string())
         );
     }
 }
@@ -56,7 +56,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn absent() {
@@ -67,7 +67,7 @@ mod failing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
         assert_eq!(html::get_base_url(&dom.document), None);
     }
@@ -82,7 +82,7 @@ mod failing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
         assert_eq!(html::get_base_url(&dom.document), None);
     }
@@ -97,8 +97,8 @@ mod failing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
-        assert_eq!(html::get_base_url(&dom.document), Some(str!()));
+        assert_eq!(html::get_base_url(&dom.document), Some("".to_string()));
     }
 }

tests/html/get_charset.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn meta_content_type() {
@@ -19,9 +19,9 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
-        assert_eq!(html::get_charset(&dom.document), Some(str!("GB2312")));
+        assert_eq!(html::get_charset(&dom.document), Some("GB2312".to_string()));
     }
 
     #[test]
@@ -34,9 +34,9 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
-        assert_eq!(html::get_charset(&dom.document), Some(str!("GB2312")));
+        assert_eq!(html::get_charset(&dom.document), Some("GB2312".to_string()));
     }
 
     #[test]
@@ -50,9 +50,9 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
-        assert_eq!(html::get_charset(&dom.document), Some(str!("utf-8")));
+        assert_eq!(html::get_charset(&dom.document), Some("utf-8".to_string()));
     }
     #[test]
     fn multiple_conflicting_meta_content_type_first() {
@@ -65,8 +65,8 @@ mod passing {
     <body>
     </body>
 </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
 
-        assert_eq!(html::get_charset(&dom.document), Some(str!("GB2312")));
+        assert_eq!(html::get_charset(&dom.document), Some("GB2312".to_string()));
     }
 }

tests/html/get_node_attr.rs

@@ -9,12 +9,12 @@
 mod passing {
     use html5ever::rcdom::{Handle, NodeData};
 
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn div_two_style_attributes() {
         let html = "<!doctype html><html><head></head><body><DIV STYLE=\"color: blue;\" style=\"display: none;\"></div></body></html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut count = 0;
 
         fn test_walk(node: &Handle, i: &mut i8) {
@@ -35,7 +35,7 @@ mod passing {
                     } else if node_name == "div" {
                         assert_eq!(
                             html::get_node_attr(node, "style"),
-                            Some(str!("color: blue;"))
+                            Some("color: blue;".to_string())
                         );
                     }
 

tests/html/get_node_name.rs

@@ -9,12 +9,12 @@
 mod passing {
     use html5ever::rcdom::{Handle, NodeData};
 
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn parent_node_names() {
         let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut count = 0;
 
         fn test_walk(node: &Handle, i: &mut i8) {

tests/html/has_favicon.rs

@@ -7,12 +7,12 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn icon() {
         let html = "<link rel=\"icon\" href=\"\" /><div>text</div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let res: bool = html::has_favicon(&dom.document);
 
         assert!(res);
@@ -21,7 +21,7 @@ mod passing {
     #[test]
     fn shortcut_icon() {
         let html = "<link rel=\"shortcut icon\" href=\"\" /><div>text</div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let res: bool = html::has_favicon(&dom.document);
 
         assert!(res);
@@ -37,12 +37,12 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn absent() {
         let html = "<div>text</div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let res: bool = html::has_favicon(&dom.document);
 
         assert!(!res);

tests/html/is_icon.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn icon() {
@@ -34,7 +34,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn mask_icon() {

tests/html/serialize_document.rs

@@ -7,17 +7,17 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
-    use crate::opts::Options;
+    use monolith::html;
+    use monolith::opts::Options;
 
     #[test]
     fn div_as_root_element() {
         let html = "<div><script src=\"some.js\"></script></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let options = Options::default();
 
         assert_eq!(
-            String::from_utf8_lossy(&html::serialize_document(dom, str!(), &options)),
+            String::from_utf8_lossy(&html::serialize_document(dom, "".to_string(), &options)),
             "<html><head></head><body><div><script src=\"some.js\"></script></div></body></html>"
         );
     }
@@ -28,19 +28,19 @@ mod passing {
                     <link rel=\"something\" href=\"some.css\" />\
                     <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
                     <div><script src=\"some.js\"></script></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut options = Options::default();
         options.isolate = true;
 
         assert_eq!(
             String::from_utf8_lossy(&html::serialize_document(
                 dom,
-                str!(),
+                "".to_string(),
                 &options
             )),
             "<html>\
                 <head>\
-                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-eval' 'unsafe-inline' data:;\"></meta>\
                     <title>Isolated document</title>\
                     <link rel=\"something\" href=\"some.css\">\
                     <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
@@ -60,12 +60,12 @@ mod passing {
                     <title>Unstyled document</title>\
                     <link rel=\"stylesheet\" href=\"main.css\"/>\
                     <div style=\"display: none;\"></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut options = Options::default();
         options.no_css = true;
 
         assert_eq!(
-            String::from_utf8_lossy(&html::serialize_document(dom, str!(), &options)),
+            String::from_utf8_lossy(&html::serialize_document(dom, "".to_string(), &options)),
             "<!DOCTYPE html>\
             <html>\
             <head>\
@@ -84,14 +84,14 @@ mod passing {
                     <title>Frameless document</title>\
                     <link rel=\"something\"/>\
                     <div><script src=\"some.js\"></script></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut options = Options::default();
         options.no_frames = true;
 
         assert_eq!(
             String::from_utf8_lossy(&html::serialize_document(
                 dom,
-                str!(),
+                "".to_string(),
                 &options
             )),
             "<!DOCTYPE html>\
@@ -117,7 +117,7 @@ mod passing {
                         <img style=\"width: 100%;\" src=\"some.png\" />\
                         <iframe src=\"some.html\"></iframe>\
                     </div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut options = Options::default();
         options.isolate = true;
         options.no_css = true;
@@ -129,13 +129,13 @@ mod passing {
         assert_eq!(
             String::from_utf8_lossy(&html::serialize_document(
                 dom,
-                str!(),
+                "".to_string(),
                 &options
             )),
             "<!DOCTYPE html>\
                 <html>\
                     <head>\
-                        <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;\"></meta>\
+                        <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-eval' 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;\"></meta>\
                         <title>no-frame no-css no-js no-image isolated document</title>\
                         <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
                         <link rel=\"stylesheet\" href=\"some.css\">\

tests/html/set_node_attr.rs

@@ -9,12 +9,12 @@
 mod passing {
     use html5ever::rcdom::{Handle, NodeData};
 
-    use crate::html;
+    use monolith::html;
 
     #[test]
     fn html_lang_and_body_style() {
         let html = "<!doctype html><html lang=\"en\"><head></head><body></body></html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut count = 0;
 
         fn test_walk(node: &Handle, i: &mut i8) {
@@ -31,23 +31,23 @@ mod passing {
                     let node_name = name.local.as_ref().to_string();
 
                     if node_name == "html" {
-                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("en")));
+                        assert_eq!(html::get_node_attr(node, "lang"), Some("en".to_string()));
 
-                        html::set_node_attr(node, "lang", Some(str!("de")));
-                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("de")));
+                        html::set_node_attr(node, "lang", Some("de".to_string()));
+                        assert_eq!(html::get_node_attr(node, "lang"), Some("de".to_string()));
 
                         html::set_node_attr(node, "lang", None);
                         assert_eq!(html::get_node_attr(node, "lang"), None);
 
-                        html::set_node_attr(node, "lang", Some(str!("")));
-                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("")));
+                        html::set_node_attr(node, "lang", Some("".to_string()));
+                        assert_eq!(html::get_node_attr(node, "lang"), Some("".to_string()));
                     } else if node_name == "body" {
                         assert_eq!(html::get_node_attr(node, "style"), None);
 
-                        html::set_node_attr(node, "style", Some(str!("display: none;")));
+                        html::set_node_attr(node, "style", Some("display: none;".to_string()));
                         assert_eq!(
                             html::get_node_attr(node, "style"),
-                            Some(str!("display: none;"))
+                            Some("display: none;".to_string())
                         );
                     }
 
@@ -67,7 +67,7 @@ mod passing {
     #[test]
     fn body_background() {
         let html = "<!doctype html><html lang=\"en\"><head></head><body background=\"1\" background=\"2\"></body></html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let mut count = 0;
 
         fn test_walk(node: &Handle, i: &mut i8) {
@@ -84,7 +84,10 @@ mod passing {
                     let node_name = name.local.as_ref().to_string();
 
                     if node_name == "body" {
-                        assert_eq!(html::get_node_attr(node, "background"), Some(str!("1")));
+                        assert_eq!(
+                            html::get_node_attr(node, "background"),
+                            Some("1".to_string())
+                        );
 
                         html::set_node_attr(node, "background", None);
                         assert_eq!(html::get_node_attr(node, "background"), None);

tests/html/walk_and_embed_assets.rs

@@ -12,15 +12,16 @@ mod passing {
     use std::collections::HashMap;
     use url::Url;
 
-    use crate::html;
-    use crate::opts::Options;
+    use monolith::html;
+    use monolith::opts::Options;
+    use monolith::url::EMPTY_IMAGE_DATA_URL;
 
     #[test]
     fn basic() {
         let cache = &mut HashMap::new();
 
         let html: &str = "<div><P></P></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
 
         let mut options = Options::default();
@@ -42,7 +43,7 @@ mod passing {
     #[test]
     fn ensure_no_recursive_iframe() {
         let html = "<div><P></P><iframe src=\"\"></iframe></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -65,7 +66,7 @@ mod passing {
     #[test]
     fn ensure_no_recursive_frame() {
         let html = "<frameset><frame src=\"\"></frameset>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -93,7 +94,7 @@ mod passing {
             <style>html{background-color: #000;}</style>\
             <div style=\"display: none;\"></div>\
         ";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -129,7 +130,7 @@ mod passing {
     fn no_images() {
         let html = "<link rel=\"icon\" href=\"favicon.ico\">\
                     <div><img src=\"http://localhost/assets/mono_lisa.png\" /></div>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -157,7 +158,7 @@ mod passing {
                         </div>\
                     </body>\
                 </html>",
-                empty_image = empty_image!()
+                empty_image = EMPTY_IMAGE_DATA_URL
             )
         );
     }
@@ -166,7 +167,7 @@ mod passing {
     fn no_body_background_images() {
         let html =
             "<body background=\"no/such/image.png\" background=\"no/such/image2.png\"></body>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -190,7 +191,7 @@ mod passing {
     #[test]
     fn no_frames() {
         let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -222,7 +223,7 @@ mod passing {
     #[test]
     fn no_iframes() {
         let html = "<iframe src=\"http://trackbook.com\"></iframe>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -258,7 +259,7 @@ mod passing {
                 <script>alert(1)</script>\
             </div>\
         ";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -293,7 +294,7 @@ mod passing {
     fn keeps_integrity_for_unfamiliar_links() {
         let html = "<title>Has integrity</title>\
                     <link integrity=\"sha384-12345\" rel=\"something\" href=\"https://some-site.com/some-file.ext\" />";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -328,7 +329,7 @@ mod passing {
             <link integrity=\"\" rel=\"stylesheet\" href=\"data:;\"/>\
             <script integrity=\"\" src=\"some.js\"></script>\
         ";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -366,7 +367,7 @@ mod passing {
             <link integrity=\"sha384-123\" rel=\"something\" href=\"data:;\"/>\
             <script integrity=\"sha384-456\" src=\"some.js\"></script>\
         ";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -410,7 +411,7 @@ mod passing {
                 </body>\
             </html>\
         ";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -452,7 +453,7 @@ mod passing {
                 </noscript>\
             </body>\
         </html>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 
@@ -480,7 +481,7 @@ mod passing {
                         </noscript>\
                     </body>\
                 </html>",
-                empty_image!(),
+                EMPTY_IMAGE_DATA_URL,
             )
         );
     }
@@ -488,7 +489,7 @@ mod passing {
     #[test]
     fn preserves_script_type_json() {
         let html = "<script id=\"data\" type=\"application/json\">{\"mono\":\"lith\"}</script>";
-        let dom = html::html_to_dom(&html.as_bytes().to_vec(), str!());
+        let dom = html::html_to_dom(&html.as_bytes().to_vec(), "".to_string());
         let url: Url = Url::parse("http://localhost").unwrap();
         let cache = &mut HashMap::new();
 

tests/js/attr_is_event_handler.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::js;
+    use monolith::js;
 
     #[test]
     fn onblur_camelcase() {
@@ -34,7 +34,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::js;
+    use monolith::js;
 
     #[test]
     fn href() {

tests/mod.rs

@@ -2,7 +2,7 @@ mod cli;
 mod css;
 mod html;
 mod js;
-mod macros;
+// mod macros;
 mod opts;
 mod url;
 mod utils;

tests/opts.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::opts::Options;
+    use monolith::opts::Options;
 
     #[test]
     fn defaults() {
@@ -24,12 +24,12 @@ mod passing {
         assert_eq!(options.no_js, false);
         assert_eq!(options.insecure, false);
         assert_eq!(options.no_metadata, false);
-        assert_eq!(options.output, str!());
+        assert_eq!(options.output, "".to_string());
         assert_eq!(options.silent, false);
         assert_eq!(options.timeout, 0);
         assert_eq!(options.user_agent, None);
         assert_eq!(options.no_video, false);
 
-        assert_eq!(options.target, str!());
+        assert_eq!(options.target, "".to_string());
     }
 }

tests/url/clean_url.rs

@@ -9,14 +9,15 @@
 mod passing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn preserve_original() {
         let u: Url = Url::parse("https://somewhere.com/font.eot#iefix").unwrap();
 
-        url::clean_url(u.clone());
+        let clean_u: Url = url::clean_url(u.clone());
 
+        assert_eq!(clean_u.as_str(), "https://somewhere.com/font.eot");
         assert_eq!(u.as_str(), "https://somewhere.com/font.eot#iefix");
     }
 

tests/url/create_data_url.rs

@@ -9,7 +9,7 @@
 mod passing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn encode_string_with_specific_media_type() {

tests/url/is_url_and_has_protocol.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn mailto() {
@@ -80,7 +80,7 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn url_with_no_protocol() {

tests/url/mod.rs

@@ -2,6 +2,4 @@ mod clean_url;
 mod create_data_url;
 mod is_url_and_has_protocol;
 mod parse_data_url;
-mod percent_decode;
-mod percent_encode;
 mod resolve_url;

tests/url/parse_data_url.rs

@@ -9,7 +9,7 @@
 mod passing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn parse_text_html_base64() {
@@ -96,7 +96,7 @@ mod passing {
 mod failing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn empty_data_url() {

tests/url/resolve_url.rs

@@ -9,7 +9,7 @@
 mod passing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn basic_httsp_relative() {
@@ -211,7 +211,7 @@ mod passing {
 mod failing {
     use reqwest::Url;
 
-    use crate::url;
+    use monolith::url;
 
     #[test]
     fn from_data_url_to_url_with_no_protocol() {

tests/utils/detect_media_type.rs

@@ -9,7 +9,7 @@
 mod passing {
     use reqwest::Url;
 
-    use crate::utils;
+    use monolith::utils;
 
     #[test]
     fn image_gif87() {
@@ -188,7 +188,7 @@ mod passing {
 mod failing {
     use reqwest::Url;
 
-    use crate::utils;
+    use monolith::utils;
 
     #[test]
     fn unknown_media_type() {

tests/utils/indent.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::utils;
+    use monolith::utils;
 
     #[test]
     fn zero() {

tests/utils/parse_content_type.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::utils;
+    use monolith::utils;
 
     #[test]
     fn text_plain_utf8() {

tests/utils/retrieve_asset.rs

@@ -12,9 +12,9 @@ mod passing {
     use std::collections::HashMap;
     use std::env;
 
-    use crate::opts::Options;
-    use crate::url;
-    use crate::utils;
+    use monolith::opts::Options;
+    use monolith::url;
+    use monolith::utils;
 
     #[test]
     fn read_data_url() {
@@ -63,13 +63,13 @@ mod passing {
             cache,
             &client,
             &Url::parse(&format!(
-                "{file}{cwd}/src/tests/data/basic/local-file.html",
+                "{file}{cwd}/tests/_data_/basic/local-file.html",
                 file = file_url_protocol,
                 cwd = cwd.to_str().unwrap()
             ))
             .unwrap(),
             &Url::parse(&format!(
-                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                "{file}{cwd}/tests/_data_/basic/local-script.js",
                 file = file_url_protocol,
                 cwd = cwd.to_str().unwrap()
             ))
@@ -84,7 +84,7 @@ mod passing {
         assert_eq!(
             final_url,
             Url::parse(&format!(
-                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                "{file}{cwd}/tests/_data_/basic/local-script.js",
                 file = file_url_protocol,
                 cwd = cwd.to_str().unwrap()
             ))
@@ -106,8 +106,8 @@ mod failing {
     use reqwest::Url;
     use std::collections::HashMap;
 
-    use crate::opts::Options;
-    use crate::utils;
+    use monolith::opts::Options;
+    use monolith::utils;
 
     #[test]
     fn read_local_file_with_data_url_parent() {