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

data/lib/jekyll/favicon/generator.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'jekyll/plugin'
-require 'jekyll/generator'
-require 'jekyll/favicon'
+require "jekyll/plugin"
+require "jekyll/generator"
+require "jekyll/favicon"
 
 module Jekyll
   module Favicon
     # New generator that creates all the stastic icons and metadata files
     class Generator < Jekyll::Generator
-      # :reek:UtilityFunction
       def generate(site)
         Favicon.assets(site)
-               .select(&:generable?)
-               .each { |asset| site.static_files << asset }
+          .select(&:generable?)
+          .each { |asset| site.static_files << asset }
       end
     end
   end

data/lib/jekyll/favicon/hooks.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'jekyll/hooks'
+require "jekyll/hooks"
 
 Jekyll::Hooks.register :site, :after_init do |site|
   static_files = Jekyll::Favicon.assets(site)
-                                .uniq(&:path)
-  excludes = site.config['exclude']
+    .uniq(&:path)
+  excludes = site.config["exclude"]
   static_files.each do |static_file|
     source = static_file.source_relative_path
     excludes << source and next if static_file.generable?
 
     Jekyll.logger.warn Jekyll::Favicon,
-                       "Missing #{source}, not generating favicons."
+      "Missing #{source}, not generating favicons."
   end
 end

data/lib/jekyll/favicon/static_data_file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/static_file'
-require 'jekyll/favicon/static_file/mutable'
+require "jekyll/favicon/static_file"
+require "jekyll/favicon/static_file/mutable"
 
 module Jekyll
   module Favicon

data/lib/jekyll/favicon/static_file.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'forwardable'
-require 'jekyll/static_file'
-require 'jekyll/favicon/static_file/sourceable'
-require 'jekyll/favicon/static_file/taggable'
-require 'jekyll/favicon/static_file/referenceable'
-require 'jekyll/favicon/utils'
-require 'jekyll/favicon/configuration'
+require "pathname"
+require "forwardable"
+require "jekyll/static_file"
+require "jekyll/favicon/static_file/sourceable"
+require "jekyll/favicon/static_file/taggable"
+require "jekyll/favicon/static_file/referenceable"
+require "jekyll/favicon/utils"
+require "jekyll/favicon/configuration"
 
 module Jekyll
   module Favicon
@@ -23,7 +23,7 @@ module Jekyll
       attr_reader :spec, :site
 
       def initialize(site, spec = {})
-        raise StandardError unless spec.include? 'name'
+        raise StandardError unless spec.include? "name"
 
         @spec = spec
         spec_dir, spec_name = File.split spec_relative_path
@@ -43,9 +43,9 @@ module Jekyll
       end
 
       def href
-        Pathname.new('/')
-                .join(url)
-                .to_s
+        Pathname.new("/")
+          .join(*[site.baseurl, url].compact)
+          .to_s
       end
 
       private
@@ -62,11 +62,11 @@ module Jekyll
       end
 
       def site_dir
-        site_configuration.fetch('dir', '.')
+        site_configuration.fetch("dir", ".")
       end
 
       def site_background
-        site_configuration.fetch('background', 'transparent')
+        site_configuration.fetch("background", "transparent")
       end
 
       def site_configuration
@@ -80,17 +80,17 @@ module Jekyll
       def spec_relative_pathname
         return spec_pathname if spec_pathname.relative?
 
-        pathname.relative_path_from '/'
+        pathname.relative_path_from "/"
       end
 
       def spec_pathname
         Pathname.new(site_dir)
-                .join(*spec_dir_name)
+          .join(*spec_dir_name)
       end
 
       def spec_dir_name
-        spec.values_at('dir', 'name')
-            .compact
+        spec.values_at("dir", "name")
+          .compact
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/configuration/defaults'
-require 'jekyll/favicon/utils'
+require "jekyll/favicon/configuration/defaults"
+require "jekyll/favicon/utils"
 
 module Jekyll
   module Favicon
@@ -24,30 +24,28 @@ module Jekyll
         def convertible_patch(configuration)
           Utils.patch configuration do |value|
             case value
-            when :sizes then sizes.join ' '
+            when :sizes then sizes.join " "
             else value
             end
           end
         end
 
         def sizes
-          if (match = name.match(/^.*-(\d+x\d+)\..*$/)) then [match[1]]
-          elsif (define = convert_spec['define'])
-            define.split('=').last.split(',').collect { |size| [size, size].join 'x' }
-          elsif (resize = convert_spec['resize']) then [resize]
-          elsif (scale = convert_spec['scale']) then [scale]
+          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]
           end
         end
 
         # Jekyll::StaticFile method
         # asks if dest mtime is older than source mtime after original modified?
         def modified?
-          super || self.class.mtimes[href] < mtime
+          super || self.class.mtimes.fetch(href, -1) < mtime
         end
 
         # Jekyll::StaticFile method
         # adds dest mtime to list after original write
-        # :reek:ControlParameter
         def write(dest)
           super(dest) && self.class.mtimes[href] = mtime
         end
@@ -58,8 +56,8 @@ module Jekyll
         # add file creation instead of copying
         def copy_file(dest_path)
           case @extname
-          when '.svg' then super(dest_path)
-          when '.ico', '.png'
+          when ".svg" then super(dest_path)
+          when ".ico", ".png"
             Utils.convert path, dest_path, convert
           else Jekyll.logger.warn "Jekyll::Favicon: Can't generate " \
                                   " #{dest_path}. Extension not supported."
@@ -67,46 +65,51 @@ module Jekyll
         end
 
         def convert_allow_empty?
-          @extname == '.svg' && @extname == File.extname(path)
+          @extname == ".svg" && @extname == File.extname(path)
         end
 
         def convert_spec
-          spec.fetch 'convert', {}
+          spec.fetch "convert", {}
+        end
+
+        def convertible_keys
+          convertible_defaults["defaults"].keys
         end
 
         def convert_normalize(options)
           return {} unless options
 
-          Utils.compact options.slice(*convertible_defaults['defaults'].keys)
+          Utils.slice_and_compact options, convertible_keys
         end
 
-        def convert_defaults
-          convertible_defaults.dig File.extname(path), @extname
+        def convert_patch(options)
+          patched_options = convert_patch_options options
+          Utils.slice_and_compact patched_options, convertible_keys
         end
 
-        # :reek:FeatureEnvy
-        def convert_patch(options)
-          %w[density extent].each do |name|
-            method = "convert_patch_#{name}".to_sym
-            options.merge! name => send(method, options[name])
+        def convert_patch_options(options)
+          %w[density extent].each_with_object(options) do |name, memo|
+            method = "convert_patch_option_#{name}".to_sym
+            memo[name] = send(method, options[name])
           end
-          Utils.compact options.slice(*convertible_defaults['defaults'].keys)
         end
 
-        def convert_patch_density(density)
+        def convert_patch_option_density(density)
           case density
           when :max
-            length = sizes.collect { |size| size.split('x').max }.max.to_i
+            length = sizes.collect { |size| size.split("x").collect(&:to_i) }
+              .flatten
+              .max
             length * 3
           else density
           end
         end
 
-        def convert_patch_extent(extent)
+        def convert_patch_option_extent(extent)
           case extent
           when :auto
             if (size = sizes.first)
-              width, height = size.split 'x'
+              width, height = size.split "x"
               size if width != height
             end
           else extent

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'rexml/document'
-require 'jekyll/favicon/utils'
-require 'jekyll/favicon/static_graphic_file'
+require "rexml/document"
+require "jekyll/favicon/utils"
+require "jekyll/favicon/static_graphic_file"
 
 module Jekyll
   module Favicon
@@ -15,12 +15,12 @@ module Jekyll
 
         def mutation
           refers = case @extname
-                   when '.xml'
-                     mutation_refers.select { |refer| refer.key? 'browserconfig' }
+                   when ".xml"
+                     mutation_refers.select { |refer| refer.key? "browserconfig" }
                    else
-                     mutation_refers.collect { |refer| refer['webmanifest'] }
-                                    .compact
-                   end
+                     mutation_refers.collect { |refer| refer["webmanifest"] }
+                       .compact
+          end
           patch(Utils.merge(*refers) || {})
         end
 
@@ -41,8 +41,8 @@ module Jekyll
 
         def mutated_content
           case @extname
-          when '.json', '.webmanifest', '.manifest' then mutated_content_json
-          when '.xml' then mutated_content_xml
+          when ".json", ".webmanifest", ".manifest" then mutated_content_json
+          when ".xml" then mutated_content_xml
           end
         end
 
@@ -53,7 +53,7 @@ module Jekyll
 
         def mutated_content_xml
           mutated = Utils.mutate_element (mutable || REXML::Document.new), mutation
-          output = String.new
+          output = +""
           mutated.write output
           output
         end
@@ -63,17 +63,17 @@ module Jekyll
 
           content = File.read path
           case File.extname path
-          when '.xml' then REXML::Document.new content
+          when ".xml" then REXML::Document.new content
           else JSON.parse content
           end
         end
 
         def mutation_refers
           site.static_files
-              .select { |static_file| static_file.is_a? StaticFile }
-              .select(&:referenceable?)
-              .collect(&:refer)
-              .flatten
+            .select { |static_file| static_file.is_a? StaticFile }
+            .select(&:referenceable?)
+            .collect(&:refer)
+            .flatten
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/configuration/defaults'
+require "jekyll/favicon/configuration/defaults"
 
 module Jekyll
   module Favicon
@@ -14,7 +14,7 @@ module Jekyll
         end
 
         def refer
-          patch spec.fetch('refer', [])
+          patch spec.fetch("refer", [])
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/configuration/defaults'
-require 'jekyll/favicon/utils'
+require "jekyll/favicon/configuration/defaults"
+require "jekyll/favicon/utils"
 
 module Jekyll
   module Favicon
@@ -31,7 +31,7 @@ module Jekyll
           case options
           when String
             source_dir, source_name = File.split options
-            { 'dir' => source_dir, 'name' => source_name }
+            {"dir" => source_dir, "name" => source_name}
           when Hash
             Utils.compact options
           else {}
@@ -39,15 +39,15 @@ module Jekyll
         end
 
         def self.source_filter(options)
-          options.fetch 'source', {}
+          options.fetch "source", {}
         end
 
         private
 
         def source_relative_pathname
-          Pathname.new(source['dir'])
-                  .join(source['name'])
-                  .cleanpath
+          Pathname.new(source["dir"])
+            .join(source["name"])
+            .cleanpath
         end
 
         def source_defaults

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'rexml/document'
-require 'jekyll/favicon/configuration/defaults'
-require 'jekyll/favicon/utils'
+require "rexml/document"
+require "jekyll/favicon/configuration/defaults"
+require "jekyll/favicon/utils"
 
 module Jekyll
   module Favicon
@@ -20,27 +20,21 @@ module Jekyll
             tag_name, tag_options = options.first
             tag_defaults = taggable_defaults[tag_name]
             tag_attributes = tag_defaults.merge tag_options
-            tag_build tag_name, patch(tag_attributes)
+            Utils.build_tag tag_name, patch(tag_attributes)
           end
         end
 
         private
 
         def tag_spec
-          spec.fetch 'tag', []
-        end
-
-        # :reek:UtilityFunction
-        def tag_build(name, attributes = {})
-          config = attributes.transform_keys { |key| "_#{key}" }
-          Jekyll::Favicon::Utils.build_element name, nil, config
+          spec.fetch "tag", []
         end
 
         def mimetype
           mappings = {
-            '.ico' => 'image/x-icon',
-            '.png' => 'image/png',
-            '.svg' => 'image/svg+xml'
+            ".ico" => "image/x-icon",
+            ".png" => "image/png",
+            ".svg" => "image/svg+xml"
           }
           mappings[extname]
         end

data/lib/jekyll/favicon/static_graphic_file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/static_file'
-require 'jekyll/favicon/static_file/convertible'
+require "jekyll/favicon/static_file"
+require "jekyll/favicon/static_file/convertible"
 
 module Jekyll
   module Favicon

data/lib/jekyll/favicon/tag.rb

@@ -1,24 +1,23 @@
 # frozen_string_literal: true
 
-require 'liquid'
-require 'jekyll/favicon/static_file'
+require "liquid"
+require "jekyll/favicon/static_file"
 
 module Jekyll
   module Favicon
     # New `favicon` tag include html tags on templates
     class Tag < Liquid::Tag
-      # :reek:UtilityFunction
       def render(context)
         context.registers[:site]
-               .static_files
-               .select { |static_file| static_file.is_a? StaticFile }
-               .select(&:taggable?)
-               .collect(&:tags)
-               .flatten
-               .join("\n")
+          .static_files
+          .select { |static_file| static_file.is_a? StaticFile }
+          .select(&:taggable?)
+          .collect(&:tags)
+          .flatten
+          .join("\n")
       end
     end
   end
 end
 
-Liquid::Template.register_tag('favicon', Jekyll::Favicon::Tag)
+Liquid::Template.register_tag("favicon", Jekyll::Favicon::Tag)