favicon_maker 1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9f56d73840c0d1a741f3eb58b7b429491fcdcc9
-  data.tar.gz: 658309f9a8a5841224b9be54f00f20b38f10c013
+  metadata.gz: 5425fa11731c03a11f38496fe910d7a2480defd7
+  data.tar.gz: f57af314852b7b0d2615a887ecf02e688e4e391b
 SHA512:
-  metadata.gz: f6a390aff4cc5751c65a73d5acef579e32d78b9ba4bd778aac642617de2e1d0f08189534605e3801ceff5c2ad9788fc9c0f38a79b4f5b433f68c27476df4c449
-  data.tar.gz: ebec04c983eb2ecc4ecaf9d72dc19bb713ed16a26618709f33635989d584d04a2c0eec8205be2d88eaab98813f9e0a10b240da5a28f49ba3694edf5cc380f46e
+  metadata.gz: 13b08c0ae6e4c5cced0dbe271087ac7c43bda4dcd75dc65ca3d895d0f19fb3dc471ffcfe4c617714c9be4d86ed712cf7d23b5dc0273141a1d997ae1affcd9c18
+  data.tar.gz: 64879750eaadd6ea7a381e564ae5482b21e3ea64b41f3e7e5ceb87ba89553688ce0d2212a71d05913c1eb897f40d6c878417b7b1df5e3dd7a89e62d610d0ce3c

data/README.md

@@ -1,5 +1,6 @@
-FaviconMaker [![Build Status](https://secure.travis-ci.org/follmann/favicon_maker.png)](http://travis-ci.org/follmann/favicon_maker) [![Code Climate](https://codeclimate.com/github/follmann/favicon_maker.png)](https://codeclimate.com/github/follmann/favicon_maker)
-============
+# FaviconMaker 
+[![Gem Version](https://badge.fury.io/rb/favicon_maker.svg)](http://badge.fury.io/rb/favicon_maker)
+[![Build Status](https://secure.travis-ci.org/follmann/favicon_maker.png)](http://travis-ci.org/follmann/favicon_maker) [![Code Climate](https://codeclimate.com/github/follmann/favicon_maker.png)](https://codeclimate.com/github/follmann/favicon_maker)
 
 Tired of creating a gazillion different favicons to satisfy all kinds of devices and resolutions in different file formats?
 
@@ -68,7 +69,7 @@ end
 In order to integrate the FaviconMaker effortless into your [Middleman](https://github.com/tdreyno/middleman) project use the following gem: [middleman-favicon-maker](https://github.com/follmann/middleman-favicon-maker) with version v3.5 or higher
 
 ## Template Image Guideline
-Choose the version with the biggest dimension as your base image. Currently the size 152x152 for newer iOS devices marks the upper limit. So just create a PNG with 24 or 32 Bit color depth and 152x152 document size. Downscaling of images always works better than upscaling. Use more than one template file to improve lower resolutions.
+Choose the version with the biggest dimension as your base image. Currently the size 152x152 for newer iOS devices marks the upper limit. So just create a PNG with 24 or 32 Bit color depth and 152x152 document size or a vector image SVG (since v1.2). Downscaling of images always works better than upscaling. Use more than one template file to improve lower resolutions.
 
 ## Contributing
 1. Fork it

data/lib/favicon_maker.rb

@@ -1,7 +1,7 @@
 require "favicon_maker/maker_config"
+require "favicon_maker/input_validator"
 require "favicon_maker/generator"
 require "favicon_maker/creator"
-require "favicon_maker/base_command"
-require "favicon_maker/ico_command"
-require "favicon_maker/png_command"
-require "favicon_maker/input_validator"
+require "favicon_maker/commands/base_command"
+require "favicon_maker/commands/ico_command"
+require "favicon_maker/commands/png_command"

data/lib/favicon_maker/commands/base_command.rb

@@ -0,0 +1,32 @@
+module FaviconMaker
+  module BaseCommand
+
+    def compose(template_file_path, output_file_path, convert_settings, options, format, &block)
+      ico_cmd =   [ "convert -background none #{options}".strip ]
+      ico_cmd +=  [ "\"#{template_file_path}\" #{options_to_args(convert_settings)}" ]
+      ico_cmd +=  yield([]) if block_given?
+      ico_cmd +=  [ " #{format}:\"#{output_file_path}\"" ]
+      @command = ico_cmd.join(' ')
+    end
+
+    def options_to_args(options)
+      return nil if options.nil?
+      options.map { |k,v|
+        if [ :xc, :null ].include?(k)
+          "#{k}:#{v}"
+        else
+          "-#{k} #{v}".strip
+        end
+      }.join(' ')
+    end
+
+    def on_windows?
+      (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
+    end
+
+    def to_s
+      @command
+    end
+
+  end
+end

data/lib/favicon_maker/commands/ico_command.rb

@@ -0,0 +1,28 @@
+module FaviconMaker
+  class IcoCommand
+
+    include BaseCommand
+
+    def initialize(template_file_path, output_file_path, size, options)
+
+      convert_settings = [
+        [ :quiet,       nil      ],
+      ]
+
+      center_settings = [
+        [ :gravity,     "center" ],
+        [ :background,  "none"   ],
+      ]
+
+      compose(template_file_path, output_file_path, convert_settings, options, :ico) do |ico_cmd|
+        escapes = "\\" unless on_windows?
+        size.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |s|
+          ico_cmd += [ "#{escapes}( -clone 0 -resize #{s}  #{options_to_args(center_settings)} -extent #{s} #{escapes})" ]
+        end
+        ico_cmd += [ "-delete 0" ]
+      end
+
+    end
+
+  end
+end

data/lib/favicon_maker/commands/png_command.rb

@@ -0,0 +1,21 @@
+module FaviconMaker
+  class PngCommand
+
+    include BaseCommand
+
+    def initialize(template_file_path, output_file_path, size, options)
+
+      convert_settings = [
+        [ :define,      "png:include-chunk=none,trns,gama"  ],
+        [ :format,      "png"                               ],
+        [ :resize,      size                                ],
+        [ :gravity,     "center"                            ],
+        [ :background,  "none"                              ],
+        [ :extent,      size                                ],
+      ]
+
+      compose(template_file_path, output_file_path, convert_settings, options, :png)
+
+    end
+  end
+end

data/lib/favicon_maker/creator.rb

@@ -20,7 +20,7 @@ module FaviconMaker
       im_version = fetch_image_magick_version
 
       if im_version
-        print_image_magick_ancient_version_warning  if im_version < RECENT_IM_VERSION
+        print_image_magick_ancient_version_warning(im_version) if im_version < RECENT_IM_VERSION
       else
         print_image_magick_no_version_warning
       end
@@ -78,8 +78,8 @@ module FaviconMaker
       end.to_s
     end
 
-    def print_image_magick_ancient_version_warning
-      puts "FaviconMaker: WARNING! Your installed ImageMagick version #{RECENT_IM_VERSION} is not up-to-date and might produce suboptimal output!"
+    def print_image_magick_ancient_version_warning(im_version)
+      puts "FaviconMaker: WARNING! Your installed ImageMagick version #{im_version} is not up-to-date and might produce suboptimal output!"
     end
 
 

data/lib/favicon_maker/version.rb

@@ -1,7 +1,7 @@
   module FaviconMaker
     MAJOR = 1
     MINOR = 3
-    PATCH = nil
+    PATCH = 1
     BUILD = nil
 
     VERSION = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.1
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -75,13 +75,13 @@ files:
 - README.md
 - favicon_maker.gemspec
 - lib/favicon_maker.rb
-- lib/favicon_maker/base_command.rb
+- lib/favicon_maker/commands/base_command.rb
+- lib/favicon_maker/commands/ico_command.rb
+- lib/favicon_maker/commands/png_command.rb
 - lib/favicon_maker/creator.rb
 - lib/favicon_maker/generator.rb
-- lib/favicon_maker/ico_command.rb
 - lib/favicon_maker/input_validator.rb
 - lib/favicon_maker/maker_config.rb
-- lib/favicon_maker/png_command.rb
 - lib/favicon_maker/version.rb
 - spec/favicon_maker_spec.rb
 - spec/input_validator_spec.rb

data/lib/favicon_maker/base_command.rb

@@ -1,30 +0,0 @@
-module BaseCommand
-
-  def run_convert(template_file_path, output_file_path, convert_settings, options, format, &block)
-    ico_cmd =   [ "convert -background none #{options}".strip ]
-    ico_cmd +=  [ "\"#{template_file_path}\" #{options_to_args(convert_settings)}" ]
-    ico_cmd +=  yield([]) if block_given?
-    ico_cmd +=  [ " #{format}:\"#{output_file_path}\"" ]
-    @command = ico_cmd.join(' ')
-  end
-
-  def options_to_args(options)
-    return nil if options.nil?
-    options.map { |k,v|
-      if [ :xc, :null ].include?(k)
-        "#{k}:#{v}"
-      else
-        "-#{k} #{v}".strip
-      end
-    }.join(' ')
-  end
-
-  def on_windows?
-    (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
-  end
-
-  def to_s
-    @command
-  end
-
-end

data/lib/favicon_maker/ico_command.rb

@@ -1,25 +0,0 @@
-class IcoCommand
-
-  include ::BaseCommand
-
-  def initialize(template_file_path, output_file_path, size, options)
-
-    convert_settings = [
-      [ :quiet,       nil      ],
-    ]
-
-    center_settings = [
-      [ :gravity,     "center" ],
-      [ :background,  "none"   ],
-    ]
-
-    run_convert(template_file_path, output_file_path, convert_settings, options, :ico) do |ico_cmd|
-      escapes = "\\" unless on_windows?
-      size.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |s|
-        ico_cmd += [ "#{escapes}( -clone 0 -resize #{s}  #{options_to_args(center_settings)} -extent #{s} #{escapes})" ]
-      end
-      ico_cmd += [ "-delete 0" ]
-    end
-
-  end
-end

data/lib/favicon_maker/png_command.rb

@@ -1,19 +0,0 @@
-class PngCommand
-
-  include ::BaseCommand
-
-  def initialize(template_file_path, output_file_path, size, options)
-
-    convert_settings = [
-      [ :define,      "png:include-chunk=none,trns,gama"  ],
-      [ :format,      "png"                               ],
-      [ :resize,      size                                ],
-      [ :gravity,     "center"                            ],
-      [ :background,  "none"                              ],
-      [ :extent,      size                                ],
-    ]
-
-    run_convert(template_file_path, output_file_path, convert_settings, options, :png)
-
-  end
-end