Merge pull request #157 from snshn/2-2-3

Upgrade base64 crate & version bump (2.2.2 → 2.2.3)

.github/workflows/build_gnu_linux.yml

@@ -0,0 +1,22 @@
+name: GNU/Linux
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+        rust:
+          - stable
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - run: git config --global core.autocrlf false
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --all --locked --verbose

.github/workflows/build_macos.yml

@@ -0,0 +1,22 @@
+name: macOS
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+        rust:
+          - stable
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - run: git config --global core.autocrlf false
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --all --locked --verbose

.github/workflows/build_windows.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Windows
 
 on:
   push:
@@ -10,8 +10,6 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
-          - macos-latest
           - windows-latest
         rust:
           - stable

.github/workflows/cd.yml

@@ -1,23 +1,43 @@
+# CD GitHub Actions workflow for Monolith
+
 name: CD
 
 on:
   release:
-    types: [created]
+    types:
+    - created
 
 jobs:
+
   windows:
     runs-on: windows-latest
-
     steps:
     - run: git config --global core.autocrlf false
     - name: Checkout the repository
-      uses: actions/checkout@master
-    - name: Build the executable
-      run: cargo build --all --locked
-    - name: Perform local installation
-      run: cargo install --force --locked --path .
+      uses: actions/checkout@v2
+    - name: Build and install the executable
+      run: cargo build --release
     - uses: Shopify/upload-to-release@1.0.0
       with:
         name: monolith.exe
-        path: C:\Users\runneradmin\.cargo\bin\monolith.exe
+        path: target\release\monolith.exe
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+  gnu_linux_armhf:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the repository
+      uses: actions/checkout@v2
+    - name: Prepare cross-platform environment
+      run: |
+        rustup target add arm-unknown-linux-gnueabihf
+        git clone https://github.com/raspberrypi/tools.git rpi_tools
+    - name: Build and install the executable
+      run: |
+        export RUSTFLAGS="-C linker=rpi_tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc"
+        cargo build --release --target=arm-unknown-linux-gnueabihf
+    - uses: Shopify/upload-to-release@1.0.0
+      with:
+        name: monolith-gnu-linux-armhf
+        path: target/arm-unknown-linux-gnueabihf/release/monolith
         repo-token: ${{ secrets.GITHUB_TOKEN }}

Cargo.lock

@@ -61,6 +61,11 @@ name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "base64"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -568,10 +573,10 @@ dependencies = [
 
 [[package]]
 name = "monolith"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
  "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1501,6 +1506,7 @@ dependencies = [
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+"checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum bumpalo 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe2567a8d8a3aedb4e39aa39e186d5673acfd56393c6ac83b2bc5bd82f4369c"
 "checksum bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "monolith"
-version = "2.2.2"
+version = "2.2.3"
 edition = "2018"
 authors = [
     "Sunshine <sunshine@uberspace.net>",
@@ -12,7 +12,7 @@ authors = [
 description = "CLI tool for saving web pages as a single HTML file"
 
 [dependencies]
-base64 = "0.11.0"
+base64 = "0.12.0"
 clap = "2.33.0"
 cssparser = "0.27.2"
 html5ever = "0.24.1"

README.md

@@ -1,4 +1,6 @@
-[![GitHub Actions Build Status](https://github.com/Y2Z/monolith/workflows/Build/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3ABuild)
+[![Monolith Build Status for GNU/Linux](https://github.com/Y2Z/monolith/workflows/GNU%2FLinux/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AGNU%2FLinux)
+[![Monolith Build Status for macOS](https://github.com/Y2Z/monolith/workflows/macOS/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AmacOS)
+[![Monolith Build Status for Windows](https://github.com/Y2Z/monolith/workflows/Windows/badge.svg)](https://github.com/Y2Z/monolith/actions?query=workflow%3AWindows)
 
 ```
  ___     ___________    __________      ___________________    ___
@@ -10,9 +12,9 @@
 |___|   |__________|  \____________________|   |___|   |___|  |___|
 ```
 
-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.
+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.
+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 with `wget -mpk`, this tool embeds all assets as data URLs and therefore lets browsers render the saved page exactly the way it was on the Internet, even when no network connection is available.
 
@@ -20,20 +22,20 @@ If compared to saving websites with `wget -mpk`, this tool embeds all assets as
 
 ## Installation
 
-#### With Homebrew (on macOS and GNU/Linux)
+#### Via Homebrew (on macOS and GNU/Linux)
     $ brew install monolith
 
 #### Using Snapcraft (on GNU/Linux)
     $ snap install monolith
 
-#### Via Docker
-The guide can be found [here](docs/containers.md)
-
 #### From source
     $ git clone https://github.com/Y2Z/monolith.git
     $ cd monolith
     $ make install
 
+#### With Docker
+The guide can be found [here](docs/containers.md)
+
 ---------------------------------------------------
 
 ## Usage
@@ -78,4 +80,4 @@ The Unlicense
 ---------------------------------------------------
 
 <!-- Microtext -->
-<sub>Keep in mind that `monolith` is not aware of your browser's session</sub>
+<sub>Keep in mind that `monolith` is not aware of your browser’s session</sub>

src/css.rs

@@ -217,17 +217,21 @@ pub fn process_css<'a>(
                 ref unit_value,
                 ..
             } => {
-                if *has_sign {
-                    result.push_str("-");
+                if *has_sign && *unit_value >= 0. {
+                    result.push_str("+");
                 }
                 result.push_str(str!(unit_value * 100.).as_str());
                 result.push_str("%");
             }
             Token::Dimension {
+                ref has_sign,
                 ref value,
                 ref unit,
                 ..
             } => {
+                if *has_sign && *value >= 0. {
+                    result.push_str("+");
+                }
                 result.push_str(str!(value).as_str());
                 result.push_str(str!(unit).as_str());
             }

src/tests/css/embed_css.rs

@@ -197,3 +197,30 @@ body {\n    \
         CSS
     );
 }
+
+#[test]
+fn passing_transform_percentages_and_degrees() {
+    let cache = &mut HashMap::new();
+    let client = Client::new();
+
+    const CSS: &str = "\
+div {\n    \
+    transform: translate(-50%, -50%) rotate(-45deg);\n\
+    transform: translate(50%, 50%) rotate(45deg);\n\
+    transform: translate(+50%, +50%) rotate(+45deg);\n\
+}\n\
+\n\
+";
+
+    assert_eq!(
+        css::embed_css(
+            cache,
+            &client,
+            "https://doesntmatter.local/",
+            &CSS,
+            false,
+            true,
+        ),
+        CSS
+    );
+}