jekyll-favicon 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: caf32655a87cfda4b33b8a7c71d9b88767a37f6586fc0daf264f46dec0d1720d
-  data.tar.gz: c7fa97ebcffd2808026f049efabbb5b80e2fcd20254d840e9825f3bdb943811c
+SHA1:
+  metadata.gz: 267c48cbc01616267240dda45dad7fb41f60acd8
+  data.tar.gz: 3d0017596678b2ec30fe058ff0b99022deeb7305
 SHA512:
-  metadata.gz: 5a8de79c35b12649cf20a8f83c706ca1447862a4271b1071216ceb830a7193cd998892ff82277ffc0f93d7932d325cef2841819414bfd5cc12e3f3bee9bc928d
-  data.tar.gz: a9b0a7bf04a3a13f28b42607cc83845900afb669f636842eff2d22aa7cf37861ec771397f1447cc144b1c72f6c54d5a90af1a26888498791873880b8b4e4f0ec
+  metadata.gz: 813ecf6f4517829ba91101fd6c275ec7541910aa343a1b49cde9ac83991a56c37a7fd25fb064f62cddd29ddf90303cd73122eb587b17a31fd6efc6b6b60d5d5a
+  data.tar.gz: bf0d9bc8fc038b8c933f1785b98bb5b9ae3e29f0dbbe7253d39293205cc80c7c122d8ac865425b651efaa4f5078765bcbec5bc03b7dd899d76b0402af4db6b72

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,9 +10,9 @@ A clear and concise description of what the bug is.
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+2. Create a new project or clone one from '...'
+3. Add gem
+4. Bundle/Run/Test/...
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -20,16 +20,13 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Environment:**
+ - OS name and version
+ - Ruby manager name and version (if present)
+ - Ruby version
+ - Bundler version
+ - Jekyll version
+ - Jekyll Favicon version
 
 **Additional context**
 Add any other context about the problem here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,16 @@
 # PR Template
 
-Include at least this concepts:
+- Tell us...
+  - what you wanted to achieve
+  - how you did it (use Markdown and screenshots if needed)
 
-- Explain what you wanted to achieve
+- Did you...
+  - [ ] update the Readme? (if needed)
+  - [ ] update the Changelog? (if needed)
+  - [ ] update the tests?
+  - [ ] run the tests?
+  - [ ] check rubocop?
 
-- Explain what you did
+Don't forget to visit [travis-ci](https://travis-ci.org/afaundez/jekyll-favicon/pull_requests) after creating the PR.
 
-  - use markdown
-  - include screenshots if helps to explain
- 
-- Explain how to test it
-
-Thanks for contrubuting!
+Thanks for contributing!

data/.ruby-version

@@ -0,0 +1 @@
+2.1.0

data/.travis.yml

@@ -1,11 +1,15 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6.4
+  - 2.5.6
+  - 2.4.7
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
+  - 2.1.0
+before_install:
+  - if ! [[ `ruby -v | cut -d' ' -f2` > "2.3" ]]; then gem install bundler -v '< 2'; fi;
 addons:
   apt:
     config:

data/CHANGELOG.md

@@ -6,25 +6,56 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.2.3] - 2015-03-27
+## [0.2.8] - 2019-09-11
+### Changed
+- Upgrade mini_magick 4.9.4 in gemspec for security fix
+- Update gemspec to support Jekyll 4.0
+
+## [0.2.7] - 2019-05-27
+### Fixed
+- Set default background back to none
+- Restore safari-pinned-tab
+### Changed
+- Update README outdated stuff
+- Correct typos on README
+
+## [0.2.6] - 2019-03-23
+### Added
+- Readme troubleshooting for librsvg2-bin package missing
+### Fixed
+- ICO convert uses background config
+
+## [0.2.5] - 2019-01-16
+### Changed
+- Strike GraphicsMagick at Readme because it's compatible a this moment
+### Fixed
+- Skip safari pinned tab when source is not a SVG
+
+## [0.2.4] - 2018-10-05
+### Fixed
+- Path for favicon.ico in classic template
+- Changelog dates
+### Changed
+- Drowngrade listen gem for ruby 2.1 compatibility
+
+## [0.2.3] - 2018-08-17
 ### Added
 - Changelog
 - Contributing guide
 - Issue and Pull Request templates
 - Improve Readme usage
-
 ### Fixed
 - Missing baseurl in links from `favicon` tag
 
-## [0.2.2] - 2015-03-27
+## [0.2.2] - 2018-04-10
 ### Fixed
 - Missing png template
 
-## [0.2.1] - 2015-03-27
+## [0.2.1] - 2018-03-27
 ### Fixed
 - Jekyll gem version dependency
 
-## [0.2.0] - 2015-03-27
+## [0.2.0] - 2018-03-27
 ### Added
 - Jekyll generator with ImageMagick dependency
 - Configuration file options
@@ -33,11 +64,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Templates structure
 
-## [0.1.2] - 2015-03-17
+## [0.1.2] - 2018-03-17
 ### Fixed
 - Fix gem version
 
-## [0.1.1] - 2015-03-17
+## [0.1.1] - 2018-03-17
 ### Changed
 - Replace heredoc for ruby >=2.1 compatibility
 

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    jekyll-favicon (0.2.3)
-      jekyll (~> 3.0)
-      mini_magick (~> 4.5)
+    jekyll-favicon (0.2.8)
+      jekyll (>= 3.0, < 5.0)
+      mini_magick (>= 4.9.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.3)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -40,29 +40,31 @@ GEM
     jekyll-watch (2.0.0)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.3)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    mini_magick (4.8.0)
-    mini_portile2 (2.3.0)
+    mini_magick (4.9.5)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.0.5)
+    minitest-hooks (1.5.0)
+      minitest (> 5.3)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.13.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    powerpack (0.1.1)
-    public_suffix (3.0.3)
+    powerpack (0.1.2)
+    public_suffix (3.1.1)
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.2.1)
+    rouge (3.10.0)
     rubocop (0.54.0)
       parallel (~> 1.10)
       parser (>= 2.5)
@@ -70,25 +72,26 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    sass (3.5.7)
+    ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.17)
   jekyll-favicon!
   minitest (~> 5.0)
+  minitest-hooks (~> 1.4, >= 1.4.2)
   nokogiri (~> 1.8)
   rake (~> 10.0)
   rubocop (~> 0.54.0, >= 0.54.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -9,21 +9,31 @@ This [Jekyll](https://jekyllrb.com) plugin adds:
   - a [browser configuration schema](https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/dn320426%28v=vs.85%29)
 - a tag to generate all the corresponding links and metadata needed in the head tag
 
-
-
 ## Prerequisites
 
-Before using this plugin your system must have installed [ImageMagick](http://www.imagemagick.org) (or [GraphicsMagick](http://www.graphicsmagick.org/)).
+Before using this plugin your system must have installed [ImageMagick](http://www.imagemagick.org) ~~(or [GraphicsMagick](http://www.graphicsmagick.org/))~~.
 
 Check if it is already installed by running:
 
 ```sh
 $ convert --version
-Version: ImageMagick 7.0.7-27 Q16 x86_64 2018-03-18 http://www.imagemagick.org
-Copyright: © 1999-2018 ImageMagick Studio LLC
-License: http://www.imagemagick.org/script/license.php
-Features: Cipher DPC HDRI Modules
-Delegates (built-in): bzlib freetype jng jpeg ltdl lzma png tiff xml zlib
+Version: ImageMagick 7.0.8-46 Q16 x86_64 2019-05-19 https://imagemagick.org
+Copyright: © 1999-2019 ImageMagick Studio LLC
+License: https://imagemagick.org/script/license.php
+Features: Cipher DPC HDRI Modules OpenMP(3.1)
+Delegates (built-in): bzlib freetype heic jng jp2 jpeg lcms ltdl lzma openexr png tiff webp xml zlib
+```
+
+If you have a [problem converting SVG files](https://github.com/afaundez/jekyll-favicon/issues/9#issuecomment-473862194), you may need to install the package `librsvg2-bin`. For example, in Ubuntu/Debian systems:
+
+```sh
+sudo apt install librsvg2-bin
+```
+
+If you have a [problem converting SVG files](https://github.com/afaundez/jekyll-favicon/issues/9#issuecomment-473862194), you may need to install the package `librsvg2-bin`. For example, in Ubuntu/Debian systems:
+
+```sh
+sudo apt install librsvg2-bin
 ```
 
 ## Installation
@@ -31,20 +41,20 @@ Delegates (built-in): bzlib freetype jng jpeg ltdl lzma png tiff xml zlib
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'jekyll-favicon', '~> 0.2.3', group: :jekyll_plugins
+gem 'jekyll-favicon', '~> 0.2.8', group: :jekyll_plugins
 ```
 
 ## Usage
 
-If you are going to use this plugin in a hosted build/service, be sure that they include your plugins as part of the process. You can check [running example](https://afaundez.gitlab.io/jekyll-favicon-example/) hosted by [GitLab](https://about.gitlab.com/features/pages/).
+If you are going to use this plugin in a hosted build/service, be sure that they include your plugins as part of the process. You can check [this running example](https://afaundez.gitlab.io/jekyll-favicon-example/) hosted by [GitLab](https://about.gitlab.com/features/pages/).
 
 As [Github Pages](https://pages.github.com) build doesn't load custom plugins, this plugin won't work. As an alternative, you can build your site and push all files (for example, build to `docs`, version it and push it, although this works only for project pages).
 
 ### Generator
 
-By installing the plugin, it will be automatically active. It will search for the file `/favicon.svg` and generate set of files in `/assets/images` and few more items at the site's root. It also will exclude the original sources from being copied as a regular static file.
+By installing the plugin, it will be automatically activated. It will search for the file `/favicon.svg` and generate a set of files in `/assets/images` and few more items at the site's root. It also will exclude the original sources from being copied as a regular static file.
 
-You can override whit your sites's `_config.yml`:
+You can override these settings in your sites's `_config.yml`:
 
 ```yaml
 favicon:

data/jekyll-favicon.gemspec

@@ -24,12 +24,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-hooks', '~> 1.4', '>= 1.4.2'
   spec.add_development_dependency 'nokogiri', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.54.0', '>= 0.54.0'
 
-  spec.add_runtime_dependency 'jekyll', '~> 3.0'
-  spec.add_runtime_dependency 'mini_magick', '~> 4.5'
+  spec.add_runtime_dependency 'jekyll', '>= 3.0', '< 5.0'
+  spec.add_runtime_dependency 'mini_magick', '>= 4.9.4'
 end

data/lib/browserconfig.rb

@@ -0,0 +1,54 @@
+require 'rexml/document'
+
+# Build browserconfig XML
+class Browserconfig
+  attr_accessor :document
+
+  def load(source_path, config, prefix)
+    @document = if File.exist? source_path
+                  REXML::Document.new File.read source_path
+                else
+                  REXML::Document.new
+                end
+    add_browserconfig_schema
+    add_browserconfig_elements config, prefix
+  end
+
+  def add(path, element, attributes = {}, text = nil)
+    parent = @document.elements[path]
+    parent.elements[element] = REXML::Element.new element
+    attributes.each do |key, value|
+      parent.elements[element].add_attribute key, value
+    end
+    parent.add_text text if text
+  end
+
+  def dump
+    output = ''
+    formatter = REXML::Formatters::Pretty.new 2
+    formatter.compact = true
+    formatter.write @document, output
+    output
+  end
+
+  private
+
+  def add_browserconfig_schema
+    browserconfig = @document.elements['browserconfig']
+    browserconfig ||= @document.elements.add 'browserconfig'
+    msapplication = browserconfig.elements['msapplication']
+    msapplication ||= browserconfig.elements.add 'msapplication'
+    tile = msapplication.elements['tile']
+    tile || msapplication.elements.add('tile')
+  end
+
+  def add_browserconfig_elements(config, prefix)
+    path = 'browserconfig/msapplication/tile'
+    pathname = Pathname.new prefix
+    add path, 'square70x70logo', 'src' => pathname.join('favicon-128x128.png')
+    add path, 'square150x150logo', 'src' => pathname.join('favicon-270x270.png')
+    add path, 'wide310x150logo', 'src' => pathname.join('favicon-558x270.png')
+    add path, 'square310x310logo', 'src' => pathname.join('favicon-558x558.png')
+    add path, 'TileColor', {}, config['tile-color']
+  end
+end

data/lib/hash.rb

@@ -0,0 +1,12 @@
+# Extend Hash with deep find of a key return array
+class Hash
+  def deep_find(target)
+    keys.collect do |key|
+      if key == target
+        self[key]
+      elsif self[key].is_a? Hash
+        self[key].deep_find(target)
+      end
+    end.compact.flatten
+  end
+end

data/lib/image.rb

@@ -0,0 +1,33 @@
+# Build browserconfig XML
+module Image
+  def self.convert(source, output, options = {})
+    MiniMagick::Tool::Convert.new do |convert|
+      options_for convert, options
+      convert << source
+      convert << output
+    end
+  end
+
+  def self.options_for(convert, options)
+    convert.flatten
+    basic_options convert, options
+    resize_options convert, options
+    odd_options convert, options
+  end
+
+  def self.basic_options(convert, options)
+    convert.background options[:background] if options[:background]
+    convert.define options[:define] if options[:define]
+    convert.density options[:density] if options[:density]
+    convert.alpha options[:alpha] if options[:alpha]
+  end
+
+  def self.resize_options(convert, options)
+    convert.resize options[:resize] if options[:resize]
+  end
+
+  def self.odd_options(convert, options)
+    convert.gravity 'center' if options[:odd]
+    convert.extent options[:resize] if options[:odd] && options[:resize]
+  end
+end

data/lib/jekyll-favicon.rb

@@ -3,6 +3,10 @@
 require 'jekyll'
 require 'mini_magick'
 require_relative 'string'
+require_relative 'hash'
+require_relative 'browserconfig'
+require_relative 'webmanifest'
+require_relative 'image'
 require_relative 'jekyll/favicon'
 require_relative 'jekyll/favicon/version'
 require_relative 'jekyll/favicon/hooks'

data/lib/jekyll/favicon/config/defaults.yml

@@ -1,8 +1,9 @@
 favicon:
   source: favicon.svg
   path: /assets/images
+  background: none
   apple-touch-icon:
-    background: white
+    background: none
     sizes:
       - 57x57
       - 76x76
@@ -19,13 +20,21 @@ favicon:
       - 270x270
       - 558x270
       - 558x558
-    browserconfig-path: /
+    browserconfig:
+      source: browserconfig.xml
+      target: browserconfig.xml
   chrome:
     sizes:
       - 192x192
       - 96x96
       - 48x48
-    manifest-path: /
+    manifest:
+      source: manifest.webmanifest
+      target: manifest.webmanifest
+      sizes:
+        - 192x192
+        - 96x96
+        - 48x48
   classic:
     sizes:
       - 16x16
@@ -38,8 +47,8 @@ favicon:
   png:
     dimensions: 558x558
   ico:
-    path: /
+    target: favicon.ico
     sizes:
-      - 48
-      - 32
-      - 16
+      - 48x48
+      - 32x32
+      - 16x16

data/lib/jekyll/favicon/generator.rb

@@ -8,86 +8,84 @@ module Jekyll
 
       def generate(site)
         @site = site
-        if File.exist? favicon_source
-          @template = favicon_tempfile
-          generate_files Favicon.config['path']
+        if File.file? source_path Favicon.config['source']
+          @template = favicon_tempfile source_path Favicon.config['source']
+          generate_icons && generate_metadata
         else
-          Jekyll.logger.warn 'Jekyll::Favicon: Missing' \
-                             " #{Favicon.config['source']}, not generating" \
-                             ' favicons.'
+          Jekyll.logger.warn 'Jekyll::Favicon: Missing ' \
+                             "#{Favicon.config['source']}, not generating " \
+                             'favicons.'
         end
       end
 
       def clean
-        return unless @tempfile
+        return unless @template
         @template.close
         @template.unlink
       end
 
       private
 
-      def generate_files(prefix)
-        generate_ico_from @template.path
-        generate_png_from @template.path, prefix
-        if File.extname(favicon_source) == '.svg'
-          generate_svg_from favicon_source, prefix,
-                            'safari-pinned-tab.svg'
-        end
-        generate_metadata_from 'browserconfig.xml'
-        generate_metadata_from 'manifest.webmanifest'
-      end
-
-      def generate_ico_from(source)
-        ico_favicon = Icon.new(@site, '', 'favicon.ico', source)
-        @site.static_files << ico_favicon
+      def source_path(path = nil)
+        File.join(*[@site.source, path].compact)
       end
 
-      def generate_png_from(source, prefix)
-        ['classic', 'ie', 'chrome', 'apple-touch-icon'].each do |template|
-          Favicon.config[template]['sizes'].each do |size|
-            png_favicon = Icon.new(@site, prefix, "favicon-#{size}.png", source)
-            @site.static_files << png_favicon
-          end
+      def favicon_tempfile(source)
+        tempfile = Tempfile.new(['favicon-template', '.png'])
+        options = { background: 'none' }
+        if source.svg?
+          options[:density] = Favicon.config['svg']['density']
+          options[:resize] = Favicon.config['svg']['dimensions']
+        elsif source.png?
+          options[:resize] = Favicon.config['png']['dimensions']
         end
+        Image.convert source, tempfile.path, options
+        tempfile
       end
 
-      def generate_metadata_from(template)
-        metadata_page = Metadata.new(@site, @site.source, '', template)
-        @site.pages << metadata_page
+      def generate_icons
+        @site.static_files.push ico_icon
+        @site.static_files.push(*png_icons)
+        @site.static_files.push(*svg_icons)
       end
 
-      def generate_svg_from(source, prefix, name)
-        svg_favicon = Icon.new(@site, prefix, name, source)
-        @site.static_files << svg_favicon
+      def ico_icon
+        target = Favicon.config['ico']['target']
+        Icon.new @site, Favicon.config['source'], @template.path, target
       end
 
-      def favicon_source
-        File.join(*[@site.source, Favicon.config['source']].compact)
+      def png_icons
+        Favicon.config.deep_find('sizes').uniq.collect do |size|
+          target = File.join Favicon.config['path'], "favicon-#{size}.png"
+          Icon.new @site, Favicon.config['source'], @template.path, target
+        end
       end
 
-      def favicon_tempfile
-        tempfile = Tempfile.new(['favicon_template', '.png'])
-        convert favicon_source, tempfile.path, Favicon.config
-        tempfile
+      def svg_icons
+        return [] unless Favicon.config['source'].svg?
+        source = Favicon.config['source']
+        %w[safari-pinned-tab.svg].collect do |name|
+          target = File.join Favicon.config['path'], name
+          Icon.new @site, source, source_path(source), target
+        end
       end
 
-      def convert(source, output, options = {})
-        MiniMagick::Tool::Convert.new do |convert|
-          options_for convert, source, options
-          convert << favicon_source
-          convert << output
-        end
+      def generate_metadata
+        @site.pages.push metadata Browserconfig.new,
+                                  Favicon.config['ie']['browserconfig']
+        @site.pages.push metadata Webmanifest.new,
+                                  Favicon.config['chrome']['manifest']
       end
 
-      def options_for(convert, source, options)
-        convert.flatten
-        convert.background 'none'
-        if source.svg?
-          convert.density options['svg']['density']
-          convert.resize options['svg']['dimensions']
-        elsif source.png?
-          convert.resize options['png']['dimensions']
-        end
+      def metadata(document, config)
+        page = Metadata.new @site, @site.source,
+                            File.dirname(config['target']),
+                            File.basename(config['target'])
+        favicon_path = File.join (@site.baseurl || ''), Favicon.config['path']
+        document.load source_path(config['source']), config, favicon_path
+        page.content = document.dump
+        page.data = { 'layout' => nil }
+        page
       end
     end
   end

data/lib/jekyll/favicon/hooks.rb

@@ -1,6 +1,9 @@
 Jekyll::Hooks.register :site, :after_init do |site|
   Jekyll::Favicon.merge site.config['favicon']
-  site.config['exclude'] << Jekyll::Favicon.config['source']
+  favicon_config = Jekyll::Favicon.config
+  site.config['exclude'] << favicon_config['source']
+  site.config['exclude'] << favicon_config['chrome']['manifest']['source']
+  site.config['exclude'] << favicon_config['ie']['browserconfig']['source']
 end
 
 Jekyll::Hooks.register :site, :post_write do |site|

data/lib/jekyll/favicon/icon.rb

@@ -2,44 +2,52 @@ module Jekyll
   module Favicon
     # Extended static file that generates multpiple favicons
     class Icon < Jekyll::StaticFile
-      attr_accessor :source
+      attr_accessor :replica
+      attr_accessor :target
 
-      def initialize(site, dir, name, source, collection = nil)
+      def initialize(site, source, replica, target, collection = nil)
         @site = site
         @base = @site.source
-        @dir  = dir
-        @name = name
-        @source = source
+        @dir  = File.dirname source
+        @name = File.basename source
+        @replica = replica
+        @target = target
         @collection = collection
-        @relative_path = File.join(*[@dir, name].compact)
-        @extname = File.extname(@name)
-        @data = { 'name' => @name, 'layout' => nil }
+        @relative_path = File.join(*[@dir, @name].compact)
+        @extname = File.extname(target)
+        @data = { 'name' => File.basename(target), 'layout' => nil }
       end
 
-      def path
-        source
+      def destination(dest)
+        basename = File.basename(@target)
+        @site.in_dest_dir(*[dest, destination_rel_dir, basename].compact)
+      end
+
+      def destination_rel_dir
+        File.dirname @target
       end
 
       private
 
       def copy_file(dest_path)
         case @extname
-        when '.svg' then FileUtils.cp path, dest_path
-        when '.ico' then convert path, dest_path, ico_options
-        when '.png' then convert path, dest_path, png_options
+        when '.svg' then FileUtils.cp @replica, dest_path
+        when '.ico' then Image.convert @replica, dest_path, ico_options
+        when '.png' then Image.convert @replica, dest_path, png_options
         else Jekyll.logger.warn "Jekyll::Favicon: Can't generate" \
                              " #{dest_path}, extension not supported supported."
         end
       end
 
       def dimensions
-        @name[/favicon-(\d+x\d+).png/, 1].split('x').collect(&:to_i)
+        basename = File.basename(@target)
+        basename[/favicon-(\d+x\d+).png/, 1].split('x').collect(&:to_i)
       end
 
       def png_options
         options = {}
-        options[:background] = Favicon.config['background']
         w, h = dimensions
+        options[:background] = background_for dimensions
         options[:odd] = w != h
         options[:resize] = dimensions.join('x')
         options
@@ -47,37 +55,18 @@ module Jekyll
 
       def ico_options
         options = {}
-        options[:background] = Favicon.config['background']
-        ico_sizes = Favicon.config['ico']['sizes'].join ','
+        sizes = Favicon.config['ico']['sizes']
+        options[:background] = background_for sizes.first
+        options[:resize] = sizes.first
+        ico_sizes = sizes.collect { |size| size.split('x').first }.join ','
         options[:define] = "icon:auto-resize=#{ico_sizes}"
         options
       end
 
-      def convert(input, output, options = {})
-        MiniMagick::Tool::Convert.new do |convert|
-          options_for convert, options
-          convert << input
-          convert << output
-        end
-      end
-
-      def options_for(convert, options)
-        convert.flatten
-        convert.background background_for options[:resize]
-        convert.define options[:define] if options[:define]
-        return unless options[:resize]
-        convert.resize options[:resize]
-        return unless options[:odd]
-        convert.gravity 'center'
-        convert.extent options[:resize]
-      end
-
       def background_for(size)
-        if Favicon.config['apple-touch-icon']['sizes'].include? size
-          Favicon.config['apple-touch-icon']['background']
-        else
-          'none'
-        end
+        category = Favicon.config['apple-touch-icon']
+        return category['background'] if category['sizes'].include? size
+        Favicon.config['background']
       end
     end
   end

data/lib/jekyll/favicon/metadata.rb

@@ -2,18 +2,11 @@ module Jekyll
   module Favicon
     # Extended Page that generate files from ERB templates
     class Metadata < Jekyll::Page
-      def initialize(site, base, dir, name)
-        @site = site
-        @base = base
-        @dir = dir
-        @name = name
-
-        process @name
-        prepend_path = @site.baseurl || ''
-        template = File.read File.join Favicon.templates, "#{name}.erb"
-        self.content = ERB.new(template, nil, '-').result binding
-        self.data = { 'name' => name, 'layout' => nil }
+      # rubocop:disable Naming/MemoizedInstanceVariableName
+      def read_yaml(*)
+        @data ||= {}
       end
+      # rubocop:enable Naming/MemoizedInstanceVariableName
     end
   end
 end

data/lib/jekyll/favicon/templates/chrome.html.erb

@@ -2,4 +2,4 @@
 <%- Favicon.config['chrome']['sizes'].each do |size| -%>
   <link rel="icon" sizes="<%= size %>" href="<%= File.join prepend_path, Favicon.config['path'], "favicon-#{size}.png" %>">
 <%- end -%>
-<link rel="manifest" href="<%= File.join prepend_path, Favicon.config['chrome']['manifest-path'], 'manifest.webmanifest' %>">
+<link rel="manifest" href="<%= File.join prepend_path, Favicon.config['chrome']['manifest']['target'] %>">

data/lib/jekyll/favicon/templates/classic.html.erb

@@ -1,7 +1,8 @@
 <!-- Classic -->
-<link rel="shortcut icon" href="favicon.ico">
+<%- favicon_ico_path = File.join prepend_path, Favicon.config['ico']['target'] -%>
+<link rel="shortcut icon" href="<%= favicon_ico_path %>">
+<link rel="icon" sizes="<%= Favicon.config['ico']['sizes'].join ' ' %>" href="<%= favicon_ico_path %>">
 <%- favicon_path = File.join prepend_path, Favicon.config['path'] -%>
-<link rel="icon" sizes="<%= Favicon.config['ico']['sizes'].collect{|s| "#{s}x#{s}"}.join ' ' %>" href="<%= File.join favicon_path, 'favicon.ico' %>">
 <%- Favicon.config['classic']['sizes'].each do |size| -%>
   <link rel="icon" sizes="<%= size %>" type="image/png" href="<%= File.join favicon_path, "favicon-#{size}.png" %>">
 <%- end -%>

data/lib/jekyll/favicon/templates/ie.html.erb

@@ -1,4 +1,4 @@
 <!-- IE -->
 <meta name="msapplication-TileColor" content="<%= Favicon.config['ie']['tile-color'] %>">
 <meta name="msapplication-TileImage" content="<%= File.join prepend_path, Favicon.config['path'], 'favicon-144x144.png' %>">
-<meta name="msapplication-config" content="<%= File.join prepend_path, Favicon.config['ie']['browserconfig-path'], 'browserconfig.xml' %>">
+<meta name='msapplication-config' content="<%= File.join prepend_path, Favicon.config['ie']['browserconfig']['target'] %>">

data/lib/jekyll/favicon/templates/safari.html.erb

@@ -3,4 +3,6 @@
 <%- Favicon.config['apple-touch-icon']['sizes'].each do |size| -%>
   <link rel="apple-touch-icon" sizes="<%= size %>" href="<%= File.join favicon_path, "favicon-#{size}.png" %>">
 <%- end -%>
+<% if  Favicon.config['source'].svg? %>
 <link rel="mask-icon" color="<%= Favicon.config['safari-pinned-tab']['mask-icon-color'] %>" href="<%= File.join favicon_path, 'safari-pinned-tab.svg' %>">
+<% end %>

data/lib/jekyll/favicon/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Favicon
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.2.8'.freeze
   end
 end

data/lib/webmanifest.rb

@@ -0,0 +1,30 @@
+# Build Webmanifest JSON
+class Webmanifest
+  attr_accessor :document
+
+  def load(source_path, config, prefix)
+    @document = if File.exist? source_path
+                  JSON.parse File.read source_path
+                else
+                  {}
+                end
+    add_webmanifest_elements config, prefix
+  end
+
+  def dump
+    JSON.pretty_generate document
+  end
+
+  private
+
+  def add_webmanifest_elements(config, prefix)
+    icons = config['sizes'].collect do |size|
+      {
+        src: File.join(prefix, "favicon-#{size}.png"),
+        type: 'png',
+        sizes: size
+      }
+    end
+    @document = Jekyll::Utils.deep_merge_hashes @document, icons: icons
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-favicon
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Alvaro Faundez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -90,30 +110,36 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.9.4
 description: Jekyll-favicon is a jekyll plugin that adds the tag favicon, generating
   html tags for favicon.
 email:
@@ -127,6 +153,7 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -139,6 +166,9 @@ files:
 - bin/console
 - bin/setup
 - jekyll-favicon.gemspec
+- lib/browserconfig.rb
+- lib/hash.rb
+- lib/image.rb
 - lib/jekyll-favicon.rb
 - lib/jekyll/favicon.rb
 - lib/jekyll/favicon/config/defaults.yml
@@ -147,14 +177,13 @@ files:
 - lib/jekyll/favicon/icon.rb
 - lib/jekyll/favicon/metadata.rb
 - lib/jekyll/favicon/tag.rb
-- lib/jekyll/favicon/templates/browserconfig.xml.erb
 - lib/jekyll/favicon/templates/chrome.html.erb
 - lib/jekyll/favicon/templates/classic.html.erb
 - lib/jekyll/favicon/templates/ie.html.erb
-- lib/jekyll/favicon/templates/manifest.webmanifest.erb
 - lib/jekyll/favicon/templates/safari.html.erb
 - lib/jekyll/favicon/version.rb
 - lib/string.rb
+- lib/webmanifest.rb
 homepage: https://github.com/afaundez/jekyll-favicon
 licenses:
 - MIT
@@ -175,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin for favicon tag generation.

data/lib/jekyll/favicon/templates/browserconfig.xml.erb

@@ -1,12 +0,0 @@
-<browserconfig>
-  <msapplication>
-    <tile>
-      <%- favicon_path = File.join prepend_path, Favicon.config['path'] -%>
-      <square310x310logo src="<%= File.join favicon_path, 'favicon-558x558.png' %>" />
-      <wide310x150logo src="<%= File.join favicon_path, 'favicon-558x270.png' %>" />
-      <square150x150logo src="<%= File.join favicon_path, 'favicon-270x270.png' %>" />
-      <square70x70logo src="<%= File.join favicon_path, 'favicon-128x128.png' %>" />
-      <TileColor><%= Favicon.config['ie']['tile-color'] %></TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>

data/lib/jekyll/favicon/templates/manifest.webmanifest.erb

@@ -1 +0,0 @@
-<%= JSON.pretty_generate icons: Favicon.config['chrome']['sizes'].collect{|size| {src: File.join(prepend_path, Favicon.config['path'], "favicon-#{size}.png"), type: 'png', sizes: size}} %>