favicon_maker 0.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2fef14009c845e3a40a3794579d66c12d0f40e
-  data.tar.gz: 8f8d56288229bf603dc326df4b872a2f4a61b4c4
+  metadata.gz: 5060beb595085399132ea1b324f4746153e142a1
+  data.tar.gz: b1037564b82ab94cad83b1616c0fab17c7c95390
 SHA512:
-  metadata.gz: 6fbfcfc6086db90c91d36a4f84394adb8bea4ada8101fb73b01c27a49d282c1938ba66e77743d233bcfc80d100c85542638b5e0fa5458e76d95aedf15923e835
-  data.tar.gz: 4ccd98ea5d07a56699ba295953c9dc6db1a2d3e2d4a4409da0ea2b18683f143e0393477e6376cec9388e20440d02b5ac366a715928173aa205ad571746e2bc5c
+  metadata.gz: 5dc5392d5193014f9e8a307ddaf17154d5dcfdd43f2a9b38606655e81bc34dd3badfffafd75d5964e3d853d64ebae2d9d86dc5cf976a0bfc93cf818480fe579a
+  data.tar.gz: c3fedf492456d8f9c8c3a945835610469118a95de51e441c70f65c4d515628463ae334218812e76436af469357a05d1898f4a86773723ea39d60c4b9df6abd4d

data/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  # watch(%r{^lib/(.+)\.rb$})     { |m| ["spec/lib/#{m[1]}_spec.rb", "spec/favicon_maker_spec.rb"] }
+  watch(%r{^lib/favicon_maker/(.+)\.rb$})     { |m| ["spec/lib/#{m[1]}_spec.rb", "spec/favicon_maker_spec.rb"] }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,3 +1,4 @@
+
 FaviconMaker [![Build Status](https://secure.travis-ci.org/follmann/favicon_maker.png)](http://travis-ci.org/follmann/favicon_maker)
 ============
 
@@ -5,83 +6,185 @@ Tired of creating a gazillion different favicons to satisfy all kinds of devices
 
 I know I was, so I created FaviconMaker to ease the tedious process of creating multiple versions of your favicon.
 
-The basic idea is to have one image file as source for all the different sizes and or formats (png/ico). If the input folder contains a precomposed file like a visually improved version of the 16x16 favicon.ico this file version will not be generated but the file optionally be copied to the output folder. The remaining versions will still be sourced from the input image defined.
-
-## Install
-### Standalone
-    gem install favicon_maker
-
-### Using Bundler (recommended)
-    ...
-    gem "favicon_maker"
-    ...
+The basic idea is to have a template image file as source for all the different sizes and or formats (png/ico). From v1.x on it is possible to use multiple template files 
+
+## Installation
+Using Bundler
+
+``` shell
+gem "favicon_maker"
+```
+## Using the DSL 
+### Definition
+* ```setup``` takes the directory config
+* ```from```  defines the template to be used
+* ```icon```  needs at least a filename. Usually the size and the file format are encoded in that name e.g. ```apple-touch-icon-152x152-precomposed.png```, if that is the case FaviconMaker tries to extract that information. It takes an options hash as the second argument where ```size:  "16x16"``` and ```format: :ico``` can be specified. Only .ico and .png are supported. The options passed take precedence over information extracted from the filename.
+* ```each_icon``` is called for every generated file with the fully qualified output filepath
+
+### Complete example:
+``` ruby
+FaviconMaker.generate do
+ 
+  setup do
+    template_dir  "/home/app/favicon-templates"
+    output_dir    "/home/app/public"
+  end
+
+  from "favicon_base_hires.png" 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 "favicon-196x196.png"
+    icon "favicon-160x160.png"
+    icon "favicon-96x96.png"
+    icon "mstile-144x144", format: "png"
+  end
+
+  from "favicon_base.png" do
+    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-32x32.png"
+    icon "favicon-16x16.png"
+    icon "favicon.png", size: "16x16"
+    icon "favicon.ico", size: "64x64,32x32,24x24,16x16"
+  end
+
+  each_icon do |filepath|
+    puts filepath # verbose example
+  end
+end
+```
+
+## Changes from v0.3 to v1.0
+* Almost entire rewrite
+* DSL to configure the output
+* No internal configuration and format definitions anymore
+* Support for multiple template files
 
 ## Integration
 ### Middleman
-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)
-### Capistrano
-1. Edit your Capfile and add the following line
-
-        require "favicon_maker"
-
-2. Add the following snippet to your deploy.rb
+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
 
-        namespace :favicon do
-          task :create_versions do
-            options = {
-              :root_dir => release_path,
-              :input_dir => File.join("app", "assets", "public"),
-              :output_dir => "public"
-            }
-            FaviconMaker::Generator.create_versions(options) do |filepath|
-              puts "Created favicon: #{filepath}"
-            end
-          end
-        end
-
-        after "deploy:update_code", "favicon:create_versions"
+## 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.
 
-**Note: This snippet is untested but should work**
-
-## Basic Usage
-### Simple
-    require "rubygems"
-    require "favicon_maker"
+## DEPRECATED - FaviconMaker v0.x
+### Integration
+#### Middleman
+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) till version v3.4
 
-    FaviconMaker::Generator.create_versions
-
-Uses the following defaults:
-
-    options = {
-      :versions => [:apple_152, :apple_144, :apple_120, :apple_114, :apple_76, :apple_72, :apple_60, :apple_57, :apple, :fav_196, :fav_160, :fav_96, :fav_32, :fav_16, :fav_png, :fav_ico, :mstile_144],
-      :custom_versions => {},
-      :root_dir => File.dirname(__FILE__),
-      :input_dir => "favicons",
-      :base_image => "favicon_base.png",
-      :output_dir => "favicons_output",
-      :copy => false
-    }
-
-### Advanced
-(untested attempted Rails integration, using all available options. Could be used in a Rake task or Capistrano recipe)
+#### Capistrano
+1. Edit your Capfile and add the following line
+``` ruby
+require "favicon_maker"
+```
+2. Add the following snippet to your deploy.rb
 
+``` ruby
+namespace :favicon do
+  task :create_versions do
     options = {
-      :versions => [:apple_152, :apple_144, :apple_120, :apple_114, :apple_76, :apple_72, :apple_60, :apple_57, :apple, :fav_196, :fav_160, :fav_96, :fav_32, :fav_16, :fav_png, :fav_ico, :mstile_144],
-      :custom_versions => {:apple_extreme_retina => {:filename => "apple-touch-icon-228x228-precomposed.png", :dimensions => "228x228", :format => "png"}},
-      :root_dir => Rails.root,
+      :root_dir => release_path,
       :input_dir => File.join("app", "assets", "public"),
-      :base_image => "favicon.png",
-      :output_dir => "public",
-      :copy => true
+      :output_dir => "public"
     }
-
     FaviconMaker::Generator.create_versions(options) do |filepath|
       puts "Created favicon: #{filepath}"
     end
+  end
+end
+
+after "deploy:update_code", "favicon:create_versions"
+```
 
-## Base Image Guideline
-Choose the version with the biggest dimension as your base image. Currently the size 196x196 for newer iOS devices marks the upper limit. So just create a PNG with 24 or 32 Bit color depth and 196x196 document size. Downscaling of images always works better than upscaling.
+**Note: This snippet is untested but should work**
 
+### v0.x Usage
+#### Simple
+
+``` ruby
+require "rubygems"
+require "favicon_maker"
+
+FaviconMaker::Generator.create_versions
+```
+Uses the following defaults:
+``` ruby
+options = {
+  :versions => [
+    :apple_152,
+    :apple_144,
+    :apple_120,
+    :apple_114,
+    :apple_76,
+    :apple_72,
+    :apple_60,
+    :apple_57,
+    :apple,
+    :fav_196,
+    :fav_160,
+    :fav_96,
+    :fav_32,
+    :fav_16,
+    :fav_png,
+    :fav_ico,
+    :mstile_144
+  ],
+  :custom_versions => {},
+  :root_dir => File.dirname(__FILE__),
+  :input_dir => "favicons",
+  :base_image => "favicon_base.png",
+  :output_dir => "favicons_output",
+  :copy => false
+}
+```
+#### Advanced
+(untested attempted Rails integration, using all available options. Could be used in a Rake task or Capistrano recipe)
+``` ruby
+options = {
+  :versions => [
+    :apple_152,
+    :apple_144,
+    :apple_120,
+    :apple_114,
+    :apple_76,
+    :apple_72,
+    :apple_60,
+    :apple_57,
+    :apple,
+    :fav_196,
+    :fav_160,
+    :fav_96,
+    :fav_32,
+    :fav_16,
+    :fav_png,
+    :fav_ico,
+    :mstile_144
+  ],
+  :custom_versions => {
+    :apple_extreme_retina => {
+      :filename => "apple-touch-icon-228x228-precomposed.png",
+      :dimensions => "228x228",
+      :format => "png"
+    }
+  },
+  :root_dir => Rails.root,
+  :input_dir => File.join("app", "assets", "public"),
+  :base_image => "favicon.png",
+  :output_dir => "public",
+  :copy => true
+}
+
+FaviconMaker::Generator.create_versions(options) do |filepath|
+  puts "Created favicon: #{filepath}"
+end
+```
 ## Copyright
 
-© 2011 Andreas Follmann. See LICENSE for details.
+© 2011-2014 Andreas Follmann. See LICENSE for details.
+

data/favicon_maker.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Andreas Follmann"]
   #s.email       = [""]
   s.homepage    = "https://github.com/follmann/favicon_maker"
-  s.summary     = %q{Create favicon files in various sizes from a base image}
-  s.description = %q{Create favicon files in various sizes from a base image}
+  s.summary     = %q{Create favicon files in various sizes from one or multiple base images}
+  s.description = %q{Create favicon files in various sizes from one or multiple base images}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("mini_magick", ["~> 3.5"])
+  s.add_runtime_dependency("docile", ["~> 1.1.2"])
 
-  s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("rspec", ["~> 2.14.1"])
+  s.add_development_dependency("guard-rspec")
 end

data/lib/favicon_maker.rb

@@ -1,9 +1,3 @@
-module FaviconMaker
-  
-  libdir = File.dirname(__FILE__)
-  $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-  
-  # Auto-load modules on-demand
-  autoload :Generator, "favicon_maker/generator"
-  
-end
+require "favicon_maker/maker_config"
+require "favicon_maker/generator"
+require "favicon_maker/creator"

data/lib/favicon_maker/creator.rb

@@ -0,0 +1,101 @@
+require "mini_magick"
+require 'fileutils'
+
+module FaviconMaker
+
+  class Creator
+    RECENT_IM_VERSION         = "6.8.0"
+    COLORSPACE_MIN_IM_VERSION = "6.7.5"
+
+    attr_accessor :template_file_path
+    attr_accessor :output_path
+    attr_accessor :colorspace_in
+    attr_accessor :colorspace_out
+    attr_accessor :finished_block
+
+    def initialize(template_file_path, output_path, finished_block)
+      @template_file_path = template_file_path
+      @output_path        = output_path
+      @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
+
+    def icon(output_filename, options={})
+      format  = options[:format]  || extract_format(output_filename)
+      size    = options[:size]    || extract_size(output_filename)
+      output_file_path = File.join(output_path, output_filename)
+
+      generate_file(template_file_path, output_file_path, size, format)
+
+      finished_block.call(output_file_path, template_file_path) if finished_block
+    end
+
+    private
+
+    def fetch_image_magick_version
+      version = (`convert --version`).scan(/ImageMagick (\d\.\d\.\d)/).flatten.first
+    end
+
+    def extract_format(output_filename)
+      File.extname(output_filename).split('.').last
+    end
+
+    def extract_size(output_filename)
+      matches = output_filename.match /.*-(\d+x\d+).*/
+      matches[1] if matches
+    end
+
+    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.format "png"
+        image.strip
+        image.colorspace colorspace_out
+        image.write output_file_path
+      when :ico
+        ico_cmd = "convert \"#{template_file_path}\" -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}) "
+        end
+        ico_cmd << "-delete 0 -colorspace #{colorspace_out} \"#{output_file_path}\""
+        print `#{ico_cmd}`
+      end
+    end
+
+    def print_image_magick_ancient_version_warning
+      puts "FaviconMaker: WARNING! Your installed ImageMagick version #{IM_VERSION} is not up-to-date and might produce suboptimal output!"
+    end
+
+
+    def print_image_magick_no_version_warning
+      puts "FaviconMaker: WARNING! The version of your installed ImageMagick could not be detected!"
+    end
+
+    def on_windows?
+      (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
+    end
+
+  end
+
+end

data/lib/favicon_maker/generator.rb

@@ -1,142 +1,43 @@
-module FaviconMaker
-  require "mini_magick"
-  require 'fileutils'
-  require 'pathname'
-
-  class Generator
-
-    ICON_VERSION_DEFINITIONS = {
-      :apple_152  => { :filename => "apple-touch-icon-152x152-precomposed.png", :sizes => "152x152",  :format => "png" },
-      :apple_144  => { :filename => "apple-touch-icon-144x144-precomposed.png", :sizes => "144x144",  :format => "png" },
-      :apple_120  => { :filename => "apple-touch-icon-120x120-precomposed.png", :sizes => "120x120",  :format => "png" },
-      :apple_114  => { :filename => "apple-touch-icon-114x114-precomposed.png", :sizes => "114x114",  :format => "png" },
-      :apple_76   => { :filename => "apple-touch-icon-76x76-precomposed.png",   :sizes => "76x76",    :format => "png" },
-      :apple_72   => { :filename => "apple-touch-icon-72x72-precomposed.png",   :sizes => "72x72",    :format => "png" },
-      :apple_60   => { :filename => "apple-touch-icon-60x60-precomposed.png",   :sizes => "60x60",    :format => "png" },
-      :apple_57   => { :filename => "apple-touch-icon-57x57-precomposed.png",   :sizes => "57x57",    :format => "png" },
-      :apple_pre  => { :filename => "apple-touch-icon-precomposed.png",         :sizes => "57x57",    :format => "png" },
-      :apple      => { :filename => "apple-touch-icon.png",                     :sizes => "57x57",    :format => "png" },
-      :fav_196    => { :filename => "favicon-196x196.png",                      :sizes => "196x196",  :format => "png" },
-      :fav_160    => { :filename => "favicon-160x160.png",                      :sizes => "160x160",  :format => "png" },
-      :fav_96     => { :filename => "favicon-96x96.png",                        :sizes => "96x96",    :format => "png" },
-      :fav_32     => { :filename => "favicon-32x32.png",                        :sizes => "32x32",    :format => "png" },
-      :fav_16     => { :filename => "favicon-16x16.png",                        :sizes => "16x16",    :format => "png" },
-      :fav_png    => { :filename => "favicon.png",                              :sizes => "16x16",    :format => "png" },
-      :fav_ico    => { :filename => "favicon.ico",                              :sizes => "64x64,32x32,24x24,16x16", :format => "ico" },
-      :mstile_144 => { :filename => "mstile-144x144",                           :sizes => "144x144",  :format => "png" }
-    }
-
-    DEFAULT_OPTIONS = {
-      :versions         => ICON_VERSION_DEFINITIONS.keys,
-      :custom_versions  => {},
-      :root_dir         => File.dirname(__FILE__),
-      :input_dir        => "favicons",
-      :base_image       => "favicon_base.png",
-      :output_dir       => "favicons_output",
-      :copy             => false
-    }
-
-    IM_VERSION                    = (`convert --version`).scan(/ImageMagick (\d\.\d\.\d)/).flatten.first
-    RECENT_VERSION                = "6.8.0"
-    COLORSPACE_MIN_VERSION        = "6.7.5"
-    COLORSPACE_IN, COLORSPACE_OUT = *(IM_VERSION < COLORSPACE_MIN_VERSION ? ["sRGB", "RGB"] : ["RGB", "sRGB"])
-
-    class << self
+require 'docile'
 
-      def create_versions(options={}, &block)
-        print_image_magick_warning  if IM_VERSION < RECENT_VERSION
-
-        options = DEFAULT_OPTIONS.merge(options)
-        raise ArgumentError unless options[:versions].is_a? Array
-
-        base_path       = File.join(options[:root_dir], options[:input_dir])
-        output_path     = determine_output_path(options[:root_dir], options[:output_dir])
-        input_file_path = File.join(base_path, options[:base_image])
-        copy_composed   = options[:copy]
-
-        process_icon_versions(options[:versions], options[:custom_versions]) do |version|
-          build_mode, output_file_path  = copy_or_generate_file(
-                                            input_file_path,
-                                            base_path,
-                                            output_path,
-                                            copy_composed,
-                                            version
-                                          )
-
-          if block_given?
-            yield output_file_path, build_mode
-          end
-        end
-      end
-
-      private
+module FaviconMaker
 
-      def copy_or_generate_file(input_file_path, base_path, output_path, copy_composed, version)
-        sizes               = version[:dimensions] || version[:sizes]
-        composed_file_path  = File.join(base_path, version[:filename])
-        output_file_path    = File.join(output_path, version[:filename])
-        output_format       = version[:format]
+  class << self
+    def generate(&block)
+      Docile.dsl_eval(Generator.new, &block).start
+    end
+  end
 
-        # check for self composed icon file
-        if copy_composed && File.exist?(composed_file_path)
-          copy_image(composed_file_path, output_file_path)
-          return :copied, output_file_path
-        else
-          generate_file(output_format, sizes, input_file_path, output_file_path)
-          return :generated, output_file_path
-        end
-      end
+  class Generator
+    extend Forwardable
 
-      def generate_file(format, sizes, input_file_path, output_file_path)
-        case format.to_sym
-        when :png
-          image = MiniMagick::Image.open(input_file_path)
-          image.define "png:include-chunk=none,trns,gama"
-          image.colorspace COLORSPACE_IN
-          image.resize sizes
-          image.format "png"
-          image.strip
-          image.colorspace COLORSPACE_OUT
-          image.write output_file_path
-        when :ico
-          ico_cmd = "convert \"#{input_file_path}\" -colorspace #{COLORSPACE_IN} "
-          escapes = "\\" unless on_windows?
-          sizes.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |size|
-            ico_cmd << "#{escapes}( -clone 0 -resize #{size} #{escapes}) "
-          end
-          ico_cmd << "-delete 0 -colorspace #{COLORSPACE_OUT} \"#{output_file_path}\""
-          puts `#{ico_cmd}`
-        end
-      end
+    attr_accessor :config
+    attr_accessor :creators
+    attr_accessor :finished_block
 
-      def copy_image(composed_file_path, output_file_path)
-        FileUtils.cp(composed_file_path, output_file_path)
-      end
+    delegate [:template_dir, :output_dir] => :config
 
-      def determine_output_path(root_dir, output_dir)
-        if Pathname.new(output_dir).absolute?
-          output_dir
-        else
-          File.join(root_dir, output_dir)
-        end
-      end
+    def initialize
+      @creators = {}
+    end
 
-      def process_icon_versions(versions, custom_versions, &block)
-        icon_versions_available = ICON_VERSION_DEFINITIONS.merge(custom_versions)
+    def setup(&block)
+      @config = Docile.dsl_eval(MakerConfig.new, &block)
+    end
 
-        (versions + custom_versions.keys).uniq.each do |version_label|
-          yield icon_versions_available[version_label]
-        end
-      end
+    def from(template_filename, &block)
+      creators[template_filename] = block
+    end
 
-      def print_image_magick_warning
-        puts "FaviconMaker: WARNING! Your installed ImageMagick version #{IM_VERSION} is not up-to-date and might produce suboptimal output!"
-      end
+    def each_icon(&block)
+      @finished_block = block
+    end
 
-      def on_windows?
-        (RbConfig::CONFIG['host_os'].match /mswin|mingw|cygwin/)
+    def start
+      creators.each do |template_filename, creator_block|
+        template_file = File.join(template_dir, template_filename)
+        Docile.dsl_eval(Creator.new(template_file, output_dir, finished_block), &creator_block)
       end
-
     end
   end
 end

data/lib/favicon_maker/maker_config.rb

@@ -0,0 +1,8 @@
+class MakerConfig
+  [:template_dir, :output_dir].each do |method_name|
+    define_method method_name do |dir=nil|
+      instance_variable_set("@#{method_name}", dir) if dir
+      instance_variable_get("@#{method_name}")
+    end
+  end
+end

data/lib/favicon_maker/version.rb

@@ -1,3 +1,3 @@
 module FaviconMaker
-  VERSION = "0.3"
+  VERSION = "1.0"
 end

data/spec/favicon_maker_spec.rb

@@ -2,116 +2,146 @@ require 'spec_helper'
 
 describe FaviconMaker, '#create_versions' do
 
-  before(:all) do
-    @multi_versions = []
-    @uni_versions = []
-    @options = {
-      :versions => [
-        :apple_152,
-        :apple_144,
-        :apple_120,
-        :apple_114,
-        :apple_76,
-        :apple_72,
-        :apple_60,
-        :apple_57,
-        :apple,
-        :fav_196,
-        :fav_160,
-        :fav_96,
-        :fav_32,
-        :fav_16,
-        :fav_png,
-        :fav_ico,
-        :mstile_144
-      ],
-      :custom_versions => {
-        :apple_extreme_retina => {
-          :filename => "apple-touch-icon-228x228-precomposed.png", :sizes => "228x228", :format => "png"
-        }
-      },
-      :root_dir => File.join(Dir.pwd, "spec"),
-      :input_dir => "support",
-      :copy => true
-    }
-
-    @cleanup = lambda do |output_dir|
-      if Dir.exists?(output_dir)
-        Dir[File.join(output_dir, "*")].each do |file|
-          File.delete(file)
-        end
-        Dir.delete(output_dir)
+  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) }
+
+  def cleanup(output_dir)
+    if Dir.exists?(output_dir)
+      Dir[File.join(output_dir, "*")].each do |file|
+        File.delete(file)
       end
+      Dir.delete(output_dir)
     end
   end
 
   context "multi-color icon" do
+
+    let(:relative_output_dir) { "output1" }
+
     before do
-      options = @options.merge({
-        :base_image => "favicon base.png",
-        :output_dir => "output1"
-      })
+      cleanup(output_path)
+      Dir.mkdir(output_path)
+    end
 
-      @output_dir = File.join(options[:root_dir], options[:output_dir])
+    subject do
+      files = []
+      template_files = []
 
-      @cleanup.call(@output_dir)
+      FaviconMaker.generate do
 
-      Dir.mkdir(@output_dir)
+        setup do
+          template_dir     absolute_template_dir
+          output_dir    output_path
+        end
 
-      FaviconMaker::Generator.create_versions(options) do |filepath, status|
-        @multi_versions << filepath
-      end
-    end
+        from "favicon base.png" 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"
+        end
+
+        from "favicon_base.png" do
+          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"
+        end
 
-    it "creates 18 different versions" do
-      @multi_versions.size.should eql(18)
+        each_icon do |filepath, template_filepath|
+          files << filepath
+          template_files << template_filepath
+        end
+      end
+      return files, template_files
     end
 
-    it "creates files for versions" do
-      @multi_versions.each do |file|
-        File.exists?(file).should be_true
+    it "creates 18 files" do
+      files, template_files = subject
+      expect(files.size).to eql(18)
+      files.each do |file|
+        expect(File.exists?(file)).to be_true
       end
+      expect(template_files.uniq.size).to eql(2)
     end
 
     after do
-      @cleanup.call(@output_dir)
+      cleanup(output_path)
     end
 
   end
 
   context "uni-color icon" do
 
+    let(:relative_output_dir) { "output2" }
+
     before do
-      options = @options.merge({
-        :base_image => "favicon_base_uni.png",
-        :output_dir => "output2"
-      })
+      cleanup(output_path)
+      Dir.mkdir(output_path)
+    end
 
-      @output_dir = File.join(options[:root_dir], options[:output_dir])
+    subject do
+      files = []
 
-      @cleanup.call(@output_dir)
+      FaviconMaker.generate do
 
-      Dir.mkdir(@output_dir)
+        setup do
+          template_dir  absolute_template_dir
+          output_dir    output_path
+        end
 
-      FaviconMaker::Generator.create_versions(options) do |filepath, status|
-        @uni_versions << filepath
-      end
-    end
+        from "favicon_base_uni.png" 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"
+        end
 
-    it "creates 18 different versions" do
-      @uni_versions.size.should eql(18)
+        each_icon do |filepath|
+          files << filepath
+        end
+      end
+      files
     end
 
-    it "creates files for versions" do
-      @uni_versions.each do |file|
-        File.exists?(file).should be_true
+    it "creates 18 files" do
+      files = subject
+      expect(files.size).to eql(18)
+      files.each do |file|
+        expect(File.exists?(file)).to be_true
       end
     end
 
     after do
-      @cleanup.call(@output_dir)
+      cleanup(output_path)
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '1.0'
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -24,21 +24,49 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: docile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
-description: Create favicon files in various sizes from a base image
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Create favicon files in various sizes from one or multiple base images
 email: 
 executables: []
 extensions: []
@@ -48,15 +76,19 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - favicon_maker.gemspec
 - lib/favicon_maker.rb
+- lib/favicon_maker/creator.rb
 - lib/favicon_maker/generator.rb
+- lib/favicon_maker/maker_config.rb
 - lib/favicon_maker/version.rb
 - spec/favicon_maker_spec.rb
 - spec/spec_helper.rb
 - spec/support/favicon base.png
+- spec/support/favicon_base.png
 - spec/support/favicon_base_uni.png
 homepage: https://github.com/follmann/favicon_maker
 licenses: []
@@ -80,9 +112,10 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Create favicon files in various sizes from a base image
+summary: Create favicon files in various sizes from one or multiple base images
 test_files:
 - spec/favicon_maker_spec.rb
 - spec/spec_helper.rb
 - spec/support/favicon base.png
+- spec/support/favicon_base.png
 - spec/support/favicon_base_uni.png