Merge pull request #207 from snshn/bump-version

bump version (2.3.0 -> 2.3.1)

.github/workflows/cd.yml

@@ -15,7 +15,7 @@ jobs:
     - run: git config --global core.autocrlf false
     - name: Checkout the repository
       uses: actions/checkout@v2
-    - name: Build and install the executable
+    - name: Build the executable
       run: cargo build --release
     - uses: Shopify/upload-to-release@1.0.0
       with:
@@ -52,3 +52,16 @@ jobs:
         name: monolith-gnu-linux-armhf
         path: target/arm-unknown-linux-gnueabihf/release/monolith
         repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+  gnu_linux_x86_64:
+    runs-on: ubuntu-18.04
+    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
+        path: target/release/monolith
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monolith"
-version = "2.2.6"
+version = "2.3.1"
 edition = "2018"
 authors = [
     "Sunshine <sunshine@uberspace.net>",
@@ -12,19 +12,19 @@ authors = [
 description = "CLI tool for saving web pages as a single HTML file"
 
 [dependencies]
-base64 = "0.12.0"
-clap = "2.33.0"
+base64 = "0.12.3"
+chrono = "0.4.13" # Used to render comments indicating the time the page was saved
+clap = "2.33.1"
 cssparser = "0.27.2"
 html5ever = "0.24.1"
-sha2 = "0.8.1" # Used in calculating checksums during integrity checks
-time = "0.1.42" # Used to render comments indicating the time the page was saved
+sha2 = "0.9.1" # Used in calculating checksums during integrity checks
 url = "2.1.1"
 
 [dependencies.reqwest]
-version = "0.10.*"
+version = "0.10.6"
 default-features = false
 features = ["default-tls", "blocking", "gzip"]
 
 [dev-dependencies]
-assert_cmd = "0.12.0"
+assert_cmd = "1.0.1"
 tempfile = "3.1.0"

Makefile

@@ -23,3 +23,7 @@ install:
 uninstall:
 	@cargo uninstall
 .PHONY: uninstall
+
+clean:
+	@cargo clean
+.PHONY: clean

README.md

@@ -3,13 +3,13 @@
 [![Monolith Build Status for Windows](https://github.com/Y2Z/monolith/workflows/Windows/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AWindows)
 
 ```
- ___     ___________    __________      ___________________    ___
-|   \   /           \  |          |    |                   |  |   |
-|    \_/     __      \_|    __    |    |    ___     ___    |__|   |
-|           |  |           |  |   |    |   |   |   |   |          |
-|           |__|    _      |__|   |____|   |   |   |   |    __    |
-|   |\_/|          | \                     |   |   |   |   |  |   |
-|___|   |__________|  \____________________|   |___|   |___|  |___|
+ _____     ______________    __________      ___________________    ___
+|     \   /              \  |          |    |                   |  |   |
+|      \_/       __       \_|    __    |    |    ___     ___    |__|   |
+|               |  |            |  |   |    |   |   |   |   |          |
+|   |\     /|   |__|    _       |__|   |____|   |   |   |   |    __    |
+|   | \___/ |          | \                      |   |   |   |   |  |   |
+|___|       |__________|  \_____________________|   |___|   |___|  |___|
 ```
 
 A data hoarder’s dream come true: bundle any web page into a single HTML file. You can finally replace that gazillion of open tabs with a gazillion of .html files stored somewhere on your precious little drive.
@@ -28,6 +28,13 @@ If compared to saving websites with `wget -mpk`, this tool embeds all assets as
 #### Using Snapcraft (on GNU/Linux)
     $ snap install monolith
 
+#### Using Ports collection (on FreeBSD and TrueOS)
+    $ cd /usr/ports/www/monolith/
+    $ make install clean
+
+#### Using pre-built binaries (Windows, ARM-based devices, etc)
+Every [release](https://github.com/Y2Z/monolith/releases) contains pre-built binaries for Windows, GNU/Linux, as well as platforms with non-standart CPU architecture.
+
 #### From source
 
 Dependency: `libssl-dev`
@@ -36,7 +43,7 @@ Dependency: `libssl-dev`
     $ cd monolith
     $ make install
 
-#### With Docker
+#### Using Containers
 The guide can be found [here](docs/containers.md)
 
 ---------------------------------------------------
@@ -48,16 +55,16 @@ The guide can be found [here](docs/containers.md)
 
 ## Options
  - `-c`: Ignore styles
- - `-f`: Exclude frames and iframes
+ - `-f`: Exclude frames
  - `-F`: Omit web fonts
  - `-i`: Remove images
  - `-I`: Isolate the document
  - `-j`: Exclude JavaScript
  - `-k`: Accept invalid X.509 (TLS) certificates
  - `-o`: Write output to file
- - `-s`: Silent mode
- - `-t`: Set custom network request timeout
- - `-u`: Provide own User-Agent
+ - `-s`: Be quiet
+ - `-t`: Adjust network request timeout
+ - `-u`: Provide custom User-Agent
 
 ---------------------------------------------------
 

docs/arch/0002-noscript-nodes.md

@@ -8,12 +8,12 @@ Accepted
 
 ## Context
 
-HTML pages sometimes contain NOSCRIPT nodes, which reveal their contents only in case when JavaScript is not available. Most of the time they contain hidden messages that inform about certain JavaScript-dependent features not being operational, however sometimes can also feature media assets or even iframes.
+HTML pages can contain `noscript` nodes, which reveal their contents only in case when JavaScript is not available. Most of the time they contain hidden messages that inform about certain JavaScript-dependent features not being operational, however sometimes can also feature media assets or even iframes.
 
 ## Decision
 
-When the document is being saved with or without JavaScript, each NOSCRIPT node should be preserved while its children need to be processed exactly the same way as the rest of the document. This approach will ensure that even hidden remote assets are embedded — since those hidden elements may have to be displayed later in a browser that has JavaScript turned off. An option should be available to "unwrap" all NOSCRIPT nodes in order to make their contents always visible in the document, complimenting the "disable JS" function of the program.
+When the document is being saved with or without JavaScript, each `noscript` node should be preserved while its children need to be processed exactly the same way as the rest of the document. This approach will ensure that even hidden remote assets are embedded — since those hidden elements may have to be displayed later in a browser that has JavaScript turned off. An option should be available to "unwrap" all `noscript` nodes in order to make their contents always visible in the document, complimenting the "disable JS" function of the program.
 
 ## Consequences
 
-Saved documents will have contents of all NOSCRIPT nodes processed as if they are part of the document's DOM, therefore properly display images encapsulated within NOSCRIPT nodes when being viewed in browsers that have JavaScript turned off (or have no JavaScript support in the first place). The new option to "unwrap" NOSCRIPT elements will help the user ensure that the resulting document always represents what the original web page looked like in a browser that had JavaScript turned off.
+Saved documents will have contents of all `noscript` nodes processed as if they are part of the document's DOM, therefore properly display images encapsulated within `noscript` nodes when being viewed in browsers that have JavaScript turned off (or have no JavaScript support in the first place). The new option to "unwrap" `noscript` elements will help the user ensure that the resulting document always represents what the original web page looked like in a browser that had JavaScript turned off.

docs/arch/0003-network-request-timeout.md

@@ -12,14 +12,10 @@ A slow network connection and overloaded server may negatively impact network re
 
 ## Decision
 
-Make the program simulate behavior of popular web browsers and CLI tools, where 
-the default network response timeout is most often set to 120 seconds.
+Make the program simulate behavior of popular web browsers and CLI tools, where the default network response timeout is most often set to 120 seconds.
 
-Instead of featuring retries for timed out network requests, the program
-should have an option to adjust the timeout length, along with making it
-indefinite when given "0" as its value.
+Instead of featuring retries for timed out network requests, the program should have an option to adjust the timeout length, along with making it indefinite when given "0" as its value.
 
 ## Consequences
 
-The user is able to retrieve resources that have long response time, as well as obtain
-full control over how soon, and if at all, network requests should time out.
+The user is able to retrieve resources that have long response time, as well as obtain full control over how soon, and if at all, network requests should time out.

docs/arch/0004-asset-integrity-check.md

@@ -0,0 +1,21 @@
+# 4. Asset integrity check
+
+Date: 2020-02-23
+
+## Status
+
+Accepted
+
+## Context
+
+In HTML5, `link` and `script` nodes have an attribute named `integrity`, which lets the browser check if the remote file is valid, mostly for the purpose of enhancing page security.
+
+## Decision
+
+In order to replicate the browser's behavior, the program should perform integrity check the same way it does, excluding the linked asset from the final result if such check fails.
+
+The `integrity` attribute should be removed from nodes, as it bears no benefit for resources embedded as data URLs.
+
+## Consequences
+
+Assets that fail to pass the check get excluded from the saved document. Meanwhile, saved documents no longer contain integrity attributes on all `link` and `script` nodes.

docs/arch/0005-asset-minimization.md

@@ -8,18 +8,12 @@ Accepted
 
 ## Context
 
-It may look like a good idea to make monolith compress retrieved assets while
-saving the page for the purpose of reducing the resulting document's file size.
+It may look like a good idea to make monolith compress retrieved assets while saving the page for the purpose of reducing the resulting document's file size.
 
 ## Decision
 
-Given that the main purpose of this program is to save pages in a convenient to store and share manner — it's mostly an archiving tool,
-aside from being able to tell monolith to exclude certain types of asests (e.g. images, CSS, JavaScript),
-it would be outside of scope of this program to implement code for compressing assets. Minimizing files before embedding them
-does not reduce the amount of data that needs to be transferred either. A separate tool can be used later to compress and minimize pages
-saved by monolith, if needed.
+Given that the main purpose of this program is to save pages in a convenient to store and share manner — it's mostly an archiving tool, aside from being able to tell monolith to exclude certain types of asests (e.g. images, CSS, JavaScript), it would be outside of scope of this program to implement code for compressing assets. Minimizing files before embedding them does not reduce the amount of data that needs to be transferred either. A separate tool can be used later to compress and minimize pages saved by monolith, if needed.
 
 ## Consequences
 
-Monolith will not support modification of original document assets for the purpose of reducing their size, sticking to performing only minimal
-amount of modifications to the original web page — whatever is needed to provide security or exclude unwanted asset types.
+Monolith will not support modification of original document assets for the purpose of reducing their size, sticking to performing only minimal amount of modifications to the original web page — whatever is needed to provide security or exclude unwanted asset types.

docs/arch/0006-reload-and-location-meta-tags.md

@@ -0,0 +1,19 @@
+# 4. Reload and location `meta` tags
+
+Date: 2020-06-25
+
+## Status
+
+Accepted
+
+## Context
+
+HTML documents may contain `meta` tags capable of automatically refreshing the page or redirecting to another location.
+
+## Decision
+
+Since the resulting document is saved to disk and generally not intended to be served over the network, it only makes sense to remove `meta` tags that have `http-equiv` attribute equal to "Refresh" or "Location", in order to prevent them from reloading the page or redirecting to another location.
+
+## Consequences
+
+Monolith will ensure that saved documents do not contain `meta` tags capable of changing location or reloading the page.

docs/references.md

@@ -0,0 +1,3 @@
+# References
+
+- https://content-security-policy.com/

docs/web-apps.md

@@ -0,0 +1,10 @@
+# Web apps that can be saved with Monolith
+
+These apps retain most or all 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|

snap/snapcraft.yaml

@@ -18,11 +18,11 @@ description: |
 
 confinement: strict
 
-# Building on armhf fails, so we specify all supported non-armhf architectures
 architectures:
   - build-on: amd64
-  - build-on: i386
   - build-on: arm64
+  - build-on: armhf
+  - build-on: i386
   - build-on: ppc64el
   - build-on: s390x
 

src/css.rs

@@ -2,7 +2,9 @@ use cssparser::{ParseError, Parser, ParserInput, SourcePosition, Token};
 use reqwest::blocking::Client;
 use std::collections::HashMap;
 
-use crate::utils::{data_to_data_url, get_url_fragment, is_http_url, resolve_url, retrieve_asset};
+use crate::opts::Options;
+use crate::url::{data_to_data_url, get_url_fragment, is_http_url, resolve_url, url_with_fragment};
+use crate::utils::retrieve_asset;
 
 const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
     // Universal
@@ -58,12 +60,11 @@ pub fn process_css<'a>(
     client: &Client,
     parent_url: &str,
     parser: &mut Parser,
+    options: &Options,
+    depth: u32,
     rule_name: &str,
     prop_name: &str,
     func_name: &str,
-    opt_no_fonts: bool,
-    opt_no_images: bool,
-    opt_silent: bool,
 ) -> Result<String, ParseError<'a, String>> {
     let mut result: String = str!();
 
@@ -90,7 +91,7 @@ pub fn process_css<'a>(
             Token::Colon => result.push_str(":"),
             Token::Comma => result.push_str(","),
             Token::ParenthesisBlock | Token::SquareBracketBlock | Token::CurlyBracketBlock => {
-                if opt_no_fonts && curr_rule == "font-face" {
+                if options.no_fonts && curr_rule == "font-face" {
                     continue;
                 }
 
@@ -113,12 +114,11 @@ pub fn process_css<'a>(
                             client,
                             parent_url,
                             parser,
+                            options,
+                            depth,
                             rule_name,
                             curr_prop.as_str(),
                             func_name,
-                            opt_no_fonts,
-                            opt_no_images,
-                            opt_silent,
                         )
                     })
                     .unwrap();
@@ -148,7 +148,7 @@ pub fn process_css<'a>(
             // @import, @font-face, @charset, @media...
             Token::AtKeyword(ref value) => {
                 curr_rule = str!(value);
-                if opt_no_fonts && curr_rule == "font-face" {
+                if options.no_fonts && curr_rule == "font-face" {
                     continue;
                 }
                 result.push_str("@");
@@ -171,34 +171,42 @@ pub fn process_css<'a>(
 
                     let import_full_url = resolve_url(&parent_url, value).unwrap_or_default();
                     let import_url_fragment = get_url_fragment(import_full_url.clone());
-                    match retrieve_asset(cache, client, &parent_url, &import_full_url, opt_silent) {
+                    match retrieve_asset(
+                        cache,
+                        client,
+                        &parent_url,
+                        &import_full_url,
+                        options.silent,
+                        depth + 1,
+                    ) {
                         Ok((import_contents, import_final_url, _import_media_type)) => {
-                            result.push_str(
-                                enquote(
-                                    data_to_data_url(
-                                        "text/css",
-                                        embed_css(
-                                            cache,
-                                            client,
-                                            &import_final_url,
-                                            &String::from_utf8_lossy(&import_contents),
-                                            opt_no_fonts,
-                                            opt_no_images,
-                                            opt_silent,
-                                        )
-                                        .as_bytes(),
-                                        &import_final_url,
-                                        &import_url_fragment,
-                                    ),
-                                    false,
+                            let import_data_url = data_to_data_url(
+                                "text/css",
+                                embed_css(
+                                    cache,
+                                    client,
+                                    &import_final_url,
+                                    &String::from_utf8_lossy(&import_contents),
+                                    options,
+                                    depth + 1,
                                 )
-                                .as_str(),
+                                .as_bytes(),
+                                &import_final_url,
                             );
+                            let assembled_url: String = url_with_fragment(
+                                import_data_url.as_str(),
+                                import_url_fragment.as_str(),
+                            );
+                            result.push_str(enquote(assembled_url, false).as_str());
                         }
                         Err(_) => {
                             // Keep remote reference if unable to retrieve the asset
                             if is_http_url(import_full_url.clone()) {
-                                result.push_str(enquote(import_full_url, false).as_str());
+                                let assembled_url: String = url_with_fragment(
+                                    import_full_url.as_str(),
+                                    import_url_fragment.as_str(),
+                                );
+                                result.push_str(enquote(assembled_url, false).as_str());
                             }
                         }
                     }
@@ -209,7 +217,7 @@ pub fn process_css<'a>(
                             continue;
                         }
 
-                        if opt_no_images && is_image_url_prop(curr_prop.as_str()) {
+                        if options.no_images && is_image_url_prop(curr_prop.as_str()) {
                             result.push_str(enquote(str!(empty_image!()), false).as_str());
                         } else {
                             let resolved_url = resolve_url(&parent_url, value).unwrap_or_default();
@@ -219,21 +227,23 @@ pub fn process_css<'a>(
                                 client,
                                 &parent_url,
                                 &resolved_url,
-                                opt_silent,
+                                options.silent,
+                                depth + 1,
                             ) {
                                 Ok((data, final_url, media_type)) => {
-                                    let data_url = data_to_data_url(
-                                        &media_type,
-                                        &data,
-                                        &final_url,
-                                        &url_fragment,
-                                    );
-                                    result.push_str(enquote(data_url, false).as_str());
+                                    let data_url = data_to_data_url(&media_type, &data, &final_url);
+                                    let assembled_url: String =
+                                        url_with_fragment(data_url.as_str(), url_fragment.as_str());
+                                    result.push_str(enquote(assembled_url, false).as_str());
                                 }
                                 Err(_) => {
                                     // Keep remote reference if unable to retrieve the asset
                                     if is_http_url(resolved_url.clone()) {
-                                        result.push_str(enquote(resolved_url, false).as_str());
+                                        let assembled_url: String = url_with_fragment(
+                                            resolved_url.as_str(),
+                                            url_fragment.as_str(),
+                                        );
+                                        result.push_str(enquote(assembled_url, false).as_str());
                                     }
                                 }
                             }
@@ -261,7 +271,7 @@ pub fn process_css<'a>(
                 if *has_sign && *unit_value >= 0. {
                     result.push_str("+");
                 }
-                result.push_str(str!(unit_value * 100.).as_str());
+                result.push_str(str!(unit_value * 100.0).as_str());
                 result.push_str("%");
             }
             Token::Dimension {
@@ -305,7 +315,14 @@ pub fn process_css<'a>(
                 if is_import {
                     let full_url = resolve_url(&parent_url, value).unwrap_or_default();
                     let url_fragment = get_url_fragment(full_url.clone());
-                    match retrieve_asset(cache, client, &parent_url, &full_url, opt_silent) {
+                    match retrieve_asset(
+                        cache,
+                        client,
+                        &parent_url,
+                        &full_url,
+                        options.silent,
+                        depth + 1,
+                    ) {
                         Ok((css, final_url, _media_type)) => {
                             let data_url = data_to_data_url(
                                 "text/css",
@@ -314,39 +331,51 @@ pub fn process_css<'a>(
                                     client,
                                     &final_url,
                                     &String::from_utf8_lossy(&css),
-                                    opt_no_fonts,
-                                    opt_no_images,
-                                    opt_silent,
+                                    options,
+                                    depth + 1,
                                 )
                                 .as_bytes(),
                                 &final_url,
-                                &url_fragment,
                             );
-                            result.push_str(enquote(data_url, false).as_str());
+                            let assembled_url: String =
+                                url_with_fragment(data_url.as_str(), url_fragment.as_str());
+                            result.push_str(enquote(assembled_url, false).as_str());
                         }
                         Err(_) => {
                             // Keep remote reference if unable to retrieve the asset
                             if is_http_url(full_url.clone()) {
-                                result.push_str(enquote(full_url, false).as_str());
+                                let assembled_url: String =
+                                    url_with_fragment(full_url.as_str(), url_fragment.as_str());
+                                result.push_str(enquote(assembled_url, false).as_str());
                             }
                         }
                     }
                 } else {
-                    if opt_no_images && is_image_url_prop(curr_prop.as_str()) {
+                    if is_image_url_prop(curr_prop.as_str()) && options.no_images {
                         result.push_str(enquote(str!(empty_image!()), false).as_str());
                     } else {
                         let full_url = resolve_url(&parent_url, value).unwrap_or_default();
                         let url_fragment = get_url_fragment(full_url.clone());
-                        match retrieve_asset(cache, client, &parent_url, &full_url, opt_silent) {
+                        match retrieve_asset(
+                            cache,
+                            client,
+                            &parent_url,
+                            &full_url,
+                            options.silent,
+                            depth + 1,
+                        ) {
                             Ok((data, final_url, media_type)) => {
-                                let data_url =
-                                    data_to_data_url(&media_type, &data, &final_url, &url_fragment);
-                                result.push_str(enquote(data_url, false).as_str());
+                                let data_url = data_to_data_url(&media_type, &data, &final_url);
+                                let assembled_url: String =
+                                    url_with_fragment(data_url.as_str(), url_fragment.as_str());
+                                result.push_str(enquote(assembled_url, false).as_str());
                             }
                             Err(_) => {
                                 // Keep remote reference if unable to retrieve the asset
                                 if is_http_url(full_url.clone()) {
-                                    result.push_str(enquote(full_url, false).as_str());
+                                    let assembled_url: String =
+                                        url_with_fragment(full_url.as_str(), url_fragment.as_str());
+                                    result.push_str(enquote(assembled_url, false).as_str());
                                 }
                             }
                         }
@@ -367,12 +396,11 @@ pub fn process_css<'a>(
                             client,
                             parent_url,
                             parser,
+                            options,
+                            depth,
                             curr_rule.as_str(),
                             curr_prop.as_str(),
                             function_name,
-                            opt_no_fonts,
-                            opt_no_images,
-                            opt_silent,
                         )
                     })
                     .unwrap();
@@ -384,6 +412,11 @@ pub fn process_css<'a>(
         }
     }
 
+    // Ensure empty CSS is really empty
+    if result.len() > 0 && result.trim().len() == 0 {
+        result = result.trim().to_string()
+    }
+
     Ok(result)
 }
 
@@ -392,9 +425,8 @@ pub fn embed_css(
     client: &Client,
     parent_url: &str,
     css: &str,
-    opt_no_fonts: bool,
-    opt_no_images: bool,
-    opt_silent: bool,
+    options: &Options,
+    depth: u32,
 ) -> String {
     let mut input = ParserInput::new(&css);
     let mut parser = Parser::new(&mut input);
@@ -404,12 +436,11 @@ pub fn embed_css(
         client,
         parent_url,
         &mut parser,
+        options,
+        depth,
         "",
         "",
         "",
-        opt_no_fonts,
-        opt_no_images,
-        opt_silent,
     )
     .unwrap()
 }

src/lib.rs

@@ -1,9 +1,14 @@
+#[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)]

src/main.rs

@@ -1,8 +1,5 @@
-use monolith::html::{html_to_dom, stringify_document, walk_and_embed_assets};
-use monolith::utils::{data_url_to_data, is_data_url, is_file_url, is_http_url, retrieve_asset};
 use reqwest::blocking::Client;
 use reqwest::header::{HeaderMap, HeaderValue, USER_AGENT};
-use reqwest::Url;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
@@ -11,12 +8,17 @@ use std::path::Path;
 use std::process;
 use std::time::Duration;
 
-mod args;
-mod macros;
+use monolith::html::{
+    add_base_tag, add_favicon, has_base_tag, has_favicon, html_to_dom, metadata_tag,
+    stringify_document, walk_and_embed_assets,
+};
+use monolith::opts::Options;
+use monolith::url::{
+    data_to_data_url, data_url_to_data, is_data_url, is_file_url, is_http_url, resolve_url,
+};
+use monolith::utils::retrieve_asset;
 
-#[macro_use]
-extern crate clap;
-use crate::args::AppArgs;
+mod macros;
 
 enum Output {
     Stdout(io::Stdout),
@@ -25,7 +27,7 @@ enum Output {
 
 impl Output {
     fn new(file_path: &str) -> Result<Output, Error> {
-        if file_path.is_empty() {
+        if file_path.is_empty() || file_path.eq("-") {
             Ok(Output::Stdout(io::stdout()))
         } else {
             Ok(Output::File(fs::File::create(file_path)?))
@@ -47,11 +49,11 @@ impl Output {
 }
 
 fn main() {
-    let app_args = AppArgs::get();
-    let original_target: &str = &app_args.target;
+    let options = Options::from_args();
+    let original_target: &str = &options.target;
     let target_url: &str;
     let base_url;
-    let dom;
+    let mut dom;
 
     // Pre-process the input
     let cwd_normalized: String =
@@ -60,6 +62,7 @@ fn main() {
     let mut target: String = str!(original_target.clone()).replace("\\", "/");
     let path_is_relative: bool = path.is_relative();
 
+    // Determine exact target URL
     if target.clone().len() == 0 {
         eprintln!("No target specified");
         process::exit(1);
@@ -86,31 +89,38 @@ fn main() {
         target_url = target.as_str();
     }
 
-    let mut output = Output::new(&app_args.output).expect("Could not prepare output");
+    // Define output
+    let mut output = Output::new(&options.output).expect("Could not prepare output");
 
     // Initialize client
     let mut cache = HashMap::new();
     let mut header_map = HeaderMap::new();
     header_map.insert(
         USER_AGENT,
-        HeaderValue::from_str(&app_args.user_agent).expect("Invalid User-Agent header specified"),
+        HeaderValue::from_str(&options.user_agent).expect("Invalid User-Agent header specified"),
     );
-
-    let timeout: u64 = if app_args.timeout > 0 {
-        app_args.timeout
+    let timeout: u64 = if options.timeout > 0 {
+        options.timeout
     } else {
         std::u64::MAX / 4
     };
     let client = Client::builder()
         .timeout(Duration::from_secs(timeout))
-        .danger_accept_invalid_certs(app_args.insecure)
+        .danger_accept_invalid_certs(options.insecure)
         .default_headers(header_map)
         .build()
         .expect("Failed to initialize HTTP client");
 
-    // Retrieve root document
+    // Retrieve target document
     if is_file_url(target_url) || is_http_url(target_url) {
-        match retrieve_asset(&mut cache, &client, target_url, target_url, app_args.silent) {
+        match retrieve_asset(
+            &mut cache,
+            &client,
+            target_url,
+            target_url,
+            options.silent,
+            0,
+        ) {
             Ok((data, final_url, _media_type)) => {
                 base_url = final_url;
                 dom = html_to_dom(&String::from_utf8_lossy(&data));
@@ -132,57 +142,50 @@ fn main() {
         process::exit(1);
     }
 
-    let time_saved = time::now_utc();
+    // Embed remote assets
+    walk_and_embed_assets(&mut cache, &client, &base_url, &dom.document, &options, 0);
 
-    walk_and_embed_assets(
-        &mut cache,
-        &client,
-        &base_url,
-        &dom.document,
-        app_args.no_css,
-        app_args.no_fonts,
-        app_args.no_frames,
-        app_args.no_js,
-        app_args.no_images,
-        app_args.silent,
-    );
-
-    let mut html: String = stringify_document(
-        &dom.document,
-        app_args.no_css,
-        app_args.no_frames,
-        app_args.no_js,
-        app_args.no_images,
-        app_args.isolate,
-    );
-
-    if !app_args.no_metadata {
-        // Safe to unwrap (we just put this through an HTTP request)
-        let mut clean_url = Url::parse(&base_url).unwrap();
-        clean_url.set_fragment(None);
-        // Don't include credentials
-        clean_url.set_username("").unwrap();
-        clean_url.set_password(None).unwrap();
-        let metadata_comment = if is_http_url(&base_url) {
-            format!(
-                "<!-- Saved from {} at {} using {} v{} -->\n",
-                &clean_url,
-                time_saved.rfc3339(),
-                env!("CARGO_PKG_NAME"),
-                env!("CARGO_PKG_VERSION"),
-            )
-        } else {
-            format!(
-                "<!-- Saved from local source at {} using {} v{} -->\n",
-                time_saved.rfc3339(),
-                env!("CARGO_PKG_NAME"),
-                env!("CARGO_PKG_VERSION"),
-            )
-        };
-        html.insert_str(0, &metadata_comment);
+    // Take care of BASE tag
+    if is_http_url(base_url.clone()) && !has_base_tag(&dom.document) {
+        dom = add_base_tag(&dom.document, base_url.clone());
     }
 
+    // Request and embed /favicon.ico (unless it's already linked in the document)
+    if !options.no_images && is_http_url(target_url) && !has_favicon(&dom.document) {
+        let favicon_ico_url: String = resolve_url(&base_url, "/favicon.ico").unwrap();
+
+        match retrieve_asset(
+            &mut cache,
+            &client,
+            &base_url,
+            &favicon_ico_url,
+            options.silent,
+            0,
+        ) {
+            Ok((data, final_url, media_type)) => {
+                let favicon_data_url: String = data_to_data_url(&media_type, &data, &final_url);
+                dom = add_favicon(&dom.document, favicon_data_url);
+            }
+            Err(_) => {
+                // Failed to retrieve favicon.ico
+            }
+        }
+    }
+
+    // Serialize DOM tree
+    let mut result: String = stringify_document(&dom.document, &options);
+
+    // Add metadata tag
+    if !options.no_metadata {
+        let metadata_comment: String = metadata_tag(&base_url);
+        result.insert_str(0, &metadata_comment);
+        if metadata_comment.len() > 0 {
+            result.insert_str(metadata_comment.len(), "\n");
+        }
+    }
+
+    // Write result into stdout or file
     output
-        .writeln_str(&html)
+        .writeln_str(&result)
         .expect("Could not write HTML output");
 }

src/opts.rs

@@ -1,7 +1,7 @@
 use clap::{App, Arg};
 
 #[derive(Default)]
-pub struct AppArgs {
+pub struct Options {
     pub target: String,
     pub no_css: bool,
     pub no_fonts: bool,
@@ -17,16 +17,25 @@ pub struct AppArgs {
     pub no_metadata: bool,
 }
 
+const ASCII: &str = " \
+ _____     ______________    __________      ___________________    ___
+|     \\   /              \\  |          |    |                   |  |   |
+|      \\_/       __       \\_|    __    |    |    ___     ___    |__|   |
+|               |  |            |  |   |    |   |   |   |   |          |
+|   |\\     /|   |__|    _       |__|   |____|   |   |   |   |    __    |
+|   | \\___/ |          | \\                      |   |   |   |   |  |   |
+|___|       |__________|  \\_____________________|   |___|   |___|  |___|
+";
 const DEFAULT_NETWORK_TIMEOUT: u64 = 120;
 const DEFAULT_USER_AGENT: &str =
     "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0";
 
-impl AppArgs {
-    pub fn get() -> AppArgs {
+impl Options {
+    pub fn from_args() -> Options {
         let app = App::new(env!("CARGO_PKG_NAME"))
             .version(crate_version!())
             .author(crate_authors!("\n"))
-            .about(crate_description!())
+            .about(format!("{}\n{}", ASCII, crate_description!()).as_str())
             .arg(
                 Arg::with_name("target")
                     .required(true)
@@ -34,7 +43,7 @@ impl AppArgs {
                     .index(1)
                     .help("URL or file path"),
             )
-            // .args_from_usage("-a, --include-audio 'Removes audio sources'")
+            // .args_from_usage("-a, --no-audio 'Removes audio sources'")
             .args_from_usage("-c, --no-css 'Removes CSS'")
             .args_from_usage("-f, --no-frames 'Removes frames and iframes'")
             .args_from_usage("-F, --no-fonts 'Removes fonts'")
@@ -43,37 +52,39 @@ impl AppArgs {
             .args_from_usage("-j, --no-js 'Removes JavaScript'")
             .args_from_usage("-k, --insecure 'Allows invalid X.509 (TLS) certificates'")
             .args_from_usage("-M, --no-metadata 'Excludes metadata information from the document'")
-            .args_from_usage("-o, --output=[document.html] 'Writes output to <file>'")
+            .args_from_usage("-o, --output=[document.html] 'Write output to <file>'")
             .args_from_usage("-s, --silent 'Suppresses verbosity'")
-            .args_from_usage("-t, --timeout=[60] 'Adjusts network request timeout'")
-            .args_from_usage("-u, --user-agent=[Firefox] 'Sets custom User-Agent string'")
-            // .args_from_usage("-v, --include-video 'Removes video sources'")
+            .args_from_usage("-t, --timeout=[60] 'Adjust network request timeout'")
+            .args_from_usage("-u, --user-agent=[Firefox] 'Set custom User-Agent string'")
+            // .args_from_usage("-v, --no-video 'Removes video sources'")
             .get_matches();
-        let mut app_args = AppArgs::default();
+        let mut options: Options = Options::default();
+
         // Process the command
-        app_args.target = app
+        options.target = app
             .value_of("target")
             .expect("please set target")
             .to_string();
-        app_args.no_css = app.is_present("no-css");
-        app_args.no_fonts = app.is_present("no-fonts");
-        app_args.no_frames = app.is_present("no-frames");
-        app_args.no_images = app.is_present("no-images");
-        app_args.no_js = app.is_present("no-js");
-        app_args.insecure = app.is_present("insecure");
-        app_args.no_metadata = app.is_present("no-metadata");
-        app_args.isolate = app.is_present("isolate");
-        app_args.silent = app.is_present("silent");
-        app_args.timeout = app
+        options.no_css = app.is_present("no-css");
+        options.no_frames = app.is_present("no-frames");
+        options.no_fonts = app.is_present("no-fonts");
+        options.no_images = app.is_present("no-images");
+        options.isolate = app.is_present("isolate");
+        options.no_js = app.is_present("no-js");
+        options.insecure = app.is_present("insecure");
+        options.no_metadata = app.is_present("no-metadata");
+        options.output = app.value_of("output").unwrap_or("").to_string();
+        options.silent = app.is_present("silent");
+        options.timeout = app
             .value_of("timeout")
             .unwrap_or(&DEFAULT_NETWORK_TIMEOUT.to_string())
             .parse::<u64>()
             .unwrap();
-        app_args.output = app.value_of("output").unwrap_or("").to_string();
-        app_args.user_agent = app
+        options.user_agent = app
             .value_of("user-agent")
             .unwrap_or(DEFAULT_USER_AGENT)
             .to_string();
-        app_args
+
+        options
     }
 }

src/tests/css/embed_css.rs

@@ -1,8 +1,3 @@
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-
-use crate::css;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,308 +5,346 @@ use crate::css;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_empty_input() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod passing {
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
 
-    assert_eq!(
-        css::embed_css(cache, &client, "", "", false, false, false,),
-        ""
-    );
-}
-
-#[test]
-fn passing_style_exclude_unquoted_images() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const STYLE: &str = "/* border: none;*/\
-background-image: url(https://somewhere.com/bg.png); \
-list-style: url(/assets/images/bullet.svg);\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &STYLE,
-            false,
-            true,
-            true,
-        ),
-        format!(
-            "/* border: none;*/\
-background-image: url('{empty_image}'); \
-list-style: url('{empty_image}');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_style_exclude_single_quoted_images() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const STYLE: &str = "/* border: none;*/\
-background-image: url('https://somewhere.com/bg.png'); \
-list-style: url('/assets/images/bullet.svg');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)";
-
-    assert_eq!(
-        css::embed_css(cache, &client, "", &STYLE, false, true, true,),
-        format!(
-            "/* border: none;*/\
-background-image: url('{empty_image}'); \
-list-style: url('{empty_image}');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_style_block() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-#id.class-name:not(:nth-child(3n+0)) {\n  \
-  // border: none;\n  \
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');\n\
-}\n\
-\n\
-html > body {}";
-
-    assert_eq!(
-        css::embed_css(cache, &client, "file:///", &CSS, false, false, true,),
-        CSS
-    );
-}
-
-#[test]
-fn passing_attribute_selectors() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-[data-value] {
-    /* Attribute exists */
-}
-
-[data-value='foo'] {
-    /* Attribute has this exact value */
-}
-
-[data-value*='foo'] {
-    /* Attribute value contains this value somewhere in it */
-}
-
-[data-value~='foo'] {
-    /* Attribute has this value in a space-separated list somewhere */
-}
-
-[data-value^='foo'] {
-    /* Attribute value starts with this */
-}
-
-[data-value|='foo'] {
-    /* Attribute value starts with this in a dash-separated list */
-}
-
-[data-value$='foo'] {
-    /* Attribute value ends with this */
-}
-";
-
-    assert_eq!(
-        css::embed_css(cache, &client, "", &CSS, false, false, false,),
-        CSS
-    );
-}
-
-#[test]
-fn passing_import_string() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-@charset 'UTF-8';\n\
-\n\
-@import 'data:text/css,html{background-color:%23000}';\n\
-\n\
-@import url('data:text/css,html{color:%23fff}')\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            false,
-            true,
-        ),
-        "\
-@charset 'UTF-8';\n\
-\n\
-@import 'data:text/css;base64,aHRtbHtiYWNrZ3JvdW5kLWNvbG9yOiMwMDB9';\n\
-\n\
-@import url('data:text/css;base64,aHRtbHtjb2xvcjojZmZmfQ==')\n\
-"
-    );
-}
-
-#[test]
-fn passing_hash_urls() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-body {\n    \
-    behavior: url(#default#something);\n\
-}\n\
-\n\
-.scissorHalf {\n    \
-    offset-path: url(#somePath);\n\
-}\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            false,
-            true,
-        ),
-        CSS
-    );
-}
-
-#[test]
-fn passing_transform_percentages_and_degrees() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-div {\n    \
-    transform: translate(-50%, -50%) rotate(-45deg);\n\
-    transform: translate(50%, 50%) rotate(45deg);\n\
-    transform: translate(+50%, +50%) rotate(+45deg);\n\
-}\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            false,
-            true,
-        ),
-        CSS
-    );
-}
-
-#[test]
-fn passing_unusual_indents() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-.is\\:good:hover {\n    \
-    color: green\n\
-}\n\
-\n\
-#\\~\\!\\@\\$\\%\\^\\&\\*\\(\\)\\+\\=\\,\\.\\/\\\\\\'\\\"\\;\\:\\?\\>\\<\\[\\]\\{\\}\\|\\`\\# {\n    \
-    color: black\n\
-}\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            false,
-            true,
-        ),
-        CSS
-    );
-}
-
-#[test]
-fn passing_exclude_fonts() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-@font-face {\n    \
-    font-family: 'My Font';\n    \
-    src: url(my_font.woff);\n\
-}\n\
-\n\
-#identifier {\n    \
-    font-family: 'My Font' Arial\n\
-}\n\
-\n\
-@font-face {\n    \
-    font-family: 'My Font';\n    \
-    src: url(my_font.woff);\n\
-}\n\
-\n\
-div {\n    \
-    font-family: 'My Font' Verdana\n\
-}\n\
-";
-
-    const CSS_OUT: &str = " \
-\n\
-\n\
-#identifier {\n    \
-    font-family: 'My Font' Arial\n\
-}\n\
-\n \
-\n\
-\n\
-div {\n    \
-    font-family: 'My Font' Verdana\n\
-}\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            true,
-            false,
-            true,
-        ),
-        CSS_OUT
-    );
+    use crate::css;
+    use crate::opts::Options;
+
+    #[test]
+    fn empty_input() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let options = Options::default();
+
+        assert_eq!(css::embed_css(cache, &client, "", "", &options, 0), "");
+    }
+
+    #[test]
+    fn trim_if_empty() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let options = Options::default();
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                "\t     \t   ",
+                &options,
+                0,
+            ),
+            ""
+        );
+    }
+
+    #[test]
+    fn style_exclude_unquoted_images() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+
+        const STYLE: &str = "/* border: none;*/\
+            background-image: url(https://somewhere.com/bg.png); \
+            list-style: url(/assets/images/bullet.svg);\
+            width:99.998%; \
+            margin-top: -20px; \
+            line-height: -1; \
+            height: calc(100vh - 10pt)";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &STYLE,
+                &options,
+                0,
+            ),
+            format!(
+                "/* border: none;*/\
+                background-image: url('{empty_image}'); \
+                list-style: url('{empty_image}');\
+                width:99.998%; \
+                margin-top: -20px; \
+                line-height: -1; \
+                height: calc(100vh - 10pt)",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    fn style_exclude_single_quoted_images() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+
+        const STYLE: &str = "/* border: none;*/\
+            background-image: url('https://somewhere.com/bg.png'); \
+            list-style: url('/assets/images/bullet.svg');\
+            width:99.998%; \
+            margin-top: -20px; \
+            line-height: -1; \
+            height: calc(100vh - 10pt)";
+
+        assert_eq!(
+            css::embed_css(cache, &client, "", &STYLE, &options, 0),
+            format!(
+                "/* border: none;*/\
+                background-image: url('{empty_image}'); \
+                list-style: url('{empty_image}');\
+                width:99.998%; \
+                margin-top: -20px; \
+                line-height: -1; \
+                height: calc(100vh - 10pt)",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    fn style_block() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            #id.class-name:not(:nth-child(3n+0)) {\n  \
+            // border: none;\n  \
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');\n\
+            }\n\
+            \n\
+            html > body {}";
+
+        assert_eq!(
+            css::embed_css(cache, &client, "file:///", &CSS, &options, 0),
+            CSS
+        );
+    }
+
+    #[test]
+    fn attribute_selectors() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            [data-value] {
+                /* Attribute exists */
+            }
+
+            [data-value='foo'] {
+                /* Attribute has this exact value */
+            }
+
+            [data-value*='foo'] {
+                /* Attribute value contains this value somewhere in it */
+            }
+
+            [data-value~='foo'] {
+                /* Attribute has this value in a space-separated list somewhere */
+            }
+
+            [data-value^='foo'] {
+                /* Attribute value starts with this */
+            }
+
+            [data-value|='foo'] {
+                /* Attribute value starts with this in a dash-separated list */
+            }
+
+            [data-value$='foo'] {
+                /* Attribute value ends with this */
+            }
+            ";
+
+        assert_eq!(css::embed_css(cache, &client, "", &CSS, &options, 0), CSS);
+    }
+
+    #[test]
+    fn import_string() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            @charset 'UTF-8';\n\
+            \n\
+            @import 'data:text/css,html{background-color:%23000}';\n\
+            \n\
+            @import url('data:text/css,html{color:%23fff}')\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                &options,
+                0,
+            ),
+            "\
+            @charset 'UTF-8';\n\
+            \n\
+            @import 'data:text/css;base64,aHRtbHtiYWNrZ3JvdW5kLWNvbG9yOiMwMDB9';\n\
+            \n\
+            @import url('data:text/css;base64,aHRtbHtjb2xvcjojZmZmfQ==')\n\
+            "
+        );
+    }
+
+    #[test]
+    fn hash_urls() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            body {\n    \
+                behavior: url(#default#something);\n\
+            }\n\
+            \n\
+            .scissorHalf {\n    \
+                offset-path: url(#somePath);\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                &options,
+                0,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn transform_percentages_and_degrees() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            div {\n    \
+                transform: translate(-50%, -50%) rotate(-45deg);\n\
+                transform: translate(50%, 50%) rotate(45deg);\n\
+                transform: translate(+50%, +50%) rotate(+45deg);\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                &options,
+                0,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn unusual_indents() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            .is\\:good:hover {\n    \
+                color: green\n\
+            }\n\
+            \n\
+            #\\~\\!\\@\\$\\%\\^\\&\\*\\(\\)\\+\\=\\,\\.\\/\\\\\\'\\\"\\;\\:\\?\\>\\<\\[\\]\\{\\}\\|\\`\\# {\n    \
+                color: black\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                &options,
+                0,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn exclude_fonts() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let mut options = Options::default();
+        options.no_fonts = true;
+        options.silent = true;
+
+        const CSS: &str = "\
+            @font-face {\n    \
+                font-family: 'My Font';\n    \
+                src: url(my_font.woff);\n\
+            }\n\
+            \n\
+            #identifier {\n    \
+                font-family: 'My Font' Arial\n\
+            }\n\
+            \n\
+            @font-face {\n    \
+                font-family: 'My Font';\n    \
+                src: url(my_font.woff);\n\
+            }\n\
+            \n\
+            div {\n    \
+                font-family: 'My Font' Verdana\n\
+            }\n\
+            ";
+
+        const CSS_OUT: &str = " \
+            \n\
+            \n\
+            #identifier {\n    \
+                font-family: 'My Font' Arial\n\
+            }\n\
+            \n \
+            \n\
+            \n\
+            div {\n    \
+                font-family: 'My Font' Verdana\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                &options,
+                0,
+            ),
+            CSS_OUT
+        );
+    }
 }

src/tests/css/enquote.rs

@@ -1,5 +1,3 @@
-use crate::css;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,44 +5,49 @@ use crate::css;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_empty_input_single_quotes() {
-    assert_eq!(css::enquote(str!(""), false), "''");
-}
+#[cfg(test)]
+mod passing {
+    use crate::css;
 
-#[test]
-fn passing_empty_input_double_quotes() {
-    assert_eq!(css::enquote(str!(""), true), "\"\"");
-}
+    #[test]
+    fn empty_input_single_quotes() {
+        assert_eq!(css::enquote(str!(""), false), "''");
+    }
 
-#[test]
-fn passing_apostrophes_single_quotes() {
-    assert_eq!(
-        css::enquote(str!("It's a lovely day, don't you think?"), false),
-        "'It\\'s a lovely day, don\\'t you think?'"
-    );
-}
+    #[test]
+    fn empty_input_double_quotes() {
+        assert_eq!(css::enquote(str!(""), true), "\"\"");
+    }
 
-#[test]
-fn passing_apostrophes_double_quotes() {
-    assert_eq!(
-        css::enquote(str!("It's a lovely day, don't you think?"), true),
-        "\"It's a lovely day, don't you think?\""
-    );
-}
+    #[test]
+    fn apostrophes_single_quotes() {
+        assert_eq!(
+            css::enquote(str!("It's a lovely day, don't you think?"), false),
+            "'It\\'s a lovely day, don\\'t you think?'"
+        );
+    }
 
-#[test]
-fn passing_feet_and_inches_single_quotes() {
-    assert_eq!(
-        css::enquote(str!("5'2\", 6'5\""), false),
-        "'5\\'2\", 6\\'5\"'"
-    );
-}
+    #[test]
+    fn apostrophes_double_quotes() {
+        assert_eq!(
+            css::enquote(str!("It's a lovely day, don't you think?"), true),
+            "\"It's a lovely day, don't you think?\""
+        );
+    }
 
-#[test]
-fn passing_feet_and_inches_double_quotes() {
-    assert_eq!(
-        css::enquote(str!("5'2\", 6'5\""), true),
-        "\"5'2\\\", 6'5\\\"\""
-    );
+    #[test]
+    fn feet_and_inches_single_quotes() {
+        assert_eq!(
+            css::enquote(str!("5'2\", 6'5\""), false),
+            "'5\\'2\", 6\\'5\"'"
+        );
+    }
+
+    #[test]
+    fn feet_and_inches_double_quotes() {
+        assert_eq!(
+            css::enquote(str!("5'2\", 6'5\""), true),
+            "\"5'2\\\", 6'5\\\"\""
+        );
+    }
 }

src/tests/data/import-css-via-data-url/index.html

@@ -0,0 +1,23 @@
+<!doctype html>
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Attempt to import CSS via data URL asset</title>
+  <style>
+
+body {
+  background-color: white;
+  color: black;
+}
+
+  </style>
+  <link href="data:text/css;base64,QGltcG9ydCAic3R5bGUuY3NzIjsK" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+  <p>If you see pink background with white foreground then we’re in trouble</p>
+</body>
+
+</html>

src/tests/data/import-css-via-data-url/style.css

@@ -0,0 +1,4 @@
+body {
+  background-color: pink;
+  color: white;
+}

src/tests/data/integrity/index.html

@@ -0,0 +1,19 @@
+<!doctype html>
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline' file:;" />
+  <title>Local HTML file</title>
+  <link href="style.css" rel="stylesheet" type="text/css" integrity="sha512-IWaCTORHkRhOWzcZeILSVmV6V6gPTHgNem6o6rsFAyaKTieDFkeeMrWjtO0DuWrX3bqZY46CVTZXUu0mia0qXQ==" crossorigin="anonymous" />
+  <link href="style.css" rel="stylesheet" type="text/css" integrity="sha512-vWBzl4NE9oIg8NFOPAyOZbaam0UXWr6aDHPaY2kodSzAFl+mKoj/RMNc6C31NDqK4mE2i68IWxYWqWJPLCgPOw==" crossorigin="anonymous" />
+</head>
+
+<body>
+  <p>This page should have black background and white foreground, but only when served via http: (not via file:)</p>
+  <script src="script.js" integrity="sha256-ecrEsYh3+ICCX8BCrNSotXgI5534282JwJjx8Q9ZWLc="></script>
+  <script src="script.js" integrity="sha256-6idk9dK0bOkVdG7Oz4/0YLXSJya8xZHqbRZKMhYrt6o="></script>
+</body>
+
+</html>

src/tests/data/integrity/script.js

@@ -0,0 +1,3 @@
+function noop() {
+    console.log("monolith");
+}

src/tests/data/integrity/style.css

@@ -0,0 +1,4 @@
+body {
+    background-color: #000;
+    color: #FFF;
+}

src/tests/html/add_favicon.rs

@@ -0,0 +1,29 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use html5ever::serialize::{serialize, SerializeOpts};
+
+    use crate::html;
+
+    #[test]
+    fn basic() {
+        let html = "<div>text</div>";
+        let mut dom = html::html_to_dom(&html);
+
+        dom = html::add_favicon(&dom.document, "I_AM_A_FAVICON_DATA_URL".to_string());
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head><link rel=\"icon\" href=\"I_AM_A_FAVICON_DATA_URL\"></link></head><body><div>text</div></body></html>"
+        );
+    }
+}

src/tests/html/csp.rs

@@ -0,0 +1,80 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use crate::opts::Options;
+
+    #[test]
+    fn isolated() {
+        let mut options = Options::default();
+        options.isolate = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "default-src 'unsafe-inline' data:;");
+    }
+
+    #[test]
+    fn no_css() {
+        let mut options = Options::default();
+        options.no_css = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "style-src 'none';");
+    }
+
+    #[test]
+    fn no_fonts() {
+        let mut options = Options::default();
+        options.no_fonts = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "font-src 'none';");
+    }
+
+    #[test]
+    fn no_frames() {
+        let mut options = Options::default();
+        options.no_frames = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "frame-src 'none'; child-src 'none';");
+    }
+
+    #[test]
+    fn no_js() {
+        let mut options = Options::default();
+        options.no_js = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "script-src 'none';");
+    }
+
+    #[test]
+    fn no_images() {
+        let mut options = Options::default();
+        options.no_images = true;
+        let csp_content = html::csp(&options);
+
+        assert_eq!(csp_content, "img-src data:;");
+    }
+
+    #[test]
+    fn all() {
+        let mut options = Options::default();
+        options.isolate = true;
+        options.no_css = true;
+        options.no_fonts = true;
+        options.no_frames = true;
+        options.no_js = true;
+        options.no_images = true;
+        let csp_content = html::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:;");
+    }
+}

src/tests/html/embed_srcset.rs

@@ -7,16 +7,21 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::html;
     use reqwest::blocking::Client;
     use std::collections::HashMap;
 
+    use crate::html;
+    use crate::opts::Options;
+
     #[test]
     fn replace_with_empty_images() {
         let cache = &mut HashMap::new();
         let client = Client::new();
         let srcset_value = "small.png 1x, large.png 2x";
-        let embedded_css = html::embed_srcset(cache, &client, "", &srcset_value, true, true);
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+        let embedded_css = html::embed_srcset(cache, &client, "", &srcset_value, &options, 0);
 
         assert_eq!(
             format!("{} 1x, {} 2x", empty_image!(), empty_image!()),

src/tests/html/get_node_name.rs

@@ -1,6 +1,3 @@
-use crate::html;
-use html5ever::rcdom::{Handle, NodeData};
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -8,42 +5,49 @@ use html5ever::rcdom::{Handle, NodeData};
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn get_node_name() {
-    let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
-    let dom = html::html_to_dom(&html);
-    let mut count = 0;
+#[cfg(test)]
+mod passing {
+    use html5ever::rcdom::{Handle, NodeData};
 
-    fn test_walk(node: &Handle, i: &mut i8) {
-        *i += 1;
+    use crate::html;
 
-        match &node.data {
-            NodeData::Document => {
-                for child in node.children.borrow().iter() {
-                    test_walk(child, &mut *i);
-                }
-            }
-            NodeData::Element { ref name, .. } => {
-                let node_name = name.local.as_ref().to_string();
-                let parent = html::get_parent_node(node);
-                let parent_node_name = html::get_node_name(&parent);
-                if node_name == "head" || node_name == "body" {
-                    assert_eq!(parent_node_name, Some("html"));
-                } else if node_name == "div" {
-                    assert_eq!(parent_node_name, Some("body"));
-                } else if node_name == "p" {
-                    assert_eq!(parent_node_name, Some("div"));
-                }
+    #[test]
+    fn get_node_name() {
+        let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
+        let dom = html::html_to_dom(&html);
+        let mut count = 0;
 
-                for child in node.children.borrow().iter() {
-                    test_walk(child, &mut *i);
+        fn test_walk(node: &Handle, i: &mut i8) {
+            *i += 1;
+
+            match &node.data {
+                NodeData::Document => {
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
                 }
-            }
-            _ => (),
-        };
+                NodeData::Element { ref name, .. } => {
+                    let node_name = name.local.as_ref().to_string();
+                    let parent = html::get_parent_node(node);
+                    let parent_node_name = html::get_node_name(&parent);
+                    if node_name == "head" || node_name == "body" {
+                        assert_eq!(parent_node_name, Some("html"));
+                    } else if node_name == "div" {
+                        assert_eq!(parent_node_name, Some("body"));
+                    } else if node_name == "p" {
+                        assert_eq!(parent_node_name, Some("div"));
+                    }
+
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
+                }
+                _ => (),
+            };
+        }
+
+        test_walk(&dom.document, &mut count);
+
+        assert_eq!(count, 7);
     }
-
-    test_walk(&dom.document, &mut count);
-
-    assert_eq!(count, 7);
 }

src/tests/html/has_favicon.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,19 +5,28 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_http_url() {
-    assert!(utils::is_http_url("http://kernel.org"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use crate::opts::Options;
 
-#[test]
-fn passing_https_url() {
-    assert!(utils::is_http_url("https://www.rust-lang.org/"));
-}
+    #[test]
+    fn icon() {
+        let html = "<link rel=\"icon\" href=\"\" /><div>text</div>";
+        let dom = html::html_to_dom(&html);
+        let res: bool = html::has_favicon(&dom.document);
 
-#[test]
-fn passing_http_url_with_backslashes() {
-    assert!(utils::is_http_url("http:\\\\freebsd.org\\"));
+        assert!(res);
+    }
+
+    #[test]
+    fn shortcut_icon() {
+        let html = "<link rel=\"shortcut icon\" href=\"\" /><div>text</div>";
+        let dom = html::html_to_dom(&html);
+        let res: bool = html::has_favicon(&dom.document);
+
+        assert!(res);
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -29,29 +36,17 @@ fn passing_http_url_with_backslashes() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_url_with_no_protocol() {
-    assert!(!utils::is_http_url("//kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::html;
+    use crate::opts::Options;
 
-#[test]
-fn failing_dot_slash_filename() {
-    assert!(!utils::is_http_url("./index.html"));
-}
+    #[test]
+    fn absent() {
+        let html = "<div>text</div>";
+        let dom = html::html_to_dom(&html);
+        let res: bool = html::has_favicon(&dom.document);
 
-#[test]
-fn failing_just_filename() {
-    assert!(!utils::is_http_url("some-local-page.htm"));
-}
-
-#[test]
-fn failing_https_ip_port_url() {
-    assert!(!utils::is_http_url("ftp://1.2.3.4/www/index.html"));
-}
-
-#[test]
-fn failing_data_url() {
-    assert!(!utils::is_http_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
+        assert!(!res);
+    }
 }

src/tests/html/is_icon.rs

@@ -1,5 +1,3 @@
-use crate::html;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,29 +5,24 @@ use crate::html;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_icon() {
-    assert!(html::is_icon("icon"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::html;
 
-#[test]
-fn passing_shortcut_icon_capitalized() {
-    assert!(html::is_icon("Shortcut Icon"));
-}
+    #[test]
+    fn icon() {
+        assert!(html::is_icon("icon"));
+    }
 
-#[test]
-fn passing_icon_uppercase() {
-    assert!(html::is_icon("ICON"));
-}
+    #[test]
+    fn shortcut_icon_capitalized() {
+        assert!(html::is_icon("Shortcut Icon"));
+    }
 
-#[test]
-fn passing_mask_icon() {
-    assert!(html::is_icon("mask-icon"));
-}
-
-#[test]
-fn passing_fluid_icon() {
-    assert!(html::is_icon("fluid-icon"));
+    #[test]
+    fn icon_uppercase() {
+        assert!(html::is_icon("ICON"));
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -39,12 +32,27 @@ fn passing_fluid_icon() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_stylesheet() {
-    assert!(!html::is_icon("stylesheet"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::html;
 
-#[test]
-fn failing_empty_string() {
-    assert!(!html::is_icon(""));
+    #[test]
+    fn mask_icon() {
+        assert!(!html::is_icon("mask-icon"));
+    }
+
+    #[test]
+    fn fluid_icon() {
+        assert!(!html::is_icon("fluid-icon"));
+    }
+
+    #[test]
+    fn stylesheet() {
+        assert!(!html::is_icon("stylesheet"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!html::is_icon(""));
+    }
 }

src/tests/html/metadata_tag.rs

@@ -0,0 +1,82 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use chrono::prelude::*;
+
+    use crate::html;
+
+    #[test]
+    fn http_url() {
+        let url = "http://192.168.1.1/";
+        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
+        let metadata_comment: String = html::metadata_tag(url);
+
+        assert_eq!(
+            metadata_comment,
+            format!(
+                "<!-- Saved from {} at {} using {} v{} -->",
+                &url,
+                timestamp,
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION"),
+            )
+        );
+    }
+
+    #[test]
+    fn file_url() {
+        let url = "file:///home/monolith/index.html";
+        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
+        let metadata_comment: String = html::metadata_tag(url);
+
+        assert_eq!(
+            metadata_comment,
+            format!(
+                "<!-- Saved from local source at {} using {} v{} -->",
+                timestamp,
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION"),
+            )
+        );
+    }
+
+    #[test]
+    fn data_url() {
+        let url = "data:text/html,Hello%2C%20World!";
+        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
+        let metadata_comment: String = html::metadata_tag(url);
+
+        assert_eq!(
+            metadata_comment,
+            format!(
+                "<!-- Saved from local source at {} using {} v{} -->",
+                timestamp,
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION"),
+            )
+        );
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::html;
+
+    #[test]
+    fn empty_string() {
+        assert_eq!(html::metadata_tag(""), "");
+    }
+}

src/tests/html/mod.rs

@@ -1,6 +1,10 @@
+mod add_favicon;
+mod csp;
 mod embed_srcset;
 mod get_node_name;
+mod has_favicon;
 mod has_proper_integrity;
 mod is_icon;
+mod metadata_tag;
 mod stringify_document;
 mod walk_and_embed_assets;

src/tests/html/stringify_document.rs

@@ -1,5 +1,3 @@
-use crate::html;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,182 +5,146 @@ use crate::html;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_div_as_root_element() {
-    let html = "<div><script src=\"some.js\"></script></div>";
-    let dom = html::html_to_dom(&html);
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use crate::opts::Options;
 
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
+    #[test]
+    fn div_as_root_element() {
+        let html = "<div><script src=\"some.js\"></script></div>";
+        let dom = html::html_to_dom(&html);
+        let options = Options::default();
 
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<html><head></head><body><div><script src=\"some.js\"></script></div></body></html>"
-    );
-}
+        assert_eq!(
+            html::stringify_document(&dom.document, &options),
+            "<html><head></head><body><div><script src=\"some.js\"></script></div></body></html>"
+        );
+    }
 
-#[test]
-fn passing_full_page_with_no_html_head_or_body() {
-    let html = "<title>Isolated document</title>\
-                <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);
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = true;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<html>\
-            <head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
-                <title>Isolated document</title>\
-                <link rel=\"something\" href=\"some.css\">\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-            </head>\
-            <body>\
-                <div>\
-                    <script src=\"some.js\"></script>\
-                </div>\
-            </body>\
-         </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_no_html_head_or_body() {
-    let html = "<!doctype html>\
-                <title>Unstyled document</title>\
-                <link rel=\"stylesheet\" href=\"main.css\"/>\
-                <div style=\"display: none;\"></div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-         <html>\
-         <head>\
-         <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
-         <title>Unstyled document</title>\
-         <link rel=\"stylesheet\" href=\"main.css\">\
-         </head>\
-         <body><div style=\"display: none;\"></div></body>\
-         </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_no_html_head_or_body_forbid_frames() {
-    let html = "<!doctype html>\
-                <title>Frameless document</title>\
-                <link rel=\"something\"/>\
-                <div><script src=\"some.js\"></script></div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-            <html>\
-            <head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none';child-src 'none';\"></meta>\
-            <title>Frameless document</title>\
-            <link rel=\"something\">\
-            </head>\
-            <body><div><script src=\"some.js\"></script></div></body>\
-            </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_all_forbidden() {
-    let html = "<!doctype html>\
-                <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\">\
-                <div>\
-                <script src=\"some.js\"></script>\
-                <img style=\"width: 100%;\" src=\"some.png\" />\
-                <iframe src=\"some.html\"></iframe>\
-                </div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_isolate: bool = true;
-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = true;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-            <html>\
-                <head>\
-                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-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>\
+    #[test]
+    fn full_page_with_no_html_head_or_body() {
+        let html = "<title>Isolated document</title>\
+                    <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);
+        let mut options = Options::default();
+        options.isolate = true;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                &options
+            ),
+            "<html>\
+                <head>\
+                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+                    <title>Isolated document</title>\
+                    <link rel=\"something\" href=\"some.css\">\
                     <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-                    <link rel=\"stylesheet\" href=\"some.css\">\
                 </head>\
                 <body>\
                     <div>\
                         <script src=\"some.js\"></script>\
-                        <img style=\"width: 100%;\" src=\"some.png\">\
-                        <iframe src=\"some.html\"></iframe>\
                     </div>\
                 </body>\
             </html>"
-    );
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_no_html_head_or_body() {
+        let html = "<!doctype html>\
+                    <title>Unstyled document</title>\
+                    <link rel=\"stylesheet\" href=\"main.css\"/>\
+                    <div style=\"display: none;\"></div>";
+        let dom = html::html_to_dom(&html);
+        let mut options = Options::default();
+        options.no_css = true;
+
+        assert_eq!(
+            html::stringify_document(&dom.document, &options),
+            "<!DOCTYPE html>\
+            <html>\
+            <head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
+            <title>Unstyled document</title>\
+            <link rel=\"stylesheet\" href=\"main.css\">\
+            </head>\
+            <body><div style=\"display: none;\"></div></body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_no_html_head_or_body_forbid_frames() {
+        let html = "<!doctype html>\
+                    <title>Frameless document</title>\
+                    <link rel=\"something\"/>\
+                    <div><script src=\"some.js\"></script></div>";
+        let dom = html::html_to_dom(&html);
+        let mut options = Options::default();
+        options.no_frames = true;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                &options
+            ),
+            "<!DOCTYPE html>\
+                <html>\
+                <head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none'; child-src 'none';\"></meta>\
+                <title>Frameless document</title>\
+                <link rel=\"something\">\
+                </head>\
+                <body><div><script src=\"some.js\"></script></div></body>\
+                </html>"
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_all_forbidden() {
+        let html = "<!doctype html>\
+                    <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\">\
+                    <div>\
+                        <script src=\"some.js\"></script>\
+                        <img style=\"width: 100%;\" src=\"some.png\" />\
+                        <iframe src=\"some.html\"></iframe>\
+                    </div>";
+        let dom = html::html_to_dom(&html);
+        let mut options = Options::default();
+        options.isolate = true;
+        options.no_css = true;
+        options.no_fonts = true;
+        options.no_frames = true;
+        options.no_js = true;
+        options.no_images = true;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                &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>\
+                        <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\">\
+                    </head>\
+                    <body>\
+                        <div>\
+                            <script src=\"some.js\"></script>\
+                            <img style=\"width: 100%;\" src=\"some.png\">\
+                            <iframe src=\"some.html\"></iframe>\
+                        </div>\
+                    </body>\
+                </html>"
+        );
+    }
 }

src/tests/html/walk_and_embed_assets.rs

@@ -1,8 +1,3 @@
-use crate::html;
-use html5ever::serialize::{serialize, SerializeOpts};
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,410 +5,325 @@ use std::collections::HashMap;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_basic() {
-    let cache = &mut HashMap::new();
+#[cfg(test)]
+mod passing {
+    use html5ever::serialize::{serialize, SerializeOpts};
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
 
-    let html = "<div><P></P></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
+    use crate::html;
+    use crate::opts::Options;
 
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+    #[test]
+    fn basic() {
+        let cache = &mut HashMap::new();
 
-    let client = Client::new();
+        let html = "<div><P></P></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
 
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
+        let mut options = Options::default();
+        options.silent = true;
 
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        let client = Client::new();
 
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><p></p></div></body></html>"
-    );
-}
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
 
-#[test]
-fn passing_ensure_no_recursive_iframe() {
-    let html = "<div><P></P><iframe src=\"\"></iframe></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
 
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><p></p></div></body></html>"
+        );
+    }
 
-    let client = Client::new();
+    #[test]
+    fn ensure_no_recursive_iframe() {
+        let html = "<div><P></P><iframe src=\"\"></iframe></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
 
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
+        let mut options = Options::default();
+        options.silent = true;
 
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        let client = Client::new();
 
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><p></p><iframe src=\"\"></iframe></div></body></html>"
-    );
-}
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
 
-#[test]
-fn passing_ensure_no_recursive_frame() {
-    let html = "<frameset><frame src=\"\"></frameset>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
 
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><p></p><iframe src=\"\"></iframe></div></body></html>"
+        );
+    }
 
-    let client = Client::new();
+    #[test]
+    fn ensure_no_recursive_frame() {
+        let html = "<frameset><frame src=\"\"></frameset>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
 
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
+        let mut options = Options::default();
+        options.silent = true;
 
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        let client = Client::new();
 
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><frameset><frame src=\"\"></frameset></html>"
-    );
-}
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
 
-#[test]
-fn passing_no_css() {
-    let html = "<link rel=\"stylesheet\" href=\"main.css\">\
-                <style>html{background-color: #000;}</style>\
-                <div style=\"display: none;\"></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
 
-    let opt_no_css: bool = true;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><frameset><frame src=\"\"></frameset></html>"
+        );
+    }
 
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
+    #[test]
+    fn no_css() {
+        let html = "<link rel=\"stylesheet\" href=\"main.css\">\
+                    <style>html{background-color: #000;}</style>\
+                    <div style=\"display: none;\"></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
 
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        let mut options = Options::default();
+        options.no_css = true;
+        options.silent = true;
 
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html>\
-         <head>\
-         <link rel=\"stylesheet\">\
-         <style></style>\
-         </head>\
-         <body>\
-         <div></div>\
-         </body>\
-         </html>"
-    );
-}
+        let client = Client::new();
 
-#[test]
-fn passing_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);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
 
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
 
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        format!(
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
             "<html>\
-         <head>\
-         <link rel=\"icon\">\
-         </head>\
-         <body>\
-         <div>\
-         <img src=\"{empty_image}\">\
-         </div>\
-         </body>\
-         </html>",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_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);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
-
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body></body></html>"
-    );
-}
-
-#[test]
-fn passing_no_frames() {
-    let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><frameset><frame src=\"\"></frameset></html>"
-    );
-}
-
-#[test]
-fn passing_no_iframes() {
-    let html = "<iframe src=\"http://trackbook.com\"></iframe>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><iframe src=\"\"></iframe></body></html>"
-    );
-}
-
-#[test]
-fn passing_no_js() {
-    let html = "<div onClick=\"void(0)\">\
-                <script src=\"http://localhost/assets/some.js\"></script>\
-                <script>alert(1)</script>\
-                </div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><script></script>\
-         <script></script></div></body></html>"
-    );
-}
-
-#[test]
-fn passing_with_no_integrity() {
-    let html = "<title>No integrity</title>\
-                <link integrity=\"sha384-...\" rel=\"something\"/>\
-                <script integrity=\"sha384-...\" src=\"some.js\"></script>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-    let opt_no_css: bool = true;
-    let opt_no_fonts: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_fonts,
-        opt_no_frames,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html>\
-         <head><title>No integrity</title><link rel=\"something\"><script></script></head>\
-         <body></body>\
-         </html>"
-    );
+            <head>\
+            <link rel=\"stylesheet\">\
+            <style></style>\
+            </head>\
+            <body>\
+            <div></div>\
+            </body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    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);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            format!(
+                "<html>\
+                    <head>\
+                        <link rel=\"icon\">\
+                    </head>\
+                    <body>\
+                        <div>\
+                            <img src=\"{empty_image}\">\
+                        </div>\
+                    </body>\
+                </html>",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    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);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body></body></html>"
+        );
+    }
+
+    #[test]
+    fn no_frames() {
+        let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_frames = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><frameset><frame src=\"\"></frameset></html>"
+        );
+    }
+
+    #[test]
+    fn no_iframes() {
+        let html = "<iframe src=\"http://trackbook.com\"></iframe>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_frames = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><iframe src=\"\"></iframe></body></html>"
+        );
+    }
+
+    #[test]
+    fn no_js() {
+        let html = "<div onClick=\"void(0)\">\
+                        <script src=\"http://localhost/assets/some.js\"></script>\
+                        <script>alert(1)</script>\
+                    </div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_js = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><script></script>\
+            <script></script></div></body></html>"
+        );
+    }
+
+    #[test]
+    fn discards_integrity() {
+        let html = "<title>No integrity</title>\
+                    <link integrity=\"sha384-...\" rel=\"something\"/>\
+                    <script integrity=\"sha384-...\" src=\"some.js\"></script>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_css = true;
+        options.no_frames = true;
+        options.no_js = true;
+        options.no_images = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html>\
+                <head><title>No integrity</title><link rel=\"something\"><script></script></head>\
+                <body></body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    fn removes_unwanted_meta_tags() {
+        let html = "<html>\
+            <head>\
+                <meta http-equiv=\"Refresh\" value=\"20\"/>\
+                <meta http-equiv=\"Location\" value=\"https://freebsd.org\"/>\
+            </head>\
+            <body></body>\
+        </html>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_css = true;
+        options.no_frames = true;
+        options.no_js = true;
+        options.no_images = true;
+        options.silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(cache, &client, &url, &dom.document, &options, 0);
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html>\
+                <head>\
+                    <meta>\
+                    <meta>\
+                </head>\
+                <body></body>\
+            </html>"
+        );
+    }
 }

src/tests/js/attr_is_event_handler.rs

@@ -1,5 +1,3 @@
-use crate::js;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,19 +5,24 @@ use crate::js;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_onblur_camelcase() {
-    assert!(js::attr_is_event_handler("onBlur"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::js;
 
-#[test]
-fn passing_onclick_lowercase() {
-    assert!(js::attr_is_event_handler("onclick"));
-}
+    #[test]
+    fn onblur_camelcase() {
+        assert!(js::attr_is_event_handler("onBlur"));
+    }
 
-#[test]
-fn passing_onclick_camelcase() {
-    assert!(js::attr_is_event_handler("onClick"));
+    #[test]
+    fn onclick_lowercase() {
+        assert!(js::attr_is_event_handler("onclick"));
+    }
+
+    #[test]
+    fn onclick_camelcase() {
+        assert!(js::attr_is_event_handler("onClick"));
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -29,17 +32,22 @@ fn passing_onclick_camelcase() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_href() {
-    assert!(!js::attr_is_event_handler("href"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::js;
 
-#[test]
-fn failing_empty_string() {
-    assert!(!js::attr_is_event_handler(""));
-}
+    #[test]
+    fn href() {
+        assert!(!js::attr_is_event_handler("href"));
+    }
 
-#[test]
-fn failing_class() {
-    assert!(!js::attr_is_event_handler("class"));
+    #[test]
+    fn empty_string() {
+        assert!(!js::attr_is_event_handler(""));
+    }
+
+    #[test]
+    fn class() {
+        assert!(!js::attr_is_event_handler("class"));
+    }
 }

src/tests/mod.rs

@@ -3,4 +3,5 @@ mod css;
 mod html;
 mod js;
 mod macros;
+mod opts;
 mod utils;

src/tests/opts.rs

@@ -0,0 +1,30 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::opts::Options;
+
+    #[test]
+    fn defaults() {
+        let options: Options = Options::default();
+
+        assert_eq!(options.target, str!());
+        assert_eq!(options.no_css, false);
+        assert_eq!(options.no_frames, false);
+        assert_eq!(options.no_fonts, false);
+        assert_eq!(options.no_images, false);
+        assert_eq!(options.isolate, false);
+        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.silent, false);
+        assert_eq!(options.timeout, 0);
+        assert_eq!(options.user_agent, "");
+    }
+}

src/tests/url/clean_url.rs

@@ -0,0 +1,51 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn removes_fragment() {
+        assert_eq!(
+            url::clean_url("https://somewhere.com/font.eot#iefix"),
+            "https://somewhere.com/font.eot"
+        );
+    }
+
+    #[test]
+    fn removes_empty_fragment() {
+        assert_eq!(
+            url::clean_url("https://somewhere.com/font.eot#"),
+            "https://somewhere.com/font.eot"
+        );
+    }
+
+    #[test]
+    fn removes_empty_query_and_empty_fragment() {
+        assert_eq!(
+            url::clean_url("https://somewhere.com/font.eot?#"),
+            "https://somewhere.com/font.eot"
+        );
+    }
+
+    #[test]
+    fn removes_empty_query_amp_and_empty_fragment() {
+        assert_eq!(
+            url::clean_url("https://somewhere.com/font.eot?a=b&#"),
+            "https://somewhere.com/font.eot?a=b"
+        );
+    }
+
+    #[test]
+    fn keeps_credentials() {
+        assert_eq!(
+            url::clean_url("https://cookie:monster@gibson.internet/"),
+            "https://cookie:monster@gibson.internet/"
+        );
+    }
+}

src/tests/url/data_to_data_url.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,32 +5,27 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_remove_protocl_and_fragment() {
-    if cfg!(windows) {
-        assert_eq!(
-            utils::file_url_to_fs_path("file:///C:/documents/some-path/some-file.svg#fragment"),
-            "C:\\documents\\some-path\\some-file.svg"
-        );
-    } else {
-        assert_eq!(
-            utils::file_url_to_fs_path("file:///tmp/some-path/some-file.svg#fragment"),
-            "/tmp/some-path/some-file.svg"
-        );
-    }
-}
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn encode_string_with_specific_media_type() {
+        let mime = "application/javascript";
+        let data = "var word = 'hello';\nalert(word);\n";
+        let data_url = url::data_to_data_url(mime, data.as_bytes(), "");
 
-#[test]
-fn passing_decodes_urls() {
-    if cfg!(windows) {
         assert_eq!(
-            utils::file_url_to_fs_path("file:///C:/Documents%20and%20Settings/some-file.html"),
-            "C:\\Documents and Settings\\some-file.html"
-        );
-    } else {
-        assert_eq!(
-            utils::file_url_to_fs_path("file:///home/user/My%20Documents"),
-            "/home/user/My Documents"
+            &data_url,
+            "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
         );
     }
+
+    #[test]
+    fn encode_append_fragment() {
+        let data = "<svg></svg>\n";
+        let data_url = url::data_to_data_url("image/svg+xml", data.as_bytes(), "");
+
+        assert_eq!(&data_url, "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4K");
+    }
 }

src/tests/url/data_url_to_data.rs

@@ -0,0 +1,104 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn parse_text_html_base64() {
+        let (media_type, data) = url::data_url_to_data("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg==");
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_utf8() {
+        let (media_type, data) = url::data_url_to_data(
+            "data:text/html;utf8,Work expands so as to fill the time available for its completion",
+        );
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_plaintext() {
+        let (media_type, data) = url::data_url_to_data(
+            "data:text/html,Work expands so as to fill the time available for its completion",
+        );
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_charset_utf_8_between_two_whitespaces() {
+        let (media_type, data) = url::data_url_to_data(" data:text/html;charset=utf-8,Work expands so as to fill the time available for its completion ");
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_css_url_encoded() {
+        let (media_type, data) =
+            url::data_url_to_data("data:text/css,div{background-color:%23000}");
+
+        assert_eq!(media_type, "text/css");
+        assert_eq!(String::from_utf8_lossy(&data), "div{background-color:#000}");
+    }
+
+    #[test]
+    fn parse_no_media_type_base64() {
+        let (media_type, data) = url::data_url_to_data("data:;base64,dGVzdA==");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "test");
+    }
+
+    #[test]
+    fn parse_no_media_type_no_encoding() {
+        let (media_type, data) = url::data_url_to_data("data:;,test%20test");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "test test");
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::url;
+
+    #[test]
+    fn just_word_data() {
+        let (media_type, data) = url::data_url_to_data("data");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "");
+    }
+}

src/tests/url/decode_url.rs

@@ -7,12 +7,12 @@
 
 #[cfg(test)]
 mod passing {
-    use crate::utils;
+    use crate::url;
 
     #[test]
     fn decode_unicode_characters() {
         assert_eq!(
-            utils::decode_url(str!(
+            url::decode_url(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"
             )),
             "検ヒム解塗ゃッ = サ"
@@ -22,7 +22,7 @@ mod passing {
     #[test]
     fn decode_file_url() {
         assert_eq!(
-            utils::decode_url(str!("file:///tmp/space%20here/test%231.html")),
+            url::decode_url(str!("file:///tmp/space%20here/test%231.html")),
             "file:///tmp/space here/test#1.html"
         );
     }
@@ -30,7 +30,7 @@ mod passing {
     #[test]
     fn plus_sign() {
         assert_eq!(
-            utils::decode_url(str!(
+            url::decode_url(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/file_url_to_fs_path.rs

@@ -0,0 +1,41 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn remove_protocl_and_fragment() {
+        if cfg!(windows) {
+            assert_eq!(
+                url::file_url_to_fs_path("file:///C:/documents/some-path/some-file.svg#fragment"),
+                "C:\\documents\\some-path\\some-file.svg"
+            );
+        } else {
+            assert_eq!(
+                url::file_url_to_fs_path("file:///tmp/some-path/some-file.svg#fragment"),
+                "/tmp/some-path/some-file.svg"
+            );
+        }
+    }
+
+    #[test]
+    fn decodes_urls() {
+        if cfg!(windows) {
+            assert_eq!(
+                url::file_url_to_fs_path("file:///C:/Documents%20and%20Settings/some-file.html"),
+                "C:\\Documents and Settings\\some-file.html"
+            );
+        } else {
+            assert_eq!(
+                url::file_url_to_fs_path("file:///home/user/My%20Documents"),
+                "/home/user/My Documents"
+            );
+        }
+    }
+}

src/tests/url/get_url_fragment.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,22 +5,22 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_encode_string_with_specific_media_type() {
-    let mime = "application/javascript";
-    let data = "var word = 'hello';\nalert(word);\n";
-    let data_url = utils::data_to_data_url(mime, data.as_bytes(), "", "");
+#[cfg(test)]
+mod passing {
+    use crate::url;
 
-    assert_eq!(
-        &data_url,
-        "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
-    );
-}
-
-#[test]
-fn passing_encode_append_fragment() {
-    let data = "<svg></svg>\n";
-    let data_url = utils::data_to_data_url("text/css", data.as_bytes(), "", "fragment");
-
-    assert_eq!(&data_url, "data:text/css;base64,PHN2Zz48L3N2Zz4K#fragment");
+    #[test]
+    fn data_url() {
+        assert_eq!(
+            url::get_url_fragment(
+                "data:image/svg+xml;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h#test"
+            ),
+            "test"
+        );
+    }
+
+    #[test]
+    fn https_empty() {
+        assert_eq!(url::get_url_fragment("https://kernel.org#"), "");
+    }
 }

src/tests/url/is_data_url.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,18 +5,23 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_data_url_text_html() {
-    assert!(utils::is_data_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::url;
 
-#[test]
-fn passing_data_url_no_media_type() {
-    assert!(utils::is_data_url(
-        "data:;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
+    #[test]
+    fn data_url_text_html() {
+        assert!(url::is_data_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
+
+    #[test]
+    fn data_url_no_media_type() {
+        assert!(url::is_data_url(
+            "data:;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -28,17 +31,22 @@ fn passing_data_url_no_media_type() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_https_url() {
-    assert!(!utils::is_data_url("https://kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::url;
 
-#[test]
-fn failing_no_protocol_url() {
-    assert!(!utils::is_data_url("//kernel.org"));
-}
+    #[test]
+    fn https_url() {
+        assert!(!url::is_data_url("https://kernel.org"));
+    }
 
-#[test]
-fn failing_empty_string() {
-    assert!(!utils::is_data_url(""));
+    #[test]
+    fn no_protocol_url() {
+        assert!(!url::is_data_url("//kernel.org"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!url::is_data_url(""));
+    }
 }

src/tests/url/is_file_url.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,50 +5,37 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_mailto() {
-    assert!(utils::url_has_protocol(
-        "mailto:somebody@somewhere.com?subject=hello"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::url;
 
-#[test]
-fn passing_tel() {
-    assert!(utils::url_has_protocol("tel:5551234567"));
-}
+    #[test]
+    fn unix_file_url() {
+        assert!(url::is_file_url(
+            "file:///home/user/Websites/my-website/index.html"
+        ));
+    }
 
-#[test]
-fn passing_ftp_no_slashes() {
-    assert!(utils::url_has_protocol("ftp:some-ftp-server.com"));
-}
+    #[test]
+    fn windows_file_url() {
+        assert!(url::is_file_url(
+            "file:///C:/Documents%20and%20Settings/user/Websites/my-website/assets/images/logo.png"
+        ));
+    }
 
-#[test]
-fn passing_ftp_with_credentials() {
-    assert!(utils::url_has_protocol(
-        "ftp://user:password@some-ftp-server.com"
-    ));
-}
+    #[test]
+    fn unix_url_with_backslashes() {
+        assert!(url::is_file_url(
+            "file:\\\\\\home\\user\\Websites\\my-website\\index.html"
+        ));
+    }
 
-#[test]
-fn passing_javascript() {
-    assert!(utils::url_has_protocol("javascript:void(0)"));
-}
-
-#[test]
-fn passing_http() {
-    assert!(utils::url_has_protocol("http://news.ycombinator.com"));
-}
-
-#[test]
-fn passing_https() {
-    assert!(utils::url_has_protocol("https://github.com"));
-}
-
-#[test]
-fn passing_mailto_uppercase() {
-    assert!(utils::url_has_protocol(
-        "MAILTO:somebody@somewhere.com?subject=hello"
-    ));
+    #[test]
+    fn windows_file_url_with_backslashes() {
+        assert!(url::is_file_url(
+            "file:\\\\\\C:\\Documents%20and%20Settings\\user\\Websites\\my-website\\assets\\images\\logo.png"
+        ));
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -60,24 +45,39 @@ fn passing_mailto_uppercase() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_url_with_no_protocol() {
-    assert!(!utils::url_has_protocol(
-        "//some-hostname.com/some-file.html"
-    ));
-}
+#[cfg(test)]
+mod failing {
+    use crate::url;
 
-#[test]
-fn failing_relative_path() {
-    assert!(!utils::url_has_protocol("some-hostname.com/some-file.html"));
-}
+    #[test]
+    fn url_with_no_protocl() {
+        assert!(!url::is_file_url("//kernel.org"));
+    }
 
-#[test]
-fn failing_relative_to_root_path() {
-    assert!(!utils::url_has_protocol("/some-file.html"));
-}
+    #[test]
+    fn dot_slash_filename() {
+        assert!(!url::is_file_url("./index.html"));
+    }
 
-#[test]
-fn failing_empty_string() {
-    assert!(!utils::url_has_protocol(""));
+    #[test]
+    fn just_filename() {
+        assert!(!url::is_file_url("some-local-page.htm"));
+    }
+
+    #[test]
+    fn https_ip_port_url() {
+        assert!(!url::is_file_url("https://1.2.3.4:80/www/index.html"));
+    }
+
+    #[test]
+    fn data_url() {
+        assert!(!url::is_file_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
+
+    #[test]
+    fn just_word_file() {
+        assert!(!url::is_file_url("file"));
+    }
 }

src/tests/url/is_http_url.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,32 +5,24 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_unix_file_url() {
-    assert!(utils::is_file_url(
-        "file:///home/user/Websites/my-website/index.html"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::url;
 
-#[test]
-fn passing_windows_file_url() {
-    assert!(utils::is_file_url(
-        "file:///C:/Documents%20and%20Settings/user/Websites/my-website/assets/images/logo.png"
-    ));
-}
+    #[test]
+    fn http_url() {
+        assert!(url::is_http_url("http://kernel.org"));
+    }
 
-#[test]
-fn passing_unix_url_with_backslashes() {
-    assert!(utils::is_file_url(
-        "file:\\\\\\home\\user\\Websites\\my-website\\index.html"
-    ));
-}
+    #[test]
+    fn https_url() {
+        assert!(url::is_http_url("https://www.rust-lang.org/"));
+    }
 
-#[test]
-fn passing_windows_file_url_with_backslashes() {
-    assert!(utils::is_file_url(
-        "file:\\\\\\C:\\Documents%20and%20Settings\\user\\Websites\\my-website\\assets\\images\\logo.png"
-    ));
+    #[test]
+    fn http_url_with_backslashes() {
+        assert!(url::is_http_url("http:\\\\freebsd.org\\"));
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -42,34 +32,34 @@ fn passing_windows_file_url_with_backslashes() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_url_with_no_protocl() {
-    assert!(!utils::is_file_url("//kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::url;
 
-#[test]
-fn failing_dot_slash_filename() {
-    assert!(!utils::is_file_url("./index.html"));
-}
+    #[test]
+    fn url_with_no_protocol() {
+        assert!(!url::is_http_url("//kernel.org"));
+    }
 
-#[test]
-fn failing_just_filename() {
-    assert!(!utils::is_file_url("some-local-page.htm"));
-}
+    #[test]
+    fn dot_slash_filename() {
+        assert!(!url::is_http_url("./index.html"));
+    }
 
-#[test]
-fn failing_https_ip_port_url() {
-    assert!(!utils::is_file_url("https://1.2.3.4:80/www/index.html"));
-}
+    #[test]
+    fn just_filename() {
+        assert!(!url::is_http_url("some-local-page.htm"));
+    }
 
-#[test]
-fn failing_data_url() {
-    assert!(!utils::is_file_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
-}
+    #[test]
+    fn https_ip_port_url() {
+        assert!(!url::is_http_url("ftp://1.2.3.4/www/index.html"));
+    }
 
-#[test]
-fn failing_just_word_file() {
-    assert!(!utils::is_file_url("file"));
+    #[test]
+    fn data_url() {
+        assert!(!url::is_http_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
 }

src/tests/url/mod.rs

@@ -0,0 +1,12 @@
+mod clean_url;
+mod data_to_data_url;
+mod data_url_to_data;
+mod decode_url;
+mod file_url_to_fs_path;
+mod get_url_fragment;
+mod is_data_url;
+mod is_file_url;
+mod is_http_url;
+mod resolve_url;
+mod url_has_protocol;
+mod url_with_fragment;

src/tests/url/resolve_url.rs

@@ -0,0 +1,239 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use url::ParseError;
+
+    use crate::url;
+
+    #[test]
+    fn from_https_to_level_up_relative() -> Result<(), ParseError> {
+        let resolved_url =
+            url::resolve_url("https://www.kernel.org", "../category/signatures.html")?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_just_filename_to_full_https_url() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "saved_page.htm",
+            "https://www.kernel.org/category/signatures.html",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_https_url_to_url_with_no_protocol() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "https://www.kernel.org",
+            "//www.kernel.org/theme/images/logos/tux.png",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/theme/images/logos/tux.png"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_https_url_to_url_with_no_protocol_and_on_different_hostname() -> Result<(), ParseError>
+    {
+        let resolved_url = url::resolve_url(
+            "https://www.kernel.org",
+            "//another-host.org/theme/images/logos/tux.png",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://another-host.org/theme/images/logos/tux.png"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_https_url_to_relative_root_path() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "https://www.kernel.org/category/signatures.html",
+            "/theme/images/logos/tux.png",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/theme/images/logos/tux.png"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_https_to_just_filename() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "https://www.w3schools.com/html/html_iframe.asp",
+            "default.asp",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.w3schools.com/html/default.asp"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_data_url_to_https() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "https://www.kernel.org/category/signatures.html",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_data_url_to_data_url() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K",
+        )?;
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_file_url_to_relative_path() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "file:///home/user/Websites/my-website/index.html",
+            "assets/images/logo.png",
+        )
+        .unwrap_or(str!());
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "file:///home/user/Websites/my-website/assets/images/logo.png"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_file_url_to_relative_path_with_backslashes() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "file:\\\\\\home\\user\\Websites\\my-website\\index.html",
+            "assets\\images\\logo.png",
+        )
+        .unwrap_or(str!());
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "file:///home/user/Websites/my-website/assets/images/logo.png"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn from_data_url_to_file_url() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "file:///etc/passwd",
+        )
+        .unwrap_or(str!());
+
+        assert_eq!(resolved_url.as_str(), "file:///etc/passwd");
+
+        Ok(())
+    }
+
+    #[test]
+    fn preserve_fragment() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "http://doesnt-matter.local/",
+            "css/fonts/fontmarvelous.svg#fontmarvelous",
+        )
+        .unwrap_or(str!());
+
+        assert_eq!(
+            resolved_url.as_str(),
+            "http://doesnt-matter.local/css/fonts/fontmarvelous.svg#fontmarvelous"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn resolve_from_file_url_to_file_url() -> Result<(), ParseError> {
+        let resolved_url = if cfg!(windows) {
+            url::resolve_url("file:///c:/index.html", "file:///c:/image.png").unwrap_or(str!())
+        } else {
+            url::resolve_url("file:///tmp/index.html", "file:///tmp/image.png").unwrap_or(str!())
+        };
+
+        assert_eq!(
+            resolved_url.as_str(),
+            if cfg!(windows) {
+                "file:///c:/image.png"
+            } else {
+                "file:///tmp/image.png"
+            }
+        );
+
+        Ok(())
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::url;
+    use url::ParseError;
+
+    #[test]
+    fn from_data_url_to_url_with_no_protocol() -> Result<(), ParseError> {
+        let resolved_url = url::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "//www.w3schools.com/html/html_iframe.asp",
+        )
+        .unwrap_or(str!());
+
+        assert_eq!(resolved_url.as_str(), "");
+
+        Ok(())
+    }
+}

src/tests/url/url_has_protocol.rs

@@ -0,0 +1,91 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn mailto() {
+        assert!(url::url_has_protocol(
+            "mailto:somebody@somewhere.com?subject=hello"
+        ));
+    }
+
+    #[test]
+    fn tel() {
+        assert!(url::url_has_protocol("tel:5551234567"));
+    }
+
+    #[test]
+    fn ftp_no_slashes() {
+        assert!(url::url_has_protocol("ftp:some-ftp-server.com"));
+    }
+
+    #[test]
+    fn ftp_with_credentials() {
+        assert!(url::url_has_protocol(
+            "ftp://user:password@some-ftp-server.com"
+        ));
+    }
+
+    #[test]
+    fn javascript() {
+        assert!(url::url_has_protocol("javascript:void(0)"));
+    }
+
+    #[test]
+    fn http() {
+        assert!(url::url_has_protocol("http://news.ycombinator.com"));
+    }
+
+    #[test]
+    fn https() {
+        assert!(url::url_has_protocol("https://github.com"));
+    }
+
+    #[test]
+    fn mailto_uppercase() {
+        assert!(url::url_has_protocol(
+            "MAILTO:somebody@somewhere.com?subject=hello"
+        ));
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+
+    #[test]
+    fn url_with_no_protocol() {
+        assert!(!url::url_has_protocol(
+            "//some-hostname.com/some-file.html"
+        ));
+    }
+
+    #[test]
+    fn relative_path() {
+        assert!(!url::url_has_protocol("some-hostname.com/some-file.html"));
+    }
+
+    #[test]
+    fn relative_to_root_path() {
+        assert!(!url::url_has_protocol("/some-file.html"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!url::url_has_protocol(""));
+    }
+}

src/tests/url/url_with_fragment.rs

@@ -0,0 +1,40 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::url;
+
+    #[test]
+    fn url_with_fragment_url() {
+        let url = "https://localhost.localdomain/path/";
+        let fragment = "test";
+        let assembled_url = url::url_with_fragment(url, fragment);
+
+        assert_eq!(&assembled_url, "https://localhost.localdomain/path/#test");
+    }
+    #[test]
+    fn url_with_fragment_empty_url() {
+        let url = "https://localhost.localdomain/path/";
+        let fragment = "";
+        let assembled_url = url::url_with_fragment(url, fragment);
+
+        assert_eq!(&assembled_url, "https://localhost.localdomain/path/");
+    }
+
+    #[test]
+    fn url_with_fragment_data_url() {
+        let url = "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4K";
+        let fragment = "fragment";
+        let assembled_url = url::url_with_fragment(url, fragment);
+
+        assert_eq!(
+            &assembled_url,
+            "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4K#fragment"
+        );
+    }
+}

src/tests/utils/clean_url.rs

@@ -1,48 +0,0 @@
-use crate::utils;
-
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn passing_removes_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot#iefix"),
-        "https://somewhere.com/font.eot"
-    );
-}
-
-#[test]
-fn passing_removes_empty_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot#"),
-        "https://somewhere.com/font.eot"
-    );
-}
-
-#[test]
-fn passing_removes_empty_query_and_empty_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot?#"),
-        "https://somewhere.com/font.eot"
-    );
-}
-
-#[test]
-fn passing_removes_empty_query_amp_and_empty_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot?a=b&#"),
-        "https://somewhere.com/font.eot?a=b"
-    );
-}
-
-#[test]
-fn passing_keeps_credentials() {
-    assert_eq!(
-        utils::clean_url("https://cookie:monster@gibson.internet/"),
-        "https://cookie:monster@gibson.internet/"
-    );
-}

src/tests/utils/data_url_to_data.rs

@@ -1,95 +0,0 @@
-use crate::utils;
-
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn passing_parse_text_html_base64() {
-    let (media_type, data) = utils::data_url_to_data("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg==");
-
-    assert_eq!(media_type, "text/html");
-    assert_eq!(
-        String::from_utf8_lossy(&data),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_utf8() {
-    let (media_type, data) = utils::data_url_to_data(
-        "data:text/html;utf8,Work expands so as to fill the time available for its completion",
-    );
-
-    assert_eq!(media_type, "text/html");
-    assert_eq!(
-        String::from_utf8_lossy(&data),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_plaintext() {
-    let (media_type, data) = utils::data_url_to_data(
-        "data:text/html,Work expands so as to fill the time available for its completion",
-    );
-
-    assert_eq!(media_type, "text/html");
-    assert_eq!(
-        String::from_utf8_lossy(&data),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_charset_utf_8_between_two_whitespaces() {
-    let (media_type, data) = utils::data_url_to_data(" data:text/html;charset=utf-8,Work expands so as to fill the time available for its completion ");
-
-    assert_eq!(media_type, "text/html");
-    assert_eq!(
-        String::from_utf8_lossy(&data),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_css_url_encoded() {
-    let (media_type, data) = utils::data_url_to_data("data:text/css,div{background-color:%23000}");
-
-    assert_eq!(media_type, "text/css");
-    assert_eq!(String::from_utf8_lossy(&data), "div{background-color:#000}");
-}
-
-#[test]
-fn passing_parse_no_media_type_base64() {
-    let (media_type, data) = utils::data_url_to_data("data:;base64,dGVzdA==");
-
-    assert_eq!(media_type, "");
-    assert_eq!(String::from_utf8_lossy(&data), "test");
-}
-
-#[test]
-fn passing_parse_no_media_type_no_encoding() {
-    let (media_type, data) = utils::data_url_to_data("data:;,test%20test");
-
-    assert_eq!(media_type, "");
-    assert_eq!(String::from_utf8_lossy(&data), "test test");
-}
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn failing_just_word_data() {
-    let (media_type, data) = utils::data_url_to_data("data");
-
-    assert_eq!(media_type, "");
-    assert_eq!(String::from_utf8_lossy(&data), "");
-}

src/tests/utils/detect_media_type.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,131 +5,136 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_image_gif87() {
-    assert_eq!(utils::detect_media_type(b"GIF87a", ""), "image/gif");
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;
 
-#[test]
-fn passing_image_gif89() {
-    assert_eq!(utils::detect_media_type(b"GIF89a", ""), "image/gif");
-}
+    #[test]
+    fn image_gif87() {
+        assert_eq!(utils::detect_media_type(b"GIF87a", ""), "image/gif");
+    }
 
-#[test]
-fn passing_image_jpeg() {
-    assert_eq!(utils::detect_media_type(b"\xFF\xD8\xFF", ""), "image/jpeg");
-}
+    #[test]
+    fn image_gif89() {
+        assert_eq!(utils::detect_media_type(b"GIF89a", ""), "image/gif");
+    }
 
-#[test]
-fn passing_image_png() {
-    assert_eq!(
-        utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", ""),
-        "image/png"
-    );
-}
+    #[test]
+    fn image_jpeg() {
+        assert_eq!(utils::detect_media_type(b"\xFF\xD8\xFF", ""), "image/jpeg");
+    }
 
-#[test]
-fn passing_image_svg() {
-    assert_eq!(utils::detect_media_type(b"<svg ", ""), "image/svg+xml");
-}
+    #[test]
+    fn image_png() {
+        assert_eq!(
+            utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", ""),
+            "image/png"
+        );
+    }
 
-#[test]
-fn passing_image_webp() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....WEBPVP8 ", ""),
-        "image/webp"
-    );
-}
+    #[test]
+    fn image_svg() {
+        assert_eq!(utils::detect_media_type(b"<svg ", ""), "image/svg+xml");
+    }
 
-#[test]
-fn passing_image_icon() {
-    assert_eq!(
-        utils::detect_media_type(b"\x00\x00\x01\x00", ""),
-        "image/x-icon"
-    );
-}
+    #[test]
+    fn image_webp() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....WEBPVP8 ", ""),
+            "image/webp"
+        );
+    }
 
-#[test]
-fn passing_image_svg_filename() {
-    assert_eq!(
-        utils::detect_media_type(b"<?xml ", "local-file.svg"),
-        "image/svg+xml"
-    );
-}
+    #[test]
+    fn image_icon() {
+        assert_eq!(
+            utils::detect_media_type(b"\x00\x00\x01\x00", ""),
+            "image/x-icon"
+        );
+    }
 
-#[test]
-fn passing_image_svg_url_uppercase() {
-    assert_eq!(
-        utils::detect_media_type(b"", "https://some-site.com/images/local-file.SVG"),
-        "image/svg+xml"
-    );
-}
+    #[test]
+    fn image_svg_filename() {
+        assert_eq!(
+            utils::detect_media_type(b"<?xml ", "local-file.svg"),
+            "image/svg+xml"
+        );
+    }
 
-#[test]
-fn passing_audio_mpeg() {
-    assert_eq!(utils::detect_media_type(b"ID3", ""), "audio/mpeg");
-}
+    #[test]
+    fn image_svg_url_uppercase() {
+        assert_eq!(
+            utils::detect_media_type(b"", "https://some-site.com/images/local-file.SVG"),
+            "image/svg+xml"
+        );
+    }
 
-#[test]
-fn passing_audio_mpeg_2() {
-    assert_eq!(utils::detect_media_type(b"\xFF\x0E", ""), "audio/mpeg");
-}
+    #[test]
+    fn audio_mpeg() {
+        assert_eq!(utils::detect_media_type(b"ID3", ""), "audio/mpeg");
+    }
 
-#[test]
-fn passing_audio_mpeg_3() {
-    assert_eq!(utils::detect_media_type(b"\xFF\x0F", ""), "audio/mpeg");
-}
+    #[test]
+    fn audio_mpeg_2() {
+        assert_eq!(utils::detect_media_type(b"\xFF\x0E", ""), "audio/mpeg");
+    }
 
-#[test]
-fn passing_audio_ogg() {
-    assert_eq!(utils::detect_media_type(b"OggS", ""), "audio/ogg");
-}
+    #[test]
+    fn audio_mpeg_3() {
+        assert_eq!(utils::detect_media_type(b"\xFF\x0F", ""), "audio/mpeg");
+    }
 
-#[test]
-fn passing_audio_wav() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....WAVEfmt ", ""),
-        "audio/wav"
-    );
-}
+    #[test]
+    fn audio_ogg() {
+        assert_eq!(utils::detect_media_type(b"OggS", ""), "audio/ogg");
+    }
 
-#[test]
-fn passing_audio_flac() {
-    assert_eq!(utils::detect_media_type(b"fLaC", ""), "audio/x-flac");
-}
+    #[test]
+    fn audio_wav() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....WAVEfmt ", ""),
+            "audio/wav"
+        );
+    }
 
-#[test]
-fn passing_video_avi() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....AVI LIST", ""),
-        "video/avi"
-    );
-}
+    #[test]
+    fn audio_flac() {
+        assert_eq!(utils::detect_media_type(b"fLaC", ""), "audio/x-flac");
+    }
 
-#[test]
-fn passing_video_mp4() {
-    assert_eq!(utils::detect_media_type(b"....ftyp", ""), "video/mp4");
-}
+    #[test]
+    fn video_avi() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....AVI LIST", ""),
+            "video/avi"
+        );
+    }
 
-#[test]
-fn passing_video_mpeg() {
-    assert_eq!(
-        utils::detect_media_type(b"\x00\x00\x01\x0B", ""),
-        "video/mpeg"
-    );
-}
+    #[test]
+    fn video_mp4() {
+        assert_eq!(utils::detect_media_type(b"....ftyp", ""), "video/mp4");
+    }
 
-#[test]
-fn passing_video_quicktime() {
-    assert_eq!(utils::detect_media_type(b"....moov", ""), "video/quicktime");
-}
+    #[test]
+    fn video_mpeg() {
+        assert_eq!(
+            utils::detect_media_type(b"\x00\x00\x01\x0B", ""),
+            "video/mpeg"
+        );
+    }
 
-#[test]
-fn passing_video_webm() {
-    assert_eq!(
-        utils::detect_media_type(b"\x1A\x45\xDF\xA3", ""),
-        "video/webm"
-    );
+    #[test]
+    fn video_quicktime() {
+        assert_eq!(utils::detect_media_type(b"....moov", ""), "video/quicktime");
+    }
+
+    #[test]
+    fn video_webm() {
+        assert_eq!(
+            utils::detect_media_type(b"\x1A\x45\xDF\xA3", ""),
+            "video/webm"
+        );
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -141,7 +144,12 @@ fn passing_video_webm() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_unknown_media_type() {
-    assert_eq!(utils::detect_media_type(b"abcdef0123456789", ""), "");
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+
+    #[test]
+    fn unknown_media_type() {
+        assert_eq!(utils::detect_media_type(b"abcdef0123456789", ""), "");
+    }
 }

src/tests/utils/indent.rs

@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,17 +5,27 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_data_url() {
-    assert_eq!(
-        utils::get_url_fragment(
-            "data:image/svg+xml;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h#test"
-        ),
-        "test"
-    );
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;
 
-#[test]
-fn passing_https_empty() {
-    assert_eq!(utils::get_url_fragment("https://kernel.org#"), "");
+    #[test]
+    fn zero() {
+        assert_eq!(utils::indent(0), "");
+    }
+
+    #[test]
+    fn one() {
+        assert_eq!(utils::indent(1), " ");
+    }
+
+    #[test]
+    fn two() {
+        assert_eq!(utils::indent(2), "  ");
+    }
+
+    #[test]
+    fn three() {
+        assert_eq!(utils::indent(3), "   ");
+    }
 }

src/tests/utils/mod.rs

@@ -1,13 +1,3 @@
-mod clean_url;
-mod data_to_data_url;
-mod data_url_to_data;
-mod decode_url;
 mod detect_media_type;
-mod file_url_to_fs_path;
-mod get_url_fragment;
-mod is_data_url;
-mod is_file_url;
-mod is_http_url;
-mod resolve_url;
+mod indent;
 mod retrieve_asset;
-mod url_has_protocol;

src/tests/utils/resolve_url.rs

@@ -1,229 +0,0 @@
-use url::ParseError;
-
-use crate::utils;
-
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn passing_from_https_to_level_up_relative() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url("https://www.kernel.org", "../category/signatures.html")?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_just_filename_to_full_https_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "saved_page.htm",
-        "https://www.kernel.org/category/signatures.html",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_https_url_to_url_with_no_protocol() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org",
-        "//www.kernel.org/theme/images/logos/tux.png",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/theme/images/logos/tux.png"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_https_url_to_url_with_no_protocol_and_on_different_hostname(
-) -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org",
-        "//another-host.org/theme/images/logos/tux.png",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://another-host.org/theme/images/logos/tux.png"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_https_url_to_relative_root_path() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org/category/signatures.html",
-        "/theme/images/logos/tux.png",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/theme/images/logos/tux.png"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_https_to_just_filename() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.w3schools.com/html/html_iframe.asp",
-        "default.asp",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.w3schools.com/html/default.asp"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_data_url_to_https() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "https://www.kernel.org/category/signatures.html",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_data_url_to_data_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K",
-    )?;
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_file_url_to_relative_path() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "file:///home/user/Websites/my-website/index.html",
-        "assets/images/logo.png",
-    )
-    .unwrap_or(str!());
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "file:///home/user/Websites/my-website/assets/images/logo.png"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_file_url_to_relative_path_with_backslashes() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "file:\\\\\\home\\user\\Websites\\my-website\\index.html",
-        "assets\\images\\logo.png",
-    )
-    .unwrap_or(str!());
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "file:///home/user/Websites/my-website/assets/images/logo.png"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_from_data_url_to_file_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "file:///etc/passwd",
-    )
-    .unwrap_or(str!());
-
-    assert_eq!(resolved_url.as_str(), "file:///etc/passwd");
-
-    Ok(())
-}
-
-#[test]
-fn passing_preserve_fragment() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "http://doesnt-matter.local/",
-        "css/fonts/fontmarvelous.svg#fontmarvelous",
-    )
-    .unwrap_or(str!());
-
-    assert_eq!(
-        resolved_url.as_str(),
-        "http://doesnt-matter.local/css/fonts/fontmarvelous.svg#fontmarvelous"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn passing_resolve_from_file_url_to_file_url() -> Result<(), ParseError> {
-    let resolved_url = if cfg!(windows) {
-        utils::resolve_url("file:///c:/index.html", "file:///c:/image.png").unwrap_or(str!())
-    } else {
-        utils::resolve_url("file:///tmp/index.html", "file:///tmp/image.png").unwrap_or(str!())
-    };
-
-    assert_eq!(
-        resolved_url.as_str(),
-        if cfg!(windows) {
-            "file:///c:/image.png"
-        } else {
-            "file:///tmp/image.png"
-        }
-    );
-
-    Ok(())
-}
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn failing_from_data_url_to_url_with_no_protocol() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "//www.w3schools.com/html/html_iframe.asp",
-    )
-    .unwrap_or(str!());
-
-    assert_eq!(resolved_url.as_str(), "");
-
-    Ok(())
-}

src/tests/utils/retrieve_asset.rs

@@ -1,8 +1,3 @@
-use crate::utils;
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-use std::env;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,66 +5,78 @@ use std::env;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn passing_read_data_url() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod passing {
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
+    use std::env;
 
-    // If both source and target are data URLs,
-    // ensure the result contains target data URL
-    let (data, final_url, media_type) = utils::retrieve_asset(
-        cache,
-        &client,
-        "data:text/html;base64,c291cmNl",
-        "data:text/html;base64,dGFyZ2V0",
-        false,
-    )
-    .unwrap();
-    assert_eq!(
-        utils::data_to_data_url(&media_type, &data, &final_url, ""),
-        utils::data_to_data_url("text/html", "target".as_bytes(), "", "")
-    );
-    assert_eq!(
-        final_url,
-        utils::data_to_data_url("text/html", "target".as_bytes(), "", "")
-    );
-    assert_eq!(&media_type, "text/html");
-}
+    use crate::url;
+    use crate::utils;
 
-#[test]
-fn passing_read_local_file_with_file_url_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+    #[test]
+    fn read_data_url() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
 
-    let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-
-    // Inclusion of local assets from local sources should be allowed
-    let cwd = env::current_dir().unwrap();
-    let (data, final_url, _media_type) = utils::retrieve_asset(
-        cache,
-        &client,
-        &format!(
-            "{file}{cwd}/src/tests/data/basic/local-file.html",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
-        ),
-        &format!(
-            "{file}{cwd}/src/tests/data/basic/local-script.js",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
-        ),
-        false,
-    )
-    .unwrap();
-    assert_eq!(utils::data_to_data_url("application/javascript", &data, &final_url, ""), "data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==");
-    assert_eq!(
-        &final_url,
-        &format!(
-            "{file}{cwd}/src/tests/data/basic/local-script.js",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
+        // If both source and target are data URLs,
+        // ensure the result contains target data URL
+        let (data, final_url, media_type) = utils::retrieve_asset(
+            cache,
+            &client,
+            "data:text/html;base64,c291cmNl",
+            "data:text/html;base64,dGFyZ2V0",
+            false,
+            0,
         )
-    );
+        .unwrap();
+        assert_eq!(
+            url::data_to_data_url(&media_type, &data, &final_url),
+            url::data_to_data_url("text/html", "target".as_bytes(), "")
+        );
+        assert_eq!(
+            final_url,
+            url::data_to_data_url("text/html", "target".as_bytes(), "")
+        );
+        assert_eq!(&media_type, "text/html");
+    }
+
+    #[test]
+    fn read_local_file_with_file_url_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+
+        // Inclusion of local assets from local sources should be allowed
+        let cwd = env::current_dir().unwrap();
+        let (data, final_url, _media_type) = utils::retrieve_asset(
+            cache,
+            &client,
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-file.html",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            ),
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            ),
+            false,
+            0,
+        )
+        .unwrap();
+        assert_eq!(url::data_to_data_url("application/javascript", &data, &final_url), "data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==");
+        assert_eq!(
+            &final_url,
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            )
+        );
+    }
 }
 
 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -79,46 +86,56 @@ fn passing_read_local_file_with_file_url_parent() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
 
-#[test]
-fn failing_read_local_file_with_data_url_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod failing {
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
 
-    // Inclusion of local assets from data URL sources should not be allowed
-    match utils::retrieve_asset(
-        cache,
-        &client,
-        "data:text/html;base64,SoUrCe",
-        "file:///etc/passwd",
-        false,
-    ) {
-        Ok((..)) => {
-            assert!(false);
+    use crate::utils;
+
+    #[test]
+    fn read_local_file_with_data_url_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        // Inclusion of local assets from data URL sources should not be allowed
+        match utils::retrieve_asset(
+            cache,
+            &client,
+            "data:text/html;base64,SoUrCe",
+            "file:///etc/passwd",
+            false,
+            0,
+        ) {
+            Ok((..)) => {
+                assert!(false);
+            }
+            Err(_) => {
+                assert!(true);
+            }
         }
-        Err(_) => {
-            assert!(true);
-        }
-    }
-}
-
-#[test]
-fn failing_read_local_file_with_https_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    // Inclusion of local assets from remote sources should not be allowed
-    match utils::retrieve_asset(
-        cache,
-        &client,
-        "https://kernel.org/",
-        "file:///etc/passwd",
-        false,
-    ) {
-        Ok((..)) => {
-            assert!(false);
-        }
-        Err(_) => {
-            assert!(true);
+    }
+
+    #[test]
+    fn read_local_file_with_https_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        // Inclusion of local assets from remote sources should not be allowed
+        match utils::retrieve_asset(
+            cache,
+            &client,
+            "https://kernel.org/",
+            "file:///etc/passwd",
+            false,
+            0,
+        ) {
+            Ok((..)) => {
+                assert!(false);
+            }
+            Err(_) => {
+                assert!(true);
+            }
         }
     }
 }

src/url.rs

@@ -0,0 +1,168 @@
+use base64;
+use url::{form_urlencoded, ParseError, Url};
+
+use crate::utils::detect_media_type;
+
+pub fn clean_url<T: AsRef<str>>(input: T) -> String {
+    let mut url = Url::parse(input.as_ref()).unwrap();
+
+    // Clear fragment
+    url.set_fragment(None);
+
+    // Get rid of stray question mark
+    if url.query() == Some("") {
+        url.set_query(None);
+    }
+
+    // Remove empty trailing ampersand(s)
+    let mut result: String = url.to_string();
+    while result.ends_with("&") {
+        result.pop();
+    }
+
+    result
+}
+
+pub fn data_to_data_url(media_type: &str, data: &[u8], url: &str) -> String {
+    let media_type: String = if media_type.is_empty() {
+        detect_media_type(data, &url)
+    } else {
+        media_type.to_string()
+    };
+
+    format!("data:{};base64,{}", media_type, base64::encode(data))
+}
+
+pub fn data_url_to_data<T: AsRef<str>>(url: T) -> (String, Vec<u8>) {
+    let parsed_url: Url = Url::parse(url.as_ref()).unwrap_or(Url::parse("data:,").unwrap());
+    let path: String = parsed_url.path().to_string();
+    let comma_loc: usize = path.find(',').unwrap_or(path.len());
+
+    let meta_data: String = path.chars().take(comma_loc).collect();
+    let raw_data: String = path.chars().skip(comma_loc + 1).collect();
+
+    let text: String = decode_url(raw_data);
+
+    let meta_data_items: Vec<&str> = meta_data.split(';').collect();
+    let mut media_type: String = str!();
+    let mut encoding: &str = "";
+
+    let mut i: i8 = 0;
+    for item in &meta_data_items {
+        if i == 0 {
+            media_type = str!(item);
+        } else {
+            if item.eq_ignore_ascii_case("base64")
+                || item.eq_ignore_ascii_case("utf8")
+                || item.eq_ignore_ascii_case("charset=UTF-8")
+            {
+                encoding = item;
+            }
+        }
+
+        i = i + 1;
+    }
+
+    let data: Vec<u8> = if encoding.eq_ignore_ascii_case("base64") {
+        base64::decode(&text).unwrap_or(vec![])
+    } else {
+        text.as_bytes().to_vec()
+    };
+
+    (media_type, data)
+}
+
+pub fn decode_url(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 file_url_to_fs_path(url: &str) -> String {
+    if !is_file_url(url) {
+        return str!();
+    }
+
+    let cutoff_l = if cfg!(windows) { 8 } else { 7 };
+    let mut fs_file_path: String = decode_url(url.to_string()[cutoff_l..].to_string());
+    let url_fragment = get_url_fragment(url);
+    if url_fragment != "" {
+        let max_len = fs_file_path.len() - 1 - url_fragment.len();
+        fs_file_path = fs_file_path[0..max_len].to_string();
+    }
+
+    if cfg!(windows) {
+        fs_file_path = fs_file_path.replace("/", "\\");
+    }
+
+    // File paths should not be %-encoded
+    decode_url(fs_file_path)
+}
+
+pub fn get_url_fragment<T: AsRef<str>>(url: T) -> String {
+    if Url::parse(url.as_ref()).unwrap().fragment() == None {
+        str!()
+    } else {
+        str!(Url::parse(url.as_ref()).unwrap().fragment().unwrap())
+    }
+}
+
+pub fn is_data_url<T: AsRef<str>>(url: T) -> bool {
+    Url::parse(url.as_ref())
+        .and_then(|u| Ok(u.scheme() == "data"))
+        .unwrap_or(false)
+}
+
+pub fn is_file_url<T: AsRef<str>>(url: T) -> bool {
+    Url::parse(url.as_ref())
+        .and_then(|u| Ok(u.scheme() == "file"))
+        .unwrap_or(false)
+}
+
+pub fn is_http_url<T: AsRef<str>>(url: T) -> bool {
+    Url::parse(url.as_ref())
+        .and_then(|u| Ok(u.scheme() == "http" || u.scheme() == "https"))
+        .unwrap_or(false)
+}
+
+pub fn resolve_url<T: AsRef<str>, U: AsRef<str>>(from: T, to: U) -> Result<String, ParseError> {
+    let result = if is_http_url(to.as_ref()) {
+        to.as_ref().to_string()
+    } else {
+        Url::parse(from.as_ref())?
+            .join(to.as_ref())?
+            .as_ref()
+            .to_string()
+    };
+    Ok(result)
+}
+
+pub fn url_has_protocol<T: AsRef<str>>(url: T) -> bool {
+    Url::parse(url.as_ref())
+        .and_then(|u| Ok(u.scheme().len() > 0))
+        .unwrap_or(false)
+}
+
+pub fn url_with_fragment(url: &str, fragment: &str) -> String {
+    let mut result = str!(&url);
+
+    if !fragment.is_empty() {
+        result += "#";
+        result += fragment;
+    }
+
+    result
+}

src/utils.rs

@@ -1,10 +1,12 @@
-use base64;
 use reqwest::blocking::Client;
 use reqwest::header::CONTENT_TYPE;
 use std::collections::HashMap;
 use std::fs;
 use std::path::Path;
-use url::{form_urlencoded, ParseError, Url};
+
+use crate::url::{clean_url, data_url_to_data, file_url_to_fs_path, is_data_url, is_file_url};
+
+const INDENT: &str = " ";
 
 const MAGIC: [[&[u8]; 2]; 18] = [
     // Image
@@ -38,26 +40,6 @@ const PLAINTEXT_MEDIA_TYPES: &[&str] = &[
     "text/plain",
 ];
 
-pub fn data_to_data_url(media_type: &str, data: &[u8], url: &str, fragment: &str) -> String {
-    let media_type: String = if media_type.is_empty() {
-        detect_media_type(data, &url)
-    } else {
-        media_type.to_string()
-    };
-    let hash: String = if fragment != "" {
-        format!("#{}", fragment)
-    } else {
-        str!()
-    };
-
-    format!(
-        "data:{};base64,{}{}",
-        media_type,
-        base64::encode(data),
-        hash
-    )
-}
-
 pub fn detect_media_type(data: &[u8], url: &str) -> String {
     for item in MAGIC.iter() {
         if data.starts_with(item[0]) {
@@ -72,159 +54,27 @@ pub fn detect_media_type(data: &[u8], url: &str) -> String {
     str!()
 }
 
-pub fn url_has_protocol<T: AsRef<str>>(url: T) -> bool {
-    Url::parse(url.as_ref())
-        .and_then(|u| Ok(u.scheme().len() > 0))
-        .unwrap_or(false)
-}
-
-pub fn is_data_url<T: AsRef<str>>(url: T) -> bool {
-    Url::parse(url.as_ref())
-        .and_then(|u| Ok(u.scheme() == "data"))
-        .unwrap_or(false)
-}
-
-pub fn is_file_url<T: AsRef<str>>(url: T) -> bool {
-    Url::parse(url.as_ref())
-        .and_then(|u| Ok(u.scheme() == "file"))
-        .unwrap_or(false)
-}
-
-pub fn is_http_url<T: AsRef<str>>(url: T) -> bool {
-    Url::parse(url.as_ref())
-        .and_then(|u| Ok(u.scheme() == "http" || u.scheme() == "https"))
-        .unwrap_or(false)
-}
-
 pub fn is_plaintext_media_type(media_type: &str) -> bool {
     PLAINTEXT_MEDIA_TYPES.contains(&media_type.to_lowercase().as_str())
 }
 
-pub fn resolve_url<T: AsRef<str>, U: AsRef<str>>(from: T, to: U) -> Result<String, ParseError> {
-    let result = if is_http_url(to.as_ref()) {
-        to.as_ref().to_string()
-    } else {
-        Url::parse(from.as_ref())?
-            .join(to.as_ref())?
-            .as_ref()
-            .to_string()
-    };
-    Ok(result)
-}
-
-pub fn get_url_fragment<T: AsRef<str>>(url: T) -> String {
-    if Url::parse(url.as_ref()).unwrap().fragment() == None {
-        str!()
-    } else {
-        str!(Url::parse(url.as_ref()).unwrap().fragment().unwrap())
+pub fn indent(level: u32) -> String {
+    let mut result = str!();
+    let mut l: u32 = level;
+    while l > 0 {
+        result += INDENT;
+        l -= 1;
     }
-}
-
-pub fn clean_url<T: AsRef<str>>(input: T) -> String {
-    let mut url = Url::parse(input.as_ref()).unwrap();
-
-    // Clear fragment
-    url.set_fragment(None);
-
-    // Get rid of stray question mark
-    if url.query() == Some("") {
-        url.set_query(None);
-    }
-
-    // Remove empty trailing ampersand(s)
-    let mut result: String = url.to_string();
-    while result.ends_with("&") {
-        result.pop();
-    }
-
     result
 }
 
-pub fn data_url_to_data<T: AsRef<str>>(url: T) -> (String, Vec<u8>) {
-    let parsed_url: Url = Url::parse(url.as_ref()).unwrap_or(Url::parse("data:,").unwrap());
-    let path: String = parsed_url.path().to_string();
-    let comma_loc: usize = path.find(',').unwrap_or(path.len());
-
-    let meta_data: String = path.chars().take(comma_loc).collect();
-    let raw_data: String = path.chars().skip(comma_loc + 1).collect();
-
-    let text: String = decode_url(raw_data);
-
-    let meta_data_items: Vec<&str> = meta_data.split(';').collect();
-    let mut media_type: String = str!();
-    let mut encoding: &str = "";
-
-    let mut i: i8 = 0;
-    for item in &meta_data_items {
-        if i == 0 {
-            media_type = str!(item);
-        } else {
-            if item.eq_ignore_ascii_case("base64")
-                || item.eq_ignore_ascii_case("utf8")
-                || item.eq_ignore_ascii_case("charset=UTF-8")
-            {
-                encoding = item;
-            }
-        }
-
-        i = i + 1;
-    }
-
-    let data: Vec<u8> = if encoding.eq_ignore_ascii_case("base64") {
-        base64::decode(&text).unwrap_or(vec![])
-    } else {
-        text.as_bytes().to_vec()
-    };
-
-    (media_type, data)
-}
-
-pub fn decode_url(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 file_url_to_fs_path(url: &str) -> String {
-    if !is_file_url(url) {
-        return str!();
-    }
-
-    let cutoff_l = if cfg!(windows) { 8 } else { 7 };
-    let mut fs_file_path: String = decode_url(url.to_string()[cutoff_l..].to_string());
-    let url_fragment = get_url_fragment(url);
-    if url_fragment != "" {
-        let max_len = fs_file_path.len() - 1 - url_fragment.len();
-        fs_file_path = fs_file_path[0..max_len].to_string();
-    }
-
-    if cfg!(windows) {
-        fs_file_path = fs_file_path.replace("/", "\\");
-    }
-
-    // File paths should not be %-encoded
-    decode_url(fs_file_path)
-}
-
 pub fn retrieve_asset(
     cache: &mut HashMap<String, Vec<u8>>,
     client: &Client,
     parent_url: &str,
     url: &str,
     opt_silent: bool,
+    depth: u32,
 ) -> Result<(Vec<u8>, String, String), reqwest::Error> {
     if url.len() == 0 {
         // Provoke error
@@ -246,7 +96,7 @@ pub fn retrieve_asset(
         let path = Path::new(&fs_file_path);
         if path.exists() {
             if !opt_silent {
-                eprintln!("{}", &url);
+                eprintln!("{}{}", indent(depth).as_str(), &url);
             }
 
             Ok((fs::read(&fs_file_path).expect(""), url.to_string(), str!()))
@@ -260,7 +110,7 @@ pub fn retrieve_asset(
         if cache.contains_key(&cache_key) {
             // URL is in cache, we get and return it
             if !opt_silent {
-                eprintln!("{} (from cache)", &url);
+                eprintln!("{}{} (from cache)", indent(depth).as_str(), &url);
             }
 
             Ok((
@@ -275,9 +125,9 @@ pub fn retrieve_asset(
 
             if !opt_silent {
                 if url == res_url {
-                    eprintln!("{}", &url);
+                    eprintln!("{}{}", indent(depth).as_str(), &url);
                 } else {
-                    eprintln!("{} -> {}", &url, &res_url);
+                    eprintln!("{}{} -> {}", indent(depth).as_str(), &url, &res_url);
                 }
             }