rmagick-image_colors 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953192c3a705cdc1bfd52474f84b9d30f9c8a4d4
-  data.tar.gz: 0d5cc079d0ec891b7fce4aa9fe78fad0fe824617
+  metadata.gz: 06412df0aaa6381741d700663e7d92dfb0c98f5c
+  data.tar.gz: dc75393dfc7187ba9658307cc1861eb81712a22a
 SHA512:
-  metadata.gz: 3f493172c1c7f51e46df541f726f9426ac657bf6a58e39c56651c3fe341bb193c047250de9a89da0c306d940d5ec7900b8f9392b15243d1dc7eb3ee89a175072
-  data.tar.gz: 05a6c14b4f61c3fd0e4079ba3f3cb637761789ddebe5767477b4f058189dcf220d4452872db680fb2c288184cb98f0f03a4b6b83e0e9c78342d7c932718ac29d
+  metadata.gz: 17d9f5de9dabbf61d4b9420704e2efc3268548160b9a3842db603a0924f2cdc3edaadae278fa3bba2541b4b5b2ac7f5de5458903dbb0dbc099b17edad0ca58ad
+  data.tar.gz: ae853ecd406c1ddd6a0eb579396383094c69d877dce82761f08c902aadd4cd539ed41815225f5910040fae645febfe145510b814ed4c056ac365fd01c025698b

data/lib/rmagick/image_colors/version.rb

@@ -1,5 +1,5 @@
 module Magick
   class ImageColors
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/lib/rmagick/image_colors.rb

@@ -3,9 +3,14 @@ require 'rmagick/image_colors/version'
 
 module Magick
   class ImageColors
-    def initialize(file_path)
-      @image = Magick::Image.read(file_path).first
-      aggregate
+    def initialize(file_path=nil, image: nil, &block)
+      if image
+        @image = image
+      else
+        @image = Magick::Image.read(file_path).first
+      end
+
+      aggregate(&block)
     end
 
     def colors
@@ -13,11 +18,15 @@ module Magick
     end
 
     private
-    def aggregate
+    def aggregate(&block)
       colors = {}
       depth = @image.depth
       @image.color_histogram.each do |pixel|
-        color = pixel[0].to_color(Magick::AllCompliance, false, depth, true)
+        if block_given?
+          color = block.call(pixel)
+        else
+          color = pixel[0].to_color(Magick::AllCompliance, false, depth, true)
+        end
         colors[color] ||= 0
         colors[color] += pixel[1]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmagick-image_colors
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - shiro16
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Color analysis of image