carrierwave-color 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d10a7dd55d5bebfbe5ee8592ce6fb6dd8dadd6
-  data.tar.gz: 9f425d1ce557654002f0bae34582469e6d172ab2
+  metadata.gz: 1b6fc42d5e7ce84c7e1c44872f3a3342980435cd
+  data.tar.gz: f8ce682015304674dde3184d29467444f27df637
 SHA512:
-  metadata.gz: 6b9cf6e341455d0e5b12a919af205993f36743f87ecb3899900a576b064f705ec1aca6e59954c2738692f2c55fcbed61e0adf3bef2b73d5abeb123e24c909fbe
-  data.tar.gz: 58f49f327bbb5d3842b7551d93fa99d9b790b5feb46f35ac6e4b1b89cd6c27a31a57edbe25fd8a2cb51264d73861729e3c9caa694381433fc60777624ac191e8
+  metadata.gz: 583b69fa74bc3c3d66c805d532d160f011fefabf73e2aca5887bcfc3f1b11e470a1c5d9911d1c06a36ef70f01ec9cb33b24da13c2254c231a008148c21f74d05
+  data.tar.gz: b4f5a905ae31fbc9ff50b3ca86fd8d9cf55738e37f389f156c9b65d6937fb8ad7225603dfe104386d27e15fdcd4a0e8e6490e3cea99aa94631d3c482aa8b563e

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/README.md

@@ -10,9 +10,10 @@ or to index images for a "search by color" feature.
 Installation
 ------------
 
-Add this line to your application's Gemfile:
+Add the following lines to your application's Gemfile:
 
 ```ruby
+# Detect the dominant color of images on upload
 gem "carrierwave-color"
 ```
 

data/lib/carrierwave/color/detection.rb

@@ -12,13 +12,14 @@ module CarrierWave
       end
 
       def dominant_from_palette_html(path, palette_hexes)
-        histogram = Colorscore::Histogram.new(path)
+        scores = Colorscore::Histogram.new(path).scores
         palette = Colorscore::Palette.from_hex(palette_hexes)
 
-        histogram_scores = histogram.scores
-        return nil if histogram_scores.first.last.nil?
+        # Return nil values from scores
+        scores.reject! { |_color_score, color| color.nil? }
+        return nil if scores.empty?
 
-        scores = palette.scores(histogram_scores, 1)
+        scores = palette.scores(scores, 1)
         _score, color = scores.first
         color.html
       end

data/lib/carrierwave/color/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Color
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/detection_spec.rb

@@ -4,6 +4,7 @@ module CarrierWave
   module Color
     RSpec.describe Detection do
       let(:path) { File.expand_path('../fixtures/red-rainbow.jpg', __FILE__) }
+      let(:blue_color) { ::Color::RGB.from_html("0066cc") }
 
       describe ".dominant_html" do
         it "returns the correct hex code" do
@@ -20,12 +21,21 @@ module CarrierWave
 
         it "returns nil when the histogram fails" do
           allow_any_instance_of(Colorscore::Histogram).to receive(:scores)
-            .and_return([[1, nil]])
+            .and_return([[1, nil], [1, nil]])
 
           palette = %w(ff0000 00ff00 0000ff)
           result = Detection.dominant_from_palette_html(path, palette)
           expect(result).to be_nil
         end
+
+        it "returns the only color found if the histogram contains any color" do
+          allow_any_instance_of(Colorscore::Histogram).to receive(:scores)
+            .and_return([[1, blue_color], [1, nil]])
+
+          palette = %w(ff0000 00ff00 0000ff)
+          result = Detection.dominant_from_palette_html(path, palette)
+          expect(result).to eq("#0000ff")
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-color
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorscore
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -106,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Store the dominant color of an image with CarrierWave
 test_files: []
-has_rdoc: