middleman-favicon-maker 4.0.5 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b0433e183c68686843e2d41299fdbe27cdb378
-  data.tar.gz: 40bc39f57dc5b71b30513e703b28ac84c1777e13
+  metadata.gz: 37e88f68bd6296f3109b10f7ad61702769689e7f
+  data.tar.gz: 15135900040a395325ec3351af7e664127c2b6f3
 SHA512:
-  metadata.gz: 2f3d2a2d8436950b1dd5f0f1013c28d5ab01c666bcfda9c7135f901cf78b1ebd48692224aa4f4e517466ce88daed06da783263bfb0e032d627ea488df29e8168
-  data.tar.gz: ccca9560b23183d8770473189cd2595ce19fb498789072baf4262590300b416a389e7ab96aef61c01e1ab8a8e9df0d0ad7e472da34fc17828f4e35aa47b371c5
+  metadata.gz: 5d67dba363b0cd21d699da024516e2c73802f9ccba721d71a6c062af24671117c3f24afe3dd4ae869babbe405de8e6006588ac526cafcc0c3f1b4bb9c3d5829d
+  data.tar.gz: 6f1e61b5f2f4932d3359c5af476d2491cc05f651081218344663023ec81b7950b20e7edc3872dbb525b1a2b6525d26edd0ea7d9c66a6132df6875efb175b0c01

data/lib/middleman-favicon-maker/extension.rb

@@ -10,13 +10,11 @@ module Middleman
       option :icons,        {},  "Hash with template filename (key) and Array of Hashes with icon configs"
 
       def after_configuration
-        options[:template_dir] ||= source_path
-        options[:output_dir]   ||= build_path
+        options[:template_dir] ||= app.config.source
+        options[:output_dir]   ||= app.config.build_dir
       end
 
       def after_build(builder)
-
-        template_files = []
         ::FaviconMaker.generate do
           setup do
             template_dir  options[:template_dir]
@@ -31,18 +29,10 @@ module Middleman
             end
           end
 
-          each_icon do |filepath, template_filepath|
-            pathname = Pathname.new(filepath)
-            rel_path =
-              if pathname.absolute?
-                pathname.relative_path_from(Pathname.new(app.root)).to_s
-              else
-                filepath
-              end
-            builder.trigger(:created, rel_path)
+          each_icon do |filepath, _template_filepath|
+            builder.trigger(:created, relative_path_to_root(filepath))
           end
         end
-
       end
 
       def manipulate_resource_list(resources)
@@ -51,7 +41,7 @@ module Middleman
             ::Middleman::Sitemap::Resource.new(
               app.sitemap,
               item[:icon],
-              File.join(app.root, options[:template_dir], src)
+              File.join(app.root, relative_path_to_root(options[:template_dir]), src)
             )
           end
         end
@@ -60,12 +50,13 @@ module Middleman
 
       private
 
-      def source_path
-        File.join(app.root, app.config.source)
-      end
-
-      def build_path
-        File.join(app.root, app.config.build_dir)
+      def relative_path_to_root(filepath)
+        pathname = Pathname.new(filepath)
+        if pathname.absolute?
+          pathname.relative_path_from(Pathname.new(app.root)).to_s
+        else
+          filepath
+        end
       end
     end
   end

data/lib/middleman-favicon-maker/version.rb

@@ -1,8 +1,8 @@
 module Middleman
   module FaviconMaker
     MAJOR = 4
-    MINOR = 0
-    PATCH = 5
+    MINOR = 1
+    PATCH = 0
     BUILD = nil
 
     VERSION = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-favicon-maker
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate favicon files in various sizes from a base image in your Middleman