jekyll-favicon 1.0.0.pre.2 → 1.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19375fbd665cb27681d89f590ee75312136a775d623beec4303e42e974f60636
-  data.tar.gz: d72579b9e971436a3774bdcbf6d20bb1457f50f4e6e682648c85d6434efb3326
+  metadata.gz: 2143f5ca47523996edd21924f528455195a44924ce70ff0769bff1a1945c5e1d
+  data.tar.gz: b51d9acfbad24d42d244a0e2d0cf992eb2f1c3e22742228887a1da08893d1444
 SHA512:
-  metadata.gz: efaf8c6a2e8e2a09ef3e52c7e3f128c5fa6cb3326dcc7a439b6aab4514e6e88d5581f218112e69dbe124a0d0434f49e12d9c92d25f892e4760193cbf5a77e30d
-  data.tar.gz: c21ad3577929122b8b83bd9befc63ed9abe58a6c48c949d6203acbe656fecb3303c15502982146bcb341d5a4bad4d14fc673ac1603d0ed723aaa21c792ccd77c
+  metadata.gz: eeb8f081b15aba2072554ced2a44838b59405aa6e4c1cd56e4cb605bf98eda5a27cd54c78d2ebeaebdb4f8bd03b18da10558f76a2a9c6c37b88a31faf309a820
+  data.tar.gz: 0203d4422b676347b4d398735201dc38b238113176e8d8f80af8e86acee013d13bea905070d79e6154ece2dec095583b33b9e8fc8d26f3dad544ad589ffe9bc9

data/.devcontainer/Dockerfile

@@ -11,7 +11,9 @@ RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/l
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends imagemagick librsvg2-bin
+    && apt-get -y install librsvg2-bin
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install imagemagick
 
 # [Optional] Uncomment this line to install additional gems.
 RUN gem install reek standard webrick

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0.pre.3] - 2021-06-12
+### Fixed
+- fix SVG to PNG quality
+
 ## [1.0.0.pre.2] - 2021-06-11
 ### Fixed
 - mime time error when starting new project

data/README.md

@@ -27,6 +27,8 @@ If you have a [problem converting SVG files](https://github.com/afaundez/jekyll-
 sudo apt install librsvg2-bin
 ```
 
+You may need to install ImageMagick after installing the RSVG renderer.
+
 Check the devcontainer's [Dockerfile](.devcontainer/Dockerfile) for more practical details.
 
 ## Installation
@@ -34,7 +36,7 @@ Check the devcontainer's [Dockerfile](.devcontainer/Dockerfile) for more practic
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'jekyll-favicon', '~> 1.0.0.pre.2', group: :jekyll_plugins
+gem 'jekyll-favicon', '~> 1.0.0.pre.3', group: :jekyll_plugins
 ```
 
 ## Usage
@@ -116,12 +118,11 @@ The convert configuration is specific for each type of convertion: SVG to ICO/PN
 |----------------|---------------|-------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
 | alpha          | string        | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick alpha docs](https://imagemagick.org/script/command-line-options.php#alpha)           |
 | background     | string/symbol | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick background docs](https://imagemagick.org/script/command-line-options.php#background) |
-| define         | string/symbol | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick define docs](https://imagemagick.org/script/command-line-options.php#define)         |
-| density        | string/symbol | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick density docs](https://imagemagick.org/script/command-line-options.php#density)       |
+| define         | string/symbol | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick define docs](https://imagemagick.org/script/command-line-options.php#define)         |      |
 | extent         | string/symbol | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick extent docs](https://imagemagick.org/script/command-line-options.php#extent)         |
 | gravity        | string        | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick gravity docs](https://imagemagick.org/script/command-line-options.php#gravity)       |
 | resize         | string        | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick resize docs](https://imagemagick.org/script/command-line-options.php#resize)         |
-| scale          | string        | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick scale docs](https://imagemagick.org/script/command-line-options.php#scale)           |
+| size          | string        | see [convert config](config/jekyll/favicon/static_file/convertible.yml) | see [imagemagick size docs](https://imagemagick.org/script/command-line-options.php#size)           |
 
 Symbol values:
 

data/config/jekyll/favicon.yml

@@ -8,7 +8,7 @@ assets:
   - name: favicon.ico
     convert:
       define: 'icon:auto-resize=36,24,16'
-      scale: 36x36
+      resize: 36x36
     tag:
       - link:
           href: :href
@@ -17,7 +17,7 @@ assets:
           sizes: :sizes
   - name: favicon.png
     convert:
-      scale: 196x196
+      resize: 196x196
     tag:
       - link:
           href: :href
@@ -26,7 +26,7 @@ assets:
           sizes: :sizes
   - name: apple-touch-icon.png
     convert:
-      scale: 180x180
+      resize: 180x180
   - name: safari-pinned-tab.svg
     tag:
       - link:
@@ -35,21 +35,21 @@ assets:
           rel: mask-icon
   - name: android-chrome-192x192.png
     convert:
-      scale: 192x192
+      resize: 192x192
     refer:
       - webmanifest:
           icons:
           - src: :href
   - name: android-chrome-512x512.png
     convert:
-      scale: 512x512
+      resize: 512x512
     refer:
       - webmanifest:
           icons:
           - src: :href
   - name: mstile-icon-128x128.png
     convert:
-      scale: 128x128
+      resize: 128x128
     refer:
       - browserconfig:
           msapplication:
@@ -68,7 +68,7 @@ assets:
 
   - name: mstile-icon-270x270.png
     convert:
-      scale: 270x270
+      resize: 270x270
     refer:
       - browserconfig:
           msapplication:
@@ -79,7 +79,7 @@ assets:
                 _src: :href
   - name: mstile-icon-558x270.png
     convert:
-      scale: 558x270
+      resize: 558x270
     refer:
       - browserconfig:
           msapplication:
@@ -90,7 +90,7 @@ assets:
                 _src: :href
   - name: mstile-icon-558x558.png
     convert:
-      scale: 558x558
+      resize: 558x558
     refer:
       - browserconfig:
           msapplication:

data/config/jekyll/favicon/static_file/convertible.yml

@@ -3,27 +3,26 @@ defaults: &defaults
   alpha: null
   background: null
   define: null
-  density: null
   extent: null
   gravity: null
   resize: null
-  scale: null
+  size: null
 .svg:
   .png:
     <<: *defaults
     background: :background
-    density: :max
     extent: :auto
     gravity: center
-    scale:
+    resize:
+    size: :auto
   .ico:
     <<: *defaults
     background: :background
     define:
-    density: :max
     extent: :auto
     gravity: center
-    scale:
+    resize:
+    size: :auto
   .svg:
     <<: *defaults
 .png:

data/lib/jekyll/favicon/static_file/convertible.rb

@@ -30,11 +30,22 @@ module Jekyll
           end
         end
 
+        def convert_odd_source?
+          img = MiniMagick::Image.open path
+          Utils.odd? img.dimensions
+        end
+
+        def convert_size(size, separator = "x")
+          return size unless convert_odd_source? || Utils.odd?(size)
+          min_dimension = size.split(separator).min
+          [min_dimension, min_dimension].join(separator)
+        end
+
         def sizes
           if (match = Utils.name_to_size(name)) then [match[1]]
           elsif (define = Utils.define_to_size(convert_spec["define"])) then define
           elsif (resize = convert_spec["resize"]) then [resize]
-          elsif (scale = convert_spec["scale"]) then [scale]
+          elsif (size = convert_spec["size"]) then [size]
           end
         end
 
@@ -88,20 +99,17 @@ module Jekyll
         end
 
         def convert_patch_options(options)
-          %w[density extent].each_with_object(options) do |name, memo|
+          %w[size extent].each_with_object(options) do |name, memo|
             method = "convert_patch_option_#{name}".to_sym
             memo[name] = send(method, options[name])
           end
         end
 
-        def convert_patch_option_density(density)
-          case density
-          when :max
-            length = sizes.collect { |size| size.split("x").collect(&:to_i) }
-              .flatten
-              .max
-            length * 3
-          else density
+        def convert_patch_option_size(size)
+          case size
+          when :auto
+            convert_size size if (size = sizes.first)
+          else size
           end
         end
 

data/lib/jekyll/favicon/static_graphic_file.rb

@@ -10,7 +10,7 @@ module Jekyll
       include StaticFile::Convertible
 
       def generable?
-        convertible? && super
+        super && convertible?
       end
 
       def patch(configuration)

data/lib/jekyll/favicon/utils.rb

@@ -38,6 +38,11 @@ module Jekyll
         compactable = hash.slice(*keys)
         Utils.compact compactable
       end
+
+      def self.odd?(size, separator = "x")
+        size = size.split(separator) if size.is_a? String
+        size.uniq.size == 1
+      end
     end
   end
 end

data/lib/jekyll/favicon/utils/convert.rb

@@ -18,7 +18,7 @@ module Jekyll
         end
 
         def self.convert_options(convert, options = {})
-          priorities = %w[resize scale]
+          priorities = %w[resize size]
           convert_apply convert, options.slice(*priorities)
           common_options = options.reject { |key| priorities.include? key }
           convert_apply convert, common_options

data/lib/jekyll/favicon/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Favicon
-    VERSION = "1.0.0-2"
+    VERSION = "1.0.0-3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-favicon
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.2
+  version: 1.0.0.pre.3
 platform: ruby
 authors:
 - Alvaro Faundez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest