jnylen-colorscore 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41850e99437a7328d6e7edc19576b2d1776077db
-  data.tar.gz: 828d20cbb163ed24b648c8cd0e85f49fffc9f0e0
+  metadata.gz: a8c814223d7b429f76b6b62d53fbe3be2e5a42d3
+  data.tar.gz: 46ccd43cf3c9b432366c2ea42904e4b8780fa549
 SHA512:
-  metadata.gz: 92c4e8f29715442f4899cb0cbb6913d3702f7a8374b3dd293227064d2c1b921259583600822dce56ec90ea21e8f016e9156b1eba1467afe83f85358c24654b0d
-  data.tar.gz: 6d4b95007e931d211f18d2855ccc25345e291acbe8302fc78312c7f69ff098d4ec4e3701f101390532060c004988909af4fea01c47210a375f20ef8472e96542
+  metadata.gz: ff4b836aa50ea6697793be254d12e0c98856b311ee1f69f6eec11b0069649b464d1f360b466c2e77a5714bc3b6ffb34d31329e628b52088405e7244371fd378e
+  data.tar.gz: 60b82f50750ef6e663f849874b53086c8ba7144b38a6a0e814f2d0834a8b0148d2556639372e6f7bff74cfcfea9d4271f86391d931e23a76260ba5c58345dd8a

data/README.md

@@ -1,5 +1,3 @@
-Major change from normal colorscore: .colors is .hex_colors.
-
 # Colorscore
 
 Colorscore is a simple library that uses ImageMagick to quantize an image and find its representative colors. It can also score those colors against a palette using the CIE2000 Delta E formula. This could be used to index images for a "search by color" feature.

data/lib/colorscore/histogram.rb

@@ -21,15 +21,11 @@ module Colorscore
     end
 
     # Returns an array of colors in descending order of occurances.
-    def hex_colors
+    def colors
       hex_values = @lines.map { |line| line[/#([0-9A-F]{6}) /, 1] }.compact
       hex_values.map { |hex| Color::RGB.from_html(hex) }
     end
 
-    def rgb_colors
-      @lines.map { |line| line[/ \(([0-9, ]+)\) /, 1].split(',').map(&:strip).take(3).join(',') }.compact
-    end
-
     def color_counts
       @lines.map { |line| line.split(':')[0].to_i }
     end
@@ -37,7 +33,7 @@ module Colorscore
     def scores
       total = color_counts.inject(:+).to_f
       scores = color_counts.map { |count| count / total }
-      scores.zip(hex_colors)
+      scores.zip(colors)
     end
   end
 end

data/lib/colorscore/version.rb

@@ -1,3 +1,3 @@
 module Colorscore
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/histogram_test.rb

@@ -4,11 +4,11 @@ class HistogramTest < Test::Unit::TestCase
   def test_color_count_is_correct
     colors = 7
     histogram = Histogram.new("test/fixtures/skydiver.jpg", :colors => colors)
-    assert_operator histogram.hex_colors.size, :<=, colors
+    assert_operator histogram.colors.size, :<=, colors
   end
 
   def test_transparency_is_ignored
     histogram = Histogram.new("test/fixtures/transparency.png")
-    assert_equal Color::RGB.from_html('0000ff'), histogram.hex_colors.first
+    assert_equal Color::RGB.from_html('0000ff'), histogram.colors.first
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jnylen-colorscore
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joakim Nylén