favicon_maker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWRhN2RjOGI4OTRlMWI3ODA5NjYzNjA0MmJhYjllYmUzNmI5Y2Y0MA==
+    Y2Y1MGE2ZDQyZGM5NDJiY2MyMTExNTk0MjE4NzAwNzVjZjk3MmRhMw==
   data.tar.gz: !binary |-
-    Yjk3YmZhMmZkOGI2NWViZDcyNGZlOTQyMzRlMzNhNThkM2NhNjE4Yw==
+    MTUyMjAxZjYzODkwNDEyNTYwODczN2IzMTBhOGE2YzViNDhkODJhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDA1ZjE3ZTcxOTE5MjYzYWNmMTMxMDcxNDJiMTM3OWJmYmRkZDEyNDFmM2Yy
-    MmI0MTdjNzFlODE5N2Y1ZjQwODQ4M2IwZTJiNjEyNDUzOGU5OTc2MDI3NDVk
-    MDA2YTY0OTQ5YjM1YWE3YjgzNTE5MTBjMmNhN2Q4MTgzNzVmZjc=
+    NGZhY2E0Mjk1N2Q4MTZlYWQ5MWQxZDcwMjExYzZkNzM0M2I0OWJjMDBmY2Ri
+    ZjZiOTVkZWMyMDExNDNkYjNmOTY0ODQwZTIwNzk5MmI4MWU3OWYxODY5MzIz
+    Zjk2ZjgyMWRmYTQ3YTk2ZjMzNWVjOTA0MjU2ODA5MjM0ZmFkNDI=
   data.tar.gz: !binary |-
-    YWM3ZTYxYTY3ZWU2YzI2YjcwMTdjYTY5ODNlNTAyYTdjMGUxNDNlN2RlNDM1
-    MzcxZWRlM2Y2OWE0ZTk5ZWVmMWQzMTM3NThlN2U1MmUyZTdhYTk0MWI0NTM4
-    MDg5ZTYwNjcxZTYwNzRjYmZhODZhOGI1NDQ2ZDkwYjM2YjZjZDk=
+    YWQwNTk0ZGMyNDA0MmYxNDg3ODc5NjdlNjlmYjUyNjJiNTg1NmI2YzFjYWQy
+    NDUxNDhiYmU3ODUyMzMyMzUxZjdkNmM4YTRkN2Y0ZjAxZTA1YTRiNDNmZjEz
+    ZDFhM2ZlNTQ1YzMyMTE3OWU3Yjk3YjE2ZTZjNWFkNWVjOGY2YzY=

data/lib/favicon_maker/generator.rb

@@ -15,9 +15,21 @@ module FaviconMaker
       :fav_ico => {:filename => "favicon.ico", :sizes => "64x64,32x32,24x24,16x16", :format => "ico"}
     }
 
+    IM_VERSION = (`convert --version`).scan(/ImageMagick (\d\.\d\.\d)/).flatten.first
+    RECENT_VERSION = "6.8.0"
+    COLORSPACE_MIN_VERSION = "6.7.5"
+
     class << self
 
       def create_versions(options={}, &block)
+
+        puts "FaviconMaker: WARNING! Your installed ImageMagick version #{IM_VERSION} is not up-to-date and might produce suboptimal output!" if IM_VERSION < RECENT_VERSION
+
+        switch_colorspace = IM_VERSION < COLORSPACE_MIN_VERSION
+
+        colorspace_conv = ["RGB", "sRGB"]
+        colorspace_conv.reverse! if switch_colorspace
+
         options = {
           :versions => ICON_VERSIONS.keys,
           :custom_versions => {},
@@ -46,20 +58,22 @@ module FaviconMaker
             FileUtils.cp composed_path, output_file
             build_mode = :copied
           else
-            image = MiniMagick::Image.open(input_file)
             case version[:format].to_sym
             when :png
+              image = MiniMagick::Image.open(input_file)
               image.define "png:include-chunk=none,trns,gama"
+              image.colorspace colorspace_conv.first
               image.resize sizes
               image.format "png"
               image.strip
+              image.colorspace colorspace_conv.last
               image.write output_file
             when :ico
-              ico_cmd = "convert #{input_file} -colorspace RGB "
+              ico_cmd = "convert #{input_file} -colorspace #{colorspace_conv.first} "
               sizes.split(',').sort_by{|s| s.split('x')[0].to_i}.each do |size|
-                ico_cmd << "\\( -clone 0 -colors 256  -resize #{size} \\) "
+                ico_cmd << "\\( -clone 0 -colors 256 -resize #{size} \\) "
               end
-              ico_cmd << "-delete 0 -colors 256 -colorspace sRGB #{File.join(output_path, version[:filename])}"
+              ico_cmd << "-delete 0 -colors 256 -colorspace #{colorspace_conv.last} #{File.join(output_path, version[:filename])}"
               puts `#{ico_cmd}`
             end
             build_mode = :generated

data/lib/favicon_maker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favicon_maker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andreas Follmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Create favicon files in various sizes from a base image