prizm 0.0.1 → 0.0.2

data/lib/prizm.rb

@@ -3,34 +3,31 @@ require 'RMagick'
 
 module Prizm
   class Extractor
-    def get_colors(img_location, nc=6, remove_bg=true)
-      begin
-        image = remove_bg ? remove_bg(img_location, nc) : reduce_size(Magick::ImageList.new(img_location), 100, 100)
+    def initialize(img_location)
+      @image = Magick::ImageList.new(img_location)
+    end
+    
+    def get_colors(nc=6, remove_bg=true)
+        image = remove_bg ? remove_bg(nc) : reduce_size(100, 100)
         q = image.quantize(nc)
         colors = q.color_histogram.sort {|a, b| b[1] <=> a[1]}.map { |color, count| color }
-      rescue Magick::ImageMagickError => e
-        puts e.message
-        puts e.backtrace
-        nil
-      end
     end
     
     def to_hex(pixel)
       pixel.to_color(Magick::AllCompliance, false, 8)
     end
     
-    def reduce_size(image, width, height)
-      image.change_geometry!("#{width}x#{height}") { |cols, rows, img| img.resize!(cols, rows) }
+    def reduce_size(width, height)
+      @image.change_geometry!("#{width}x#{height}") { |cols, rows, img| img.resize!(cols, rows) }
     end
     
-    def remove_bg(img_location, nc, fuzz=20)
-      image = reduce_size Magick::ImageList.new(img_location), 100, 100
+    def remove_bg(nc, fuzz=20)
+      image = reduce_size(100, 100)
       image = image.border(1, 1, image.pixel_color(0,0))
       image = image.quantize(nc+4)
       image.fuzz = "#{fuzz}%"
       a = image.color_floodfill(0, 0, image.pixel_color(0,0))
       a = a.matte_floodfill(0,0)
-      a
     end
   end
 end

data/lib/prizm/version.rb

@@ -1,3 +1,3 @@
 module Prizm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test.rb

@@ -3,18 +3,17 @@ require 'test/unit'
 
 class TestExtractor < Test::Unit::TestCase
   def test_functional
-    colors = Prizm::Extractor.new.get_colors("#{File.dirname(__FILE__)}/rainbow.jpg", 6, false)
+    colors = Prizm::Extractor.new("#{File.dirname(__FILE__)}/rainbow.jpg").get_colors(6, false)
     assert_equal(6, colors.size)
   end
   
   def test_to_hex
-    extr = Prizm::Extractor.new
-    colors = extr.get_colors("#{File.dirname(__FILE__)}/rainbow.jpg", 6, false)
+    extr = Prizm::Extractor.new("#{File.dirname(__FILE__)}/rainbow.jpg")
+    colors = extr.get_colors(6, false)
     assert_equal('#322D31', extr.to_hex(colors[0]))
   end
   
   def test_error
-    c = Prizm::Extractor.new.get_colors("blahblah.jpg")
-    assert_equal(nil, c)
+    assert_raise(Magick::ImageMagickError) { Prizm::Extractor.new("blahblah.jpg").get_colors }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prizm
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Quan Nguyen