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

data/lib/jekyll/favicon/utils.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'jekyll/favicon/utils/configuration/compact'
-require 'jekyll/favicon/utils/configuration/merge'
-require 'jekyll/favicon/utils/configuration/patch'
-require 'jekyll/favicon/utils/convert'
-require 'jekyll/favicon/utils/tag'
+require "jekyll/favicon/utils/configuration/compact"
+require "jekyll/favicon/utils/configuration/merge"
+require "jekyll/favicon/utils/configuration/patch"
+require "jekyll/favicon/utils/convert"
+require "jekyll/favicon/utils/tag"
 
 module Jekyll
   module Favicon
@@ -19,6 +19,25 @@ module Jekyll
       def self.except(hash, *keys)
         hash.reject { |key, _| keys.include? key }
       end
+
+      def self.define_to_size(define)
+        return unless define
+
+        define.split("=")
+          .last
+          .split(",")
+          .collect { |size| [size, size].join "x" }
+      end
+
+      def self.name_to_size(name)
+        size_in_name_regex = /^.*-(\d+x\d+)\..*$/
+        name.match size_in_name_regex
+      end
+
+      def self.slice_and_compact(hash, keys)
+        compactable = hash.slice(*keys)
+        Utils.compact compactable
+      end
     end
   end
 end

data/lib/jekyll/favicon/utils/configuration/compact.rb

@@ -10,48 +10,45 @@ module Jekyll
             klass.extend(ClassMethods)
           end
 
-          # Nil and empty remove from configurations
-          module ClassMethods
-            def compact(compactable)
-              case compactable
-              when Hash, Array
-                compact_deep(compactable) || compactable.class[]
-              else
-                compactable
-              end
+          def self.compact_deep(compactable)
+            case compactable
+            when Hash then compact_hash compactable
+            when Array then compact_array compactable
+            else compactable
             end
+          end
 
-            private
+          def self.compact_hash(hash)
+            compacted_hash = hash.each_with_object({}) do |(key, value), memo|
+              next unless (compacted = compact_deep(value))
 
-            def compact_deep(compactable)
-              case compactable
-              when Hash then compact_hash compactable
-              when Array then compact_array compactable
-              else compactable
-              end
+              memo[key] = compacted
             end
+            compact_shallow compacted_hash
+          end
 
-            def compact_hash(hash)
-              compacted_hash = hash.each_with_object({}) do |(key, value), memo|
-                next unless (compacted = compact_deep(value))
+          def self.compact_array(array)
+            compacted_array = array.each_with_object([]) do |value, memo|
+              next unless (compacted = compact_deep(value))
 
-                memo[key] = compacted
-              end
-              compact_shallow compacted_hash
+              memo << compacted
             end
+            compact_shallow compacted_array
+          end
 
-            def compact_array(array)
-              compacted_array = array.each_with_object([]) do |value, memo|
-                next unless (compacted = compact_deep(value))
+          def self.compact_shallow(compactable)
+            compactable.empty? ? nil : compactable.compact
+          end
 
-                memo << compacted
+          # Nil and empty remove from configurations
+          module ClassMethods
+            def compact(compactable)
+              case compactable
+              when Hash, Array
+                Compact.compact_deep(compactable) || compactable.class[]
+              else
+                compactable
               end
-              compact_shallow compacted_array
-            end
-
-            # :reek:UtilityFunction
-            def compact_shallow(compactable)
-              compactable.empty? ? nil : compactable.compact
             end
           end
         end

data/lib/jekyll/favicon/utils/configuration/merge.rb

@@ -10,50 +10,57 @@ module Jekyll
             klass.extend(ClassMethods)
           end
 
-          # Merge configurations
-          module ClassMethods
-            def merge(left = nil, *right_and_or_rest)
-              return left if right_and_or_rest.empty?
+          def self.merge_multiple(left = nil, *right_and_or_rest)
+            return left if right_and_or_rest.empty?
 
-              right, *rest = right_and_or_rest
-              merged = merge_pair left, right
-              return merged if rest.empty?
+            right, *rest = right_and_or_rest
+            merged = merge_pair left, right
+            return merged if rest.empty?
 
-              merge(merged, *rest)
-            end
-
-            private
+            merge_multiple(merged, *rest)
+          end
 
-            def merge_pair(left, right)
-              return right if !left || !right || !left.instance_of?(right.class)
+          def self.merge_pair(left, right)
+            return right if !left || !right || !left.instance_of?(right.class)
 
-              case right
-              when Hash then merge_pair_hash left, right
-              when Array then merge_pair_array left, right
-              else right
-              end
+            case right
+            when Hash then merge_pair_hash left, right
+            when Array then merge_pair_array left, right
+            else right
             end
+          end
 
-            def merge_pair_hash(left_hash, right_hash)
-              left_hash.merge(right_hash) do |_, left_value, right_value|
-                merge left_value, right_value
-              end
+          def self.merge_pair_hash(left_hash, right_hash)
+            left_hash.merge(right_hash) do |_, left_value, right_value|
+              merge_multiple left_value, right_value
             end
+          end
 
-            def merge_pair_array(left_array, right_array)
-              joint_array = left_array + right_array
-              joint_array.group_by { |map| merge_group map }
-                         .collect { |group, values| merge_collect group, values }
-                         .flatten
-            end
+          def self.merge_pair_array(left_array, right_array)
+            joint_array = left_array + right_array
+            joint_array.group_by { |map| merge_group map }
+              .collect { |group, values| merge_collect group, values }
+              .flatten
+          end
 
-            # :reek:UtilityFunction
-            def merge_group(map, keys = %w[name dir])
-              map.is_a?(Hash) ? map.values_at(*keys) : []
-            end
+          def self.merge_group(map, keys = %w[name dir])
+            map.is_a?(Hash) ? map.values_at(*keys) : []
+          end
+
+          def self.merge_collect(group, values)
+            group.first ? merge_multiple(*values) : values
+          end
+
+          # Merge configurations
+          module ClassMethods
+            def merge(left = nil, *right_and_or_rest)
+              return left if right_and_or_rest.empty?
+
+              right, *rest = right_and_or_rest
+              merged = Merge.merge_pair left, right
+              return merged if rest.empty?
 
-            def merge_collect(group, values)
-              group.first ? merge(*values) : values
+              Merge.merge_multiple(merged, *rest)
             end
           end
         end

data/lib/jekyll/favicon/utils/configuration/patch.rb

@@ -10,35 +10,36 @@ module Jekyll
             klass.extend(ClassMethods)
           end
 
-          # Patch configuration with the block provided
-          module ClassMethods
-            def patch(value_or_values, &block)
-              patch_method = case value_or_values
-                             when Array then :patch_array
-                             when Hash then :patch_hash
-                             when Symbol, String then :patch_value
-                             else return value_or_values
-                             end
-              send patch_method, value_or_values, &block
+          def self.patch_unknown(value_or_values, &block)
+            patch_method = case value_or_values
+                           when Array then :patch_array
+                           when Hash then :patch_hash
+                           when Symbol, String then :patch_value
+                           else return value_or_values
             end
+            send patch_method, value_or_values, &block
+          end
 
-            private
+          def self.patch_array(values, &block)
+            values.collect { |value| patch_unknown value, &block }
+          end
 
-            def patch_array(values, &block)
-              values.collect { |value| patch value, &block }
-            end
+          def self.patch_hash(values, &block)
+            values.transform_values { |value| patch_unknown value, &block }
+          end
 
-            def patch_hash(values, &block)
-              values.transform_values { |value| patch value, &block }
-            end
+          def self.patch_value(value, &block)
+            block.call patch_value_string_symbol(value)
+          end
 
-            def patch_value(value, &block)
-              block.call patch_value_string_symbol(value)
-            end
+          def self.patch_value_string_symbol(value)
+            value.to_s.start_with?(":") ? value[1..].to_sym : value
+          end
 
-            # :reek:UtilityFunction
-            def patch_value_string_symbol(value)
-              value.to_s.start_with?(':') ? value[1..-1].to_sym : value
+          # Patch configuration with the block provided
+          module ClassMethods
+            def patch(value_or_values, &block)
+              Patch.patch_unknown value_or_values, &block
             end
           end
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mini_magick'
+require "mini_magick"
 
 module Jekyll
   module Favicon
@@ -11,28 +11,25 @@ module Jekyll
           klass.extend(ClassMethods)
         end
 
+        def self.convert_apply(convert, options = {})
+          options.each_with_object(convert) do |(option, value), memo|
+            memo.send option.to_sym, value
+          end
+        end
+
+        def self.convert_options(convert, options = {})
+          priorities = %w[resize scale]
+          convert_apply convert, options.slice(*priorities)
+          common_options = options.reject { |key| priorities.include? key }
+          convert_apply convert, common_options
+        end
+
         # Favicon convert utils functions
         module ClassMethods
           def convert(input, output, options = {})
             MiniMagick::Tool::Convert.new do |convert|
               convert.flatten
-              convert_options(convert, options) << input << output
-            end
-          end
-
-          private
-
-          def convert_options(convert, options = {})
-            priorities = %w[resize scale]
-            convert_apply convert, options.slice(*priorities)
-            common_options = options.reject { |key| priorities.include? key }
-            convert_apply convert, common_options
-          end
-
-          # :reek:UtilityFunction
-          def convert_apply(convert, options = {})
-            options.each_with_object(convert) do |(option, value), memo|
-              memo.send option.to_sym, value
+              Convert.convert_options(convert, options) << input << output
             end
           end
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rexml/document'
+require "rexml/document"
 
 module Jekyll
   module Favicon
@@ -11,41 +11,57 @@ module Jekyll
           klass.extend(ClassMethods)
         end
 
-        # Favicon rexml utils functions
-        module ClassMethods
-          # :reek:FeatureEnvy
-          def mutate_element(parent, changes = {})
-            changes.each_with_object(parent) do |(key, value), memo|
-              if key.start_with? '__' then memo.text = value
-              elsif key.start_with? '_' then memo.add_attribute key[1..-1], value
-              else mutate_element mutate_find_or_create_element(memo, key), value
-              end
-            end
+        def self.mutate_find_or_create_element(parent, key)
+          parent.get_elements(key).first || parent.add_element(key)
+        end
+
+        def self.mutate_xml(parent, changes = {})
+          changes.each_with_object(parent) do |(key, value), memo|
+            mutate_iterator key, value, memo
           end
+        end
 
-          def build_element(name, parent = nil, config = {})
-            element = REXML::Element.new name, parent
-            return populate_element element, config if config.is_a? Enumerable
+        def self.mutate_iterator(key, value, memo)
+          if key.start_with? "__" then memo.text = value
+          elsif key.start_with? "_" then memo.add_attribute key[1..], value
+          else Tag.mutate_xml Tag.mutate_find_or_create_element(memo, key), value
+          end
+        end
 
-            element.text = config and return element
+        def self.build_xml(name, parent = nil, config = {})
+          element = REXML::Element.new name, parent
+          return Tag.populate_element element, config if config.is_a? Enumerable
+
+          element.text = config and return element
+        end
+
+        def self.populate_element(element, config)
+          config.each_with_object(element) do |(key, value), memo|
+            populate_iterator key, value, memo
           end
+        end
+
+        def self.populate_iterator(key, value, memo)
+          if key.start_with? "__" then memo.text = value
+          elsif (child_key = key.match(/^_(.*)$/))
+            memo.add_attribute child_key[1], value
+          else build_xml key, memo, value
+          end
+        end
 
-          private
+        # Favicon rexml utils functions
+        module ClassMethods
+          def mutate_element(parent, changes = {})
+            Tag.mutate_xml parent, changes
+          end
 
-          # :reek:UtilityFunction
-          def mutate_find_or_create_element(parent, key)
-            parent.get_elements(key).first || parent.add_element(key)
+          def build_element(name, parent = nil, config = {})
+            Tag.build_xml name, parent, config
           end
 
-          # :reek:FeatureEnvy
-          def populate_element(element, config)
-            config.each_with_object(element) do |(key, value), memo|
-              if key.start_with? '__' then memo.text = value
-              elsif (child_key = key.match(/^_(.*)$/))
-                memo.add_attribute child_key[1], value
-              else build_element key, memo, value
-              end
-            end
+          def build_tag(name, attributes = {})
+            config = attributes.transform_keys { |key| "_#{key}" }
+            Tag.build_xml name, nil, config
           end
         end
       end

data/lib/jekyll/favicon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-favicon
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Alvaro Faundez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -136,6 +136,10 @@ files:
 - ".github/workflows/gem-push.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".reek.yml"
+- ".vscode/launch.json"
+- ".vscode/settings.json"
+- ".vscode/tasks.json"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -144,6 +148,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/debug
 - bin/setup
 - config/jekyll/favicon.yml
 - config/jekyll/favicon/static_file.yml
@@ -152,13 +157,6 @@ files:
 - config/jekyll/favicon/static_file/referenceable.yml
 - config/jekyll/favicon/static_file/sourceable.yml
 - config/jekyll/favicon/static_file/taggable.yml
-- gemfiles/jekyll36.gemfile
-- gemfiles/jekyll37.gemfile
-- gemfiles/jekyll38.gemfile
-- gemfiles/jekyll39.gemfile
-- gemfiles/jekyll40.gemfile
-- gemfiles/jekyll41.gemfile
-- gemfiles/jekyll42.gemfile
 - jekyll-favicon.gemspec
 - lib/jekyll-favicon.rb
 - lib/jekyll/favicon.rb