shrine-color 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7d2d6bf761232e62fdc34b0e1378dfa8288aab5
-  data.tar.gz: a15371b69e211694cb0c642bf95ef8664c2d482a
+SHA256:
+  metadata.gz: 2023aa78c934dff3cc608b6ee525b79ec8e2a2ab34b0eb10c9714cb59155b358
+  data.tar.gz: 1af9151c8c4f44fcb06eee37583ea68490ec47096ae4fc8d74f35ec5a4daba00
 SHA512:
-  metadata.gz: cd31b407cef673b5c6b454bbdb404c70aaec79433ed7f1b34a08e826a344f819daf53836675c49bf81c5d7a82cb9c4a43d4e23d39bbed82d9d6b60a53aabccd0
-  data.tar.gz: 8836c647e54b2bc93e4cab88e30b6e524bdabdb623abbf9d986990183464deaae60cdcf625406c4fa9173b0d63b5f0ec028c91c469836df8d0c00d63d0e19cfa
+  metadata.gz: fffa4367e60af3be0ef9c67b4b08acbe9fa2571498f664931e7a43ee36f878175527819ebd4566c479c07ca96aa0ff04cc8e393d3ab8d144984776dc34c03618
+  data.tar.gz: bbebd1fe938f8bf4a53b447989c1403bfb49423eaa0ba7692f5cef29fdfed5aab86a3377e135e9e5dd35cbecdada9048def46fa5f007378648ca14f9fac1732a

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+ - 2.5
+ - 2.4
+ - 2.3
+before_script:
+ - convert -version

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    shrine-color (0.1)
-      jnylen-colorscore (>= 0.1.1)
-      shrine (>= 2.0)
+    shrine-color (0.3.0)
+      jnylen-colorscore (~> 0.1, >= 0.1.3)
+      shrine (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     color (1.8)
     diff-lcs (1.2.5)
-    down (2.3.6)
-    jnylen-colorscore (0.1.1)
+    down (4.5.0)
+    jnylen-colorscore (0.1.3)
       color
     rake (11.2.2)
     rspec (3.5.0)
@@ -27,8 +27,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    shrine (2.2.0)
-      down (>= 2.3.5)
+    shrine (2.11.0)
+      down (~> 4.1)
 
 PLATFORMS
   ruby
@@ -40,4 +40,4 @@ DEPENDENCIES
   shrine-color!
 
 BUNDLED WITH
-   1.12.5
+   1.16.2

data/README.md

@@ -5,6 +5,8 @@ Get the dominant color of an image using colorscore (updated version by me). Thi
 
 This is based on carrierwave-color by Sunny Ripert (sunny).
 
+NOTE: The palettes/dominiant_color grabbed from images may differ between imagemagick versions.
+
 Requirements
 ------------
 
@@ -43,10 +45,10 @@ class ImageUploader < Shrine
     dominant_color(io.path)
   end
 
-  # palette color with version and own array of colors.
+  # palette color with version, color count and own array of colors.
   add_metadata :palette_color do |io, context|
     if context[:version] == :small
-      palette_color(io.path, ['ff0000', '00ff00', '0000ff'])
+      palette_color(io.path, 3, ['ff0000', '00ff00', '0000ff'])
     end
   end
 end

data/lib/shrine/plugins/color.rb

@@ -23,7 +23,7 @@ class Shrine
         end
 
         # Matches the dominant color to the closest color in the array provided
-        def palette_color(io_path, palette_hexes = DEFAULT_PALETTE_HEXES)
+        def palette_color(io_path, color_count = 1, palette_hexes = DEFAULT_PALETTE_HEXES)
           histogram = Colorscore::Histogram.new(io_path)
           palette = Colorscore::Palette.from_hex(palette_hexes)
 
@@ -31,8 +31,7 @@ class Shrine
           return nil if histogram_scores.first.last.nil?
 
           scores = palette.scores(histogram_scores, 1)
-          _score, color = scores.first
-          color.html
+          scores.first(color_count).map { |_score, color| color.html}
         end
 
       end

data/shrine-color.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "shrine-color"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Joakim Nylen"]
   spec.email         = ["me@jnylen.nu"]
   spec.summary       = "Return the dominant color of an image in Shrine."
@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "shrine", ">= 2.0"
-  spec.add_dependency "jnylen-colorscore", ">= 0.1.2"
+  spec.add_dependency "shrine", "~> 2.0"
+  spec.add_dependency "jnylen-colorscore", "~> 0.1", ">= 0.1.3"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 11.1"

data/spec/shrine/color_spec.rb

@@ -2,14 +2,17 @@ require 'spec_helper'
 
 describe Shrine::Plugins::Color do
   before do
-    @uploader = uploader { plugin :color }
+    @uploader = uploader {
+      plugin :determine_mime_type
+      plugin :color
+    }
   end
 
   describe ":dominant_color" do
     it "extracts dominant_color from files via add_metadata" do
       @uploader.class.add_metadata(:dominant_color) { |io, context| dominant_color(io.path) }
       uploaded_file = @uploader.upload(File.open("spec/fixtures/bora.jpg"))
-      expect(uploaded_file.metadata.fetch("dominant_color")).to eq("#48839f")
+      expect(uploaded_file.metadata.fetch("dominant_color")).to eq("#5c97a7")
     end
   end
 
@@ -17,13 +20,25 @@ describe Shrine::Plugins::Color do
     it "extracts palette_color from files with default hexes via add_metadata" do
       @uploader.class.add_metadata(:palette_color) { |io, context| palette_color(io.path) }
       uploaded_file = @uploader.upload(File.open("spec/fixtures/bora.jpg"))
-      expect(uploaded_file.metadata.fetch("palette_color")).to eq("#333399")
+      expect(uploaded_file.metadata.fetch("palette_color")).to eq(["#333399"])
     end
 
     it "extracts palette_color from files with custom hexes via add_metadata" do
-      @uploader.class.add_metadata(:palette_color) { |io, context| palette_color(io.path, ['ff0000', '00ff00', '0000ff']) }
+      @uploader.class.add_metadata(:palette_color) { |io, context| palette_color(io.path, 1, ['ff0000', '00ff00', '0000ff']) }
       uploaded_file = @uploader.upload(File.open("spec/fixtures/bora.jpg"))
-      expect(uploaded_file.metadata.fetch("palette_color")).to eq("#0000ff")
+      expect(uploaded_file.metadata.fetch("palette_color")).to eq(["#0000ff"])
+    end
+
+    it "extracts 3 palette_colors from files with default hexes via add_metadata" do
+      @uploader.class.add_metadata(:palette_color) { |io, context| palette_color(io.path, 3) }
+      uploaded_file = @uploader.upload(File.open("spec/fixtures/bora.jpg"))
+      expect(uploaded_file.metadata.fetch("palette_color")).to eq(["#333399", "#0066cc", "#66cccc"])
+    end
+
+    it "extracts 3 palette_colors from files with custom hexes via add_metadata" do
+      @uploader.class.add_metadata(:palette_color) { |io, context| palette_color(io.path, 3, ['ff0000', '00ff00', '0000ff']) }
+      uploaded_file = @uploader.upload(File.open("spec/fixtures/bora.jpg"))
+      expect(uploaded_file.metadata.fetch("palette_color")).to eq(["#0000ff", "#00ff00"])
     end
   end
 

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: shrine-color
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joakim Nylen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jnylen-colorscore
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +94,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -118,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Return the dominant color of an image in Shrine.