miro 0.2.1 → 0.2.2

data/lib/miro.rb

@@ -12,7 +12,8 @@ module Miro
       @options ||= {
         :image_magick_path  => "/usr/bin/convert",
         :resolution         => "150x150",
-        :color_count        => 8
+        :color_count        => 8,
+        :quantize           => 'RGB'
       }
     end
   end

data/lib/miro/dominant_colors.rb

@@ -17,7 +17,7 @@ module Miro
     def to_rgba
       sorted_pixels.collect {|c| ChunkyPNG::Color.to_truecolor_alpha_bytes c }
     end
-    
+
     def by_percentage
       sorted_pixels
       pixel_count = @pixels.size
@@ -43,25 +43,24 @@ module Miro
     def downsample_colors_and_convert_to_png!
       @source_image = open_source_image
       @downsampled_image = open_downsampled_image
-      command.run
-    end
 
-    def command
-      Cocaine::CommandLine.new(Miro.options[:image_magick_path], ":in -resize :resolution -colors :colors :out",
-                              :in => File.expand_path(@source_image.path),
-                              :resolution => Miro.options[:resolution],
-                              :colors => Miro.options[:color_count].to_s,
-                              :out => File.expand_path(@downsampled_image.path))
+      Cocaine::CommandLine.new(Miro.options[:image_magick_path], "':in[0]' -resize :resolution -colors :colors -colorspace :quantize -quantize :quantize :out").
+        run(:in => File.expand_path(@source_image.path),
+            :resolution => Miro.options[:resolution],
+            :colors => Miro.options[:color_count].to_s,
+            :quantize => Miro.options[:quantize],
+            :out => File.expand_path(@downsampled_image.path))
     end
 
     def open_source_image
       if remote_source_image?
         original_extension = URI.parse(@src_image_path).path.split('.').last
-        
+
         tempfile = Tempfile.open(["source", ".#{original_extension}"])
         remote_file_data = open(@src_image_path).read
 
         tempfile.write(RUBY_VERSION =~ /1.9/ ? remote_file_data.force_encoding("UTF-8") : remote_file_data)
+        tempfile.close
         return tempfile
       else
         return File.open(@src_image_path)

data/lib/miro/version.rb

@@ -1,3 +1,3 @@
 module Miro
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/miro/dominant_colors_spec.rb

@@ -56,12 +56,15 @@ describe Miro::DominantColors do
 
     it "runs the imagemagick command line with the correct arguments" do
       subject.stub(:open_downsampled_image).and_return(mock_downsampled_image)
+      line = double('line')
       Cocaine::CommandLine.should_receive(:new).with(Miro.options[:image_magick_path],
-                                                     ":in -resize :resolution -colors :colors :out",
-                                                     :in => '/path/to/source_image',
-                                                     :resolution => Miro.options[:resolution],
-                                                     :colors => Miro.options[:color_count].to_s,
-                                                     :out => '/path/to/downsampled_image')
+                                                     "':in[0]' -resize :resolution -colors :colors -colorspace :quantize -quantize :quantize :out").and_return(line)
+
+      line.should_receive(:run).with(:in => '/path/to/source_image',
+                                     :resolution => Miro.options[:resolution],
+                                     :colors => Miro.options[:color_count].to_s,
+                                     :quantize => Miro.options[:quantize],
+                                     :out => '/path/to/downsampled_image')
       subject.sorted_pixels
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miro
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &70242933714440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242933714440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oily_png
-  requirement: &70242933714020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242933714020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242933713600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242933713600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70242933713180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242933713180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extract the dominant colors from an image.
 email:
 - jon.buda@gmail.com
@@ -96,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extract the dominant colors from an image.
@@ -104,3 +124,4 @@ test_files:
 - spec/miro/dominant_colors_spec.rb
 - spec/miro_spec.rb
 - spec/spec_helper.rb
+has_rdoc: