g1nn13-image_science 1.2.4 → 1.2.5

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.5 / 2010-01-26
+
+* 1 tweak
+
+  * added some tests
+
 === 1.2.4 / 2010-01-26
 
 * 1 minor enhancements, one little mod

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -116,6 +116,7 @@ class ImageScience
     end
 
     self.resize(w.to_i, h.to_i) do |image|
+      puts image.nil? ? "resize() yielded nil" : "image yielded #{image.width} x #{image.height}"
       yield image
     end
   end

data/test/test_image_science.rb

@@ -16,8 +16,13 @@ MiniTest::Unit.autorun
 class TestImageScience < MiniTest::Unit::TestCase
 #class TestImageScience < Test::Unit::TestCase
   def setup
-    @path = 'test/pix.png'
-    @tmppath = 'test/pix-tmp.png'
+    @pix = 'test/pix.png'               # 50 x 50
+    @bearry = 'test/bearry.png'         # 323 x 24
+    @biggie = 'test/biggie.png'         # 800 x 600
+    @godzilla = 'test/godzilla.png'     # 300 x 399
+    @landscape = 'test/landscape.png'   # 400 x 300
+    @portrait = 'test/portrait.png'     # 300 x 500
+    @tmppath = 'test/tmp.png'
     @h = @w = 50
   end
 
@@ -26,7 +31,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_class_with_image
-    ImageScience.with_image @path do |img|
+    ImageScience.with_image @pix do |img|
       assert_kind_of ImageScience, img
       assert_equal @h, img.height
       assert_equal @w, img.width
@@ -44,7 +49,7 @@ class TestImageScience < MiniTest::Unit::TestCase
 
   def test_class_with_image_missing
     assert_raises TypeError do
-      ImageScience.with_image @path + "nope" do |img|
+      ImageScience.with_image @pix + "nope" do |img|
         flunk
       end
     end
@@ -53,17 +58,18 @@ class TestImageScience < MiniTest::Unit::TestCase
   ##
   # the assert_raises RuntimeError is not working on our setup don't have time
   # to investigate right now. TODO: figure out why
+  
   def test_class_with_image_missing_with_img_extension
 
 #    assert_raises RuntimeError do
-      assert_nil ImageScience.with_image("nope#{@path}") do |img|
+      assert_nil ImageScience.with_image("nope#{@pix}") do |img|
         flunk
       end
 #    end
   end
 
   def test_class_with_image_from_memory
-    data = File.new(@path).binmode.read
+    data = File.new(@pix).binmode.read
 
     ImageScience.with_image_from_memory data do |img|
       assert_kind_of ImageScience, img
@@ -90,7 +96,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_resize
-    ImageScience.with_image @path do |img|
+    ImageScience.with_image @pix do |img|
       img.resize(25, 25) do |thumb|
         assert thumb.save(@tmppath)
       end
@@ -106,7 +112,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_buffer_return
-    ImageScience.with_image @path do |img|
+    ImageScience.with_image @pix do |img|
       img.resize(25, 25) do |thumb|
         assert thumb.buffer('.jpg')
       end
@@ -114,7 +120,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_buffer_yield
-    ImageScience.with_image @path do |img|
+    ImageScience.with_image @pix do |img|
       img.resize(25, 25) do |thumb|
         thumb.buffer('.jpg') do |buffer|
           assert buffer
@@ -124,7 +130,7 @@ class TestImageScience < MiniTest::Unit::TestCase
   end
 
   def test_resize_floats
-    ImageScience.with_image @path do |img|
+    ImageScience.with_image @pix do |img|
       img.resize(25.2, 25.7) do |thumb|
         assert thumb.save(@tmppath)
       end
@@ -141,7 +147,7 @@ class TestImageScience < MiniTest::Unit::TestCase
 
   def test_resize_zero
     assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
+      ImageScience.with_image @pix do |img|
         img.resize(0, 25) do |thumb|
           assert thumb.save(@tmppath)
         end
@@ -151,7 +157,7 @@ class TestImageScience < MiniTest::Unit::TestCase
     refute File.exists?(@tmppath)
 
     assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
+      ImageScience.with_image @pix do |img|
         img.resize(25, 0) do |thumb|
           assert thumb.save(@tmppath)
         end
@@ -163,7 +169,7 @@ class TestImageScience < MiniTest::Unit::TestCase
 
   def test_resize_negative
     assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
+      ImageScience.with_image @pix do |img|
         img.resize(-25, 25) do |thumb|
           assert thumb.save(@tmppath)
         end
@@ -173,7 +179,7 @@ class TestImageScience < MiniTest::Unit::TestCase
     refute File.exists?(@tmppath)
 
     assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
+      ImageScience.with_image @pix do |img|
         img.resize(25, -25) do |thumb|
           assert thumb.save(@tmppath)
         end
@@ -183,9 +189,12 @@ class TestImageScience < MiniTest::Unit::TestCase
     refute File.exists?(@tmppath)
   end
 
+  ##
+  # biggie.png is 800 x 600
+
   def test_fit_within_smaller
-    ImageScience.with_image @path do |img|
-      img.fit_within(51, 100) do |thumb|
+    ImageScience.with_image @biggie do |img|
+      img.fit_within(100, 100) do |thumb|
         assert thumb.save(@tmppath)
       end
     end
@@ -194,65 +203,116 @@ class TestImageScience < MiniTest::Unit::TestCase
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
-      assert_equal 50, img.height
-      assert_equal 50, img.width
+      assert_equal 100, img.width
     end
   end
 
-#  def test_fit_within_shrinking_x
-#    max_x = 44
-#    max_y = 111
-#
-#    ImageScience.with_image @path do |img|
-#      img.fit_within(max_x, max_y) do |thumb|
-#        assert thumb.save(@tmppath)
-#      end
-#    end
-#
-#    assert File.exists?(@tmppath)
-#
-#    ImageScience.with_image @tmppath do |img|
-#      assert_kind_of ImageScience, img
-#      assert img.height <= 50
-#      assert img.width <= max_x
-#    end
-#  end
-#
-#  def test_fit_within_shrinking_y
-#    max_x = 100
-#    max_y = 40
-#
-#    ImageScience.with_image @path do |img|
-#      img.fit_within(max_x, max_y) do |thumb|
-#        assert thumb.save(@tmppath)
-#      end
-#    end
-#
-#    assert File.exists?(@tmppath)
-#
-#    ImageScience.with_image @tmppath do |img|
-#      assert_kind_of ImageScience, img
-#      assert img.height <= max_y
-#      assert img.width <= 50
-#    end
-#  end
-#
-#  def test_fit_within_shrinking_both
-#    max_x = 33
-#    max_y = 44
-#
-#    ImageScience.with_image @path do |img|
-#      img.fit_within(max_x, max_y) do |thumb|
-#        assert thumb.save(@tmppath)
-#      end
-#    end
-#
-#    assert File.exists?(@tmppath)
-#
-#    ImageScience.with_image @tmppath do |img|
-#      assert_kind_of ImageScience, img
-#      assert img.height <= max_y
-#      assert img.width <= max_x
-#    end
-#  end
+  def test_fit_within_shrinking_x
+    max_x = 44
+    max_y = 111
+
+    ImageScience.with_image @pix do |img|
+      img.fit_within(max_x, max_y) do |thumb|
+        assert thumb.save(@tmppath)
+      end
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert img.height <= 50
+      assert img.width <= max_x
+    end
+  end
+
+  def test_fit_within_shrinking_y
+    max_x = 100
+    max_y = 40
+
+    ImageScience.with_image @pix do |img|
+      img.fit_within(max_x, max_y) do |thumb|
+        assert thumb.save(@tmppath)
+      end
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert img.height <= max_y
+      assert img.width <= 50
+    end
+  end
+
+  def test_fit_within_shrinking_both
+    max_x = 33
+    max_y = 44
+
+    ImageScience.with_image @pix do |img|
+      img.fit_within(max_x, max_y) do |thumb|
+        assert thumb.save(@tmppath)
+      end
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert img.height <= max_y
+      assert img.width <= max_x
+    end
+  end
+
+  def test_fit_withins
+
+    max_x = max_y = 77
+    original_x = original_y = 9999
+
+    [@pix, @biggie, @bearry, @landscape, @portrait].each { |image_name|
+
+      ImageScience.with_image image_name do |img|
+        original_x = img.width
+        original_y = img.height
+        img.fit_within(max_x, max_y) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+
+      assert File.exists?(@tmppath)
+
+      ImageScience.with_image @tmppath do |img|
+        assert_kind_of ImageScience, img
+        assert img.height <= max_y
+        assert img.width <= max_x
+        assert img.height <= original_y
+        assert img.width <= original_x
+      end
+    }
+  end
+
+  def test_thumbnailing
+
+    max = 77
+    original_x = original_y = 9999
+
+    [@pix, @biggie, @bearry, @landscape, @portrait].each { |image_name|
+
+      ImageScience.with_image image_name do |img|
+        original_x = img.width
+        original_y = img.height
+        img.thumbnail(max) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+
+      assert File.exists?(@tmppath)
+
+      ImageScience.with_image @tmppath do |img|
+        assert_kind_of ImageScience, img
+        assert img.height <= max
+        assert img.width <= max
+      end
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: g1nn13-image_science
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - jim nist