image_voodoo 0.3 → 0.4

data/bin/image_voodoo

@@ -40,7 +40,7 @@ opts = OptionParser.new do |opts|
     actions << lambda {|img| img.adjust_brightness(scale, offset) }
   end
 
-  opts.on("-B" "--border WIDTH,COLOR,STYLE", "Add a simple border") do |args|
+  opts.on("-B", "--border WIDTH,COLOR,STYLE", "Add a simple border") do |args|
     width, color, style = args.split(/\,/i)
     options = {:width => width, :color => color, :style => style }
 

data/lib/image_voodoo.rb

@@ -123,12 +123,8 @@ class ImageVoodoo
     l, r = half, half + height if width > height
     t, b = half, half + width if height > width
 
-    with_crop(l, t, r, b) do |image|
-      image.thumbnail(size) do |thumb|
-        target = ImageVoodoo.new target
-        block_given? ? yield(target) : target
-      end
-    end
+    target = with_crop(l, t, r, b).thumbnail(size)
+    block_given? ? yield(target) : target
   end
 
   #
@@ -212,10 +208,8 @@ class ImageVoodoo
   def scale(ratio)
     new_width, new_height = (width * ratio).to_i, (height * ratio).to_i
 
-    resize(new_width, new_height) do |image|
-      target = ImageVoodoo.new image
-      block_given? ? yield(target) : target
-    end
+    target = resize(new_width, new_height)
+    block_given? ? yield(target) : target
   end
 
   #
@@ -223,7 +217,8 @@ class ImageVoodoo
   # edge is resized to size and yields/returns the new image. 
   #
   def thumbnail(size)
-    scale(size.to_f / (width > height ? width : height))
+    target = scale(size.to_f / (width > height ? width : height))
+    block_given? ? yield(target) : target
   end
 
   #
@@ -303,12 +298,10 @@ class ImageVoodoo
   # A top-level image loader opens path and then yields/returns the image.
   #
   def self.with_image(file)
-    readers = ImageIO.getImageReadersBySuffix(File.extname(file)[1..-1])
-    raise TypeError, "unrecognized format for #{file}" unless readers.hasNext
-    image = ImageVoodoo.new ImageIO.read(JFile.new(file))
-    block_given? ? yield(image) : image
-  rescue NativeException => ne
-    nil
+    raise ArgumentError, "file does not exist" unless File.file?(file)
+    buffered_image = ImageIO.read(JFile.new(file))
+    image = ImageVoodoo.new(buffered_image) if buffered_image
+    image && block_given? ? yield(image) : image
   end
 
   # 

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/test/test_image_science.rb

@@ -33,7 +33,7 @@ class TestImageScience < Test::Unit::TestCase
   end
 
   def test_class_with_image_missing
-    assert_raises TypeError do
+    assert_raises ArgumentError do
       ImageScience.with_image @path + "nope" do |img|
         flunk
       end
@@ -41,7 +41,16 @@ class TestImageScience < Test::Unit::TestCase
   end
 
   def test_class_with_image_missing_with_img_extension
-    assert_nil ImageScience.with_image("nope#{@path}") do |img|
+    assert_raises ArgumentError do
+      ImageScience.with_image("nope#{@path}") do |img|
+        flunk
+      end
+    end
+  end
+
+  def test_class_with_image_return_nil_on_bogus_image
+    File.open(@tmppath, "w") {|f| f << "bogus image file"}
+    assert_nil ImageScience.with_image(@tmppath) do |img|
       flunk
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: image_voodoo
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Thomas Enebo, Charles Nutter and JRuby contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-23 00:00:00 -05:00
+date: 2008-07-28 00:00:00 +09:00
 default_executable: 
 dependencies: []