image_voodoo 0.8.8 → 0.8.9

data/lib/image_voodoo/needs_head.rb

@@ -0,0 +1 @@
+class ImageVoodoo; NEEDS_HEAD = true; end

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.8.8"
+  VERSION = '0.8.9'.freeze
 end

data/samples/bench.rb

@@ -6,59 +6,52 @@ require 'rubygems'
 require 'image_science'
 
 max = (ARGV.shift || 100).to_i
-ext = ARGV.shift || "png"
-
+ext = ARGV.shift || 'png'
 file = "blah_big.#{ext}"
 
-if Config::CONFIG['host_os'] =~ /darwin/ then
-  # how fucking cool is this???
-  puts "taking screenshot for thumbnailing benchmarks"
-  system "screencapture -SC #{file}"
-else
-  abort "You need to plonk down #{file} or buy a mac"
-end unless test ?f, "#{file}"
+unless File.exist?(file)
+  if RbConfig::CONFIG['host_os'] =~ /darwin/i
+    puts 'taking screenshot for thumbnailing benchmarks'
+    system "screencapture -SC #{file}"
+  elsif RbConfig::CONFIG['host_os'] =~ /linux/i
+    puts 'taking screenshot for thumbnailing benchmarks'
+    system "gnome-screenshot -f #{file}"
+  else
+    abort "You need to save an image to #{file} since we cannot generate one"
+  end
+end
 
-ImageScience.with_image(file.sub(/#{ext}$/, 'png')) do |img|
-  img.save(file)
-end if ext != "png"
+if ext != 'png'
+  ImageScience.with_image(file.sub(/#{ext}$/, 'png')) { |img| img.save(file) }
+end
 
 puts "# of iterations = #{max}"
-Benchmark::bm(20) do |x|
-  x.report("null_time") {
-    for i in 0..max do
-      # do nothing
-    end
-  }
+Benchmark.bm(20) do |x|
+  x.report('null_time') { max.times {} }
 
-  x.report("cropped") {
-    for i in 0..max do
+  x.report('cropped') do
+    max.times do
       ImageScience.with_image(file) do |img|
-        img.cropped_thumbnail(100) do |thumb|
-          thumb.save("blah_cropped.#{ext}")
-        end
+        img.cropped_thumbnail(100) { |thumb| thumb.save("blah_cropped.#{ext}") }
       end
     end
-  }
+  end
 
-  x.report("proportional") {
-    for i in 0..max do
+  x.report('proportional') do
+    max.times do
       ImageScience.with_image(file) do |img|
-        img.thumbnail(100) do |thumb|
-          thumb.save("blah_thumb.#{ext}")
-        end
+        img.thumbnail(100) { |thumb| thumb.save("blah_thumb.#{ext}") }
       end
     end
-  }
+  end
 
-  x.report("resize") {
-    for i in 0..max do
+  x.report('resize') do
+    max.times do
       ImageScience.with_image(file) do |img|
-        img.resize(200, 200) do |resize|
-          resize.save("blah_resize.#{ext}")
-        end
+        img.resize(200, 200) { |resize| resize.save("blah_resize.#{ext}") }
       end
     end
-  }
+  end
 end
 
 # File.unlink(*Dir["blah*#{ext}"])

data/samples/file_view.rb

@@ -1,3 +1,4 @@
+require 'image_voodoo/needs_head'
 require 'image_voodoo'
 
-ImageVoodoo.with_image(ARGV[0]) { |img| img.preview }
+ImageVoodoo.with_image(ARGV[0], &:preview)

data/test/test_image_science.rb

@@ -1,9 +1,17 @@
 require 'test/unit/testcase'
-require 'test/unit' if $0 == __FILE__
+require 'test/unit' if $PROGRAM_NAME == __FILE__
 require 'image_science'
 
 class TestImageScience < Test::Unit::TestCase
-  def deny x; assert ! x; end
+  def deny(x)
+    assert !x
+  end
+
+  def similar_image?(w, h, img)
+    assert_kind_of ImageScience, img
+    assert_equal h, img.height
+    assert_equal w, img.width
+  end
 
   def setup
     @path = 'test/pix.png'
@@ -17,118 +25,68 @@ class TestImageScience < Test::Unit::TestCase
 
   def test_class_with_image
     ImageScience.with_image @path do |img|
-      assert_kind_of ImageScience, img
-      assert_equal @h, img.height
-      assert_equal @w, img.width
+      similar_image? @w, @h, img
       assert img.save(@tmppath)
     end
 
-    assert File.exists?(@tmppath)
-
-    ImageScience.with_image @tmppath do |img|
-      assert_kind_of ImageScience, img
-      assert_equal @h, img.height
-      assert_equal @w, img.width
-    end
+    ImageScience.with_image(@tmppath) { |img| similar_image? @w, @h, img }
   end
 
   def test_class_with_image_missing
     assert_raises ArgumentError do
-      ImageScience.with_image @path + "nope" do |img|
-        flunk
-      end
+      ImageScience.with_image("#{@path}nope") { flunk }
     end
   end
 
   def test_class_with_image_missing_with_img_extension
     assert_raises ArgumentError do
-      ImageScience.with_image("nope#{@path}") do |img|
-        flunk
-      end
+      ImageScience.with_image("nope#{@path}") { flunk }
     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
+    File.open(@tmppath, 'w') { |f| f << 'bogus image file' }
+    assert_nil ImageScience.with_image(@tmppath) { flunk }
   end
 
   def test_resize
     ImageScience.with_image @path do |img|
-      img.resize(25, 25) do |thumb|
-        assert thumb.save(@tmppath)
-      end
+      img.resize(25, 25) { |thumb| assert thumb.save(@tmppath) }
     end
 
-    assert File.exists?(@tmppath)
-
-    ImageScience.with_image @tmppath do |img|
-      assert_kind_of ImageScience, img
-      assert_equal 25, img.height
-      assert_equal 25, img.width
-    end
+    ImageScience.with_image(@tmppath) { |img| similar_image? 25, 25, img }
   end
 
   def test_resize_floats
     ImageScience.with_image @path do |img|
-      img.resize(25.2, 25.7) do |thumb|
-        assert thumb.save(@tmppath)
-      end
+      img.resize(25.2, 25.7) { |thumb| assert thumb.save(@tmppath) }
     end
 
-    assert File.exists?(@tmppath)
-
-    ImageScience.with_image @tmppath do |img|
-      assert_kind_of ImageScience, img
-      assert_equal 25, img.height
-      assert_equal 25, img.width
-    end
+    ImageScience.with_image(@tmppath) { |img| similar_image? 25, 25, img }
   end
 
   def test_resize_zero
-    assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
-        img.resize(0, 25) do |thumb|
-          assert thumb.save(@tmppath)
+    [[0, 25], [25, 0], [0, 0]].each do |w, h|
+      assert_raises ArgumentError do
+        ImageScience.with_image @path do |img|
+          img.resize(w, h) { |thumb| assert thumb.save(@tmppath) }
         end
       end
-    end
 
-    deny File.exists?(@tmppath)
-
-    assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
-        img.resize(25, 0) do |thumb|
-          assert thumb.save(@tmppath)
-        end
-      end
+      deny File.exist?(@tmppath)
     end
-
-    deny File.exists?(@tmppath)
   end
 
   def test_resize_negative
-    assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
-        img.resize(-25, 25) do |thumb|
-          assert thumb.save(@tmppath)
+    [[-25, 25], [25, -25], [-25, -25]].each do |w, h|
+      assert_raises ArgumentError do
+        ImageScience.with_image @path do |img|
+          img.resize(w, h) { |thumb| assert thumb.save(@tmppath) }
         end
       end
-    end
 
-    deny File.exists?(@tmppath)
-
-    assert_raises ArgumentError do
-      ImageScience.with_image @path do |img|
-        img.resize(25, -25) do |thumb|
-          assert thumb.save(@tmppath)
-        end
-      end
+      deny File.exist?(@tmppath)
     end
-
-    deny File.exists?(@tmppath)
   end
 
   def test_image_format_retrieval
@@ -147,7 +105,7 @@ class TestImageScience < Test::Unit::TestCase
   end
 
   def test_image_format_retrieval_fail_when_invalid_bytes
-    image = ImageScience.with_bytes("some invalid image bytes")
+    image = ImageScience.with_bytes('some invalid image bytes')
     assert_equal nil, image.format
   end
 
@@ -166,6 +124,6 @@ class TestImageScience < Test::Unit::TestCase
       assert new_img.save(@tmppath)
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
   end
 end

data/test/test_image_voodoo.rb

@@ -0,0 +1,82 @@
+require 'test/unit/testcase'
+require 'test/unit' if $PROGRAM_NAME == __FILE__
+require 'image_voodoo'
+
+# Depends on a small portion of awt/shapes working properly
+class TestImageVoodoo < Test::Unit::TestCase
+  # 04
+  # b8
+  def make_square
+    image = ImageVoodoo.new_image 20, 20, "test.gif"
+    image.square(*upper_left, 10, '000000')
+    image.square(10, 0, 10, '444444')
+    image.square(0, 10, 10, '888888')
+    image.square(*lower_right, 10, 'bb0000')
+  end
+
+  def assert_color(color, red, green, blue, alpha=nil)
+    assert_equal(red, color.red)
+    assert_equal(green, color.green)
+    assert_equal(blue, color.blue)
+    assert_equal(alpha, color.alpha) if alpha
+  end
+
+  def lower_right
+    [10, 10]
+  end
+  
+  def upper_left
+    [0, 0]
+  end
+
+  # TODO: Don't fully know how to predict pixel values for adjust_brightness.
+
+  def test_alpha
+    image = make_square.alpha('000000')
+    assert_equal(0xff, image.color_at(*upper_left).alpha)
+  end
+
+  # 04 -> 40
+  # 8b    b8
+  def test_flip_horizontally
+    image = make_square.flip_horizontally
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+  end
+
+  # 04 -> 8b
+  # 8b    04
+  def test_flip_vertically
+    image = make_square.flip_vertically
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+  end
+
+  def test_greyscale
+    image = make_square.greyscale
+    assert_color(image.color_at(*lower_right), 0x5d, 0x5d, 0x5d)
+  end
+
+  # 04 -0-> 04 -90-> 80 -180-> 4b -270-> b8
+  # 8b      8b       b4        08        40
+  def test_rotate
+    image = make_square
+    assert_color(image.color_at(*upper_left), 0x00, 0x00, 0x00)
+    image = image.rotate(90)
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+    image = image.rotate(180)
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+    image = image.rotate(270)
+    assert_color(image.color_at(*upper_left), 0xbb, 0x00, 0x00)
+  end
+
+  # 04  -(-90)-> 4b -(-180)-> 80 -(-270)-> b8
+  # 8b           08           b4           40
+  def test_rotate_negative
+    image = make_square
+    image = image.rotate(-90)
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+    image = image.rotate(-180)
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+    image = image.rotate(-270)
+    assert_color(image.color_at(*upper_left), 0xbb, 0x00, 0x00)
+  end
+end

data/test/test_metadata.rb

@@ -1,49 +1,56 @@
 require 'test/unit/testcase'
-require 'test/unit' if $0 == __FILE__
+require 'test/unit' if $PROGRAM_NAME == __FILE__
 require 'image_voodoo'
 
 IMAGE_DIR = File.join File.dirname(__FILE__), '..', '..', 'metadata-extractor-images'
 
 # FIXME: If we end up running on travis or other tool this should be ignored
 # subdir to this project and probably clone repo into that subdir
-unless File.exist? IMAGE_DIR
-  puts "To run this test you must clone: https://github.com/drewnoakes/metadata-extractor-images.git into a sibling directory to image_voodoo"
+if !File.exist? IMAGE_DIR
+  puts 'To run this test you must clone:'
+  puts 'https://github.com/drewnoakes/metadata-extractor-images.git'
+  puts 'into a sibling directory to image_voodoo'
 else
   class TestImageVoodooMetadata < Test::Unit::TestCase
     def setup
-      @path = File.join IMAGE_DIR, "Apple iPhone 4S.jpg"
-      @path_gps = File.join IMAGE_DIR, "Apple iPhone 4.jpg"
-      @path_no_exif = File.join File.dirname(__FILE__), "pix.png"
+      @path = File.join IMAGE_DIR, 'Apple iPhone 4S.jpg'
+      @path_gps = File.join IMAGE_DIR, 'Apple iPhone 4.jpg'
+      @path_no_exif = File.join File.dirname(__FILE__), 'pix.png'
     end
+
+    def assert_orientation(expected, metadata)
+      assert_equal expected, metadata[:IFD0][:Orientation]
+    end
+
     def test_metadata_from_file
       ImageVoodoo.with_image @path do |img|
-        assert img.metadata[:IFD0].exists?
-        assert_equal 6, img.metadata[:IFD0][:Orientation]
-        assert_equal 6, img.metadata.orientation
-        assert_equal 3264, img.metadata.width
-        assert_equal 2448, img.metadata.height
-        assert_equal "Apple", img.metadata.make
-        assert_equal "iPhone 4S", img.metadata.model
+        metadata = img.metadata
+        assert_orientation 6, metadata
+        assert_equal 6, metadata.orientation
+        assert_equal 3264, metadata.width
+        assert_equal 2448, metadata.height
+        assert_equal 'Apple', metadata.make
+        assert_equal 'iPhone 4S', metadata.model
       end
     end
 
     def test_metadata_from_inputstream
       ImageVoodoo.with_bytes File.read(@path) do |img|
-        assert_equal(6, img.metadata[:IFD0][:Orientation])
+        assert_orientation 6, img.metadata
       end
     end
 
     def test_metadata_no_ifd0
       ImageVoodoo.with_image @path_no_exif do |img|
         assert !img.metadata[:IFD0].exists?
-        assert_equal(nil, img.metadata[:IFD0][:Orientation])
+        assert_orientation nil, img.metadata
       end
     end
 
     def test_metadata_gps
       ImageVoodoo.with_image @path_gps do |img|
         assert img.metadata[:Gps].exists?
-        assert_equal("N", img.metadata[:Gps]['Latitude Ref'])
+        assert_equal('N', img.metadata[:Gps]['Latitude Ref'])
       end
     end
   end

data/test/test_shapes.rb

@@ -0,0 +1,21 @@
+require 'test/unit/testcase'
+require 'test/unit' if $PROGRAM_NAME == __FILE__
+require 'image_voodoo'
+
+class TestShapes < Test::Unit::TestCase
+  def test_new_image
+    image = ImageVoodoo.new_image 10, 20, "test.gif"
+    assert_equal 10, image.width
+    assert_equal 20, image.height
+    assert_equal "gif", image.format
+  end
+
+  def test_square
+    image = ImageVoodoo.new_image 10, 10, "test.gif"
+    image.square 0, 0, 10, 'ff9900'
+    color = image.color_at(0, 0)
+    assert_equal(0xff, color.red)
+    assert_equal(0x99, color.green)
+    assert_equal(0x00, color.blue)
+  end
+end