colorant 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    colorant (0.1.2)
+    colorant (0.1.3)
       color_namer
       trollop
 
@@ -47,9 +47,7 @@ PLATFORMS
 DEPENDENCIES
   aruba
   bundler (>= 1.0.3)
-  color_namer
   colorant!
   cucumber
   rspec
   simplecov
-  trollop

data/lib/colorant/processer.rb

@@ -17,7 +17,7 @@ module Colorant
     end
 
     def process!
-      raw_data = `convert #{file} -format %c -colors #{colors} -depth #{depth} histogram:info:- | sort -r -k 1`
+      raw_data = `convert #{file} -gravity Center -crop 80x60% +repage -format %c -colors #{colors} -depth #{depth} histogram:info:- | sort -r -k 1`
       @data = Parser.parse(raw_data)
       Reporter.report(@data, @reporter_options)
     end

data/lib/colorant/reporter.rb

@@ -19,7 +19,19 @@ module Colorant
           [color.last, row[:freq]]
         end
       end
-      send(:"#{options[:reporter] || :ruby}_report", data)
+
+      freqs = {}
+      data.each do |color|
+        if freqs[color[0]]
+          freqs[color[0]] += color[1]
+        else
+          freqs[color[0]] = color[1]
+        end
+      end
+
+      colors = freqs.to_a.sort{|a, b| b[1] <=> a[1]}
+
+      send(:"#{options[:reporter] || :ruby}_report", colors)
     end
 
     private

data/lib/colorant/version.rb

@@ -1,3 +1,3 @@
 module Colorant
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/reporter_spec.rb

@@ -31,8 +31,7 @@ module Colorant
       describe "#report" do
 
         it 'outputs a simple ordered array with the image color composition' do
-          subject.report(arnolfini_data).should == [["Brown", 70.65],
-                                                    ["Brown", 29.35]]
+          subject.report(arnolfini_data).should == [["Brown", 100]]
         end
 
         context "when called with :extended => true" do
@@ -60,8 +59,7 @@ module Colorant
 
           it 'outputs a simple ordered array with the image color composition' do
             subject.report(arnolfini_data, :reporter => :stdout)
-            @out.string.should include "\tBrown\t\t\t\t\t\t-- 70.65 %\n"
-            @out.string.should include "\tBrown\t\t\t\t\t\t-- 29.35 %\n"
+            @out.string.should include "\tBrown\t\t\t\t\t\t-- 100.0 %\n"
           end
 
           context "when called with :extended => true" do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: colorant
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors: 
 - Josep M. Bach
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2011-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,8 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -53,10 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 3
         version: 1.0.3
   type: :development
   version_requirements: *id003
@@ -68,8 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -81,8 +67,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -94,8 +78,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -107,8 +89,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -158,23 +138,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: colorant
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easily extract the colors of any image file!