Merge pull request #256 from snshn/more-tests-fixes-and-improvements

More tests, fixes, improvements
Merge branch 'master' into more-tests-fixes-and-improvements
2021-06-02 04:06:37 -10:00 · 2021-06-02 04:01:41 -10:00 · 2021-06-02 04:00:18 -10:00 · 2021-06-02 03:58:28 -10:00 · 2021-06-02 03:41:41 -10:00 · 2021-05-28 23:04:34 -10:00
70 changed files with 4452 additions and 3491 deletions
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -39,11 +39,11 @@ jobs:
        sudo dpkg -x libssl1.1*.deb /cross-build-arm
        sudo dpkg -x libssl-dev*.deb /cross-build-arm
        rustup target add arm-unknown-linux-gnueabihf
-        echo "::set-env name=C_INCLUDE_PATH::/cross-build-arm/usr/include"
-        echo "::set-env name=OPENSSL_INCLUDE_DIR::/cross-build-arm/usr/include/arm-linux-gnueabihf"
-        echo "::set-env name=OPENSSL_LIB_DIR::/cross-build-arm/usr/lib/arm-linux-gnueabihf"
-        echo "::set-env name=PKG_CONFIG_ALLOW_CROSS::1"
-        echo "::set-env name=RUSTFLAGS::-C linker=arm-linux-gnueabihf-gcc -L/usr/arm-linux-gnueabihf/lib -L/cross-build-arm/usr/lib/arm-linux-gnueabihf -L/cross-build-arm/lib/arm-linux-gnueabihf"
+        echo "C_INCLUDE_PATH=/cross-build-arm/usr/include" >> $GITHUB_ENV
+        echo "OPENSSL_INCLUDE_DIR=/cross-build-arm/usr/include/arm-linux-gnueabihf" >> $GITHUB_ENV
+        echo "OPENSSL_LIB_DIR=/cross-build-arm/usr/lib/arm-linux-gnueabihf" >> $GITHUB_ENV
+        echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
+        echo "RUSTFLAGS=-C linker=arm-linux-gnueabihf-gcc -L/usr/arm-linux-gnueabihf/lib -L/cross-build-arm/usr/lib/arm-linux-gnueabihf -L/cross-build-arm/lib/arm-linux-gnueabihf" >> $GITHUB_ENV
    - name: Build the executable
      run: cargo build --release --target=arm-unknown-linux-gnueabihf
    - name: Attach artifact to the release
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "monolith"
-version = "2.3.1"
-edition = "2018"
+version = "2.5.0"
 authors = [
    "Sunshine <sunshine@uberspace.net>",
    "Mahdi Robatipoor <mahdi.robatipoor@gmail.com>",
@@ -9,22 +8,34 @@ authors = [
    "Emi Simpson <emi@alchemi.dev>",
    "rhysd <lin90162@yahoo.co.jp>",
 ]
+edition = "2018"
 description = "CLI tool for saving web pages as a single HTML file"
+homepage = "https://github.com/Y2Z/monolith"
+repository = "https://github.com/Y2Z/monolith"
+readme = "README.md"
+keywords = ["web", "http", "html", "download", "command-line"]
+categories = ["command-line-utilities", "web-programming"]
+include = [
+    "src/*.rs",
+    "Cargo.toml",
+]
+license = "CC0-1.0"

 [dependencies]
-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"
+atty = "0.2.14" # Used for highlighting network errors
+base64 = "0.13.0"
+chrono = "0.4.19" # Used for formatting creation timestamp
+clap = "2.33.3"
+cssparser = "0.28.1"
 html5ever = "0.24.1"
-sha2 = "0.9.1" # Used in calculating checksums during integrity checks
-url = "2.1.1"
+regex = "1.5.4" # Used for parsing srcset and NOSCRIPT
+sha2 = "0.9.5" # Used for calculating checksums during integrity checks
+url = "2.2.2"

 [dependencies.reqwest]
-version = "0.10.6"
+version = "0.11.3"
 default-features = false
 features = ["default-tls", "blocking", "gzip"]

 [dev-dependencies]
-assert_cmd = "1.0.1"
-tempfile = "3.1.0"
+assert_cmd = "1.0.4"
--- a/10
+++ b/10
@@ -2,13 +2,13 @@ FROM rust

 WORKDIR /usr/local/src/
 RUN curl -s https://api.github.com/repos/y2z/monolith/releases/latest \
-| grep "tarball_url.*\"," \
-| cut -d '"' -f 4 \
-| wget -qi - -O monolith.tar.gz
+    | grep "tarball_url.*\"," \
+    | cut -d '"' -f 4 \
+    | wget -qi - -O monolith.tar.gz

 RUN tar xfz monolith.tar.gz \
-&& mv Y2Z-monolith-* monolith \
-&& rm monolith.tar.gz
+    && mv Y2Z-monolith-* monolith \
+    && rm monolith.tar.gz

 WORKDIR /usr/local/src/monolith
 RUN ls -a
--- a/137
+++ b/137
@@ -1,24 +1,121 @@
-This is free and unencumbered software released into the public domain.
+Creative Commons Legal Code

-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
+CC0 1.0 Universal

-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+Statement of Purpose

-For more information, please refer to <http://unlicense.org>
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ build:
 test: build
 	@cargo test --locked
 	@cargo fmt --all -- --check
-.PHONY: test_code_formatting
+.PHONY: test

 lint:
 	@cargo fmt --all --
--- a/README.md
+++ b/README.md
@@ -22,18 +22,32 @@ If compared to saving websites with `wget -mpk`, this tool embeds all assets as

 ## Installation

-#### Via Homebrew (on macOS and GNU/Linux)
+#### Using [Cargo](https://crates.io/crates/monolith)
+    $ cargo install monolith
+
+#### Via [Homebrew](https://formulae.brew.sh/formula/monolith) (macOS and GNU/Linux)
    $ brew install monolith

-#### Using Snapcraft (on GNU/Linux)
+#### Using [Snapcraft](https://snapcraft.io/monolith) (GNU/Linux)
    $ snap install monolith

-#### Using Ports collection (on FreeBSD and TrueOS)
+#### Using [FreeBSD packages](https://svnweb.freebsd.org/ports/head/www/monolith/) (FreeBSD)
+    $ pkg install monolith
+
+#### Using [FreeBSD ports](https://www.freshports.org/www/monolith/) (FreeBSD)
    $ 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.
+#### Using [pkgsrc](https://pkgsrc.se/www/monolith) (NetBSD, OpenBSD, Haiku, etc)
+    $ cd /usr/pkgsrc/www/monolith
+    $ make install clean
+
+#### Using [pre-built binaries](https://github.com/Y2Z/monolith/releases) (Windows, ARM-based devices, etc)
+Every release contains pre-built binaries for Windows, GNU/Linux, as well as platforms with non-standart CPU architecture.
+
+#### Using [containers](https://www.docker.com/)
+    $ docker build -t Y2Z/monolith .
+    $ sudo install -b utils/run-in-container.sh /usr/local/bin/monolith

 #### From source

@@ -43,32 +57,38 @@ Dependency: `libssl-dev`
    $ cd monolith
    $ make install

-#### Using Containers
-The guide can be found [here](docs/containers.md)
-
 ---------------------------------------------------

 ## Usage
    $ monolith https://lyrics.github.io/db/P/Portishead/Dummy/Roads/ -o portishead-roads-lyrics.html
+or
+
+    $ cat index.html | monolith -aIiFfcMv -b https://original.site/ - > result.html

 ---------------------------------------------------

 ## Options
- - `-c`: Ignore styles
- - `-f`: Exclude frames
- - `-F`: Omit web fonts
+ - `-a`: Exclude audio sources
+ - `-b`: Use custom `base URL`
+ - `-c`: Exclude CSS
+ - `-e`: Ignore network errors
+ - `-f`: Omit frames
+ - `-F`: Exclude web fonts
 - `-i`: Remove images
 - `-I`: Isolate the document
 - `-j`: Exclude JavaScript
 - `-k`: Accept invalid X.509 (TLS) certificates
- - `-o`: Write output to file
+ - `-M`: Don't add timestamp and URL information
+ - `-n`: Extract contents of NOSCRIPT elements
+ - `-o`: Write output to `file`
 - `-s`: Be quiet
- - `-t`: Adjust network request timeout
- - `-u`: Provide custom User-Agent
+ - `-t`: Adjust `network request timeout`
+ - `-u`: Provide custom `User-Agent`
+ - `-v`: Exclude videos

 ---------------------------------------------------

-## HTTPS and HTTP proxies
+## Proxies
 Please set `https_proxy`, `http_proxy`, and `no_proxy` environment variables.

 ---------------------------------------------------
@@ -79,14 +99,18 @@ Please open an issue if something is wrong, that helps make this project better.
 ---------------------------------------------------

 ## Related projects
- - `Monolith Chrome Extension`: https://github.com/rhysd/monolith-of-web
- - `Pagesaver`: https://github.com/distributed-mind/pagesaver
- - `Personal WayBack Machine`: https://github.com/popey/pwbm
+ - Monolith Chrome Extension: https://github.com/rhysd/monolith-of-web
+ - Pagesaver: https://github.com/distributed-mind/pagesaver
+ - Personal WayBack Machine: https://github.com/popey/pwbm
+ - Hako: https://github.com/dmpop/hako
+ - Monk: https://gitlab.com/fisherdarling/monk

 ---------------------------------------------------

 ## License
-The Unlicense
+
+To the extent possible under law, the author(s) have dedicated all copyright related and neighboring rights to this software to the public domain worldwide.
+This software is distributed without any warranty.

 ---------------------------------------------------

--- a/docs/arch/0003-network-request-timeout.md
+++ b/docs/arch/0003-network-request-timeout.md
@@ -1,4 +1,4 @@
-# 2. Network request timeout
+# 3. Network request timeout

 Date: 2020-02-15

--- a/docs/arch/0005-asset-minimization.md
+++ b/docs/arch/0005-asset-minimization.md
@@ -1,4 +1,4 @@
-# 4. Asset Minimization
+# 5. Asset Minimization

 Date: 2020-03-14

--- a/docs/arch/0006-reload-and-location-meta-tags.md
+++ b/docs/arch/0006-reload-and-location-meta-tags.md
@@ -1,4 +1,4 @@
-# 4. Reload and location `meta` tags
+# 6. Reload and location `meta` tags

 Date: 2020-06-25

--- a/docs/arch/0007-network-errors.md
+++ b/docs/arch/0007-network-errors.md
@@ -0,0 +1,19 @@
+# 7. Network errors
+
+Date: 2020-11-22
+
+## Status
+
+Accepted
+
+## Context
+
+Servers may return information with HTTP response codes other than `200`, however those responses may still contain useful data.
+
+## Decision
+
+Fail by default, notifying of the network error. Add option to continue retrieving assets by treating all response codes as `200`.
+
+## Consequences
+
+Monolith will fail to obtain resources with status other than `200`, unless told to ignore network errors.
--- a/docs/arch/0008-base-tag.md
+++ b/docs/arch/0008-base-tag.md
@@ -0,0 +1,40 @@
+# 8. Base Tag
+
+Date: 2020-12-25
+
+## Status
+
+Accepted
+
+## Context
+
+HTML documents may contain `base` tag, which influences resolution of anchor links and relative URLs as well as dynamically loaded resources.
+
+Sometimes, in order to make certain saved documents function closer to how they operate while being served from a remote server, the `base` tag specifying the source page's URL may need to be added to the document.
+
+There can be only one such tag. If multiple `base` tags are present, only the first encountered tag ends up being used.
+
+## Decision
+
+Adding the `base` tag should be optional — saved documents should not contain the `base` tag unless it was specified by the user, or the document originally had the `base` tag in it.
+
+Existing `href` attribute's value of the original `base` tag should be used for resolving the document's relative links instead of document's own URL (precisely the way browsers do it).
+
+## Consequences
+
+#### If the base tag does not exist in the source document
+
+- If the base tag does not exist in the source document
+  - With base URL option provided
+    - use the specified base URL value to retrieve assets, keep original base URL value in the document
+  - Without base URL option provided
+    - download document as usual, do not add base tag
+-  If the base tag already exists in the source document
+   - With base URL option provided
+     - we overwrite the original base URL before retrieving assets, keep new base URL value in the document
+   - Without base URL option provided:
+     - use the base URL from the original document to retrieve assets, keep original base URL value in the document
+
+The program will obtain ability to retrieve remote assets for non-remote sources (such as data URLs and local files).
+
+The program will obatin ability to get rid of existing base tag values (by provind an empty one).
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -1,15 +0,0 @@
-1. Run `docker build -t y2z/monolith .` to create a Docker image
-
-2. Create a file named `monolith` which contains:
-```sh
-#!/bin/sh
-
-docker run --rm \
-    y2z/monolith \
-    monolith \
-    "$@"
-```
-3. Make the file executable (`chmod +x monolith`) and include it into your `$PATH`
-4. Now you should be able to run a containerized build of monolith like this:  
-`monolith -I https://github.com > document.html`
-
--- a/monolith.nuspec
+++ b/monolith.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>monolith</id>
+    <version>2.4.0</version>
+    <title>Monolith</title>
+    <authors>Sunshine, Mahdi Robatipoor, Emmanuel Delaborde, Emi Simpson, rhysd</authors>
+    <projectUrl>https://github.com/Y2Z/monolith</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/Y2Z/monolith/master/assets/icon/icon.png</iconUrl>
+    <licenseUrl>https://raw.githubusercontent.com/Y2Z/monolith/master/LICENSE</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>CLI tool for saving complete web pages as a single HTML file
+
+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.
+
+Unlike the conventional “Save page as”, monolith not only saves the target document, it embeds CSS, image, and JavaScript assets all at once, producing a single HTML5 document that is a joy to store and share.
+
+If compared to saving websites using wget, this tool embeds all assets as data URLs and therefore lets browsers render the saved page exactly the way it was on the Internet, even when no network connection is available.
+    </description>
+    <copyright>Public Domain</copyright>
+    <language>en-US</language>
+    <tags>scraping archiving</tags>
+    <docsUrl>https://github.com/Y2Z/monolith/blob/master/README.md</docsUrl>
+  </metadata>
+</package>
--- a/src/css.rs
+++ b/src/css.rs
@@ -1,9 +1,12 @@
-use cssparser::{ParseError, Parser, ParserInput, SourcePosition, Token};
+use cssparser::{
+    serialize_identifier, serialize_string, ParseError, Parser, ParserInput, SourcePosition, Token,
+};
 use reqwest::blocking::Client;
 use std::collections::HashMap;
+use url::Url;

 use crate::opts::Options;
-use crate::url::{data_to_data_url, get_url_fragment, is_http_url, resolve_url, url_with_fragment};
+use crate::url::{create_data_url, resolve_url};
 use crate::utils::retrieve_asset;

 const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
@@ -26,7 +29,44 @@ const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
    "suffix",
    "symbols",
 ];
-const CSS_SPECIAL_CHARS: &str = "~!@$%^&*()+=,./'\";:?><[]{}|`#";
+
+pub fn embed_css(
+    cache: &mut HashMap<String, Vec<u8>>,
+    client: &Client,
+    document_url: &Url,
+    css: &str,
+    options: &Options,
+    depth: u32,
+) -> String {
+    let mut input = ParserInput::new(&css);
+    let mut parser = Parser::new(&mut input);
+
+    process_css(
+        cache,
+        client,
+        document_url,
+        &mut parser,
+        options,
+        depth,
+        "",
+        "",
+        "",
+    )
+    .unwrap()
+}
+
+pub fn format_ident(ident: &str) -> String {
+    let mut res: String = String::new();
+    let _ = serialize_identifier(ident, &mut res);
+    res = res.trim_end().to_string();
+    res
+}
+
+pub fn format_quoted_string(string: &str) -> String {
+    let mut res: String = String::new();
+    let _ = serialize_string(string, &mut res);
+    res
+}

 pub fn is_image_url_prop(prop_name: &str) -> bool {
    CSS_PROPS_WITH_IMAGE_URLS
@@ -35,30 +75,10 @@ pub fn is_image_url_prop(prop_name: &str) -> bool {
        .is_some()
 }

-pub fn enquote(input: String, double: bool) -> String {
-    if double {
-        format!("\"{}\"", input.replace("\"", "\\\""))
-    } else {
-        format!("'{}'", input.replace("'", "\\'"))
-    }
-}
-
-pub fn escape(value: &str) -> String {
-    let mut res = str!(&value);
-
-    res = res.replace("\\", "\\\\");
-
-    for c in CSS_SPECIAL_CHARS.chars() {
-        res = res.replace(c, format!("\\{}", c).as_str());
-    }
-
-    res
-}
-
 pub fn process_css<'a>(
    cache: &mut HashMap<String, Vec<u8>>,
    client: &Client,
-    parent_url: &str,
+    document_url: &Url,
    parser: &mut Parser,
    options: &Options,
    depth: u32,
@@ -112,7 +132,7 @@ pub fn process_css<'a>(
                        process_css(
                            cache,
                            client,
-                            parent_url,
+                            document_url,
                            parser,
                            options,
                            depth,
@@ -143,7 +163,7 @@ pub fn process_css<'a>(
            Token::Ident(ref value) => {
                curr_rule = str!();
                curr_prop = str!(value);
-                result.push_str(&escape(value));
+                result.push_str(&format_ident(value));
            }
            // @import, @font-face, @charset, @media...
            Token::AtKeyword(ref value) => {
@@ -164,23 +184,22 @@ pub fn process_css<'a>(
                    curr_rule = str!();

                    // Skip empty import values
-                    if value.len() < 1 {
+                    if value.len() == 0 {
                        result.push_str("''");
                        continue;
                    }

-                    let import_full_url = resolve_url(&parent_url, value).unwrap_or_default();
-                    let import_url_fragment = get_url_fragment(import_full_url.clone());
+                    let import_full_url: Url = resolve_url(&document_url, value);
                    match retrieve_asset(
                        cache,
                        client,
-                        &parent_url,
+                        &document_url,
                        &import_full_url,
-                        options.silent,
+                        options,
                        depth + 1,
                    ) {
                        Ok((import_contents, import_final_url, _import_media_type)) => {
-                            let import_data_url = data_to_data_url(
+                            let mut import_data_url = create_data_url(
                                "text/css",
                                embed_css(
                                    cache,
@@ -193,63 +212,64 @@ pub fn process_css<'a>(
                                .as_bytes(),
                                &import_final_url,
                            );
-                            let assembled_url: String = url_with_fragment(
-                                import_data_url.as_str(),
-                                import_url_fragment.as_str(),
+                            import_data_url.set_fragment(import_full_url.fragment());
+                            result.push_str(
+                                format_quoted_string(&import_data_url.to_string()).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()) {
-                                let assembled_url: String = url_with_fragment(
-                                    import_full_url.as_str(),
-                                    import_url_fragment.as_str(),
+                            if import_full_url.scheme() == "http"
+                                || import_full_url.scheme() == "https"
+                            {
+                                result.push_str(
+                                    format_quoted_string(&import_full_url.to_string()).as_str(),
                                );
-                                result.push_str(enquote(assembled_url, false).as_str());
                            }
                        }
                    }
                } else {
                    if func_name == "url" {
                        // Skip empty url()'s
-                        if value.len() < 1 {
+                        if value.len() == 0 {
                            continue;
                        }

                        if options.no_images && is_image_url_prop(curr_prop.as_str()) {
-                            result.push_str(enquote(str!(empty_image!()), false).as_str());
+                            result.push_str(format_quoted_string(empty_image!()).as_str());
                        } else {
-                            let resolved_url = resolve_url(&parent_url, value).unwrap_or_default();
-                            let url_fragment = get_url_fragment(resolved_url.clone());
+                            let resolved_url: Url = resolve_url(&document_url, value);
                            match retrieve_asset(
                                cache,
                                client,
-                                &parent_url,
+                                &document_url,
                                &resolved_url,
-                                options.silent,
+                                options,
                                depth + 1,
                            ) {
                                Ok((data, final_url, media_type)) => {
-                                    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());
+                                    let mut data_url =
+                                        create_data_url(&media_type, &data, &final_url);
+                                    data_url.set_fragment(resolved_url.fragment());
+                                    result.push_str(
+                                        format_quoted_string(&data_url.to_string()).as_str(),
+                                    );
                                }
                                Err(_) => {
                                    // Keep remote reference if unable to retrieve the asset
-                                    if is_http_url(resolved_url.clone()) {
-                                        let assembled_url: String = url_with_fragment(
-                                            resolved_url.as_str(),
-                                            url_fragment.as_str(),
+                                    if resolved_url.scheme() == "http"
+                                        || resolved_url.scheme() == "https"
+                                    {
+                                        result.push_str(
+                                            format_quoted_string(&resolved_url.to_string())
+                                                .as_str(),
                                        );
-                                        result.push_str(enquote(assembled_url, false).as_str());
                                    }
                                }
                            }
                        }
                    } else {
-                        result.push_str(enquote(str!(value), false).as_str());
+                        result.push_str(format_quoted_string(value).as_str());
                    }
                }
            }
@@ -290,8 +310,9 @@ pub fn process_css<'a>(
            Token::IDHash(ref value) => {
                curr_rule = str!();
                result.push_str("#");
-                result.push_str(&escape(value));
+                result.push_str(&format_ident(value));
            }
+            // url()
            Token::UnquotedUrl(ref value) => {
                let is_import: bool = curr_rule == "import";

@@ -313,18 +334,17 @@ pub fn process_css<'a>(

                result.push_str("url(");
                if is_import {
-                    let full_url = resolve_url(&parent_url, value).unwrap_or_default();
-                    let url_fragment = get_url_fragment(full_url.clone());
+                    let full_url: Url = resolve_url(&document_url, value);
                    match retrieve_asset(
                        cache,
                        client,
-                        &parent_url,
+                        &document_url,
                        &full_url,
-                        options.silent,
+                        options,
                        depth + 1,
                    ) {
                        Ok((css, final_url, _media_type)) => {
-                            let data_url = data_to_data_url(
+                            let mut data_url = create_data_url(
                                "text/css",
                                embed_css(
                                    cache,
@@ -337,45 +357,42 @@ pub fn process_css<'a>(
                                .as_bytes(),
                                &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());
+                            data_url.set_fragment(full_url.fragment());
+                            result.push_str(format_quoted_string(&data_url.to_string()).as_str());
                        }
                        Err(_) => {
                            // Keep remote reference if unable to retrieve the asset
-                            if is_http_url(full_url.clone()) {
-                                let assembled_url: String =
-                                    url_with_fragment(full_url.as_str(), url_fragment.as_str());
-                                result.push_str(enquote(assembled_url, false).as_str());
+                            if full_url.scheme() == "http" || full_url.scheme() == "https" {
+                                result
+                                    .push_str(format_quoted_string(&full_url.to_string()).as_str());
                            }
                        }
                    }
                } else {
                    if is_image_url_prop(curr_prop.as_str()) && options.no_images {
-                        result.push_str(enquote(str!(empty_image!()), false).as_str());
+                        result.push_str(format_quoted_string(empty_image!()).as_str());
                    } else {
-                        let full_url = resolve_url(&parent_url, value).unwrap_or_default();
-                        let url_fragment = get_url_fragment(full_url.clone());
+                        let full_url: Url = resolve_url(&document_url, value);
                        match retrieve_asset(
                            cache,
                            client,
-                            &parent_url,
+                            &document_url,
                            &full_url,
-                            options.silent,
+                            options,
                            depth + 1,
                        ) {
                            Ok((data, final_url, media_type)) => {
-                                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());
+                                let mut data_url = create_data_url(&media_type, &data, &final_url);
+                                data_url.set_fragment(full_url.fragment());
+                                result
+                                    .push_str(format_quoted_string(&data_url.to_string()).as_str());
                            }
                            Err(_) => {
                                // Keep remote reference if unable to retrieve the asset
-                                if is_http_url(full_url.clone()) {
-                                    let assembled_url: String =
-                                        url_with_fragment(full_url.as_str(), url_fragment.as_str());
-                                    result.push_str(enquote(assembled_url, false).as_str());
+                                if full_url.scheme() == "http" || full_url.scheme() == "https" {
+                                    result.push_str(
+                                        format_quoted_string(&full_url.to_string()).as_str(),
+                                    );
                                }
                            }
                        }
@@ -383,6 +400,7 @@ pub fn process_css<'a>(
                }
                result.push_str(")");
            }
+            // =
            Token::Delim(ref value) => result.push_str(&value.to_string()),
            Token::Function(ref name) => {
                let function_name: &str = &name.clone();
@@ -394,7 +412,7 @@ pub fn process_css<'a>(
                        process_css(
                            cache,
                            client,
-                            parent_url,
+                            document_url,
                            parser,
                            options,
                            depth,
@@ -419,28 +437,3 @@ pub fn process_css<'a>(

    Ok(result)
 }
-
-pub fn embed_css(
-    cache: &mut HashMap<String, Vec<u8>>,
-    client: &Client,
-    parent_url: &str,
-    css: &str,
-    options: &Options,
-    depth: u32,
-) -> String {
-    let mut input = ParserInput::new(&css);
-    let mut parser = Parser::new(&mut input);
-
-    process_css(
-        cache,
-        client,
-        parent_url,
-        &mut parser,
-        options,
-        depth,
-        "",
-        "",
-        "",
-    )
-    .unwrap()
-}
--- a/src/html.rs
+++ b/src/html.rs
--- a/src/js.rs
+++ b/src/js.rs
@@ -1,4 +1,4 @@
-const JS_DOM_EVENT_ATTRS: &[&str] = &[
+const JS_DOM_EVENT_ATTRS: &'static [&str] = &[
    // From WHATWG HTML spec 8.1.5.2 "Event handlers on elements, Document objects, and Window objects":
    //   https://html.spec.whatwg.org/#event-handlers-on-elements,-document-objects,-and-window-objects
    //   https://html.spec.whatwg.org/#attributes-3 (table "List of event handler content attributes")
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,19 @@
 use reqwest::blocking::Client;
 use reqwest::header::{HeaderMap, HeaderValue, USER_AGENT};
 use std::collections::HashMap;
-use std::env;
 use std::fs;
-use std::io::{self, Error, Write};
+use std::io::{self, prelude::*, Error, Write};
 use std::path::Path;
 use std::process;
 use std::time::Duration;
+use url::Url;

 use monolith::html::{
-    add_base_tag, add_favicon, has_base_tag, has_favicon, html_to_dom, metadata_tag,
+    add_favicon, create_metadata_tag, get_base_url, has_favicon, html_to_dom, set_base_url,
    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::url::{create_data_url, parse_data_url, resolve_url};
 use monolith::utils::retrieve_asset;

 mod macros;
@@ -48,45 +46,89 @@ impl Output {
    }
 }

+pub fn read_stdin() -> String {
+    let mut buffer = String::new();
+
+    for line in io::stdin().lock().lines() {
+        buffer += line.unwrap_or_default().as_str();
+        buffer += "\n";
+    }
+
+    buffer
+}
+
 fn main() {
    let options = Options::from_args();
-    let original_target: &str = &options.target;
-    let target_url: &str;
-    let base_url;
-    let mut dom;
+    let mut target: String = str!(&options.target.clone());

-    // Pre-process the input
-    let cwd_normalized: String =
-        str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-    let path = Path::new(original_target);
-    let mut target: String = str!(original_target.clone()).replace("\\", "/");
-    let path_is_relative: bool = path.is_relative();
+    // Check if target was provided
+    if target.len() == 0 {
+        if !options.silent {
+            eprintln!("No target specified");
+        }
+        process::exit(1);
+    }
+
+    let target_url: Url;
+    let mut base_url: Url;
+    let mut use_stdin: bool = false;

    // Determine exact target URL
-    if target.clone().len() == 0 {
-        eprintln!("No target specified");
-        process::exit(1);
-    } else if is_http_url(target.clone()) || is_data_url(target.clone()) {
-        target_url = target.as_str();
-    } else if is_file_url(target.clone()) {
-        target_url = target.as_str();
-    } else if path.exists() {
-        if !path.is_file() {
-            eprintln!("Local target is not a file: {}", original_target);
-            process::exit(1);
-        }
-        target.insert_str(0, if cfg!(windows) { "file:///" } else { "file://" });
-        if path_is_relative {
-            target.insert_str(if cfg!(windows) { 8 } else { 7 }, &cwd_normalized);
-            target.insert_str(
-                if cfg!(windows) { 8 } else { 7 } + &cwd_normalized.len(),
-                "/",
-            );
-        }
-        target_url = target.as_str();
+    if target.clone() == "-" {
+        // Read from pipe (stdin)
+        use_stdin = true;
+        // Set default target URL to an empty data URL; the user can control it via --base-url
+        target_url = Url::parse("data:text/html,").unwrap();
    } else {
-        target.insert_str(0, "http://");
-        target_url = target.as_str();
+        match Url::parse(&target.clone()) {
+            Ok(parsed_url) => {
+                if parsed_url.scheme() == "data"
+                    || parsed_url.scheme() == "file"
+                    || (parsed_url.scheme() == "http" || parsed_url.scheme() == "https")
+                {
+                    target_url = parsed_url;
+                } else {
+                    if !options.silent {
+                        eprintln!("Unsupported target URL type: {}", &parsed_url.scheme());
+                    }
+                    process::exit(1);
+                }
+            }
+            Err(_err) => {
+                // Failed to parse given base URL,
+                //  perhaps it's a filesystem path?
+                let path: &Path = Path::new(&target);
+
+                if path.exists() {
+                    if path.is_file() {
+                        match Url::from_file_path(fs::canonicalize(&path).unwrap()) {
+                            Ok(file_url) => {
+                                target_url = file_url;
+                            }
+                            Err(_err) => {
+                                if !options.silent {
+                                    eprintln!(
+                                        "Could not generate file URL out of given path: {}",
+                                        "err"
+                                    );
+                                }
+                                process::exit(1);
+                            }
+                        }
+                    } else {
+                        if !options.silent {
+                            eprintln!("Local target is not a file: {}", &options.target);
+                        }
+                        process::exit(1);
+                    }
+                } else {
+                    // Last chance, now we do what browsers do:
+                    //  prepend "http://" and hope it points to a website
+                    target.insert_str(0, "http://");
+                    target_url = Url::parse(&target).unwrap();
+                }
+            }
+        }
    }

    // Define output
@@ -95,14 +137,16 @@ fn main() {
    // Initialize client
    let mut cache = HashMap::new();
    let mut header_map = HeaderMap::new();
-    header_map.insert(
-        USER_AGENT,
-        HeaderValue::from_str(&options.user_agent).expect("Invalid User-Agent header specified"),
-    );
+    if let Some(user_agent) = &options.user_agent {
+        header_map.insert(
+            USER_AGENT,
+            HeaderValue::from_str(&user_agent).expect("Invalid User-Agent header specified"),
+        );
+    }
    let timeout: u64 = if options.timeout > 0 {
        options.timeout
    } else {
-        std::u64::MAX / 4
+        std::u64::MAX / 4 // This is pretty close to infinity
    };
    let client = Client::builder()
        .timeout(Duration::from_secs(timeout))
@@ -111,63 +155,122 @@ fn main() {
        .build()
        .expect("Failed to initialize HTTP client");

+    // At this stage we assume that the base URL is the same as the target URL
+    base_url = target_url.clone();
+
+    let mut dom;
+
    // Retrieve target document
-    if is_file_url(target_url) || is_http_url(target_url) {
-        match retrieve_asset(
-            &mut cache,
-            &client,
-            target_url,
-            target_url,
-            options.silent,
-            0,
-        ) {
+    if use_stdin {
+        dom = html_to_dom(&read_stdin());
+    } else if target_url.scheme() == "file"
+        || (target_url.scheme() == "http" || target_url.scheme() == "https")
+    {
+        match retrieve_asset(&mut cache, &client, &target_url, &target_url, &options, 0) {
            Ok((data, final_url, _media_type)) => {
-                base_url = final_url;
+                if options.base_url.clone().unwrap_or(str!()).is_empty() {
+                    base_url = final_url
+                }
                dom = html_to_dom(&String::from_utf8_lossy(&data));
            }
            Err(_) => {
-                eprintln!("Could not retrieve target document");
+                if !options.silent {
+                    eprintln!("Could not retrieve target document");
+                }
                process::exit(1);
            }
        }
-    } else if is_data_url(target_url) {
-        let (media_type, data): (String, Vec<u8>) = data_url_to_data(target_url);
+    } else if target_url.scheme() == "data" {
+        let (media_type, data): (String, Vec<u8>) = parse_data_url(&target_url);
+
        if !media_type.eq_ignore_ascii_case("text/html") {
-            eprintln!("Unsupported data URL media type");
+            if !options.silent {
+                eprintln!("Unsupported data URL media type");
+            }
            process::exit(1);
        }
-        base_url = str!(target_url);
+
        dom = html_to_dom(&String::from_utf8_lossy(&data));
    } else {
        process::exit(1);
    }

+    // Use custom base URL if specified, read and use what's in the DOM otherwise
+    let b: String = options.base_url.clone().unwrap_or(str!());
+    if b.is_empty() {
+        // No custom base URL is specified,
+        //  try to see if the document has BASE tag
+        if let Some(existing_base_url) = get_base_url(&dom.document) {
+            base_url = resolve_url(&target_url, &existing_base_url);
+        }
+    } else {
+        // Custom base URL provided
+        match Url::parse(&b) {
+            Ok(parsed_url) => {
+                if parsed_url.scheme() == "file" {
+                    // File base URLs can only work with
+                    //  documents saved from filesystem
+                    if target_url.scheme() == "file" {
+                        base_url = parsed_url;
+                    }
+                } else {
+                    base_url = parsed_url;
+                }
+            }
+            Err(_) => {
+                // Failed to parse given base URL,
+                //  perhaps it's a filesystem path?
+                if target_url.scheme() == "file" {
+                    // Relative paths could work for documents saved from filesystem
+                    let path: &Path = Path::new(&b);
+                    if path.exists() {
+                        match Url::from_file_path(fs::canonicalize(&path).unwrap()) {
+                            Ok(file_url) => {
+                                base_url = file_url;
+                            }
+                            Err(_) => {
+                                if !options.silent {
+                                    eprintln!("Could not map given path to base URL: {}", b);
+                                }
+                                process::exit(1);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
    // Embed remote assets
    walk_and_embed_assets(&mut cache, &client, &base_url, &dom.document, &options, 0);

-    // 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());
+    // Update or add new BASE tag to reroute network requests
+    //  and hash-links in the final document
+    if let Some(new_base_url) = options.base_url.clone() {
+        dom = set_base_url(&dom.document, new_base_url);
    }

    // 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();
+    if !options.no_images
+        && (target_url.scheme() == "http" || target_url.scheme() == "https")
+        && !has_favicon(&dom.document)
+    {
+        let favicon_ico_url: Url = resolve_url(&base_url, "/favicon.ico");

        match retrieve_asset(
            &mut cache,
            &client,
-            &base_url,
+            &target_url,
            &favicon_ico_url,
-            options.silent,
+            &options,
            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);
+                let favicon_data_url: Url = create_data_url(&media_type, &data, &final_url);
+                dom = add_favicon(&dom.document, favicon_data_url.to_string());
            }
            Err(_) => {
-                // Failed to retrieve favicon.ico
+                // Failed to retrieve /favicon.ico
            }
        }
    }
@@ -177,7 +280,7 @@ fn main() {

    // Add metadata tag
    if !options.no_metadata {
-        let metadata_comment: String = metadata_tag(&base_url);
+        let metadata_comment: String = create_metadata_tag(&target_url);
        result.insert_str(0, &metadata_comment);
        if metadata_comment.len() > 0 {
            result.insert_str(metadata_comment.len(), "\n");
--- a/src/opts.rs
+++ b/src/opts.rs
@@ -1,23 +1,30 @@
 use clap::{App, Arg};
+use std::env;

 #[derive(Default)]
 pub struct Options {
-    pub target: String,
+    pub no_audio: bool,
+    pub base_url: Option<String>,
    pub no_css: bool,
-    pub no_fonts: bool,
+    pub ignore_errors: bool,
    pub no_frames: bool,
+    pub no_fonts: bool,
    pub no_images: bool,
+    pub isolate: bool,
    pub no_js: bool,
    pub insecure: bool,
-    pub isolate: bool,
+    pub no_metadata: bool,
    pub output: String,
    pub silent: bool,
    pub timeout: u64,
-    pub user_agent: String,
-    pub no_metadata: bool,
+    pub user_agent: Option<String>,
+    pub no_video: bool,
+    pub target: String,
+    pub no_color: bool,
+    pub unwrap_noscript: bool,
 }

-const ASCII: &str = " \
+const ASCII: &'static str = " \
 _____     ______________    __________      ___________________    ___
 |     \\   /              \\  |          |    |                   |  |   |
 |      \\_/       __       \\_|    __    |    |    ___     ___    |__|   |
@@ -27,36 +34,43 @@ const ASCII: &str = " \
 |___|       |__________|  \\_____________________|   |___|   |___|  |___|
 ";
 const DEFAULT_NETWORK_TIMEOUT: u64 = 120;
-const DEFAULT_USER_AGENT: &str =
+const DEFAULT_USER_AGENT: &'static str =
    "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0";
+const ENV_VAR_NO_COLOR: &str = "NO_COLOR";
+const ENV_VAR_TERM: &str = "TERM";

 impl Options {
    pub fn from_args() -> Options {
        let app = App::new(env!("CARGO_PKG_NAME"))
            .version(crate_version!())
-            .author(crate_authors!("\n"))
+            .author(format!("\n{}", crate_authors!("\n")).as_str())
            .about(format!("{}\n{}", ASCII, crate_description!()).as_str())
-            .arg(
-                Arg::with_name("target")
-                    .required(true)
-                    .takes_value(true)
-                    .index(1)
-                    .help("URL or file path"),
-            )
-            // .args_from_usage("-a, --no-audio 'Removes audio sources'")
+            .args_from_usage("-a, --no-audio 'Removes audio sources'")
+            .args_from_usage("-b, --base-url=[http://localhost/] 'Sets custom base URL'")
            .args_from_usage("-c, --no-css 'Removes CSS'")
+            .args_from_usage("-e, --ignore-errors 'Ignore network errors'")
            .args_from_usage("-f, --no-frames 'Removes frames and iframes'")
            .args_from_usage("-F, --no-fonts 'Removes fonts'")
            .args_from_usage("-i, --no-images 'Removes images'")
            .args_from_usage("-I, --isolate 'Cuts off document from the Internet'")
            .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] 'Write output to <file>'")
+            .args_from_usage("-M, --no-metadata 'Excludes timestamp and source information'")
+            .args_from_usage(
+                "-n, --unwrap-noscript 'Replaces NOSCRIPT elements with their contents'",
+            )
+            .args_from_usage("-o, --output=[document.html] 'Writes output to <file>'")
            .args_from_usage("-s, --silent 'Suppresses verbosity'")
-            .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'")
+            .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, --no-video 'Removes video sources'")
+            .arg(
+                Arg::with_name("target")
+                    .required(true)
+                    .takes_value(true)
+                    .index(1)
+                    .help("URL or file path, use - for stdin"),
+            )
            .get_matches();
        let mut options: Options = Options::default();

@@ -65,7 +79,12 @@ impl Options {
            .value_of("target")
            .expect("please set target")
            .to_string();
+        options.no_audio = app.is_present("no-audio");
+        if let Some(base_url) = app.value_of("base-url") {
+            options.base_url = Some(str!(base_url));
+        }
        options.no_css = app.is_present("no-css");
+        options.ignore_errors = app.is_present("ignore-errors");
        options.no_frames = app.is_present("no-frames");
        options.no_fonts = app.is_present("no-fonts");
        options.no_images = app.is_present("no-images");
@@ -80,10 +99,21 @@ impl Options {
            .unwrap_or(&DEFAULT_NETWORK_TIMEOUT.to_string())
            .parse::<u64>()
            .unwrap();
-        options.user_agent = app
-            .value_of("user-agent")
-            .unwrap_or(DEFAULT_USER_AGENT)
-            .to_string();
+        if let Some(user_agent) = app.value_of("user-agent") {
+            options.user_agent = Some(str!(user_agent));
+        } else {
+            options.user_agent = Some(DEFAULT_USER_AGENT.to_string());
+        }
+        options.unwrap_noscript = app.is_present("unwrap-noscript");
+        options.no_video = app.is_present("no-video");
+
+        options.no_color =
+            env::var_os(ENV_VAR_NO_COLOR).is_some() || atty::isnt(atty::Stream::Stderr);
+        if let Some(term) = env::var_os(ENV_VAR_TERM) {
+            if term == "dumb" {
+                options.no_color = true;
+            }
+        }

        options
    }
--- a/src/tests/cli.rs
+++ b/src/tests/cli.rs
@@ -1,559 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use assert_cmd::prelude::*;
-    use std::env;
-    use std::io::Write;
-    use std::process::Command;
-    use tempfile::NamedTempFile;
-
-    #[test]
-    fn print_version() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd.arg("-V").output().unwrap();
-
-        // STDOUT should contain program name and version
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            format!("{} {}\n", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"))
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn bad_input_empty_target() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd.arg("").output().unwrap();
-
-        // STDOUT should be empty
-        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
-
-        // STDERR should contain error description
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            "No target specified\n"
-        );
-
-        // The exit code should be 1
-        out.assert().code(1);
-
-        Ok(())
-    }
-
-    #[test]
-    fn bad_input_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap();
-
-        // STDOUT should contain HTML
-        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
-
-        // STDERR should contain error description
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            "Unsupported data URL media type\n"
-        );
-
-        // The exit code should be 1
-        out.assert().code(1);
-
-        Ok(())
-    }
-
-    #[test]
-    fn isolate_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-I")
-            .arg("data:text/html,Hello%2C%20World!")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain isolated HTML
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
-            </head><body>Hello, World!</body></html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn remove_css_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-c")
-            .arg("data:text/html,<style>body{background-color:pink}</style>Hello")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no CSS
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
-            <style></style>\
-            </head><body>Hello</body></html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn remove_fonts_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-F")
-            .arg("data:text/html,<style>@font-face { font-family: myFont; src: url(font.woff); }</style>Hi")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no web fonts
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"font-src 'none';\"></meta>\
-            <style></style>\
-            </head><body>Hi</body></html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn remove_frames_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-f")
-            .arg("data:text/html,<iframe src=\"https://duckduckgo.com\"></iframe>Hi")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no iframes
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none'; child-src 'none';\"></meta>\
-            </head><body><iframe src=\"\"></iframe>Hi</body></html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn remove_images_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-i")
-            .arg("data:text/html,<img src=\"https://google.com\"/>Hi")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no images
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            format!(
-                "<html>\
-                <head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"img-src data:;\"></meta>\
-                </head>\
-                <body>\
-                <img src=\"{empty_image}\">\
-                Hi\
-                </body>\
-                </html>\n",
-                empty_image = empty_image!()
-            )
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn remove_js_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-j")
-            .arg("data:text/html,<script>alert(2)</script>Hi")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no JS
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html>\
-            <head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'none';\"></meta>\
-            <script></script></head>\
-            <body>Hi</body>\
-            </html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn local_file_target_input() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-        let out = cmd
-            .arg("-M")
-            .arg(if cfg!(windows) {
-                "src\\tests\\data\\basic\\local-file.html"
-            } else {
-                "src/tests/data/basic/local-file.html"
-            })
-            .output()
-            .unwrap();
-        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-
-        // STDOUT should contain HTML from the local file
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "\
-            <!DOCTYPE html><html lang=\"en\"><head>\n  \
-            <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-            <title>Local HTML file</title>\n  \
-            <link rel=\"stylesheet\" type=\"text/css\" href=\"data:text/css;base64,Ym9keSB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAwOwogICAgY29sb3I6ICNmZmY7Cn0K\">\n  \
-            <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-            <img alt=\"\">\n  \
-            <a href=\"file://local-file.html/\">Tricky href</a>\n  \
-            <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-            <script src=\"data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==\"></script>\n\n\n\n\
-            </body></html>\n\
-            "
-        );
-
-        // STDERR should contain list of retrieved file URLs
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            format!(
-                "\
-                {file}{cwd}/src/tests/data/basic/local-file.html\n \
-                {file}{cwd}/src/tests/data/basic/local-style.css\n \
-                {file}{cwd}/src/tests/data/basic/local-script.js\n\
-                ",
-                file = file_url_protocol,
-                cwd = cwd_normalized
-            )
-        );
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn local_file_target_input_absolute_target_path() -> Result<(), Box<dyn std::error::Error>> {
-        let cwd = env::current_dir().unwrap();
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("-jciI")
-            .arg(if cfg!(windows) {
-                format!(
-                    "{cwd}\\src\\tests\\data\\basic\\local-file.html",
-                    cwd = cwd.to_str().unwrap()
-                )
-            } else {
-                format!(
-                    "{cwd}/src/tests/data/basic/local-file.html",
-                    cwd = cwd.to_str().unwrap()
-                )
-            })
-            .output()
-            .unwrap();
-        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-
-        // STDOUT should contain HTML from the local file
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            format!(
-                "\
-                <!DOCTYPE html><html lang=\"en\"><head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
-                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-                <title>Local HTML file</title>\n  \
-                <link rel=\"stylesheet\" type=\"text/css\">\n  \
-                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-                <img alt=\"\" src=\"{empty_image}\">\n  \
-                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
-                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-                <script></script>\n\n\n\n\
-                </body></html>\n\
-                ",
-                empty_image = empty_image!()
-            )
-        );
-
-        // STDERR should contain only the target file
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            format!(
-                "{file}{cwd}/src/tests/data/basic/local-file.html\n",
-                file = file_url_protocol,
-                cwd = cwd_normalized,
-            )
-        );
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn local_file_url_target_input() -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let cwd_normalized: String =
-            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-        let out = cmd
-            .arg("-M")
-            .arg("-cji")
-            .arg(if cfg!(windows) {
-                format!(
-                    "{file}{cwd}/src/tests/data/basic/local-file.html",
-                    file = file_url_protocol,
-                    cwd = cwd_normalized,
-                )
-            } else {
-                format!(
-                    "{file}{cwd}/src/tests/data/basic/local-file.html",
-                    file = file_url_protocol,
-                    cwd = cwd_normalized,
-                )
-            })
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML from the local file
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            format!(
-                "\
-                <!DOCTYPE html><html lang=\"en\"><head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
-                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-                <title>Local HTML file</title>\n  \
-                <link rel=\"stylesheet\" type=\"text/css\">\n  \
-                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-                <img alt=\"\" src=\"{empty_image}\">\n  \
-                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
-                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-                <script></script>\n\n\n\n\
-                </body></html>\n\
-                ",
-                empty_image = empty_image!()
-            )
-        );
-
-        // STDERR should contain list of retrieved file URLs
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            if cfg!(windows) {
-                format!(
-                    "{file}{cwd}/src/tests/data/basic/local-file.html\n",
-                    file = file_url_protocol,
-                    cwd = cwd_normalized,
-                )
-            } else {
-                format!(
-                    "{file}{cwd}/src/tests/data/basic/local-file.html\n",
-                    file = file_url_protocol,
-                    cwd = cwd_normalized,
-                )
-            }
-        );
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn security_disallow_local_assets_within_data_url_targets(
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let out = cmd
-            .arg("-M")
-            .arg("data:text/html,%3Cscript%20src=\"src/tests/data/basic/local-script.js\"%3E%3C/script%3E")
-            .output()
-            .unwrap();
-
-        // STDOUT should contain HTML with no JS in it
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head><script></script></head><body></body></html>\n"
-        );
-
-        // STDERR should be empty
-        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn embed_file_url_local_asset_within_style_attribute() -> Result<(), Box<dyn std::error::Error>>
-    {
-        let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let mut file_svg = NamedTempFile::new()?;
-        writeln!(file_svg, "<svg version=\"1.1\" baseProfile=\"full\" width=\"300\" height=\"200\" xmlns=\"http://www.w3.org/2000/svg\">\
-                            <rect width=\"100%\" height=\"100%\" fill=\"red\" />\
-                            <circle cx=\"150\" cy=\"100\" r=\"80\" fill=\"green\" />\
-                            <text x=\"150\" y=\"125\" font-size=\"60\" text-anchor=\"middle\" fill=\"white\">SVG</text>\
-                            </svg>\n")?;
-        let mut file_html = NamedTempFile::new()?;
-        writeln!(
-            file_html,
-            "<div style='background-image: url(\"{file}{path}\")'></div>\n",
-            file = file_url_prefix,
-            path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
-        )?;
-        let out = cmd.arg("-M").arg(file_html.path()).output().unwrap();
-
-        // STDOUT should contain HTML with date URL for background-image in it
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head></head><body><div style=\"background-image: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiIC8+PGNpcmNsZSBjeD0iMTUwIiBjeT0iMTAwIiByPSI4MCIgZmlsbD0iZ3JlZW4iIC8+PHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+PC9zdmc+Cgo=')\"></div>\n\n</body></html>\n"
-        );
-
-        // STDERR should list temporary files that got retrieved
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            format!(
-                "\
-                {file}{html_path}\n \
-                {file}{svg_path}\n\
-                ",
-                file = file_url_prefix,
-                html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
-                svg_path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
-            )
-        );
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn css_import_string() -> Result<(), Box<dyn std::error::Error>> {
-        let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
-        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-        let mut file_css = NamedTempFile::new()?;
-        writeln!(file_css, "body{{background-color:#000;color:#fff}}")?;
-        let mut file_html = NamedTempFile::new()?;
-        writeln!(
-            file_html,
-            "\
-            <style>\n\
-            @charset 'UTF-8';\n\
-            \n\
-            @import '{file}{css_path}';\n\
-            \n\
-            @import url({file}{css_path});\n\
-            \n\
-            @import url('{file}{css_path}')\n\
-            </style>\n\
-            ",
-            file = file_url_prefix,
-            css_path = str!(file_css.path().to_str().unwrap()).replace("\\", "/"),
-        )?;
-        let out = cmd.arg("-M").arg(file_html.path()).output().unwrap();
-
-        // STDOUT should contain embedded CSS url()'s
-        assert_eq!(
-            std::str::from_utf8(&out.stdout).unwrap(),
-            "<html><head><style>\n@charset 'UTF-8';\n\n@import 'data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K';\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K');\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K')\n</style>\n\n</head><body></body></html>\n"
-        );
-
-        // STDERR should list temporary files that got retrieved
-        assert_eq!(
-            std::str::from_utf8(&out.stderr).unwrap(),
-            format!(
-                "\
-                {file}{html_path}\n \
-                {file}{css_path}\n \
-                {file}{css_path}\n \
-                {file}{css_path}\n\
-                ",
-                file = file_url_prefix,
-                html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
-                css_path = str!(file_css.path().to_str().unwrap()).replace("\\", "/"),
-            )
-        );
-
-        // The exit code should be 0
-        out.assert().code(0);
-
-        Ok(())
-    }
-}
--- a/src/tests/cli/base_url.rs
+++ b/src/tests/cli/base_url.rs
@@ -0,0 +1,115 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::process::Command;
+
+    #[test]
+    fn add_new_when_provided() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-b")
+            .arg("http://localhost:8000/")
+            .arg("data:text/html,Hello%2C%20World!")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain newly added base URL
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <base href=\"http://localhost:8000/\"></base>\
+            </head><body>Hello, World!</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn keep_existing_when_none_provided() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("data:text/html,<base href=\"http://localhost:8000/\" />Hello%2C%20World!")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain newly added base URL
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <base href=\"http://localhost:8000/\">\
+            </head><body>Hello, World!</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn override_existing_when_provided() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-b")
+            .arg("http://localhost/")
+            .arg("data:text/html,<base href=\"http://localhost:8000/\" />Hello%2C%20World!")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain newly added base URL
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <base href=\"http://localhost/\">\
+            </head><body>Hello, World!</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn set_existing_to_empty_when_empty_provided() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-b")
+            .arg("")
+            .arg("data:text/html,<base href=\"http://localhost:8000/\" />Hello%2C%20World!")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain newly added base URL
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <base href=\"\">\
+            </head><body>Hello, World!</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
--- a/src/tests/cli/basic.rs
+++ b/src/tests/cli/basic.rs
@@ -0,0 +1,123 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::fs;
+    use std::path::Path;
+    use std::process::{Command, Stdio};
+    use url::Url;
+
+    #[test]
+    fn print_version() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd.arg("-V").output().unwrap();
+
+        // STDOUT should contain program name and version
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!("{} {}\n", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"))
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn stdin_target_input() {
+        let mut echo = Command::new("echo")
+            .arg("Hello from STDIN")
+            .stdout(Stdio::piped())
+            .spawn()
+            .unwrap();
+        let echo_out = echo.stdout.take().unwrap();
+        echo.wait().unwrap();
+
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        cmd.stdin(echo_out);
+        let out = cmd.arg("-M").arg("-").output().unwrap();
+
+        // STDOUT should contain HTML created out of STDIN
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body>Hello from STDIN\n</body></html>\n"
+        );
+    }
+
+    #[test]
+    fn css_import_string() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/css/index.html");
+        let path_css: &Path = Path::new("src/tests/data/css/style.css");
+
+        assert!(path_html.is_file());
+        assert!(path_css.is_file());
+
+        let out = cmd.arg("-M").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain embedded CSS url()'s
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head><style>\n\n    @charset \"UTF-8\";\n\n    @import \"data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K\";\n\n    @import url(\"data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K\");\n\n    @import url(\"data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K\");\n\n</style>\n</head><body></body></html>\n"
+        );
+
+        // STDERR should list files that got retrieved
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_css}\n \
+                {file_url_css}\n \
+                {file_url_css}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_css = Url::from_file_path(fs::canonicalize(&path_css).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::process::Command;
+
+    #[test]
+    fn bad_input_empty_target() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd.arg("").output().unwrap();
+
+        // STDOUT should be empty
+        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
+
+        // STDERR should contain error description
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            "No target specified\n"
+        );
+
+        // The exit code should be 1
+        out.assert().code(1);
+    }
+}
--- a/src/tests/cli/data_url.rs
+++ b/src/tests/cli/data_url.rs
@@ -0,0 +1,231 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::process::Command;
+
+    #[test]
+    fn isolate_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-I")
+            .arg("data:text/html,Hello%2C%20World!")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain isolated HTML
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+            </head><body>Hello, World!</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn remove_css_from_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-c")
+            .arg("data:text/html,<style>body{background-color:pink}</style>Hello")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
+            <style></style>\
+            </head><body>Hello</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn remove_fonts_from_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-F")
+            .arg("data:text/html,<style>@font-face { font-family: myFont; src: url(font.woff); }</style>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no web fonts
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"font-src 'none';\"></meta>\
+            <style></style>\
+            </head><body>Hi</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn remove_frames_from_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-f")
+            .arg("data:text/html,<iframe src=\"https://duckduckgo.com\"></iframe>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no iframes
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none'; child-src 'none';\"></meta>\
+            </head><body><iframe src=\"\"></iframe>Hi</body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn remove_images_from_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-i")
+            .arg("data:text/html,<img src=\"https://google.com\"/>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no images
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!(
+                "<html>\
+                <head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"img-src data:;\"></meta>\
+                </head>\
+                <body>\
+                <img src=\"{empty_image}\">\
+                Hi\
+                </body>\
+                </html>\n",
+                empty_image = empty_image!()
+            )
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn remove_js_from_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-j")
+            .arg("data:text/html,<script>alert(2)</script>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no JS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html>\
+            <head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'none';\"></meta>\
+            <script></script></head>\
+            <body>Hi</body>\
+            </html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::process::Command;
+
+    #[test]
+    fn bad_input_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap();
+
+        // STDOUT should contain HTML
+        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
+
+        // STDERR should contain error description
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            "Unsupported data URL media type\n"
+        );
+
+        // The exit code should be 1
+        out.assert().code(1);
+    }
+
+    #[test]
+    fn security_disallow_local_assets_within_data_url_targets() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("data:text/html,%3Cscript%20src=\"src/tests/data/basic/local-script.js\"%3E%3C/script%3E")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no JS in it
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head><script src=\"data:application/javascript;base64,\"></script></head><body></body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
--- a/src/tests/cli/local_files.rs
+++ b/src/tests/cli/local_files.rs
@@ -0,0 +1,269 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::fs;
+    use std::path::Path;
+    use std::process::Command;
+    use url::Url;
+
+    #[test]
+    fn local_file_target_input_relative_target_path() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let out = cmd
+            .arg("-M")
+            .arg(if cfg!(windows) {
+                "src\\tests\\data\\basic\\local-file.html"
+            } else {
+                "src/tests/data/basic/local-file.html"
+            })
+            .output()
+            .unwrap();
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "\
+            <!DOCTYPE html><html lang=\"en\"><head>\n  \
+            <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+            <title>Local HTML file</title>\n  \
+            <link href=\"data:text/css;base64,Ym9keSB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAwOwogICAgY29sb3I6ICNmZmY7Cn0K\" rel=\"stylesheet\" type=\"text/css\">\n  \
+            <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+            <img alt=\"\">\n  \
+            <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+            <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+            <script src=\"data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==\"></script>\n\n\n\n\
+            </body></html>\n\
+            "
+        );
+
+        // STDERR should contain list of retrieved file URLs, two missing
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file}{cwd}/src/tests/data/basic/local-file.html\n \
+                {file}{cwd}/src/tests/data/basic/local-style.css\n \
+                {file}{cwd}/src/tests/data/basic/local-style-does-not-exist.css (not found)\n \
+                {file}{cwd}/src/tests/data/basic/monolith.png (not found)\n \
+                {file}{cwd}/src/tests/data/basic/local-script.js\n\
+                ",
+                file = file_url_protocol,
+                cwd = cwd_normalized
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn local_file_target_input_absolute_target_path() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/basic/local-file.html");
+
+        let out = cmd
+            .arg("-M")
+            .arg("-Ijci")
+            .arg(path_html.as_os_str())
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!(
+                "\
+                <!DOCTYPE html><html lang=\"en\"><head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
+                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+                <title>Local HTML file</title>\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+                <img src=\"{empty_image}\" alt=\"\">\n  \
+                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+                <script></script>\n\n\n\n\
+                </body></html>\n\
+                ",
+                empty_image = empty_image!()
+            )
+        );
+
+        // STDERR should contain only the target file
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "{file_url_html}\n",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn local_file_url_target_input() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        let out = cmd
+            .arg("-M")
+            .arg("-cji")
+            .arg(if cfg!(windows) {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            } else {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            })
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!(
+                "\
+                <!DOCTYPE html><html lang=\"en\"><head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
+                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+                <title>Local HTML file</title>\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+                <img src=\"{empty_image}\" alt=\"\">\n  \
+                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+                <script></script>\n\n\n\n\
+                </body></html>\n\
+                ",
+                empty_image = empty_image!()
+            )
+        );
+
+        // STDERR should contain list of retrieved file URLs
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "{file}{cwd}/src/tests/data/basic/local-file.html\n",
+                file = file_url_protocol,
+                cwd = cwd_normalized,
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn embed_file_url_local_asset_within_style_attribute() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/svg/index.html");
+        let path_svg: &Path = Path::new("src/tests/data/svg/image.svg");
+
+        let out = cmd.arg("-M").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain HTML with date URL for background-image in it
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body><div style=\"background-image: url(&quot;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InJlZCIgLz4KICAgIDxjaXJjbGUgY3g9IjE1MCIgY3k9IjEwMCIgcj0iODAiIGZpbGw9ImdyZWVuIiAvPgogICAgPHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+Cjwvc3ZnPgo=&quot;)\"></div>\n</body></html>\n"
+        );
+
+        // STDERR should list files that got retrieved
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_svg}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn discard_integrity_for_local_files() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        let out = cmd
+            .arg("-M")
+            .arg("-i")
+            .arg(if cfg!(windows) {
+                format!(
+                    "{file}{cwd}/src/tests/data/integrity/index.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            } else {
+                format!(
+                    "{file}{cwd}/src/tests/data/integrity/index.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            })
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML from the local file; integrity attributes should be missing
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!(
+                "\
+                <!DOCTYPE html><html lang=\"en\"><head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"img-src data:;\"></meta>\n  \
+                <title>Local HTML file</title>\n  \
+                <link href=\"data:text/css;base64,Ym9keSB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAwOwogICAgY29sb3I6ICNGRkY7Cn0K\" rel=\"stylesheet\" type=\"text/css\" crossorigin=\"anonymous\">\n  \
+                <link href=\"style.css\" rel=\"stylesheet\" type=\"text/css\" crossorigin=\"anonymous\">\n</head>\n\n<body>\n  \
+                <p>This page should have black background and white foreground, but only when served via http: (not via file:)</p>\n  \
+                <script src=\"data:application/javascript;base64,ZnVuY3Rpb24gbm9vcCgpIHsKICAgIGNvbnNvbGUubG9nKCJtb25vbGl0aCIpOwp9Cg==\"></script>\n  \
+                <script src=\"script.js\"></script>\n\n\n\n\
+                </body></html>\n\
+                "
+            )
+        );
+
+        // STDERR should contain list of retrieved file URLs
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file}{cwd}/src/tests/data/integrity/index.html\n \
+                {file}{cwd}/src/tests/data/integrity/style.css\n \
+                {file}{cwd}/src/tests/data/integrity/style.css\n \
+                {file}{cwd}/src/tests/data/integrity/script.js\n \
+                {file}{cwd}/src/tests/data/integrity/script.js\n\
+                ",
+                file = file_url_protocol,
+                cwd = cwd_normalized,
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
--- a/src/tests/cli/mod.rs
+++ b/src/tests/cli/mod.rs
@@ -0,0 +1,6 @@
+mod base_url;
+mod basic;
+mod data_url;
+mod local_files;
+mod noscript;
+mod unusual_encodings;
--- a/src/tests/cli/noscript.rs
+++ b/src/tests/cli/noscript.rs
@@ -0,0 +1,170 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::fs;
+    use std::path::Path;
+    use std::process::Command;
+    use url::Url;
+
+    #[test]
+    fn parse_noscript_contents() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
+        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+
+        let out = cmd.arg("-M").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body><noscript><img src=\"data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InJlZCIgLz4KICAgIDxjaXJjbGUgY3g9IjE1MCIgY3k9IjEwMCIgcj0iODAiIGZpbGw9ImdyZWVuIiAvPgogICAgPHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+Cjwvc3ZnPgo=\"></noscript>\n</body></html>\n"
+        );
+
+        // STDERR should contain target HTML and embedded SVG files
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_svg}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn unwrap_noscript_contents() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
+        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+
+        let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body><!--noscript--><img src=\"data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InJlZCIgLz4KICAgIDxjaXJjbGUgY3g9IjE1MCIgY3k9IjEwMCIgcj0iODAiIGZpbGw9ImdyZWVuIiAvPgogICAgPHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+Cjwvc3ZnPgo=\"><!--/noscript-->\n</body></html>\n"
+        );
+
+        // STDERR should contain target HTML and embedded SVG files
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_svg}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn unwrap_noscript_contents_nested() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/noscript/nested.html");
+        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+
+        let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body><!--noscript--><h1>JS is not active</h1><!--noscript--><img src=\"data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InJlZCIgLz4KICAgIDxjaXJjbGUgY3g9IjE1MCIgY3k9IjEwMCIgcj0iODAiIGZpbGw9ImdyZWVuIiAvPgogICAgPHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+Cjwvc3ZnPgo=\"><!--/noscript--><!--/noscript-->\n</body></html>\n"
+        );
+
+        // STDERR should contain target HTML and embedded SVG files
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_svg}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn unwrap_noscript_contents_with_script() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let path_html: &Path = Path::new("src/tests/data/noscript/script.html");
+        let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
+
+        let out = cmd.arg("-Mn").arg(path_html.as_os_str()).output().unwrap();
+
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html>\
+                <head></head>\
+                <body>\
+                    <!--noscript-->\
+                    <img src=\"data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InJlZCIgLz4KICAgIDxjaXJjbGUgY3g9IjE1MCIgY3k9IjEwMCIgcj0iODAiIGZpbGw9ImdyZWVuIiAvPgogICAgPHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+Cjwvc3ZnPgo=\">\
+                    <!--/noscript-->\n\
+                </body>\
+            </html>\n"
+        );
+
+        // STDERR should contain target HTML and embedded SVG files
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file_url_html}\n \
+                {file_url_svg}\n\
+                ",
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+
+    #[test]
+    fn unwrap_noscript_contents_attr_data_url() {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg("-n")
+            .arg("data:text/html,<noscript class=\"\">test</noscript>")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain unwrapped contents of NOSCRIPT element
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head><!--noscript class=\"\"-->test<!--/noscript--></head><body></body></html>\n"
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
--- a/src/tests/cli/unusual_encodings.rs
+++ b/src/tests/cli/unusual_encodings.rs
@@ -0,0 +1,56 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::process::Command;
+
+    #[test]
+    fn change_encoding_to_utf_8() {
+        let cwd = env::current_dir().unwrap();
+        let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/");
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+        let out = cmd
+            .arg("-M")
+            .arg(if cfg!(windows) {
+                "src\\tests\\data\\unusual_encodings\\iso-8859-1.html"
+            } else {
+                "src/tests/data/unusual_encodings/iso-8859-1.html"
+            })
+            .output()
+            .unwrap();
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+
+        // STDOUT should contain newly added base URL
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html>\
+                <head>\n        \
+                    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n    \
+                </head>\n    \
+                <body>\n        \
+                    © Some Company\n    \
+                \n\n</body>\
+            </html>\n"
+        );
+
+        // STDERR should contain only the target file
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "{file}{cwd}/src/tests/data/unusual_encodings/iso-8859-1.html\n",
+                file = file_url_protocol,
+                cwd = cwd_normalized,
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+    }
+}
--- a/src/tests/css/embed_css.rs
+++ b/src/tests/css/embed_css.rs
@@ -8,6 +8,7 @@
 #[cfg(test)]
 mod passing {
    use reqwest::blocking::Client;
+    use reqwest::Url;
    use std::collections::HashMap;

    use crate::css;
@@ -17,26 +18,24 @@ mod passing {
    fn empty_input() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("data:,").unwrap();
        let options = Options::default();

-        assert_eq!(css::embed_css(cache, &client, "", "", &options, 0), "");
+        assert_eq!(
+            css::embed_css(cache, &client, &document_url, "", &options, 0),
+            ""
+        );
    }

    #[test]
    fn trim_if_empty() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let options = Options::default();

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                "\t     \t   ",
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, "\t     \t   ", &options, 0,),
            ""
        );
    }
@@ -45,6 +44,7 @@ mod passing {
    fn style_exclude_unquoted_images() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.no_images = true;
        options.silent = true;
@@ -58,18 +58,11 @@ mod passing {
            height: calc(100vh - 10pt)";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &STYLE,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &STYLE, &options, 0,),
            format!(
                "/* border: none;*/\
-                background-image: url('{empty_image}'); \
-                list-style: url('{empty_image}');\
+                background-image: url(\"{empty_image}\"); \
+                list-style: url(\"{empty_image}\");\
                width:99.998%; \
                margin-top: -20px; \
                line-height: -1; \
@@ -83,6 +76,7 @@ mod passing {
    fn style_exclude_single_quoted_images() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("data:,").unwrap();
        let mut options = Options::default();
        options.no_images = true;
        options.silent = true;
@@ -96,11 +90,11 @@ mod passing {
            height: calc(100vh - 10pt)";

        assert_eq!(
-            css::embed_css(cache, &client, "", &STYLE, &options, 0),
+            css::embed_css(cache, &client, &document_url, &STYLE, &options, 0),
            format!(
                "/* border: none;*/\
-                background-image: url('{empty_image}'); \
-                list-style: url('{empty_image}');\
+                background-image: url(\"{empty_image}\"); \
+                list-style: url(\"{empty_image}\");\
                width:99.998%; \
                margin-top: -20px; \
                line-height: -1; \
@@ -114,19 +108,20 @@ mod passing {
    fn style_block() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("file:///").unwrap();
        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\
+            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::embed_css(cache, &client, &document_url, &CSS, &options, 0),
            CSS
        );
    }
@@ -135,6 +130,7 @@ mod passing {
    fn attribute_selectors() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.silent = true;

@@ -143,38 +139,42 @@ mod passing {
                /* Attribute exists */
            }

-            [data-value='foo'] {
+            [data-value=\"foo\"] {
                /* Attribute has this exact value */
            }

-            [data-value*='foo'] {
+            [data-value*=\"foo\"] {
                /* Attribute value contains this value somewhere in it */
            }

-            [data-value~='foo'] {
+            [data-value~=\"foo\"] {
                /* Attribute has this value in a space-separated list somewhere */
            }

-            [data-value^='foo'] {
+            [data-value^=\"foo\"] {
                /* Attribute value starts with this */
            }

-            [data-value|='foo'] {
+            [data-value|=\"foo\"] {
                /* Attribute value starts with this in a dash-separated list */
            }

-            [data-value$='foo'] {
+            [data-value$=\"foo\"] {
                /* Attribute value ends with this */
            }
            ";

-        assert_eq!(css::embed_css(cache, &client, "", &CSS, &options, 0), CSS);
+        assert_eq!(
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0),
+            CSS
+        );
    }

    #[test]
    fn import_string() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.silent = true;

@@ -187,20 +187,13 @@ mod passing {
            ";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &CSS,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
            "\
-            @charset 'UTF-8';\n\
+            @charset \"UTF-8\";\n\
            \n\
-            @import 'data:text/css;base64,aHRtbHtiYWNrZ3JvdW5kLWNvbG9yOiMwMDB9';\n\
+            @import \"data:text/css;base64,aHRtbHtiYWNrZ3JvdW5kLWNvbG9yOiMwMDB9\";\n\
            \n\
-            @import url('data:text/css;base64,aHRtbHtjb2xvcjojZmZmfQ==')\n\
+            @import url(\"data:text/css;base64,aHRtbHtjb2xvcjojZmZmfQ==\")\n\
            "
        );
    }
@@ -209,6 +202,7 @@ mod passing {
    fn hash_urls() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.silent = true;

@@ -223,14 +217,7 @@ mod passing {
            ";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &CSS,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
            CSS
        );
    }
@@ -239,6 +226,7 @@ mod passing {
    fn transform_percentages_and_degrees() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.silent = true;

@@ -251,14 +239,7 @@ mod passing {
            ";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &CSS,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
            CSS
        );
    }
@@ -267,6 +248,7 @@ mod passing {
    fn unusual_indents() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.silent = true;

@@ -281,14 +263,7 @@ mod passing {
            ";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &CSS,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
            CSS
        );
    }
@@ -297,6 +272,7 @@ mod passing {
    fn exclude_fonts() {
        let cache = &mut HashMap::new();
        let client = Client::new();
+        let document_url: Url = Url::parse("https://doesntmatter.local/").unwrap();
        let mut options = Options::default();
        options.no_fonts = true;
        options.silent = true;
@@ -320,30 +296,74 @@ mod passing {
                font-family: 'My Font' Verdana\n\
            }\n\
            ";
-
        const CSS_OUT: &str = " \
            \n\
            \n\
            #identifier {\n    \
-                font-family: 'My Font' Arial\n\
+                font-family: \"My Font\" Arial\n\
            }\n\
            \n \
            \n\
            \n\
            div {\n    \
-                font-family: 'My Font' Verdana\n\
+                font-family: \"My Font\" Verdana\n\
            }\n\
            ";

        assert_eq!(
-            css::embed_css(
-                cache,
-                &client,
-                "https://doesntmatter.local/",
-                &CSS,
-                &options,
-                0,
-            ),
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
+            CSS_OUT
+        );
+    }
+
+    #[test]
+    fn content() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let document_url: Url = Url::parse("data:,").unwrap();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            #language a[href=\"#translations\"]:before {\n\
+                content: url(data:,) \"\\A\";\n\
+                white-space: pre }\n\
+            ";
+        const CSS_OUT: &str = "\
+            #language a[href=\"#translations\"]:before {\n\
+                content: url(\"data:;base64,\") \"\\a \";\n\
+                white-space: pre }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
+            CSS_OUT
+        );
+    }
+
+    #[test]
+    fn ie_css_hack() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let document_url: Url = Url::parse("data:,").unwrap();
+        let mut options = Options::default();
+        options.silent = true;
+
+        const CSS: &str = "\
+            div#p>svg>foreignObject>section:not(\\9) {\n\
+                width: 300px;\n\
+                width: 500px\\9;\n\
+            }\n\
+            ";
+        const CSS_OUT: &str = "\
+            div#p>svg>foreignObject>section:not(\\9) {\n\
+                width: 300px;\n\
+                width: 500px\t;\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(cache, &client, &document_url, &CSS, &options, 0,),
            CSS_OUT
        );
    }
--- a/src/tests/css/enquote.rs
+++ b/src/tests/css/enquote.rs
@@ -1,53 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use crate::css;
-
-    #[test]
-    fn empty_input_single_quotes() {
-        assert_eq!(css::enquote(str!(""), false), "''");
-    }
-
-    #[test]
-    fn empty_input_double_quotes() {
-        assert_eq!(css::enquote(str!(""), true), "\"\"");
-    }
-
-    #[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 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 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\\\"\""
-        );
-    }
-}
--- a/src/tests/css/mod.rs
+++ b/src/tests/css/mod.rs
@@ -1,3 +1,2 @@
 mod embed_css;
-mod enquote;
 mod is_image_url_prop;
--- a/src/tests/data/css/index.html
+++ b/src/tests/data/css/index.html
@@ -0,0 +1,11 @@
+<style>
+
+    @charset 'UTF-8';
+
+    @import 'style.css';
+
+    @import url(style.css);
+
+    @import url('style.css');
+
+</style>
--- a/src/tests/data/css/style.css
+++ b/src/tests/data/css/style.css
@@ -0,0 +1 @@
+body{background-color:#000;color:#fff}
--- a/src/tests/data/integrity/index.html
+++ b/src/tests/data/integrity/index.html
@@ -3,8 +3,6 @@
 <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" />
--- a/src/tests/data/noscript/image.svg
+++ b/src/tests/data/noscript/image.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" baseProfile="full" width="300" height="200" xmlns="http://www.w3.org/2000/svg">
+    <rect width="100%" height="100%" fill="red" />
+    <circle cx="150" cy="100" r="80" fill="green" />
+    <text x="150" y="125" font-size="60" text-anchor="middle" fill="white">SVG</text>
+</svg>
--- a/src/tests/data/noscript/index.html
+++ b/src/tests/data/noscript/index.html
@@ -0,0 +1 @@
+<body><noscript><img src="image.svg" /></noscript></body>
--- a/src/tests/data/noscript/nested.html
+++ b/src/tests/data/noscript/nested.html
@@ -0,0 +1 @@
+<body><noscript><h1>JS is not active</h1><noscript><img src="image.svg" /></noscript></noscript></body>
--- a/src/tests/data/noscript/script.html
+++ b/src/tests/data/noscript/script.html
@@ -0,0 +1 @@
+<body><noscript><script>alert(1);</script><img src="image.svg" /></noscript></body>
--- a/src/tests/data/svg/image.svg
+++ b/src/tests/data/svg/image.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" baseProfile="full" width="300" height="200" xmlns="http://www.w3.org/2000/svg">
+    <rect width="100%" height="100%" fill="red" />
+    <circle cx="150" cy="100" r="80" fill="green" />
+    <text x="150" y="125" font-size="60" text-anchor="middle" fill="white">SVG</text>
+</svg>
--- a/src/tests/data/svg/index.html
+++ b/src/tests/data/svg/index.html
@@ -0,0 +1 @@
+<div style="background-image: url('image.svg')"></div>
--- a/src/tests/data/unusual_encodings/iso-8859-1.html
+++ b/src/tests/data/unusual_encodings/iso-8859-1.html
@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    </head>
+    <body>
+        &copy; Some Company
+    </body>
+</html>
--- a/src/tests/html/has_proper_integrity.rs
+++ b/src/tests/html/has_proper_integrity.rs
@@ -11,7 +11,7 @@ mod passing {

    #[test]
    fn empty_input_sha256() {
-        assert!(html::has_proper_integrity(
+        assert!(html::check_integrity(
            "".as_bytes(),
            "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="
        ));
@@ -19,7 +19,7 @@ mod passing {

    #[test]
    fn sha256() {
-        assert!(html::has_proper_integrity(
+        assert!(html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha256-9EWAHgy4mSYsm54hmDaIDXPKLRsLnBX7lZyQ6xISNOM="
        ));
@@ -27,7 +27,7 @@ mod passing {

    #[test]
    fn sha384() {
-        assert!(html::has_proper_integrity(
+        assert!(html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha384-gc9l7omltke8C33bedgh15E12M7RrAQa5t63Yb8APlpe7ZhiqV23+oqiulSJl3Kw"
        ));
@@ -35,7 +35,7 @@ mod passing {

    #[test]
    fn sha512() {
-        assert!(html::has_proper_integrity(
+        assert!(html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha512-zG5B88cYMqcdiMi9gz0XkOFYw2BpjeYdn5V6+oFrMgSNjRpqL7EF8JEwl17ztZbK3N7I/tTwp3kxQbN1RgFBww=="
        ));
@@ -55,20 +55,17 @@ mod failing {

    #[test]
    fn empty_hash() {
-        assert!(!html::has_proper_integrity(
-            "abcdef0123456789".as_bytes(),
-            ""
-        ));
+        assert!(!html::check_integrity("abcdef0123456789".as_bytes(), ""));
    }

    #[test]
    fn empty_input_empty_hash() {
-        assert!(!html::has_proper_integrity("".as_bytes(), ""));
+        assert!(!html::check_integrity("".as_bytes(), ""));
    }

    #[test]
    fn sha256() {
-        assert!(!html::has_proper_integrity(
+        assert!(!html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha256-badhash"
        ));
@@ -76,7 +73,7 @@ mod failing {

    #[test]
    fn sha384() {
-        assert!(!html::has_proper_integrity(
+        assert!(!html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha384-badhash"
        ));
@@ -84,7 +81,7 @@ mod failing {

    #[test]
    fn sha512() {
-        assert!(!html::has_proper_integrity(
+        assert!(!html::check_integrity(
            "abcdef0123456789".as_bytes(),
            "sha512-badhash"
        ));
--- a/src/tests/html/compose_csp.rs
+++ b/src/tests/html/compose_csp.rs
@@ -14,7 +14,7 @@ mod passing {
    fn isolated() {
        let mut options = Options::default();
        options.isolate = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "default-src 'unsafe-inline' data:;");
    }
@@ -23,7 +23,7 @@ mod passing {
    fn no_css() {
        let mut options = Options::default();
        options.no_css = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "style-src 'none';");
    }
@@ -32,7 +32,7 @@ mod passing {
    fn no_fonts() {
        let mut options = Options::default();
        options.no_fonts = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "font-src 'none';");
    }
@@ -41,7 +41,7 @@ mod passing {
    fn no_frames() {
        let mut options = Options::default();
        options.no_frames = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "frame-src 'none'; child-src 'none';");
    }
@@ -50,7 +50,7 @@ mod passing {
    fn no_js() {
        let mut options = Options::default();
        options.no_js = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "script-src 'none';");
    }
@@ -59,7 +59,7 @@ mod passing {
    fn no_images() {
        let mut options = Options::default();
        options.no_images = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "img-src data:;");
    }
@@ -73,7 +73,7 @@ mod passing {
        options.no_frames = true;
        options.no_js = true;
        options.no_images = true;
-        let csp_content = html::csp(&options);
+        let csp_content = html::compose_csp(&options);

        assert_eq!(csp_content, "default-src 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;");
    }
--- a/src/tests/html/create_metadata_tag.rs
+++ b/src/tests/html/create_metadata_tag.rs
@@ -8,14 +8,15 @@
 #[cfg(test)]
 mod passing {
    use chrono::prelude::*;
+    use reqwest::Url;

    use crate::html;

    #[test]
    fn http_url() {
-        let url = "http://192.168.1.1/";
+        let url: Url = Url::parse("http://192.168.1.1/").unwrap();
        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
-        let metadata_comment: String = html::metadata_tag(url);
+        let metadata_comment: String = html::create_metadata_tag(&url);

        assert_eq!(
            metadata_comment,
@@ -31,9 +32,9 @@ mod passing {

    #[test]
    fn file_url() {
-        let url = "file:///home/monolith/index.html";
+        let url: Url = Url::parse("file:///home/monolith/index.html").unwrap();
        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
-        let metadata_comment: String = html::metadata_tag(url);
+        let metadata_comment: String = html::create_metadata_tag(&url);

        assert_eq!(
            metadata_comment,
@@ -48,9 +49,9 @@ mod passing {

    #[test]
    fn data_url() {
-        let url = "data:text/html,Hello%2C%20World!";
+        let url: Url = Url::parse("data:text/html,Hello%2C%20World!").unwrap();
        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
-        let metadata_comment: String = html::metadata_tag(url);
+        let metadata_comment: String = html::create_metadata_tag(&url);

        assert_eq!(
            metadata_comment,
@@ -63,20 +64,3 @@ mod passing {
        );
    }
 }
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod failing {
-    use crate::html;
-
-    #[test]
-    fn empty_string() {
-        assert_eq!(html::metadata_tag(""), "");
-    }
-}
--- a/src/tests/html/embed_srcset.rs
+++ b/src/tests/html/embed_srcset.rs
@@ -8,24 +8,151 @@
 #[cfg(test)]
 mod passing {
    use reqwest::blocking::Client;
+    use reqwest::Url;
    use std::collections::HashMap;

    use crate::html;
    use crate::opts::Options;

    #[test]
-    fn replace_with_empty_images() {
+    fn small_medium_large() {
        let cache = &mut HashMap::new();
        let client = Client::new();
-        let srcset_value = "small.png 1x, large.png 2x";
+        let srcset_value = "small.png 1x, medium.png 1.5x, large.png 2x";
        let mut options = Options::default();
        options.no_images = true;
        options.silent = true;
-        let embedded_css = html::embed_srcset(cache, &client, "", &srcset_value, &options, 0);
+        let embedded_css = html::embed_srcset(
+            cache,
+            &client,
+            &Url::parse("data:,").unwrap(),
+            &srcset_value,
+            &options,
+            0,
+        );

        assert_eq!(
+            embedded_css,
+            format!(
+                "{} 1x, {} 1.5x, {} 2x",
+                empty_image!(),
+                empty_image!(),
+                empty_image!(),
+            ),
+        );
+    }
+
+    #[test]
+    fn small_medium_only_medium_has_scale() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let srcset_value = "small.png, medium.png 1.5x";
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+        let embedded_css = html::embed_srcset(
+            cache,
+            &client,
+            &Url::parse("data:,").unwrap(),
+            &srcset_value,
+            &options,
+            0,
+        );
+
+        assert_eq!(
+            embedded_css,
+            format!("{}, {} 1.5x", empty_image!(), empty_image!()),
+        );
+    }
+
+    #[test]
+    fn commas_within_file_names() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let srcset_value = "small,s.png 1x, large,l.png 2x";
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+        let embedded_css = html::embed_srcset(
+            cache,
+            &client,
+            &Url::parse("data:,").unwrap(),
+            &srcset_value,
+            &options,
+            0,
+        );
+
+        assert_eq!(
+            embedded_css,
            format!("{} 1x, {} 2x", empty_image!(), empty_image!()),
-            embedded_css
+        );
+    }
+
+    #[test]
+    fn tabs_and_newlines_after_commas() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let srcset_value = "small,s.png 1x,\nmedium,m.png 2x,\nlarge,l.png 3x";
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+        let embedded_css = html::embed_srcset(
+            cache,
+            &client,
+            &Url::parse("data:,").unwrap(),
+            &srcset_value,
+            &options,
+            0,
+        );
+
+        assert_eq!(
+            embedded_css,
+            format!(
+                "{} 1x, {} 2x, {} 3x",
+                empty_image!(),
+                empty_image!(),
+                empty_image!()
+            ),
+        );
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use reqwest::blocking::Client;
+    use reqwest::Url;
+    use std::collections::HashMap;
+
+    use crate::html;
+    use crate::opts::Options;
+
+    #[test]
+    fn trailing_comma() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let srcset_value = "small.png 1x, large.png 2x,";
+        let mut options = Options::default();
+        options.no_images = true;
+        options.silent = true;
+        let embedded_css = html::embed_srcset(
+            cache,
+            &client,
+            &Url::parse("data:,").unwrap(),
+            &srcset_value,
+            &options,
+            0,
+        );
+
+        assert_eq!(
+            embedded_css,
+            format!("{} 1x, {} 2x,", empty_image!(), empty_image!()),
        );
    }
 }
--- a/src/tests/html/get_base_url.rs
+++ b/src/tests/html/get_base_url.rs
@@ -7,34 +7,43 @@

 #[cfg(test)]
 mod passing {
-    use crate::url;
+    use crate::html;

    #[test]
-    fn unix_file_url() {
-        assert!(url::is_file_url(
-            "file:///home/user/Websites/my-website/index.html"
-        ));
+    fn present() {
+        let html = "<!doctype html>
+<html>
+    <head>
+        <base href=\"https://musicbrainz.org\" />
+    </head>
+    <body>
+    </body>
+</html>";
+        let dom = html::html_to_dom(&html);
+
+        assert_eq!(
+            html::get_base_url(&dom.document),
+            Some(str!("https://musicbrainz.org"))
+        );
    }

    #[test]
-    fn windows_file_url() {
-        assert!(url::is_file_url(
-            "file:///C:/Documents%20and%20Settings/user/Websites/my-website/assets/images/logo.png"
-        ));
-    }
+    fn multiple_tags() {
+        let html = "<!doctype html>
+<html>
+    <head>
+        <base href=\"https://www.discogs.com/\" />
+        <base href=\"https://musicbrainz.org\" />
+    </head>
+    <body>
+    </body>
+</html>";
+        let dom = html::html_to_dom(&html);

-    #[test]
-    fn unix_url_with_backslashes() {
-        assert!(url::is_file_url(
-            "file:\\\\\\home\\user\\Websites\\my-website\\index.html"
-        ));
-    }
-
-    #[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"
-        ));
+        assert_eq!(
+            html::get_base_url(&dom.document),
+            Some(str!("https://www.discogs.com/"))
+        );
    }
 }

@@ -47,37 +56,49 @@ mod passing {

 #[cfg(test)]
 mod failing {
-    use crate::url;
+    use crate::html;

    #[test]
-    fn url_with_no_protocl() {
-        assert!(!url::is_file_url("//kernel.org"));
+    fn absent() {
+        let html = "<!doctype html>
+<html>
+    <head>
+    </head>
+    <body>
+    </body>
+</html>";
+        let dom = html::html_to_dom(&html);
+
+        assert_eq!(html::get_base_url(&dom.document), None);
    }

    #[test]
-    fn dot_slash_filename() {
-        assert!(!url::is_file_url("./index.html"));
+    fn no_href() {
+        let html = "<!doctype html>
+<html>
+    <head>
+        <base />
+    </head>
+    <body>
+    </body>
+</html>";
+        let dom = html::html_to_dom(&html);
+
+        assert_eq!(html::get_base_url(&dom.document), None);
    }

    #[test]
-    fn just_filename() {
-        assert!(!url::is_file_url("some-local-page.htm"));
-    }
+    fn empty_href() {
+        let html = "<!doctype html>
+<html>
+    <head>
+        <base href=\"\" />
+    </head>
+    <body>
+    </body>
+</html>";
+        let dom = html::html_to_dom(&html);

-    #[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"));
+        assert_eq!(html::get_base_url(&dom.document), Some(str!()));
    }
 }
--- a/src/tests/html/get_node_attr.rs
+++ b/src/tests/html/get_node_attr.rs
@@ -0,0 +1,54 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use html5ever::rcdom::{Handle, NodeData};
+
+    use crate::html;
+
+    #[test]
+    fn div_two_style_attributes() {
+        let html = "<!doctype html><html><head></head><body><DIV STYLE=\"color: blue;\" style=\"display: none;\"></div></body></html>";
+        let dom = html::html_to_dom(&html);
+        let mut count = 0;
+
+        fn test_walk(node: &Handle, i: &mut i8) {
+            *i += 1;
+
+            match &node.data {
+                NodeData::Document => {
+                    // Dig deeper
+                    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();
+
+                    if node_name == "body" {
+                        assert_eq!(html::get_node_attr(node, "class"), None);
+                    } else if node_name == "div" {
+                        assert_eq!(
+                            html::get_node_attr(node, "style"),
+                            Some(str!("color: blue;"))
+                        );
+                    }
+
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
+                }
+                _ => (),
+            };
+        }
+
+        test_walk(&dom.document, &mut count);
+
+        assert_eq!(count, 6);
+    }
+}
--- a/src/tests/html/get_node_name.rs
+++ b/src/tests/html/get_node_name.rs
@@ -12,7 +12,7 @@ mod passing {
    use crate::html;

    #[test]
-    fn get_node_name() {
+    fn parent_node_names() {
        let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
        let dom = html::html_to_dom(&html);
        let mut count = 0;
--- a/src/tests/html/has_favicon.rs
+++ b/src/tests/html/has_favicon.rs
@@ -8,7 +8,6 @@
 #[cfg(test)]
 mod passing {
    use crate::html;
-    use crate::opts::Options;

    #[test]
    fn icon() {
@@ -39,7 +38,6 @@ mod passing {
 #[cfg(test)]
 mod failing {
    use crate::html;
-    use crate::opts::Options;

    #[test]
    fn absent() {
--- a/src/tests/html/mod.rs
+++ b/src/tests/html/mod.rs
@@ -1,10 +1,13 @@
 mod add_favicon;
-mod csp;
+mod check_integrity;
+mod compose_csp;
+mod create_metadata_tag;
 mod embed_srcset;
+mod get_base_url;
+mod get_node_attr;
 mod get_node_name;
 mod has_favicon;
-mod has_proper_integrity;
 mod is_icon;
-mod metadata_tag;
+mod set_node_attr;
 mod stringify_document;
 mod walk_and_embed_assets;
--- a/src/tests/html/set_node_attr.rs
+++ b/src/tests/html/set_node_attr.rs
@@ -0,0 +1,105 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use html5ever::rcdom::{Handle, NodeData};
+
+    use crate::html;
+
+    #[test]
+    fn html_lang_and_body_style() {
+        let html = "<!doctype html><html lang=\"en\"><head></head><body></body></html>";
+        let dom = html::html_to_dom(&html);
+        let mut count = 0;
+
+        fn test_walk(node: &Handle, i: &mut i8) {
+            *i += 1;
+
+            match &node.data {
+                NodeData::Document => {
+                    // Dig deeper
+                    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();
+
+                    if node_name == "html" {
+                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("en")));
+
+                        html::set_node_attr(node, "lang", Some(str!("de")));
+                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("de")));
+
+                        html::set_node_attr(node, "lang", None);
+                        assert_eq!(html::get_node_attr(node, "lang"), None);
+
+                        html::set_node_attr(node, "lang", Some(str!("")));
+                        assert_eq!(html::get_node_attr(node, "lang"), Some(str!("")));
+                    } else if node_name == "body" {
+                        assert_eq!(html::get_node_attr(node, "style"), None);
+
+                        html::set_node_attr(node, "style", Some(str!("display: none;")));
+                        assert_eq!(
+                            html::get_node_attr(node, "style"),
+                            Some(str!("display: none;"))
+                        );
+                    }
+
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
+                }
+                _ => (),
+            };
+        }
+
+        test_walk(&dom.document, &mut count);
+
+        assert_eq!(count, 5);
+    }
+
+    #[test]
+    fn body_background() {
+        let html = "<!doctype html><html lang=\"en\"><head></head><body background=\"1\" background=\"2\"></body></html>";
+        let dom = html::html_to_dom(&html);
+        let mut count = 0;
+
+        fn test_walk(node: &Handle, i: &mut i8) {
+            *i += 1;
+
+            match &node.data {
+                NodeData::Document => {
+                    // Dig deeper
+                    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();
+
+                    if node_name == "body" {
+                        assert_eq!(html::get_node_attr(node, "background"), Some(str!("1")));
+
+                        html::set_node_attr(node, "background", None);
+                        assert_eq!(html::get_node_attr(node, "background"), None);
+                    }
+
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
+                }
+                _ => (),
+            };
+        }
+
+        test_walk(&dom.document, &mut count);
+
+        assert_eq!(count, 5);
+    }
+}
--- a/src/tests/html/walk_and_embed_assets.rs
+++ b/src/tests/html/walk_and_embed_assets.rs
@@ -10,6 +10,7 @@ mod passing {
    use html5ever::serialize::{serialize, SerializeOpts};
    use reqwest::blocking::Client;
    use std::collections::HashMap;
+    use url::Url;

    use crate::html;
    use crate::opts::Options;
@@ -18,9 +19,9 @@ mod passing {
    fn basic() {
        let cache = &mut HashMap::new();

-        let html = "<div><P></P></div>";
+        let html: &str = "<div><P></P></div>";
        let dom = html::html_to_dom(&html);
-        let url = "http://localhost";
+        let url: Url = Url::parse("http://localhost").unwrap();

        let mut options = Options::default();
        options.silent = true;
@@ -42,7 +43,7 @@ mod passing {
    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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -65,7 +66,7 @@ mod passing {
    fn ensure_no_recursive_frame() {
        let html = "<frameset><frame src=\"\"></frameset>";
        let dom = html::html_to_dom(&html);
-        let url = "http://localhost";
+        let url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -86,11 +87,14 @@ mod passing {

    #[test]
    fn no_css() {
-        let html = "<link rel=\"stylesheet\" href=\"main.css\">\
-                    <style>html{background-color: #000;}</style>\
-                    <div style=\"display: none;\"></div>";
+        let html = "\
+            <link rel=\"stylesheet\" href=\"main.css\">\
+            <link rel=\"alternate 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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -106,15 +110,18 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html>\
-            <head>\
-            <link rel=\"stylesheet\">\
-            <style></style>\
-            </head>\
-            <body>\
-            <div></div>\
-            </body>\
-            </html>"
+            "\
+            <html>\
+                <head>\
+                    <link rel=\"stylesheet\">\
+                    <link rel=\"alternate stylesheet\">\
+                    <style></style>\
+                </head>\
+                <body>\
+                    <div></div>\
+                </body>\
+            </html>\
+            "
        );
    }

@@ -123,7 +130,7 @@ mod passing {
        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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -160,7 +167,7 @@ mod passing {
        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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -184,7 +191,7 @@ mod passing {
    fn no_frames() {
        let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
        let dom = html::html_to_dom(&html);
-        let url = "http://localhost";
+        let url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -200,7 +207,15 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html><head></head><frameset><frame src=\"\"></frameset></html>"
+            "\
+            <html>\
+                <head>\
+                </head>\
+                <frameset>\
+                    <frame src=\"\">\
+                </frameset>\
+            </html>\
+            "
        );
    }

@@ -208,7 +223,7 @@ mod passing {
    fn no_iframes() {
        let html = "<iframe src=\"http://trackbook.com\"></iframe>";
        let dom = html::html_to_dom(&html);
-        let url = "http://localhost";
+        let url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -224,18 +239,27 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html><head></head><body><iframe src=\"\"></iframe></body></html>"
+            "\
+            <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 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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -251,25 +275,29 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html><head></head><body><div><script></script>\
-            <script></script></div></body></html>"
+            "\
+            <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>";
+    fn keeps_integrity_for_linked_assets() {
+        let html = "<title>Has integrity</title>\
+                    <link integrity=\"sha384-12345\" rel=\"something\" href=\"https://some-site.com/some-file.ext\" />";
        let dom = html::html_to_dom(&html);
-        let url = "http://localhost";
+        let url: Url = Url::parse("http://localhost").unwrap();
        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();
@@ -281,24 +309,109 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html>\
-                <head><title>No integrity</title><link rel=\"something\"><script></script></head>\
+            "\
+            <html>\
+                <head>\
+                    <title>Has integrity</title>\
+                    <link integrity=\"sha384-12345\" rel=\"something\" href=\"https://some-site.com/some-file.ext\">\
+                </head>\
                <body></body>\
-            </html>"
+            </html>\
+            "
+        );
+    }
+
+    #[test]
+    fn discards_integrity_for_linked_assets_nojs_nocss() {
+        let html = "\
+            <title>No integrity</title>\
+            <link integrity=\"\" rel=\"stylesheet\" href=\"data:;\"/>\
+            <script integrity=\"\" src=\"some.js\"></script>\
+        ";
+        let dom = html::html_to_dom(&html);
+        let url: Url = Url::parse("http://localhost").unwrap();
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_css = true;
+        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>\
+                    <title>No integrity</title>\
+                    <link rel=\"stylesheet\">\
+                    <script></script>\
+                </head>\
+                <body></body>\
+            </html>\
+            "
+        );
+    }
+
+    #[test]
+    fn discards_integrity_for_embedded_assets() {
+        let html = "\
+            <title>No integrity</title>\
+            <link integrity=\"sha384-123\" rel=\"something\" href=\"data:;\"/>\
+            <script integrity=\"sha384-456\" src=\"some.js\"></script>\
+        ";
+        let dom = html::html_to_dom(&html);
+        let url: Url = Url::parse("http://localhost").unwrap();
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        options.no_css = true;
+        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>\
+                    <title>No integrity</title>\
+                    <link integrity=\"sha384-123\" rel=\"something\" href=\"data:;\">\
+                    <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 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 url: Url = Url::parse("http://localhost").unwrap();
        let cache = &mut HashMap::new();

        let mut options = Options::default();
@@ -317,12 +430,87 @@ mod passing {

        assert_eq!(
            buf.iter().map(|&c| c as char).collect::<String>(),
-            "<html>\
+            "\
+            <html>\
                <head>\
-                    <meta>\
-                    <meta>\
+                    <meta http-equiv=\"disabled by monolith (Refresh)\" value=\"20\">\
+                    <meta http-equiv=\"disabled by monolith (Location)\" value=\"https://freebsd.org\">\
                </head>\
-                <body></body>\
+                <body>\
+                </body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    fn processes_noscript_tags() {
+        let html = "\
+        <html>\
+            <body>\
+                <noscript>\
+                    <img src=\"image.png\" />\
+                </noscript>\
+            </body>\
+        </html>";
+        let dom = html::html_to_dom(&html);
+        let url: Url = Url::parse("http://localhost").unwrap();
+        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>\
+                    </head>\
+                    <body>\
+                        <noscript>\
+                            <img src=\"{}\">\
+                        </noscript>\
+                    </body>\
+                </html>",
+                empty_image!(),
+            )
+        );
+    }
+
+    #[test]
+    fn preserves_script_type_json() {
+        let html = "<script id=\"data\" type=\"application/json\">{\"mono\":\"lith\"}</script>";
+        let dom = html::html_to_dom(&html);
+        let url: Url = Url::parse("http://localhost").unwrap();
+        let cache = &mut HashMap::new();
+
+        let mut options = Options::default();
+        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>\
+                    <script id=\"data\" type=\"application/json\">{\"mono\":\"lith\"}</script>\
+                </head>\
+                <body>\
+                </body>\
            </html>"
        );
    }
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -4,4 +4,5 @@ mod html;
 mod js;
 mod macros;
 mod opts;
+mod url;
 mod utils;
--- a/src/tests/opts.rs
+++ b/src/tests/opts.rs
@@ -13,7 +13,8 @@ mod passing {
    fn defaults() {
        let options: Options = Options::default();

-        assert_eq!(options.target, str!());
+        assert_eq!(options.no_audio, false);
+        assert_eq!(options.base_url, None);
        assert_eq!(options.no_css, false);
        assert_eq!(options.no_frames, false);
        assert_eq!(options.no_fonts, false);
@@ -25,6 +26,9 @@ mod passing {
        assert_eq!(options.output, str!());
        assert_eq!(options.silent, false);
        assert_eq!(options.timeout, 0);
-        assert_eq!(options.user_agent, "");
+        assert_eq!(options.user_agent, None);
+        assert_eq!(options.no_video, false);
+
+        assert_eq!(options.target, str!());
    }
 }
--- a/src/tests/url/clean_url.rs
+++ b/src/tests/url/clean_url.rs
@@ -7,12 +7,23 @@

 #[cfg(test)]
 mod passing {
+    use reqwest::Url;
+
    use crate::url;

+    #[test]
+    fn preserve_original() {
+        let u: Url = Url::parse("https://somewhere.com/font.eot#iefix").unwrap();
+
+        url::clean_url(u.clone());
+
+        assert_eq!(u.as_str(), "https://somewhere.com/font.eot#iefix");
+    }
+
    #[test]
    fn removes_fragment() {
        assert_eq!(
-            url::clean_url("https://somewhere.com/font.eot#iefix"),
+            url::clean_url(Url::parse("https://somewhere.com/font.eot#iefix").unwrap()).as_str(),
            "https://somewhere.com/font.eot"
        );
    }
@@ -20,31 +31,31 @@ mod passing {
    #[test]
    fn removes_empty_fragment() {
        assert_eq!(
-            url::clean_url("https://somewhere.com/font.eot#"),
+            url::clean_url(Url::parse("https://somewhere.com/font.eot#").unwrap()).as_str(),
            "https://somewhere.com/font.eot"
        );
    }

    #[test]
-    fn removes_empty_query_and_empty_fragment() {
+    fn removes_empty_fragment_and_keeps_empty_query() {
        assert_eq!(
-            url::clean_url("https://somewhere.com/font.eot?#"),
-            "https://somewhere.com/font.eot"
+            url::clean_url(Url::parse("https://somewhere.com/font.eot?#").unwrap()).as_str(),
+            "https://somewhere.com/font.eot?"
        );
    }

    #[test]
-    fn removes_empty_query_amp_and_empty_fragment() {
+    fn removesempty_fragment_and_keeps_empty_query() {
        assert_eq!(
-            url::clean_url("https://somewhere.com/font.eot?a=b&#"),
-            "https://somewhere.com/font.eot?a=b"
+            url::clean_url(Url::parse("https://somewhere.com/font.eot?a=b&#").unwrap()).as_str(),
+            "https://somewhere.com/font.eot?a=b&"
        );
    }

    #[test]
    fn keeps_credentials() {
        assert_eq!(
-            url::clean_url("https://cookie:monster@gibson.internet/"),
+            url::clean_url(Url::parse("https://cookie:monster@gibson.internet/").unwrap()).as_str(),
            "https://cookie:monster@gibson.internet/"
        );
    }
--- a/src/tests/url/data_to_data_url.rs
+++ b/src/tests/url/data_to_data_url.rs
@@ -7,16 +7,18 @@

 #[cfg(test)]
 mod passing {
+    use reqwest::Url;
+
    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(), "");
+        let data_url = url::create_data_url(mime, data.as_bytes(), &Url::parse("data:,").unwrap());

        assert_eq!(
-            &data_url,
+            data_url.as_str(),
            "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
        );
    }
@@ -24,8 +26,15 @@ mod passing {
    #[test]
    fn encode_append_fragment() {
        let data = "<svg></svg>\n";
-        let data_url = url::data_to_data_url("image/svg+xml", data.as_bytes(), "");
+        let data_url = url::create_data_url(
+            "image/svg+xml",
+            data.as_bytes(),
+            &Url::parse("data:,").unwrap(),
+        );

-        assert_eq!(&data_url, "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4K");
+        assert_eq!(
+            data_url.as_str(),
+            "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4K"
+        );
    }
 }
--- a/src/tests/url/file_url_to_fs_path.rs
+++ b/src/tests/url/file_url_to_fs_path.rs
@@ -1,41 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[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"
-            );
-        }
-    }
-}
--- a/src/tests/url/is_data_url.rs
+++ b/src/tests/url/is_data_url.rs
@@ -1,52 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use crate::url;
-
-    #[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"
-        ));
-    }
-}
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod failing {
-    use crate::url;
-
-    #[test]
-    fn https_url() {
-        assert!(!url::is_data_url("https://kernel.org"));
-    }
-
-    #[test]
-    fn no_protocol_url() {
-        assert!(!url::is_data_url("//kernel.org"));
-    }
-
-    #[test]
-    fn empty_string() {
-        assert!(!url::is_data_url(""));
-    }
-}
--- a/src/tests/url/is_http_url.rs
+++ b/src/tests/url/is_http_url.rs
@@ -1,65 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod passing {
-    use crate::url;
-
-    #[test]
-    fn http_url() {
-        assert!(url::is_http_url("http://kernel.org"));
-    }
-
-    #[test]
-    fn https_url() {
-        assert!(url::is_http_url("https://www.rust-lang.org/"));
-    }
-
-    #[test]
-    fn http_url_with_backslashes() {
-        assert!(url::is_http_url("http:\\\\freebsd.org\\"));
-    }
-}
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[cfg(test)]
-mod failing {
-    use crate::url;
-
-    #[test]
-    fn url_with_no_protocol() {
-        assert!(!url::is_http_url("//kernel.org"));
-    }
-
-    #[test]
-    fn dot_slash_filename() {
-        assert!(!url::is_http_url("./index.html"));
-    }
-
-    #[test]
-    fn just_filename() {
-        assert!(!url::is_http_url("some-local-page.htm"));
-    }
-
-    #[test]
-    fn https_ip_port_url() {
-        assert!(!url::is_http_url("ftp://1.2.3.4/www/index.html"));
-    }
-
-    #[test]
-    fn data_url() {
-        assert!(!url::is_http_url(
-            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-        ));
-    }
-}
--- a/src/tests/url/is_url_and_has_protocol.rs
+++ b/src/tests/url/is_url_and_has_protocol.rs
@@ -11,49 +11,64 @@ mod passing {

    #[test]
    fn mailto() {
-        assert!(url::url_has_protocol(
+        assert!(url::is_url_and_has_protocol(
            "mailto:somebody@somewhere.com?subject=hello"
        ));
    }

    #[test]
    fn tel() {
-        assert!(url::url_has_protocol("tel:5551234567"));
+        assert!(url::is_url_and_has_protocol("tel:5551234567"));
    }

    #[test]
    fn ftp_no_slashes() {
-        assert!(url::url_has_protocol("ftp:some-ftp-server.com"));
+        assert!(url::is_url_and_has_protocol("ftp:some-ftp-server.com"));
    }

    #[test]
    fn ftp_with_credentials() {
-        assert!(url::url_has_protocol(
+        assert!(url::is_url_and_has_protocol(
            "ftp://user:password@some-ftp-server.com"
        ));
    }

    #[test]
    fn javascript() {
-        assert!(url::url_has_protocol("javascript:void(0)"));
+        assert!(url::is_url_and_has_protocol("javascript:void(0)"));
    }

    #[test]
    fn http() {
-        assert!(url::url_has_protocol("http://news.ycombinator.com"));
+        assert!(url::is_url_and_has_protocol("http://news.ycombinator.com"));
    }

    #[test]
    fn https() {
-        assert!(url::url_has_protocol("https://github.com"));
+        assert!(url::is_url_and_has_protocol("https://github.com"));
+    }
+
+    #[test]
+    fn file() {
+        assert!(url::is_url_and_has_protocol("file:///tmp/image.png"));
    }

    #[test]
    fn mailto_uppercase() {
-        assert!(url::url_has_protocol(
+        assert!(url::is_url_and_has_protocol(
            "MAILTO:somebody@somewhere.com?subject=hello"
        ));
    }
+
+    #[test]
+    fn empty_data_url() {
+        assert!(url::is_url_and_has_protocol("data:text/html,"));
+    }
+
+    #[test]
+    fn empty_data_url_surrounded_by_spaces() {
+        assert!(url::is_url_and_has_protocol(" data:text/html, "));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -65,27 +80,31 @@ mod passing {

 #[cfg(test)]
 mod failing {
-    use crate::utils;
+    use crate::url;

    #[test]
    fn url_with_no_protocol() {
-        assert!(!url::url_has_protocol(
-            "//some-hostname.com/some-file.html"
-        ));
+        assert_eq!(
+            url::is_url_and_has_protocol("//some-hostname.com/some-file.html"),
+            false
+        );
    }

    #[test]
    fn relative_path() {
-        assert!(!url::url_has_protocol("some-hostname.com/some-file.html"));
+        assert_eq!(
+            url::is_url_and_has_protocol("some-hostname.com/some-file.html"),
+            false
+        );
    }

    #[test]
    fn relative_to_root_path() {
-        assert!(!url::url_has_protocol("/some-file.html"));
+        assert_eq!(url::is_url_and_has_protocol("/some-file.html"), false);
    }

    #[test]
    fn empty_string() {
-        assert!(!url::url_has_protocol(""));
+        assert_eq!(url::is_url_and_has_protocol(""), false);
    }
 }
--- a/src/tests/url/mod.rs
+++ b/src/tests/url/mod.rs
@@ -1,12 +1,7 @@
 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 create_data_url;
+mod is_url_and_has_protocol;
+mod parse_data_url;
+mod percent_decode;
+mod percent_encode;
 mod resolve_url;
-mod url_has_protocol;
-mod url_with_fragment;
--- a/src/tests/url/data_url_to_data.rs
+++ b/src/tests/url/data_url_to_data.rs
@@ -7,11 +7,13 @@

 #[cfg(test)]
 mod passing {
+    use reqwest::Url;
+
    use crate::url;

    #[test]
    fn parse_text_html_base64() {
-        let (media_type, data) = url::data_url_to_data("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg==");
+        let (media_type, data) = url::parse_data_url(&Url::parse("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg==").unwrap());

        assert_eq!(media_type, "text/html");
        assert_eq!(
@@ -22,8 +24,8 @@ mod passing {

    #[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",
+        let (media_type, data) = url::parse_data_url(
+            &Url::parse("data:text/html;utf8,Work expands so as to fill the time available for its completion").unwrap(),
        );

        assert_eq!(media_type, "text/html");
@@ -35,8 +37,11 @@ mod passing {

    #[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",
+        let (media_type, data) = url::parse_data_url(
+            &Url::parse(
+                "data:text/html,Work expands so as to fill the time available for its completion",
+            )
+            .unwrap(),
        );

        assert_eq!(media_type, "text/html");
@@ -46,21 +51,10 @@ mod passing {
        );
    }

-    #[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}");
+            url::parse_data_url(&Url::parse("data:text/css,div{background-color:%23000}").unwrap());

        assert_eq!(media_type, "text/css");
        assert_eq!(String::from_utf8_lossy(&data), "div{background-color:#000}");
@@ -68,7 +62,7 @@ mod passing {

    #[test]
    fn parse_no_media_type_base64() {
-        let (media_type, data) = url::data_url_to_data("data:;base64,dGVzdA==");
+        let (media_type, data) = url::parse_data_url(&Url::parse("data:;base64,dGVzdA==").unwrap());

        assert_eq!(media_type, "");
        assert_eq!(String::from_utf8_lossy(&data), "test");
@@ -76,7 +70,7 @@ mod passing {

    #[test]
    fn parse_no_media_type_no_encoding() {
-        let (media_type, data) = url::data_url_to_data("data:;,test%20test");
+        let (media_type, data) = url::parse_data_url(&Url::parse("data:;,test%20test").unwrap());

        assert_eq!(media_type, "");
        assert_eq!(String::from_utf8_lossy(&data), "test test");
@@ -92,11 +86,13 @@ mod passing {

 #[cfg(test)]
 mod failing {
+    use reqwest::Url;
+
    use crate::url;

    #[test]
-    fn just_word_data() {
-        let (media_type, data) = url::data_url_to_data("data");
+    fn empty_data_url() {
+        let (media_type, data) = url::parse_data_url(&Url::parse("data:,").unwrap());

        assert_eq!(media_type, "");
        assert_eq!(String::from_utf8_lossy(&data), "");
--- a/src/tests/url/percent_decode.rs
+++ b/src/tests/url/percent_decode.rs
@@ -12,7 +12,7 @@ mod passing {
    #[test]
    fn decode_unicode_characters() {
        assert_eq!(
-            url::decode_url(str!(
+            url::percent_decode(str!(
                "%E6%A4%9C%E3%83%92%E3%83%A0%E8%A7%A3%E5%A1%97%E3%82%83%E3%83%83%20%3D%20%E3%82%B5"
            )),
            "検ヒム解塗ゃッ = サ"
@@ -22,7 +22,7 @@ mod passing {
    #[test]
    fn decode_file_url() {
        assert_eq!(
-            url::decode_url(str!("file:///tmp/space%20here/test%231.html")),
+            url::percent_decode(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!(
-            url::decode_url(str!(
+            url::percent_decode(str!(
                "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
            )),
            "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
--- a/src/tests/url/get_url_fragment.rs
+++ b/src/tests/url/get_url_fragment.rs
@@ -10,17 +10,7 @@ mod passing {
    use crate::url;

    #[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#"), "");
+    fn apostrophe() {
+        assert_eq!(url::percent_encode(str!("'")), "%27");
    }
 }
--- a/src/tests/url/resolve_url.rs
+++ b/src/tests/url/resolve_url.rs
@@ -7,208 +7,196 @@

 #[cfg(test)]
 mod passing {
-    use url::ParseError;
+    use reqwest::Url;

    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")?;
-
+    fn basic_httsp_relative() {
        assert_eq!(
-            resolved_url.as_str(),
-            "https://www.kernel.org/category/signatures.html"
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org").unwrap(),
+                "category/signatures.html"
+            )
+            .as_str(),
+            Url::parse("https://www.kernel.org/category/signatures.html")
+                .unwrap()
+                .as_str()
        );
-
-        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",
-        )?;
-
+    fn basic_httsp_absolute() {
        assert_eq!(
-            resolved_url.as_str(),
-            "https://www.kernel.org/category/signatures.html"
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org").unwrap(),
+                "/category/signatures.html"
+            )
+            .as_str(),
+            Url::parse("https://www.kernel.org/category/signatures.html")
+                .unwrap()
+                .as_str()
        );
-
-        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",
-        )?;
-
+    fn from_https_to_level_up_relative() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org").unwrap(),
+                "../category/signatures.html"
+            )
+            .as_str(),
+            Url::parse("https://www.kernel.org/category/signatures.html")
+                .unwrap()
+                .as_str()
+        );
+    }
+
+    #[test]
+    fn from_https_url_to_url_with_no_protocol() {
+        assert_eq!(
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org").unwrap(),
+                "//www.kernel.org/theme/images/logos/tux.png",
+            )
+            .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",
-        )?;
-
+    fn from_https_url_to_url_with_no_protocol_and_on_different_hostname() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org").unwrap(),
+                "//another-host.org/theme/images/logos/tux.png",
+            )
+            .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",
-        )?;
-
+    fn from_https_url_to_absolute_path() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("https://www.kernel.org/category/signatures.html").unwrap(),
+                "/theme/images/logos/tux.png",
+            )
+            .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",
-        )?;
-
+    fn from_https_to_just_filename() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("https://www.w3schools.com/html/html_iframe.asp").unwrap(),
+                "default.asp",
+            )
+            .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",
-        )?;
-
+    fn from_data_url_to_https() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h")
+                    .unwrap(),
+                "https://www.kernel.org/category/signatures.html",
+            )
+            .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",
-        )?;
-
+    fn from_data_url_to_data_url() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h")
+                    .unwrap(),
+                "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K",
+            )
+            .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!());
-
+    fn from_file_url_to_relative_path() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("file:///home/user/Websites/my-website/index.html").unwrap(),
+                "assets/images/logo.png",
+            )
+            .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!());
-
+    fn from_file_url_to_relative_path_with_backslashes() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("file:\\\\\\home\\user\\Websites\\my-website\\index.html").unwrap(),
+                "assets\\images\\logo.png",
+            )
+            .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!());
-
+    fn from_data_url_to_file_url() {
        assert_eq!(
-            resolved_url.as_str(),
+            url::resolve_url(
+                &Url::parse("data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h")
+                    .unwrap(),
+                "file:///etc/passwd",
+            )
+            .as_str(),
+            "file:///etc/passwd"
+        );
+    }
+
+    #[test]
+    fn preserve_fragment() {
+        assert_eq!(
+            url::resolve_url(
+                &Url::parse("http://doesnt-matter.local/").unwrap(),
+                "css/fonts/fontmarvelous.svg#fontmarvelous",
+            )
+            .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) {
+    fn resolve_from_file_url_to_file_url() {
+        if cfg!(windows) {
+            assert_eq!(
+                url::resolve_url(
+                    &Url::parse("file:///c:/index.html").unwrap(),
+                    "file:///c:/image.png"
+                )
+                .as_str(),
                "file:///c:/image.png"
-            } else {
+            );
+        } else {
+            assert_eq!(
+                url::resolve_url(
+                    &Url::parse("file:///tmp/index.html").unwrap(),
+                    "file:///tmp/image.png"
+                )
+                .as_str(),
                "file:///tmp/image.png"
-            }
-        );
-
-        Ok(())
+            );
+        }
    }
 }

@@ -221,19 +209,20 @@ mod passing {

 #[cfg(test)]
 mod failing {
+    use reqwest::Url;
+
    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(())
+    fn from_data_url_to_url_with_no_protocol() {
+        assert_eq!(
+            url::resolve_url(
+                &Url::parse("data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h")
+                    .unwrap(),
+                "//www.w3schools.com/html/html_iframe.asp",
+            )
+            .as_str(),
+            "data:,"
+        );
    }
 }
--- a/src/tests/url/url_with_fragment.rs
+++ b/src/tests/url/url_with_fragment.rs
@@ -1,40 +0,0 @@
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[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"
-        );
-    }
-}
--- a/src/tests/utils/detect_media_type.rs
+++ b/src/tests/utils/detect_media_type.rs
@@ -7,131 +7,171 @@

 #[cfg(test)]
 mod passing {
+    use reqwest::Url;
+
    use crate::utils;

    #[test]
    fn image_gif87() {
-        assert_eq!(utils::detect_media_type(b"GIF87a", ""), "image/gif");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(utils::detect_media_type(b"GIF87a", &dummy_url), "image/gif");
    }

    #[test]
    fn image_gif89() {
-        assert_eq!(utils::detect_media_type(b"GIF89a", ""), "image/gif");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(utils::detect_media_type(b"GIF89a", &dummy_url), "image/gif");
    }

    #[test]
    fn image_jpeg() {
-        assert_eq!(utils::detect_media_type(b"\xFF\xD8\xFF", ""), "image/jpeg");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"\xFF\xD8\xFF", &dummy_url),
+            "image/jpeg"
+        );
    }

    #[test]
    fn image_png() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", ""),
+            utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", &dummy_url),
            "image/png"
        );
    }

    #[test]
    fn image_svg() {
-        assert_eq!(utils::detect_media_type(b"<svg ", ""), "image/svg+xml");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"<svg ", &dummy_url),
+            "image/svg+xml"
+        );
    }

    #[test]
    fn image_webp() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"RIFF....WEBPVP8 ", ""),
+            utils::detect_media_type(b"RIFF....WEBPVP8 ", &dummy_url),
            "image/webp"
        );
    }

    #[test]
    fn image_icon() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"\x00\x00\x01\x00", ""),
+            utils::detect_media_type(b"\x00\x00\x01\x00", &dummy_url),
            "image/x-icon"
        );
    }

    #[test]
    fn image_svg_filename() {
+        let file_url: Url = Url::parse("file:///tmp/local-file.svg").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"<?xml ", "local-file.svg"),
+            utils::detect_media_type(b"<?xml ", &file_url),
            "image/svg+xml"
        );
    }

    #[test]
    fn image_svg_url_uppercase() {
-        assert_eq!(
-            utils::detect_media_type(b"", "https://some-site.com/images/local-file.SVG"),
-            "image/svg+xml"
-        );
+        let https_url: Url = Url::parse("https://some-site.com/images/local-file.SVG").unwrap();
+        assert_eq!(utils::detect_media_type(b"", &https_url), "image/svg+xml");
    }

    #[test]
    fn audio_mpeg() {
-        assert_eq!(utils::detect_media_type(b"ID3", ""), "audio/mpeg");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(utils::detect_media_type(b"ID3", &dummy_url), "audio/mpeg");
    }

    #[test]
    fn audio_mpeg_2() {
-        assert_eq!(utils::detect_media_type(b"\xFF\x0E", ""), "audio/mpeg");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"\xFF\x0E", &dummy_url),
+            "audio/mpeg"
+        );
    }

    #[test]
    fn audio_mpeg_3() {
-        assert_eq!(utils::detect_media_type(b"\xFF\x0F", ""), "audio/mpeg");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"\xFF\x0F", &dummy_url),
+            "audio/mpeg"
+        );
    }

    #[test]
    fn audio_ogg() {
-        assert_eq!(utils::detect_media_type(b"OggS", ""), "audio/ogg");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(utils::detect_media_type(b"OggS", &dummy_url), "audio/ogg");
    }

    #[test]
    fn audio_wav() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"RIFF....WAVEfmt ", ""),
+            utils::detect_media_type(b"RIFF....WAVEfmt ", &dummy_url),
            "audio/wav"
        );
    }

    #[test]
    fn audio_flac() {
-        assert_eq!(utils::detect_media_type(b"fLaC", ""), "audio/x-flac");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"fLaC", &dummy_url),
+            "audio/x-flac"
+        );
    }

    #[test]
    fn video_avi() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"RIFF....AVI LIST", ""),
+            utils::detect_media_type(b"RIFF....AVI LIST", &dummy_url),
            "video/avi"
        );
    }

    #[test]
    fn video_mp4() {
-        assert_eq!(utils::detect_media_type(b"....ftyp", ""), "video/mp4");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"....ftyp", &dummy_url),
+            "video/mp4"
+        );
    }

    #[test]
    fn video_mpeg() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"\x00\x00\x01\x0B", ""),
+            utils::detect_media_type(b"\x00\x00\x01\x0B", &dummy_url),
            "video/mpeg"
        );
    }

    #[test]
    fn video_quicktime() {
-        assert_eq!(utils::detect_media_type(b"....moov", ""), "video/quicktime");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"....moov", &dummy_url),
+            "video/quicktime"
+        );
    }

    #[test]
    fn video_webm() {
+        let dummy_url: Url = Url::parse("data:,").unwrap();
        assert_eq!(
-            utils::detect_media_type(b"\x1A\x45\xDF\xA3", ""),
+            utils::detect_media_type(b"\x1A\x45\xDF\xA3", &dummy_url),
            "video/webm"
        );
    }
@@ -146,10 +186,16 @@ mod passing {

 #[cfg(test)]
 mod failing {
+    use reqwest::Url;
+
    use crate::utils;

    #[test]
    fn unknown_media_type() {
-        assert_eq!(utils::detect_media_type(b"abcdef0123456789", ""), "");
+        let dummy_url: Url = Url::parse("data:,").unwrap();
+        assert_eq!(
+            utils::detect_media_type(b"abcdef0123456789", &dummy_url),
+            ""
+        );
    }
 }
--- a/src/tests/utils/retrieve_asset.rs
+++ b/src/tests/utils/retrieve_asset.rs
@@ -8,9 +8,11 @@
 #[cfg(test)]
 mod passing {
    use reqwest::blocking::Client;
+    use reqwest::Url;
    use std::collections::HashMap;
    use std::env;

+    use crate::opts::Options;
    use crate::url;
    use crate::utils;

@@ -19,24 +21,35 @@ mod passing {
        let cache = &mut HashMap::new();
        let client = Client::new();

+        let mut options = Options::default();
+        options.silent = true;
+
        // If both source and target are data URLs,
-        // ensure the result contains target data URL
+        //  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,
+            &Url::parse("data:text/html;base64,c291cmNl").unwrap(),
+            &Url::parse("data:text/html;base64,dGFyZ2V0").unwrap(),
+            &options,
            0,
        )
        .unwrap();
        assert_eq!(
-            url::data_to_data_url(&media_type, &data, &final_url),
-            url::data_to_data_url("text/html", "target".as_bytes(), "")
+            url::create_data_url(&media_type, &data, &final_url),
+            url::create_data_url(
+                "text/html",
+                "target".as_bytes(),
+                &Url::parse("data:text/html;base64,c291cmNl").unwrap()
+            )
        );
        assert_eq!(
            final_url,
-            url::data_to_data_url("text/html", "target".as_bytes(), "")
+            url::create_data_url(
+                "text/html",
+                "target".as_bytes(),
+                &Url::parse("data:text/html;base64,c291cmNl").unwrap()
+            )
        );
        assert_eq!(&media_type, "text/html");
    }
@@ -46,6 +59,9 @@ mod passing {
        let cache = &mut HashMap::new();
        let client = Client::new();

+        let mut options = Options::default();
+        options.silent = true;
+
        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };

        // Inclusion of local assets from local sources should be allowed
@@ -53,28 +69,31 @@ mod passing {
        let (data, final_url, _media_type) = utils::retrieve_asset(
            cache,
            &client,
-            &format!(
+            &Url::parse(&format!(
                "{file}{cwd}/src/tests/data/basic/local-file.html",
                file = file_url_protocol,
                cwd = cwd.to_str().unwrap()
-            ),
-            &format!(
+            ))
+            .unwrap(),
+            &Url::parse(&format!(
                "{file}{cwd}/src/tests/data/basic/local-script.js",
                file = file_url_protocol,
                cwd = cwd.to_str().unwrap()
-            ),
-            false,
+            ))
+            .unwrap(),
+            &options,
            0,
        )
        .unwrap();
-        assert_eq!(url::data_to_data_url("application/javascript", &data, &final_url), "data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==");
+        assert_eq!(url::create_data_url("application/javascript", &data, &final_url), Url::parse("data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==").unwrap());
        assert_eq!(
-            &final_url,
-            &format!(
+            final_url,
+            Url::parse(&format!(
                "{file}{cwd}/src/tests/data/basic/local-script.js",
                file = file_url_protocol,
                cwd = cwd.to_str().unwrap()
-            )
+            ))
+            .unwrap()
        );
    }
 }
@@ -89,8 +108,10 @@ mod passing {
 #[cfg(test)]
 mod failing {
    use reqwest::blocking::Client;
+    use reqwest::Url;
    use std::collections::HashMap;

+    use crate::opts::Options;
    use crate::utils;

    #[test]
@@ -98,13 +119,16 @@ mod failing {
        let cache = &mut HashMap::new();
        let client = Client::new();

+        let mut options = Options::default();
+        options.silent = true;
+
        // 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,
+            &Url::parse("data:text/html;base64,SoUrCe").unwrap(),
+            &Url::parse("file:///etc/passwd").unwrap(),
+            &options,
            0,
        ) {
            Ok((..)) => {
@@ -121,13 +145,16 @@ mod failing {
        let cache = &mut HashMap::new();
        let client = Client::new();

+        let mut options = Options::default();
+        options.silent = true;
+
        // Inclusion of local assets from remote sources should not be allowed
        match utils::retrieve_asset(
            cache,
            &client,
-            "https://kernel.org/",
-            "file:///etc/passwd",
-            false,
+            &Url::parse("https://kernel.org/").unwrap(),
+            &Url::parse("file:///etc/passwd").unwrap(),
+            &options,
            0,
        ) {
            Ok((..)) => {
--- a/src/url.rs
+++ b/src/url.rs
@@ -1,47 +1,50 @@
 use base64;
-use url::{form_urlencoded, ParseError, Url};
+use url::{form_urlencoded, 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();
+pub fn clean_url(url: Url) -> Url {
+    let mut url = url.clone();

-    // Clear fragment
+    // Clear fragment (if any)
    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
+    url
 }

-pub fn data_to_data_url(media_type: &str, data: &[u8], url: &str) -> String {
+pub fn create_data_url(media_type: &str, data: &[u8], final_asset_url: &Url) -> Url {
    let media_type: String = if media_type.is_empty() {
-        detect_media_type(data, &url)
+        detect_media_type(data, &final_asset_url)
    } else {
        media_type.to_string()
    };

-    format!("data:{};base64,{}", media_type, base64::encode(data))
+    let mut data_url: Url = Url::parse("data:,").unwrap();
+
+    data_url.set_path(format!("{};base64,{}", media_type, base64::encode(data)).as_str());
+
+    data_url
 }

-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();
+pub fn is_url_and_has_protocol(input: &str) -> bool {
+    match Url::parse(&input) {
+        Ok(parsed_url) => {
+            return parsed_url.scheme().len() > 0;
+        }
+        Err(_) => {
+            return false;
+        }
+    }
+}
+
+pub fn parse_data_url(url: &Url) -> (String, Vec<u8>) {
+    let path: String = 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 text: String = percent_decode(raw_data);

    let meta_data_items: Vec<&str> = meta_data.split(';').collect();
    let mut media_type: String = str!();
@@ -72,7 +75,7 @@ pub fn data_url_to_data<T: AsRef<str>>(url: T) -> (String, Vec<u8>) {
    (media_type, data)
 }

-pub fn decode_url(input: String) -> String {
+pub fn percent_decode(input: String) -> String {
    let input: String = input.replace("+", "%2B");

    form_urlencoded::parse(input.as_bytes())
@@ -91,78 +94,16 @@ pub fn decode_url(input: String) -> String {
        .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 percent_encode(input: String) -> String {
+    form_urlencoded::byte_serialize(input.as_bytes()).collect()
 }

-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 resolve_url(from: &Url, to: &str) -> Url {
+    match Url::parse(&to) {
+        Ok(parsed_url) => parsed_url,
+        Err(_) => match from.join(to) {
+            Ok(joined) => joined,
+            Err(_) => Url::parse("data:,").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
-}
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -2,12 +2,14 @@ use reqwest::blocking::Client;
 use reqwest::header::CONTENT_TYPE;
 use std::collections::HashMap;
 use std::fs;
-use std::path::Path;
+use std::path::{Path, PathBuf};
+use url::Url;

-use crate::url::{clean_url, data_url_to_data, file_url_to_fs_path, is_data_url, is_file_url};
-
-const INDENT: &str = " ";
+use crate::opts::Options;
+use crate::url::{clean_url, parse_data_url};

+const ANSI_COLOR_RED: &'static str = "\x1b[31m";
+const ANSI_COLOR_RESET: &'static str = "\x1b[0m";
 const MAGIC: [[&[u8]; 2]; 18] = [
    // Image
    [b"GIF87a", b"image/gif"],
@@ -31,23 +33,16 @@ const MAGIC: [[&[u8]; 2]; 18] = [
    [b"....moov", b"video/quicktime"],
    [b"\x1A\x45\xDF\xA3", b"video/webm"],
 ];
+const PLAINTEXT_MEDIA_TYPES: &[&str] = &["application/javascript", "image/svg+xml"];

-const PLAINTEXT_MEDIA_TYPES: &[&str] = &[
-    "image/svg+xml",
-    "text/css",
-    "text/html",
-    "text/javascript",
-    "text/plain",
-];
-
-pub fn detect_media_type(data: &[u8], url: &str) -> String {
-    for item in MAGIC.iter() {
-        if data.starts_with(item[0]) {
-            return String::from_utf8(item[1].to_vec()).unwrap();
+pub fn detect_media_type(data: &[u8], url: &Url) -> String {
+    for magic_item in MAGIC.iter() {
+        if data.starts_with(magic_item[0]) {
+            return String::from_utf8(magic_item[1].to_vec()).unwrap();
        }
    }

-    if url.to_lowercase().ends_with(".svg") {
+    if url.path().to_lowercase().ends_with(".svg") {
        return str!("image/svg+xml");
    }

@@ -55,99 +50,180 @@ pub fn detect_media_type(data: &[u8], url: &str) -> String {
 }

 pub fn is_plaintext_media_type(media_type: &str) -> bool {
-    PLAINTEXT_MEDIA_TYPES.contains(&media_type.to_lowercase().as_str())
+    media_type.to_lowercase().as_str().starts_with("text/")
+        || PLAINTEXT_MEDIA_TYPES.contains(&media_type.to_lowercase().as_str())
 }

 pub fn indent(level: u32) -> String {
-    let mut result = str!();
+    let mut result: String = String::new();
    let mut l: u32 = level;
+
    while l > 0 {
-        result += INDENT;
+        result += " ";
        l -= 1;
    }
+
    result
 }

 pub fn retrieve_asset(
    cache: &mut HashMap<String, Vec<u8>>,
    client: &Client,
-    parent_url: &str,
-    url: &str,
-    opt_silent: bool,
+    parent_url: &Url,
+    url: &Url,
+    options: &Options,
    depth: u32,
-) -> Result<(Vec<u8>, String, String), reqwest::Error> {
-    if url.len() == 0 {
-        // Provoke error
-        client.get("").send()?;
-    }
-
-    if is_data_url(&url) {
-        let (media_type, data) = data_url_to_data(url);
-        Ok((data, url.to_string(), media_type))
-    } else if is_file_url(&url) {
-        // Check if parent_url is also file:///
-        // (if not, then we don't embed the asset)
-        if !is_file_url(&parent_url) {
+) -> Result<(Vec<u8>, Url, String), reqwest::Error> {
+    if url.scheme() == "data" {
+        let (media_type, data) = parse_data_url(url);
+        Ok((data, url.clone(), media_type))
+    } else if url.scheme() == "file" {
+        // Check if parent_url is also file:/// (if not, then we don't embed the asset)
+        if parent_url.scheme() != "file" {
+            if !options.silent {
+                eprintln!(
+                    "{}{}{} ({}){}",
+                    indent(depth).as_str(),
+                    if options.no_color { "" } else { ANSI_COLOR_RED },
+                    &url,
+                    "Security Error",
+                    if options.no_color {
+                        ""
+                    } else {
+                        ANSI_COLOR_RESET
+                    },
+                );
+            }
            // Provoke error
            client.get("").send()?;
        }

-        let fs_file_path: String = file_url_to_fs_path(url);
-        let path = Path::new(&fs_file_path);
+        let path_buf: PathBuf = url.to_file_path().unwrap().clone();
+        let path: &Path = path_buf.as_path();
        if path.exists() {
-            if !opt_silent {
-                eprintln!("{}{}", indent(depth).as_str(), &url);
+            if path.is_dir() {
+                if !options.silent {
+                    eprintln!(
+                        "{}{}{} (is a directory){}",
+                        indent(depth).as_str(),
+                        if options.no_color { "" } else { ANSI_COLOR_RED },
+                        &url,
+                        if options.no_color {
+                            ""
+                        } else {
+                            ANSI_COLOR_RESET
+                        },
+                    );
+                }
+
+                // Provoke error
+                Err(client.get("").send().unwrap_err())
+            } else {
+                if !options.silent {
+                    eprintln!("{}{}", indent(depth).as_str(), &url);
+                }
+
+                Ok((fs::read(&path).expect(""), url.clone(), str!()))
+            }
+        } else {
+            if !options.silent {
+                eprintln!(
+                    "{}{}{} (not found){}",
+                    indent(depth).as_str(),
+                    if options.no_color { "" } else { ANSI_COLOR_RED },
+                    &url,
+                    if options.no_color {
+                        ""
+                    } else {
+                        ANSI_COLOR_RESET
+                    },
+                );
            }

-            Ok((fs::read(&fs_file_path).expect(""), url.to_string(), str!()))
-        } else {
            // Provoke error
            Err(client.get("").send().unwrap_err())
        }
    } else {
-        let cache_key: String = clean_url(&url);
+        let cache_key: String = clean_url(url.clone()).as_str().to_string();

        if cache.contains_key(&cache_key) {
-            // URL is in cache, we get and return it
-            if !opt_silent {
+            // URL is in cache,
+            //  we get and return it
+            if !options.silent {
                eprintln!("{}{} (from cache)", indent(depth).as_str(), &url);
            }

-            Ok((
-                cache.get(&cache_key).unwrap().to_vec(),
-                url.to_string(),
-                str!(),
-            ))
+            Ok((cache.get(&cache_key).unwrap().to_vec(), url.clone(), str!()))
        } else {
-            // URL not in cache, we retrieve the file
-            let mut response = client.get(url).send()?;
-            let res_url = response.url().to_string();
+            // URL not in cache,
+            //  we retrieve the file
+            match client.get(url.as_str()).send() {
+                Ok(mut response) => {
+                    if !options.ignore_errors && response.status() != 200 {
+                        if !options.silent {
+                            eprintln!(
+                                "{}{}{} ({}){}",
+                                indent(depth).as_str(),
+                                if options.no_color { "" } else { ANSI_COLOR_RED },
+                                &url,
+                                response.status(),
+                                if options.no_color {
+                                    ""
+                                } else {
+                                    ANSI_COLOR_RESET
+                                },
+                            );
+                        }
+                        // Provoke error
+                        return Err(client.get("").send().unwrap_err());
+                    }

-            if !opt_silent {
-                if url == res_url {
-                    eprintln!("{}{}", indent(depth).as_str(), &url);
-                } else {
-                    eprintln!("{}{} -> {}", indent(depth).as_str(), &url, &res_url);
+                    if !options.silent {
+                        if url.as_str() == response.url().as_str() {
+                            eprintln!("{}{}", indent(depth).as_str(), &url);
+                        } else {
+                            eprintln!("{}{} -> {}", indent(depth).as_str(), &url, &response.url());
+                        }
+                    }
+
+                    let new_cache_key: String = clean_url(response.url().clone()).to_string();
+
+                    // Convert response into a byte array
+                    let mut data: Vec<u8> = vec![];
+                    response.copy_to(&mut data).unwrap();
+
+                    // Attempt to obtain media type by reading Content-Type header
+                    let media_type: &str = response
+                        .headers()
+                        .get(CONTENT_TYPE)
+                        .and_then(|header| header.to_str().ok())
+                        .unwrap_or("");
+
+                    // Add retrieved resource to cache
+                    cache.insert(new_cache_key, data.clone());
+
+                    // Return
+                    Ok((data, response.url().clone(), media_type.to_string()))
+                }
+                Err(error) => {
+                    if !options.silent {
+                        eprintln!(
+                            "{}{}{} ({}){}",
+                            indent(depth).as_str(),
+                            if options.no_color { "" } else { ANSI_COLOR_RED },
+                            &url,
+                            error,
+                            if options.no_color {
+                                ""
+                            } else {
+                                ANSI_COLOR_RESET
+                            },
+                        );
+                    }
+
+                    Err(client.get("").send().unwrap_err())
                }
            }
-
-            let new_cache_key: String = clean_url(&res_url);
-
-            // Convert response into a byte array
-            let mut data: Vec<u8> = vec![];
-            response.copy_to(&mut data)?;
-
-            // Attempt to obtain media type by reading the Content-Type header
-            let media_type = response
-                .headers()
-                .get(CONTENT_TYPE)
-                .and_then(|header| header.to_str().ok())
-                .unwrap_or("");
-
-            // Add to cache
-            cache.insert(new_cache_key, data.clone());
-
-            Ok((data, res_url, media_type.to_string()))
        }
    }
 }
--- a/utils/run-in-container.sh
+++ b/utils/run-in-container.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+DOCKER=docker
+PROG_NAME=monolith
+
+if which podman 2>&1 > /dev/null; then
+    DOCKER=podman
+fi
+
+$DOCKER run --rm Y2Z/$PROG_NAME $PROG_NAME "$@"
Author	SHA1	Message	Date
Sunshine	22a031af5d	Merge pull request #256 from snshn/more-tests-fixes-and-improvements More tests, fixes, improvements	2021-06-02 04:06:37 -10:00
Sunshine	6e6a60b305	Merge branch 'master' into more-tests-fixes-and-improvements	2021-06-02 04:01:41 -10:00
Sunshine	77d6022d84	bump version (2.4.1 -> 2.5.0)	2021-06-02 04:00:18 -10:00
Sunshine	5db19d1a3e	update dependencies	2021-06-02 03:58:28 -10:00
Sunshine	a6e891b3c5	add more tests	2021-06-02 03:41:41 -10:00
Sunshine	d7a82a008b	Merge pull request #260 from snshn/ie-css-hack-fix Remove optional trailing space from CSS idents	2021-05-28 23:04:34 -10:00
Sunshine	2369a4dd3c	remove optional trailing space from CSS idents	2021-05-28 12:03:19 -10:00
Sunshine	d27e53fb36	Merge pull request #259 from snshn/related-project-monk Add Monk to related projects in README.md	2021-05-24 10:54:11 -10:00
Sunshine	2cb51477d2	add Monk to related projects in README.md	2021-05-24 01:47:19 -10:00
Sunshine	a308a20411	simplify code of CLI tests	2021-03-15 20:10:50 -10:00
Sunshine	a6ddf1c13a	simplify code responsible for processing CSS	2021-03-14 19:42:57 -10:00
Sunshine	8256d17efd	Merge pull request #253 from snshn/unwrap-noscript Make possible to unwrap NOSCRIPT nodes	2021-03-11 22:43:28 -10:00
Sunshine	efa12935ba	Merge pull request #254 from snshn/no-containers-md Get rid of containers.md (now part of README.md)	2021-03-11 22:39:49 -10:00
Sunshine	7126a98023	Merge pull request #255 from snshn/pkgsrc Add installation instructions using pkgsrc	2021-03-11 22:38:33 -10:00
Sunshine	c7ee3ec6e2	get rid of containers.md (now part of README.md)	2021-03-11 22:27:44 -10:00
Sunshine	c4218031e2	add installation instructions using pkgsrc	2021-03-11 22:26:32 -10:00
Sunshine	6f918f6c1c	make possible to unwrap NOSCRIPT nodes	2021-03-11 18:18:39 -10:00
Sunshine	6ecda080e8	Merge pull request #252 from snshn/revamp Revamp codebase	2021-03-11 14:25:10 -10:00
Sunshine	2e86ee67a5	revamp codebase	2021-03-11 14:15:18 -10:00
Sunshine	359616b901	Update README.md	2021-03-09 16:04:32 -10:00
Sunshine	ea2cdab330	Update README.md	2021-03-09 15:52:23 -10:00
Sunshine	4434823c46	Update README.md	2021-03-09 14:49:10 -10:00
Sunshine	e0a78ffc9d	Update README.md	2021-03-09 13:31:15 -10:00
Sunshine	cbbb297473	Merge pull request #251 from snshn/bump-version-again Bump version number to 2.4.1	2021-03-09 02:17:17 -10:00
Sunshine	98ddb821a5	bump version number	2021-03-09 02:07:07 -10:00
Sunshine	be097b1d4e	Merge pull request #250 from snshn/alternate-stylesheets Embed alternate stylesheets	2021-03-09 01:58:08 -10:00
Sunshine	325688acf5	add test for alternate stylesheets	2021-03-09 01:48:41 -10:00
Sunshine	11207d49d2	embed alternate stylesheets	2021-03-09 01:46:15 -10:00
Sunshine	96da64e193	Merge pull request #247 from snshn/cc0 Change project license to CC0 1.0 Universal (CC0 1.0)	2021-03-01 13:28:49 -10:00
Sunshine	8a62a51210	Merge pull request #248 from snshn/update-container-instructions Running in container instructions update	2021-02-28 23:24:10 -10:00
Sunshine	a6ac1df93d	running in container instructions update	2021-02-28 21:46:38 -10:00
Sunshine	49e81149df	switch license to CC0-1.0	2021-02-28 19:54:46 -10:00
Sunshine	a3516b2ae9	Merge pull request #245 from snshn/change-meta-charset-to-utf-8 Forcefully set document's charset to UTF-8	2021-02-23 23:48:49 -10:00
Sunshine	385301bf16	clean up unused code	2021-02-23 23:39:51 -10:00
Sunshine	4921a70dda	Merge branch 'master' into change-meta-charset-to-utf-8	2021-02-23 23:38:03 -10:00
Sunshine	e0273c664a	forcefully set document's charset to UTF-8	2021-02-23 23:35:35 -10:00
Sunshine	6d629bfd4a	Merge pull request #244 from snshn/process-noscript Process contents of NOSCRIPT tags	2021-02-22 20:13:26 -10:00
Sunshine	ae9d78a891	process contents of NOSCRIPT tags	2021-02-22 19:42:39 -10:00
Sunshine	0f55fb3c49	Merge pull request #243 from snshn/fix-embedding-picture-srcset Fix embedding of srcset assets for PICTURE nodes	2021-02-22 16:27:22 -10:00
Sunshine	e41fd6a1c6	fix embedding of srcset for PICTURE nodes	2021-02-22 16:21:12 -10:00
Sunshine	eaf662bb3b	Update README.md	2021-02-15 15:38:06 -10:00
Sunshine	fa71f6a42c	Merge pull request #240 from snshn/color Add color to asset download log	2021-01-30 10:48:35 -10:00
Sunshine	9a27c6c5ee	add color to asset download log	2021-01-29 20:24:35 -10:00
Sunshine	4ad07c0519	Merge pull request #239 from snshn/update-crates Update dependencies	2021-01-29 17:27:43 -10:00
Sunshine	e78405f2ae	update dependencies	2021-01-29 17:19:38 -10:00
Sunshine	e81462be41	Merge pull request #237 from snshn/choco Add Chocolatey spec file	2020-12-31 15:32:27 -10:00
Sunshine	b972d717ce	add chocolatey spec	2020-12-31 15:30:41 -10:00
Sunshine	edb679d2b3	Merge pull request #236 from snshn/pipe-in-target-test Add test for stdin pipe	2020-12-31 14:44:57 -10:00
Sunshine	2e1462a953	add test for stdin pipe	2020-12-31 14:38:31 -10:00
Sunshine	57883b84b2	Merge pull request #235 from snshn/allow-empty-user-agent-string Make it possible to specify an empty user-agent string	2020-12-31 13:02:35 -10:00
Sunshine	4fa2eda983	make it possible to specify an empty user-agent string	2020-12-31 12:57:22 -10:00
Sunshine	028187a31e	Merge pull request #234 from snshn/update-dependencies Update crates	2020-12-28 12:11:25 -10:00
Sunshine	c469c30cbd	update crates	2020-12-28 12:04:27 -10:00
Sunshine	6de36243f9	Fix armhf build in cd.yml	2020-12-27 05:52:47 -10:00
Sunshine	4f162d0cc0	Update README.md	2020-12-25 22:59:24 -10:00
Sunshine	95040173fc	Merge pull request #233 from snshn/cargo-fix-license-identifier Fix license identifier in Cargo.toml	2020-12-25 22:42:31 -10:00
Sunshine	b10d41f82e	fix license identifier in Cargo.toml	2020-12-25 22:41:31 -10:00
Sunshine	4c2c55d166	Merge pull request #232 from snshn/fix-cargo-toml Reduce amount of keywords to 5 (max)	2020-12-25 22:34:08 -10:00
Sunshine	2dd1c465e4	reduce amount of keywords to 5 (max)	2020-12-25 22:28:19 -10:00
Sunshine	a5afda9c80	Merge pull request #229 from snshn/cargo-install Update Cargo.toml for publishing on crates.io	2020-12-25 22:15:13 -10:00
Sunshine	ab6fed6d1f	Merge pull request #231 from snshn/fix-srcset Fix srcset parsing	2020-12-25 22:07:45 -10:00
Sunshine	f8dcb335e7	bump version, make possible to install via cargo	2020-12-25 22:07:19 -10:00
Sunshine	913051870a	Merge pull request #230 from snshn/stdin Make possible to use stdin as input method	2020-12-25 21:58:14 -10:00
Sunshine	614a518475	fix srcset parsing	2020-12-25 21:56:40 -10:00
Sunshine	870a4b150e	make possible to use stdin as input method	2020-12-25 21:23:29 -10:00
Sunshine	0533b287b7	Merge pull request #228 from snshn/audio-video-support Add support for embedding video and audio files	2020-12-25 16:55:42 -10:00
Sunshine	4ba4285b6b	add support for embedding video and audio files	2020-12-25 16:49:43 -10:00
Sunshine	2b9caf9840	Merge pull request #227 from snshn/fix-trailing-comma-for-srcset-parsing Fix crash associated with trailing/repeating commas within srcset	2020-12-25 14:33:20 -10:00
Sunshine	8adf059980	fix crash associated with trailing/repeating commas within srcset	2020-12-25 14:24:52 -10:00
Sunshine	8ad252868e	Merge pull request #226 from snshn/base-tag-option Add base URL option	2020-12-25 13:02:05 -10:00
Sunshine	e145df372f	Merge branch 'master' into base-tag-option	2020-12-25 12:10:54 -10:00
Sunshine	816b6175ac	rewrite ADR #8 (Base Tag)	2020-12-25 12:06:56 -10:00
Sunshine	d89b4d5f5b	refactor code that processes the DOM	2020-12-25 11:09:47 -10:00
Sunshine	15d98a7269	don't modify base url by default, add option for setting it	2020-12-24 18:38:44 -10:00
Sunshine	36e82cb511	Update README.md	2020-12-13 08:42:41 -10:00
Sunshine	1b1befd7b0	Merge pull request #222 from snshn/readme-no-metadata-info Add description of -M option to README.md	2020-12-09 21:29:33 -05:00
Sunshine	a2f59b4418	Update README.md	2020-12-09 16:23:17 -10:00
Sunshine	124a62920f	Merge pull request #221 from snshn/related-project-hako Add Hako	2020-12-09 07:54:52 -05:00
Sunshine	f557504bed	Update README.md Add Hako to the list of related projects	2020-12-08 17:02:09 -10:00
Sunshine	5ac520b4da	Merge pull request #219 from snshn/ignore-network-errors-option Account for network errors	2020-11-22 17:54:30 -10:00
Sunshine	7a97291498	add ADR 7 (Network errors)	2020-11-22 17:20:37 -10:00
Sunshine	38a6f963ad	account for network errors, add option to ignore them	2020-11-22 16:49:26 -10:00
Sunshine	052f8f49ec	Merge pull request #218 from snshn/update-crates Update crates	2020-11-20 00:36:33 -10:00
Sunshine	08de486382	use newer dependencies	2020-11-20 00:30:05 -10:00
Sunshine	c0e0a69773	Merge pull request #214 from zfhrp6/remove_use_unused_opts remove unused import opts::Options;	2020-11-04 01:04:38 -08:00
Sunshine	1636540693	Merge pull request #216 from zfhrp6/suppress_deprecation_of_dependency update clap 2.33.1 -> 2.33.3	2020-11-02 19:03:43 -08:00
zfhrp	3e80cb02ce	update clap 2.33.1 -> 2.33.3	2020-11-02 00:11:41 +09:00
zfhrp	a296531b3f	remove unused import opts::Options;	2020-11-01 23:04:08 +09:00
				`@@ -0,0 +1 @@`
				`<body><noscript><img src="image.svg" /></noscript></body>`
				`@@ -0,0 +1 @@`
				`<body><noscript><h1>JS is not active</h1><noscript><img src="image.svg" /></noscript></noscript></body>`
				`@@ -0,0 +1 @@`
				`<body><noscript><script>alert(1);</script><img src="image.svg" /></noscript></body>`
				`@@ -0,0 +1 @@`
				`<div style="background-image: url('image.svg')"></div>`