favicon_maker 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY1MThiYmRlODczZWE3YjY0NGQzZmE0Mjk4ODg4YzgyNTM0ZWU4Mg==
+    MWRhN2RjOGI4OTRlMWI3ODA5NjYzNjA0MmJhYjllYmUzNmI5Y2Y0MA==
   data.tar.gz: !binary |-
-    OTRlNWI4MjlkZWY5NzI0ZGE1YjMzNjkxZjZhYmU0NzE1YzI1MDlmNg==
+    Yjk3YmZhMmZkOGI2NWViZDcyNGZlOTQyMzRlMzNhNThkM2NhNjE4Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTZhYjVlNzRmNGE3NDA3ZGYzZjE5YjIyMGQzZWQ1NTFlMmZjOTEyYWQ5Yjhk
-    NzRjZDljOGZkODM4MGU4NGU1NTAyMzYyODI2YzRkMjVkMGQxMDI1YmVlNTA1
-    ZDIyZDY0NjllMTVkNmE3ZTNjYmMxNmNjMDE2MThlMTg0MWEyYWY=
+    ZDA1ZjE3ZTcxOTE5MjYzYWNmMTMxMDcxNDJiMTM3OWJmYmRkZDEyNDFmM2Yy
+    MmI0MTdjNzFlODE5N2Y1ZjQwODQ4M2IwZTJiNjEyNDUzOGU5OTc2MDI3NDVk
+    MDA2YTY0OTQ5YjM1YWE3YjgzNTE5MTBjMmNhN2Q4MTgzNzVmZjc=
   data.tar.gz: !binary |-
-    NjQxMGJiMWU0NjdlZDM2MDg4MmEzMTAyMTAyZGZmYzE1NTE2NGE2MzIyYWM3
-    MTA0MTM5ZTNiMjhkMTY3NDc0ZGEyMGZjZjY5ZGQ3NzdiYmRhYjAzYzI5ZDM2
-    MmU0YTg4MjRkZTA0NWIwNDk5ZTc4MWYwNDE2NDIwOWRhZGFmNWM=
+    YWM3ZTYxYTY3ZWU2YzI2YjcwMTdjYTY5ODNlNTAyYTdjMGUxNDNlN2RlNDM1
+    MzcxZWRlM2Y2OWE0ZTk5ZWVmMWQzMTM3NThlN2U1MmUyZTdhYTk0MWI0NTM4
+    MDg5ZTYwNjcxZTYwNzRjYmZhODZhOGI1NDQ2ZDkwYjM2YjZjZDk=

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+
+/spec/generated/

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
-  - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
 script: "bundle exec rspec spec"

data/lib/favicon_maker/generator.rb

@@ -5,14 +5,14 @@ module FaviconMaker
   class Generator
 
     ICON_VERSIONS = {
-      :apple_144 => {:filename => "apple-touch-icon-144x144-precomposed.png", :dimensions => "144x144", :format => "png"},
-      :apple_114 => {:filename => "apple-touch-icon-114x114-precomposed.png", :dimensions => "114x114", :format => "png"},
-      :apple_72 => {:filename => "apple-touch-icon-72x72-precomposed.png", :dimensions => "72x72", :format => "png"},
-      :apple_57 => {:filename => "apple-touch-icon-57x57-precomposed.png", :dimensions => "57x57", :format => "png"},
-      :apple_pre => {:filename => "apple-touch-icon-precomposed.png", :dimensions => "57x57", :format => "png"},
-      :apple => {:filename => "apple-touch-icon.png", :dimensions => "57x57", :format => "png"},
-      :fav_png => {:filename => "favicon.png", :dimensions => "16x16", :format => "png"},
-      :fav_ico => {:filename => "favicon.ico", :dimensions => "16x16", :format => "ico"}
+      :apple_144 => {:filename => "apple-touch-icon-144x144-precomposed.png", :sizes => "144x144", :format => "png"},
+      :apple_114 => {:filename => "apple-touch-icon-114x114-precomposed.png", :sizes => "114x114", :format => "png"},
+      :apple_72 => {:filename => "apple-touch-icon-72x72-precomposed.png", :sizes => "72x72", :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_png => {:filename => "favicon.png", :sizes => "16x16", :format => "png"},
+      :fav_ico => {:filename => "favicon.ico", :sizes => "64x64,32x32,24x24,16x16", :format => "ico"}
     }
 
     class << self
@@ -30,33 +30,43 @@ module FaviconMaker
 
         raise ArgumentError unless options[:versions].is_a? Array
         base_path = File.join(options[:root_dir], options[:input_dir])
-        input_path = File.join(base_path, options[:base_image])
+        input_file = File.join(base_path, options[:base_image])
 
         icon_versions = ICON_VERSIONS.merge(options[:custom_versions])
         (options[:versions] + options[:custom_versions].keys).uniq.each do |version|
           version = icon_versions[version]
+          sizes = version[:dimensions] || version[:sizes]
           composed_path = File.join(base_path, version[:filename])
-          output_path = File.join(options[:root_dir], options[:output_dir], version[:filename])
+          output_path = File.join(options[:root_dir], options[:output_dir])
+          output_file = File.join(output_path, version[:filename])
 
           build_mode = nil
           # check for self composed icon file
-          if File.exist?(composed_path)
-            if options[:copy]
-              FileUtils.cp composed_path, output_path
-              build_mode = :copied
-            end
+          if File.exist?(composed_path) && options[:copy]
+            FileUtils.cp composed_path, output_file
+            build_mode = :copied
           else
-            image = MiniMagick::Image.open(input_path)
-            image.define "png:include-chunk=none,trns,gama"
-            image.resize version[:dimensions]
-            image.format version[:format]
-            image.flatten
-            image.write output_path
+            image = MiniMagick::Image.open(input_file)
+            case version[:format].to_sym
+            when :png
+              image.define "png:include-chunk=none,trns,gama"
+              image.resize sizes
+              image.format "png"
+              image.strip
+              image.write output_file
+            when :ico
+              ico_cmd = "convert #{input_file} -colorspace RGB "
+              sizes.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |size|
+                ico_cmd << "\\( -clone 0 -colors 256  -resize #{size} \\) "
+              end
+              ico_cmd << "-delete 0 -colors 256 -colorspace sRGB #{File.join(output_path, version[:filename])}"
+              puts `#{ico_cmd}`
+            end
             build_mode = :generated
           end
 
           if block_given?
-            yield output_path, build_mode
+            yield output_file, build_mode
           end
         end
       end

data/lib/favicon_maker/version.rb

@@ -1,3 +1,3 @@
 module FaviconMaker
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/favicon_maker_spec.rb

@@ -2,39 +2,93 @@ require 'spec_helper'
 describe FaviconMaker, '#create_versions' do
 
   before(:all) do
-    @versions = []
-    options = {
+    @multi_versions = []
+    @uni_versions = []
+    @options = {
       :versions => [:apple_144, :apple_114, :apple_72, :apple_57, :apple, :fav_png, :fav_ico],
-      :custom_versions => {:apple_extreme_retina => {:filename => "apple-touch-icon-228x228-precomposed.png", :dimensions => "228x228", :format => "png"}},
+      :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",
-      :base_image => "favicon_base.png",
-      :output_dir => "generated",
       :copy => true
     }
 
-    @generated_dir = File.join(options[:root_dir], options[:output_dir])
-    Dir.mkdir(@generated_dir)
-
-    FaviconMaker::Generator.create_versions(options) do |filepath, status|
-      @versions << filepath
+    @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)
+      end
     end
   end
 
-  it "creates 8 different versions" do
-    @versions.size.should eql(8)
-  end
+  context "multi-color icon" do
+    before do
+      options = @options.merge({
+        :base_image => "favicon_base.png",
+        :output_dir => "output1"
+      })
+
+      @output_dir = File.join(options[:root_dir], options[:output_dir])
+
+      @cleanup.call(@output_dir)
+
+      Dir.mkdir(@output_dir)
+
+      FaviconMaker::Generator.create_versions(options) do |filepath, status|
+        @multi_versions << filepath
+      end
+    end
 
-  it "creates files for versions" do
-    @versions.each do |file|
-      File.exists?(file).should be_true
+    it "creates 8 different versions" do
+      @multi_versions.size.should eql(8)
     end
+
+    it "creates files for versions" do
+      @multi_versions.each do |file|
+        File.exists?(file).should be_true
+      end
+    end
+
+    after do
+      # @cleanup.call(@output_dir)
+    end
+
   end
 
-  after(:all) do
-    @versions.each do |file|
-      File.delete(file)
+  context "uni-color icon" do
+
+    before do
+      options = @options.merge({
+        :base_image => "favicon_base_uni.png",
+        :output_dir => "output2"
+      })
+
+      @output_dir = File.join(options[:root_dir], options[:output_dir])
+
+      @cleanup.call(@output_dir)
+
+      Dir.mkdir(@output_dir)
+
+      FaviconMaker::Generator.create_versions(options) do |filepath, status|
+        @uni_versions << filepath
+      end
+    end
+
+    it "creates 8 different versions" do
+      @uni_versions.size.should eql(8)
     end
-    Dir.delete(@generated_dir)
+
+    it "creates files for versions" do
+      @uni_versions.each do |file|
+        File.exists?(file).should be_true
+      end
+    end
+
+    after do
+      # @cleanup.call(@output_dir)
+    end
+
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -57,6 +57,7 @@ files:
 - spec/favicon_maker_spec.rb
 - spec/spec_helper.rb
 - spec/support/favicon_base.png
+- spec/support/favicon_base_uni.png
 homepage: https://github.com/follmann/favicon_maker
 licenses: []
 metadata: {}
@@ -84,3 +85,4 @@ test_files:
 - spec/favicon_maker_spec.rb
 - spec/spec_helper.rb
 - spec/support/favicon_base.png
+- spec/support/favicon_base_uni.png