colorscore 0.0.3 → 0.0.4

data/lib/colorscore/histogram.rb

@@ -4,17 +4,17 @@ module Colorscore
       output = `convert #{image_path} -resize 400x400 -format %c -dither None -quantize YIQ -colors #{colors} -depth #{depth} histogram:info:-`
       @lines = output.lines.sort.reverse.map(&:strip).reject(&:empty?)
     end
-    
+
     # Returns an array of colors in descending order of occurances.
     def colors
-      hex_values = @lines.map { |line| line[/#[0-9A-F]+/] }
-      hex_values.map { |hex| Color::RGB.from_html(*hex) }
+      hex_values = @lines.map { |line| line[/#([0-9A-F]{6}) /, 1] }.compact
+      hex_values.map { |hex| Color::RGB.from_html(hex) }
     end
-    
+
     def color_counts
       @lines.map { |line| line.split(':')[0].to_i }
     end
-    
+
     def scores
       total = color_counts.inject(:+).to_f
       scores = color_counts.map { |count| count / total }

data/lib/colorscore/metrics.rb

@@ -3,19 +3,19 @@ module Colorscore
     def self.similarity(a, b)
       1 - distance(a, b)
     end
-    
+
     def self.distance(color_1, color_2)
       l1, a1, b1 = xyz_to_lab(*rgb_to_xyz(color_1))
       l2, a2, b2 = xyz_to_lab(*rgb_to_xyz(color_2))
-      
+
       distance = delta_e_cie_2000(l1, a1, b1, l2, a2, b2)
       scale(distance, 0..100)
     end
-    
+
     # Ported from colormath for Python.
     def self.delta_e_cie_2000(l1, a1, b1, l2, a2, b2)
       kl = kc = kh = 1
-      
+
       avg_lp = (l1 + l2) / 2.0
       c1 = Math.sqrt((a1 ** 2) + (b1 ** 2))
       c2 = Math.sqrt((a2 ** 2) + (b2 ** 2))
@@ -66,27 +66,27 @@ module Colorscore
 
       delta_e = Math.sqrt(((delta_lp / (s_l * kl)) ** 2) + ((delta_cp / (s_c * kc)) ** 2) + ((delta_hp / (s_h * kh)) ** 2) + r_t * (delta_cp / (s_c * kc)) * (delta_hp / (s_h * kh)))
     end
-    
+
     def self.rgb_to_xyz(color)
       color = color.to_rgb
       r, g, b = color.r, color.g, color.b
-      
+
       # assuming sRGB (D65)
       r = (r <= 0.04045) ? r/12.92 : ((r+0.055)/1.055) ** 2.4
       g = (g <= 0.04045) ? g/12.92 : ((g+0.055)/1.055) ** 2.4
       b = (b <= 0.04045) ? b/12.92 : ((b+0.055)/1.055) ** 2.4
-      
+
       r *= 100
       g *= 100
       b *= 100
-      
+
       x = 0.412453*r + 0.357580*g + 0.180423*b
       y = 0.212671*r + 0.715160*g + 0.072169*b
       z = 0.019334*r + 0.119193*g + 0.950227*b
-      
+
       [x, y, z]
     end
-    
+
     def self.xyz_to_lab(x, y, z)
       x /= 95.047
       y /= 100.000
@@ -97,13 +97,13 @@ module Colorscore
       else
         x = (7.787 * x) + (16.0 / 116)
       end
-      
+
       if y > 0.008856
         y = y ** (1.0/3)
       else
         y = (7.787 * y) + (16.0 / 116)
       end
-      
+
       if z > 0.008856
         z = z ** (1.0/3)
       else
@@ -116,7 +116,7 @@ module Colorscore
 
       [l, a, b]
     end
-    
+
     def self.scale(number, from_range, to_range=0..1, clamp=true)
       if clamp && number <= from_range.begin
         position = 0
@@ -125,10 +125,10 @@ module Colorscore
       else
         position = (number - from_range.begin).to_f / (from_range.end - from_range.begin)
       end
-      
+
       position * (to_range.end - to_range.begin) + to_range.begin
     end
-    
+
     def self.radians(degrees); degrees * Math::PI / 180; end
     def self.degrees(radians); radians * 180 / Math::PI; end
   end

data/lib/colorscore/palette.rb

@@ -5,33 +5,33 @@ module Colorscore
                "669900", "336600", "666600", "999900", "cccc33", "ffff00",
                "ffcc33", "ff9900", "ff6600", "cc6633", "996633", "663300",
                "000000", "999999", "cccccc", "ffffff"]
-    
+
     def self.default
       from_hex DEFAULT
     end
-    
+
     def self.from_hex(hex_values)
       new hex_values.map { |hex| Color::RGB.from_html(hex) }
     end
-    
+
     def scores(histogram_scores, distance_threshold=0.275)
       scores = map do |palette_color|
         score = 0
-        
+
         histogram_scores.each_with_index do |item, index|
           color_score, color = *item
-          
+
           color = color.to_hsl.tap { |c| c.s = 0.05 + c.s * (4 - c.l * 2.5) }.to_rgb
-          
+
           if (distance = Metrics.distance(palette_color, color)) < distance_threshold
             distance_penalty = (1 - distance) ** 4
             score += color_score * distance_penalty
-          end 
+          end
         end
-        
+
         [score, palette_color]
       end
-      
+
       scores.reject { |score, color| score <= 0.05 }.
              sort_by { |score, color| score }.
              reverse

data/lib/colorscore/version.rb

@@ -1,3 +1,3 @@
 module Colorscore
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/histogram_test.rb

@@ -1,12 +1,14 @@
 require File.expand_path("../test_helper", __FILE__)
 
 class HistogramTest < Test::Unit::TestCase
-  def setup
-    @colors = 7
-    @histogram = Histogram.new("test/fixtures/skydiver.jpg", @colors)
-  end
-  
   def test_color_count_is_correct
-    assert_equal @colors, @histogram.colors.size
+    colors = 7
+    histogram = Histogram.new("test/fixtures/skydiver.jpg", colors)
+    assert_equal colors, histogram.colors.size
+  end
+
+  def test_transparency_is_ignored
+    histogram = Histogram.new("test/fixtures/transparency.png")
+    assert_equal Color::RGB.from_html('0000ff'), histogram.colors.first
   end
 end

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: colorscore
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Milo Winningham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-11-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: color
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id002
-description: Finds the dominant colors in an image and scores them against a user-defined palette, using the CIE2000 Delta E formula.
-email: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Finds the dominant colors in an image and scores them against a user-defined
+  palette, using the CIE2000 Delta E formula.
+email:
 - milo@winningham.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -66,45 +62,38 @@ files:
 - lib/colorscore/palette.rb
 - lib/colorscore/version.rb
 - test/fixtures/skydiver.jpg
+- test/fixtures/transparency.png
 - test/histogram_test.rb
 - test/metrics_test.rb
 - test/palette_test.rb
 - test/test_helper.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Finds the dominant colors in an image.
-test_files: 
+test_files:
 - test/fixtures/skydiver.jpg
+- test/fixtures/transparency.png
 - test/histogram_test.rb
 - test/metrics_test.rb
 - test/palette_test.rb