carrierwave-color 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b934eea908ecbe77e1131bec424d0697c2565c0a
-  data.tar.gz: 44874d042c751d49c88e06d35bf13ac47b371ef5
+  metadata.gz: 62d10a7dd55d5bebfbe5ee8592ce6fb6dd8dadd6
+  data.tar.gz: 9f425d1ce557654002f0bae34582469e6d172ab2
 SHA512:
-  metadata.gz: 6509d6720f23b2704a953102bb93582f8c76f6300cd82cc09ce07b65e11d45e6852e65f026b0543f9cb56b88019fe0f2ebc5d3015dd726ec07d38365ec193fac
-  data.tar.gz: 4c17e7564c4cd70b9af6018beb0b7467d0fe0498be6c5dffe3635e469272fd87017cd2aa7cf87e4c0ad3f3483a08e2f76c1e34e7be6e4894587a52f0bb53350f
+  metadata.gz: 6b9cf6e341455d0e5b12a919af205993f36743f87ecb3899900a576b064f705ec1aca6e59954c2738692f2c55fcbed61e0adf3bef2b73d5abeb123e24c909fbe
+  data.tar.gz: 58f49f327bbb5d3842b7551d93fa99d9b790b5feb46f35ac6e4b1b89cd6c27a31a57edbe25fd8a2cb51264d73861729e3c9caa694381433fc60777624ac191e8

data/Gemfile

@@ -1 +1,3 @@
+source "https://rubygems.org"
+
 gemspec

data/README.md

@@ -4,6 +4,8 @@ CarrierWave Color
 Add the dominant color of an image to your database whenever you upload it
 with the CarrierWave gem on your Rails app.
 
+This can be used to show the image's background color while it is loading
+or to index images for a "search by color" feature.
 
 Installation
 ------------
@@ -27,7 +29,7 @@ In your uploader, include the module and call the processor:
 
 ```ruby
 class PhotoUploader < CarrierWave::Uploader::Base
-  include include CarrierWave::Color
+  include CarrierWave::Color
 
   process :store_dominant_color
 
@@ -106,6 +108,7 @@ Contributing
 
 1. Fork it ( https://github.com/sunny/carrierwave-color/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+4. Launch specs (`bundle exec rspec`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request

data/carrierwave-color.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "colorscore", ">= 0.0.5"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_runtime_dependency "colorscore"
 end

data/lib/carrierwave/color/detection.rb

@@ -3,9 +3,6 @@ require "colorscore"
 module CarrierWave
   module Color
     module Detection
-      class Error < StandardError
-      end
-
       module_function
 
       def dominant_html(path)
@@ -17,7 +14,11 @@ module CarrierWave
       def dominant_from_palette_html(path, palette_hexes)
         histogram = Colorscore::Histogram.new(path)
         palette = Colorscore::Palette.from_hex(palette_hexes)
-        scores = palette.scores(histogram.scores, 1)
+
+        histogram_scores = histogram.scores
+        return nil if histogram_scores.first.last.nil?
+
+        scores = palette.scores(histogram_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.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/detection_spec.rb

@@ -17,6 +17,15 @@ module CarrierWave
           result = Detection.dominant_from_palette_html(path, palette)
           expect(result).to eq("#ff0000")
         end
+
+        it "returns nil when the histogram fails" do
+          allow_any_instance_of(Colorscore::Histogram).to receive(:scores)
+            .and_return([[1, nil]])
+
+          palette = %w(ff0000 00ff00 0000ff)
+          result = Detection.dominant_from_palette_html(path, palette)
+          expect(result).to be_nil
+        end
       end
     end
   end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-color
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: colorscore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: 0.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorscore
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -79,6 +79,7 @@ files:
 - README.md
 - Rakefile
 - carrierwave-color.gemspec
+- doc/example-cults3d.gif
 - lib/carrierwave/color.rb
 - lib/carrierwave/color/detection.rb
 - lib/carrierwave/color/version.rb
@@ -110,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: Store the dominant color of an image with CarrierWave
 test_files: []
+has_rdoc: