favicon_maker 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa73c03522ae6619963ff97c6fef9c05ca16efb
-  data.tar.gz: 1d3d0730eb5ac9435ea48daf53653997ba3d5eb2
+  metadata.gz: a96b698809c2a16905b7b58d0118b5106c4fc39b
+  data.tar.gz: 023d995146b9e3f1842b4ab0da7702486397089d
 SHA512:
-  metadata.gz: 13ea1e79438db7300be2e2b0815fe002657757316fac34926ed3120fa067bd16f337fe1f54d8ad2ea3c2c55a0d0cd42823820d18749b699b17eadb8872cd557d
-  data.tar.gz: 25f2cdb5b822cb878589863cfa5ed7da3ccc7db9669374d8d37ac6782cb594507d9a3c5a5434991363b13d9c10f6466b78dbe245ee2dd8f427c35b17ece73d02
+  metadata.gz: a0a5f276df6378394239bbd6b55e007a936014a0530eb2db797f9ec48face70ad9dfc280f0eaace01dc0471c93f35ac16985b7fc7ca77c22682893ece16968dc
+  data.tar.gz: c988f8e0869737b39a5a909192db88ea94f5f15917a81d030a620547a838d9a1cef5a78e9fbb7f7ea5c9c097ef7d6f62633c61b062c54da95563f1f43f8f63a7

data/.gitignore

@@ -4,5 +4,5 @@ Gemfile.lock
 pkg/*
 .rvmrc
 
-/spec/generated/
-.DS_Store
+/spec/output*/
+.DS_Store

data/.ruby-version

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

data/favicon_maker.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("mini_magick", ["~> 3.7"])
-  s.add_runtime_dependency 'docile', '~> 1.1.3'
+  s.add_runtime_dependency 'docile', '~> 1.1'
 
   s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
   s.add_development_dependency 'guard-rspec', '~> 1.2'
-end
+end

data/lib/favicon_maker/creator.rb

@@ -1,4 +1,3 @@
-require "mini_magick"
 require 'fileutils'
 
 module FaviconMaker
@@ -9,30 +8,21 @@ module FaviconMaker
 
     attr_accessor :template_file_path
     attr_accessor :output_path
-    attr_accessor :colorspace_in
-    attr_accessor :colorspace_out
+    attr_accessor :options
     attr_accessor :finished_block
 
-    def initialize(template_file_path, output_path, finished_block)
+    def initialize(template_file_path, output_path, options, finished_block)
       @template_file_path = template_file_path
       @output_path        = output_path
+      @options            = options
       @finished_block     = finished_block
 
       im_version = fetch_image_magick_version
 
       if im_version
         print_image_magick_ancient_version_warning  if im_version < RECENT_IM_VERSION
-        if im_version < COLORSPACE_MIN_IM_VERSION
-          @colorspace_in   = "sRGB"
-          @colorspace_out  = "RGB"
-        else
-          @colorspace_in   = "RGB"
-          @colorspace_out  = "sRGB"
-        end
       else
         print_image_magick_no_version_warning
-        @colorspace_in   = "RGB"
-        @colorspace_out  = "sRGB"
       end
     end
 
@@ -78,30 +68,55 @@ module FaviconMaker
     def generate_file(template_file_path, output_file_path, size, format)
       case format.to_sym
       when :png
-        image = MiniMagick::Image.open(template_file_path)
-        image.define "png:include-chunk=none,trns,gama"
-        image.colorspace colorspace_in
-        image.resize size
-        image.combine_options do |c|
-          c.background "none"
-          c.gravity "center"
-          c.extent size
-        end unless InputValidator.size_square?(size)
-        image.format "png"
-        image.strip
-        image.colorspace colorspace_out
-        image.write output_file_path
+        convert_settings = [
+          [ :define,      "png:include-chunk=none,trns,gama"  ],
+          [ :format,      "png"                               ],
+          [ :resize,      size                                ],
+          [ :gravity,     "center"                            ],
+          [ :background,  "none"                              ],
+          [ :extent,      size                                ],
+        ]
+
+        run_convert(template_file_path, convert_settings, output_file_path, format)
       when :ico
-        ico_cmd = "convert \"#{template_file_path}\" -quiet -colorspace #{colorspace_in} "
-        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} #{escapes}) "
+        convert_settings = [
+          [ :quiet,       nil                                 ],
+        ]
+
+        center_settings = [
+          [ :gravity,     "center"                            ],
+          [ :background,  "none"                              ],
+        ]
+
+        run_convert(template_file_path, convert_settings, output_file_path, format) 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
-        ico_cmd << "-delete 0 -colorspace #{colorspace_out} \"#{output_file_path}\""
-        print `#{ico_cmd}`
       end
     end
 
+    def run_convert(template_file_path, convert_settings, output_file_path, format, &block)
+      ico_cmd = "convert -background none #{@options} "
+      ico_cmd << "\"#{template_file_path}\" #{options_to_args(convert_settings)} "
+      ico_cmd = yield(ico_cmd) if block_given?
+      ico_cmd << " #{format}:\"#{output_file_path}\""
+      print `#{ico_cmd}`
+    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}"
+        end
+      }.join(' ')
+    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!"
     end

data/lib/favicon_maker/generator.rb

@@ -26,8 +26,8 @@ module FaviconMaker
       @config = Docile.dsl_eval(MakerConfig.new, &block)
     end
 
-    def from(template_filename, &block)
-      creators[template_filename] = block
+    def from(template_filename, options="", &block)
+      creators[template_filename] = [options, block]
     end
 
     def each_icon(&block)
@@ -35,9 +35,10 @@ module FaviconMaker
     end
 
     def start
-      creators.each do |template_filename, creator_block|
+      creators.each do |template_filename, options_and_block|
         template_file = File.join(template_dir, template_filename)
-        Docile.dsl_eval(Creator.new(template_file, output_dir, finished_block), &creator_block)
+        options, creator_block = *options_and_block
+        Docile.dsl_eval(Creator.new(template_file, output_dir, options, finished_block), &creator_block)
       end
     end
   end

data/lib/favicon_maker/version.rb

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

data/spec/favicon_maker_spec.rb

@@ -5,8 +5,6 @@ describe FaviconMaker, '#create_versions' do
   let(:absolute_root_dir)     { File.join(Dir.pwd, "spec") }
   let(:absolute_template_dir) { File.join(absolute_root_dir, "support") }
 
-  let(:base_image) { "favicon base.png" }
-
   let(:output_path) { File.join(absolute_root_dir, relative_output_dir) }
 
   let(:total_count) { 19 }
@@ -20,6 +18,27 @@ describe FaviconMaker, '#create_versions' do
     end
   end
 
+  def extract_size(filepath)
+    matches = identify(filepath).match(/.*(PNG|ICO) (\d+x\d+).*/)
+    if matches && matches.size == 3
+      matches[2]
+    else
+      nil
+    end
+  end
+
+  def is_image_square?(filepath)
+    extract_size(filepath).split('x').uniq.size == 1
+  end
+
+  def is_file_image?(filepath)
+    !identify(filepath).match(/no decode delegate/).nil?
+  end
+
+  def identify(filepath)
+    `identify #{filepath}`
+  end
+
   context "multi-color icon" do
 
     let(:relative_output_dir) { "output1" }
@@ -36,7 +55,7 @@ describe FaviconMaker, '#create_versions' do
       FaviconMaker.generate do
 
         setup do
-          template_dir     absolute_template_dir
+          template_dir  absolute_template_dir
           output_dir    output_path
         end
 
@@ -148,4 +167,113 @@ describe FaviconMaker, '#create_versions' do
       # cleanup(output_path)
     end
   end
+
+  context "non-square icon" do
+
+    let(:relative_output_dir) { "output3" }
+
+    before do
+      cleanup(output_path)
+      Dir.mkdir(output_path)
+    end
+
+    subject do
+      files = []
+
+      FaviconMaker.generate do
+
+        setup do
+          template_dir  absolute_template_dir
+          output_dir    output_path
+        end
+
+        from "favicon_base_non_square.png" do
+          icon "apple-touch-icon-114x114-precomposed.png"
+          icon "apple-touch-icon-precomposed.png", size: "57x57"
+          icon "favicon.ico",     size:  "64x64,32x32,24x24,16x16"
+          icon "mstile-144x144",  format: "png"
+        end
+
+        each_icon do |filepath|
+          files << filepath
+        end
+      end
+      files
+    end
+
+    it "creates multiple files" do
+      files = subject
+      expect(files.size).to eql(4)
+      files.each do |file|
+        expect(File.exists?(file)).to be_true
+        expect(is_image_square?(file)).to be_true
+      end
+    end
+
+    after do
+      # cleanup(output_path)
+    end
+  end
+
+  context "svg icon" do
+
+    let(:relative_output_dir) { "output4" }
+
+    before do
+      cleanup(output_path)
+      Dir.mkdir(output_path)
+    end
+
+    subject do
+      files = []
+
+      FaviconMaker.generate do
+
+        setup do
+          template_dir  absolute_template_dir
+          output_dir    output_path
+        end
+
+        from "TRS_Logo_RGB_solo.svg", '-background grey' do
+          icon "apple-touch-icon-152x152-precomposed.png"
+          icon "apple-touch-icon-144x144-precomposed.png"
+          icon "apple-touch-icon-120x120-precomposed.png"
+          icon "apple-touch-icon-114x114-precomposed.png"
+          icon "apple-touch-icon-76x76-precomposed.png"
+          icon "apple-touch-icon-72x72-precomposed.png"
+          icon "apple-touch-icon-60x60-precomposed.png"
+          icon "apple-touch-icon-57x57-precomposed.png"
+          icon "apple-touch-icon-precomposed.png", size: "57x57"
+          icon "apple-touch-icon.png",             size: "57x57"
+          icon "favicon-196x196.png"
+          icon "favicon-160x160.png"
+          icon "favicon-96x96.png"
+          icon "favicon-32x32.png"
+          icon "favicon-16x16.png"
+          icon "favicon.png",     size:  "16x16"
+          icon "favicon.ico",     size:  "64x64,32x32,24x24,16x16"
+          icon "mstile-144x144",  format: "png"
+          icon "mstile-310x150",  format: "png"
+        end
+
+        each_icon do |filepath|
+          files << filepath
+        end
+      end
+      files
+    end
+
+    it "creates multiple image files" do
+      files = subject
+      expect(files.size).to eql(total_count)
+      files.each do |file|
+        expect(File.exists?(file)).to be_true
+      end
+    end
+
+    after do
+      # cleanup(output_path)
+    end
+  end
+
 end

data/spec/support/TRS_Logo_RGB_solo.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="566.93px"
+	 height="566.93px" viewBox="0 0 566.93 566.93" xml:space="preserve" fill="none">
+
+	<rect  x="0" y="0" width="566.93" height="566.93" style="fill: #ffffff; stroke: #cccccc; strokeWidth: 2;" rx="80" ry="80" />
+	<g>
+		<path fill="#2D97AB" d="M485.617,141.689c6.428-11.785,10.024-30.518-6.509-47.051c-17.977-17.977-41.928-13.424-55.339-0.012
+			c-13.821,13.819-19.177,36.337-0.012,55.502c4.553,4.552,10.898,8.5,16.566,10.304c4.879,1.572,10.097-1.129,11.645-6.007
+			c1.572-4.878-1.144-10.106-6.009-11.643c-2.84-0.91-6.658-3.331-9.092-5.764c-12.736-12.737-5.461-23.811,0.012-29.282
+			c5.401-5.402,17.628-11.479,29.119,0.012c12.923,12.924,2.771,26.5,0.628,29.037c-3.167,3.681-2.957,9.175,0.477,12.609
+			l27.583,27.583c4.056,4.055,9.23,3.904,12.201,0.933c1.914-1.914,23.021-23.042,23.021-23.042
+			c5.073-5.938,8.219-13.132,9.593-22.309c2.84-23.775,8.732-71.721,10.047-82.396c1.969-16.009-9.559-27.698-25.333-25.824
+			l-81.363,9.802c-15.973,1.933-23.146,9.059-27.907,13.798L289.141,173.764l-61.996,6.486c-3.553,0.384-6.579,2.758-7.766,6.135
+			c-1.2,3.365-0.35,7.125,2.177,9.652l42.881,42.904l-101,101c-3.621,3.62-3.622,9.489-0.002,13.109
+			c3.623,3.622,9.491,3.62,13.113,0l107.534-107.535c3.621-3.62,3.621-9.488-0.002-13.109c-0.004-0.005-0.008-0.006-0.011-0.01
+			l-35.653-35.719l46.105-4.821c2.538-0.279,4.738-1.594,6.24-3.492L428.042,61.06c3.795-3.772,7.384-7.335,17.035-8.512
+			l81.349-9.791c4.539-0.513,5.309,0.397,4.702,5.146c-1.315,10.677-7.207,58.668-10.001,82.164
+			c-1.072,7.103-3.538,10.666-4.818,12.201l-15.057,15.056L485.617,141.689z"/>
+		<path fill="#547792" d="M81.722,430.851C81.269,430.282,35.7,372.229,35.7,293.173c-0.013-54.429,22.085-112.294,59.087-154.814
+			c30.271-34.789,84.702-76.273,172.001-76.274c29.328,0.011,57.992,7.557,76.89,13.901c4.844,1.63,10.105-0.979,11.735-5.844
+			c1.645-4.855-1.013-10.073-5.846-11.736c-20.187-6.776-50.949-14.857-82.78-14.857c-94.284,0-153.186,44.93-185.995,82.63
+			C40.344,172.659,17.15,233.528,17.163,293.173c-0.012,85.472,48.014,146.681,50.053,149.252c0.223,0.267,0.465,0.537,0.71,0.782
+			c3.282,3.282,8.594,3.653,12.328,0.685C84.25,440.69,84.914,434.856,81.722,430.851z"/>
+		<path fill="#2D97AB" d="M329.79,291.205l-71.568,71.546l-0.119,0.119c-3.62,3.62-3.623,9.487-0.001,13.109
+			c3.62,3.62,9.49,3.62,13.11-0.002l65.139-65.118l42.896,42.916c2.551,2.551,6.357,3.4,9.744,2.153
+			c3.389-1.247,5.751-4.354,6.043-7.952l5.193-63.36l84.341-84.387c3.623-3.622,3.623-9.49,0-13.112
+			c-3.62-3.62-9.489-3.62-13.111,0.002c0,0-86.004,85.982-86.155,86.11c-1.899,1.595-3.062,3.876-3.272,6.347l-3.842,46.92
+			l-35.288-35.293C339.279,287.583,333.41,287.585,329.79,291.205z"/>
+		<path fill="#5E5E84" d="M516.412,293.175c0.011-19.596-2.679-40.076-7.939-60.892c-1.247-4.95-6.301-7.954-11.271-6.708
+			c-4.961,1.258-7.965,6.311-6.706,11.27c4.9,19.316,7.369,38.271,7.381,56.329c-0.023,95.938-71.708,231.054-231.077,231.077
+			c-78.38-0.023-130.635-37.861-149.077-53.696l195.636-195.499c3.62-3.62,3.622-9.487,0-13.108c-3.62-3.621-9.489-3.621-13.109,0
+			L97.779,464.279c-3.62,3.62-3.633,9.478-0.012,13.1c0.023,0.023,0.058,0.057,0.081,0.079c7.09,7.091,68.414,65.316,168.952,65.33
+			C438.951,542.788,516.412,396.819,516.412,293.175z"/>
+	</g>
+</svg>

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -96,8 +83,10 @@ files:
 - spec/favicon_maker_spec.rb
 - spec/input_validator_spec.rb
 - spec/spec_helper.rb
+- spec/support/TRS_Logo_RGB_solo.svg
 - spec/support/favicon base.png
 - spec/support/favicon_base.png
+- spec/support/favicon_base_non_square.png
 - spec/support/favicon_base_uni.png
 homepage: https://github.com/follmann/favicon_maker
 licenses: []
@@ -126,6 +115,8 @@ test_files:
 - spec/favicon_maker_spec.rb
 - spec/input_validator_spec.rb
 - spec/spec_helper.rb
+- spec/support/TRS_Logo_RGB_solo.svg
 - spec/support/favicon base.png
 - spec/support/favicon_base.png
+- spec/support/favicon_base_non_square.png
 - spec/support/favicon_base_uni.png