png 1.2.0 → 1.3.0

data/test/test_png.rb

@@ -1,42 +1,34 @@
-dir = File.expand_path "~/.ruby_inline"
-if test ?d, dir then
-  require 'fileutils'
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
-require 'minitest/autorun'
-require 'rubygems'
-require 'png'
-require 'png/reader'
-require 'png/pie'
+require "minitest/autorun"
+require "rubygems"
+require "png"
+require "png/reader"
+require "png/pie"
 
-class TestPng < MiniTest::Unit::TestCase
+class TestPng < Minitest::Test
   def setup
     @canvas = PNG::Canvas.new 5, 10, PNG::Color::White
     @png = PNG.new @canvas
 
-    @blob = <<-EOF.unpack('m*').first
+    @blob = <<-EOF.unpack("m*").first
 iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAD0lEQVR4nGP4
 jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
     EOF
   end
 
   def test_class_chunk
-    chunk = PNG.chunk 'IHDR', [10, 10, 8, 6, 0, 0, 0 ].pack('N2C5')
+    chunk = PNG.chunk "IHDR", [10, 10, 8, 6, 0, 0, 0].pack("N2C5")
 
-    header_crc = "\2152\317\275"
-    header_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000"
-    header_length = "\000\000\000\r"
-    header_chunk = "#{header_length}IHDR#{header_data}#{header_crc}"
+    header_crc = "\2152\317\275".b
+    header_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000".b
+    header_length = "\000\000\000\r".b
+    header_chunk = "#{header_length}IHDR#{header_data}#{header_crc}".b
 
     assert_equal header_chunk, chunk
   end
 
   def test_class_chunk_empty
-    chunk = PNG.chunk 'IHDR'
-    expected = "#{0.chr * 4}IHDR#{["IHDR".png_crc].pack 'N'}"
+    chunk = PNG.chunk "IHDR"
+    expected = "#{0.chr * 4}IHDR#{["IHDR".png_crc].pack "N"}"
     assert_equal expected, chunk
   end
 
@@ -47,7 +39,7 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
   def test_save
     path = "blah.png"
     @png.save(path)
-    file = File.open(path, 'rb') { |f| f.read }
+    file = File.open(path, "rb") { |f| f.read }
     assert_equal @blob, file
   ensure
     assert_equal 1, File.unlink(path)
@@ -55,7 +47,7 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
 
 end
 
-class TestCanvas < MiniTest::Unit::TestCase
+class TestCanvas < Minitest::Test
 
   def setup
     @canvas = PNG::Canvas.new 5, 10, PNG::Color::White
@@ -70,9 +62,9 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxxxxxx
                  xx..xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
+                          ".gsub(/ /, "")
 
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
   end
 
   def test_composite_underlay
@@ -84,9 +76,9 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxx..xx
                  xx00xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
+                          ".gsub(/ /, "")
 
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
   end
 
   def test_composite_overlay
@@ -98,9 +90,9 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxx..xx
                  xx..xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
+                          ".gsub(/ /, "")
 
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
   end
 
   def test_composite_blend
@@ -112,9 +104,9 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxx..xx
                  xx,,xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
+                          ".gsub(/ /, "")
 
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
   end
 
   def test_composite_bad_style
@@ -132,17 +124,17 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxx..xx
                  xx00xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
+                          ".gsub(/ /, "")
 
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
 
     canvas2 = canvas1.extract(1, 1, 2, 2)
 
     expected = " xx..
                  00xx
-                      ".gsub(/ /, '')
+                      ".gsub(/ /, "")
 
-    assert_equal expected, canvas2.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas2.to_s.gsub(/ /, "x")
   end
 
   def test_index
@@ -152,10 +144,10 @@ class TestCanvas < MiniTest::Unit::TestCase
 
   def test_index_tall
     @canvas = PNG::Canvas.new 2, 4, PNG::Color::White
-    @canvas[ 0, 0] = PNG::Color::Black
-    @canvas[ 0, 3] = PNG::Color::Background
-    @canvas[ 1, 0] = PNG::Color::Yellow
-    @canvas[ 1, 3] = PNG::Color::Blue
+    @canvas[0, 0] = PNG::Color::Black
+    @canvas[0, 3] = PNG::Color::Background
+    @canvas[1, 0] = PNG::Color::Yellow
+    @canvas[1, 3] = PNG::Color::Blue
 
     expected = "  ,,\n0000\n0000\n..++\n"
 
@@ -164,10 +156,10 @@ class TestCanvas < MiniTest::Unit::TestCase
 
   def test_index_wide
     @canvas = PNG::Canvas.new 4, 2, PNG::Color::White
-    @canvas[ 0, 0] = PNG::Color::Black
-    @canvas[ 3, 0] = PNG::Color::Background
-    @canvas[ 0, 1] = PNG::Color::Yellow
-    @canvas[ 3, 1] = PNG::Color::Blue
+    @canvas[0, 0] = PNG::Color::Black
+    @canvas[3, 0] = PNG::Color::Background
+    @canvas[0, 1] = PNG::Color::Yellow
+    @canvas[3, 1] = PNG::Color::Blue
 
     expected = "++0000,,\n..0000  \n"
 
@@ -175,23 +167,19 @@ class TestCanvas < MiniTest::Unit::TestCase
   end
 
   def test_index_bad_x
-    begin
-      @canvas[6, 1]
-    rescue => e
-      assert_equal "bad x value 6 >= 5", e.message
-    else
-      flunk "didn't raise"
-    end
+    @canvas[6, 1] # TODO: convert these to assert_raises
+  rescue => e
+    assert_equal "bad x value 6 >= 5", e.message
+  else
+    flunk "didn't raise"
   end
 
   def test_index_bad_y
-    begin
-      @canvas[1, 11]
-    rescue => e
-      assert_equal "bad y value 11 >= 10", e.message
-    else
-      flunk "didn't raise"
-    end
+    @canvas[1, 11]
+  rescue => e
+    assert_equal "bad y value 11 >= 10", e.message
+  else
+    flunk "didn't raise"
   end
 
   def test_index_equals
@@ -215,28 +203,24 @@ class TestCanvas < MiniTest::Unit::TestCase
   end
 
   def test_index_equals_bad_x
-    begin
-      @canvas[6, 1] = PNG::Color::Red
-    rescue => e
-      assert_equal "bad x value 6 >= 5", e.message
-    else
-      flunk "didn't raise"
-    end
+    @canvas[6, 1] = PNG::Color::Red
+  rescue => e
+    assert_equal "bad x value 6 >= 5", e.message
+  else
+    flunk "didn't raise"
   end
 
   def test_index_equals_bad_y
-    begin
-      @canvas[1, 11] = PNG::Color::Red
-    rescue => e
-      assert_equal "bad y value 11 >= 10", e.message
-    else
-      flunk "didn't raise"
-    end
+    @canvas[1, 11] = PNG::Color::Red
+  rescue => e
+    assert_equal "bad y value 11 >= 10", e.message
+  else
+    flunk "didn't raise"
   end
 
-#   def test_point
-#     raise NotImplementedError, 'Need to write test_point'
-#   end
+  # def test_point
+  #   raise NotImplementedError, 'Need to write test_point'
+  # end
 
   def test_inspect
     assert_equal "#<PNG::Canvas 5x10>", @canvas.inspect
@@ -320,29 +304,28 @@ class TestCanvas < MiniTest::Unit::TestCase
                  xxxx..xx
                  xx00xxxx
                  ..xxxxxx
-                          ".gsub(/ /, '')
-
-    assert_equal expected, canvas1.to_s.gsub(/ /, 'x')
+                          ".gsub(/ /, "")
 
+    assert_equal expected, canvas1.to_s.gsub(/ /, "x")
 
     canvas2 = PNG::Canvas.new 2, 2
     canvas2[0, 0] = PNG::Color::Black
 
-    expected = " xxxx 
+    expected = " xxxx
                  ..xx
-                      ".gsub(/ /, '')
+                      ".gsub(/ /, "")
 
-    assert_equal expected, canvas2.to_s.gsub(/ /, 'x')
+    assert_equal expected, canvas2.to_s.gsub(/ /, "x")
 
     return canvas1, canvas2
   end
 
-  def util_ascii_art(width, height)
+  def util_ascii_art width, height
     (("0" * width * 2) + "\n") * height
   end
 end
 
-class TestPng::TestColor < MiniTest::Unit::TestCase
+class TestPng::TestColor < Minitest::Test
   def setup
     @color = PNG::Color.new 0x01, 0x02, 0x03, 0x04
   end
@@ -380,11 +363,6 @@ class TestPng::TestColor < MiniTest::Unit::TestCase
   end
 
   def test_blend
-#     c1 = @color
-#     c2 = PNG::Color.new 0xFF, 0xFE, 0xFD, 0xFC
-
-#     assert_equal PNG::Color.new(0xFB, 0xFA, 0xF9, 0xF8), c1.blend(c2)
-
     c1 = PNG::Color::White
     c2 = PNG::Color::Black
 
@@ -420,50 +398,50 @@ class TestPng::TestColor < MiniTest::Unit::TestCase
   end
 
   def test_to_ascii
-    assert_equal '00', PNG::Color::White.to_ascii, "white"
-    assert_equal '++', PNG::Color::Yellow.to_ascii, "yellow"
-    assert_equal ',,', PNG::Color::Red.to_ascii, "red"
-    assert_equal '..', PNG::Color::Black.to_ascii, "black"
-    assert_equal '  ', PNG::Color::Background.to_ascii, "background"
+    assert_equal "00", PNG::Color::White.to_ascii, "white"
+    assert_equal "++", PNG::Color::Yellow.to_ascii, "yellow"
+    assert_equal ",,", PNG::Color::Red.to_ascii, "red"
+    assert_equal "..", PNG::Color::Black.to_ascii, "black"
+    assert_equal "  ", PNG::Color::Background.to_ascii, "background"
   end
 
   def test_to_ascii_alpha
-    assert_equal '00', PNG::Color.new(255,255,255,255).to_ascii
-    assert_equal '00', PNG::Color.new(255,255,255,192).to_ascii
-    assert_equal '++', PNG::Color.new(255,255,255,191).to_ascii
-    assert_equal ',,', PNG::Color.new(255,255,255,127).to_ascii
-    assert_equal ',,', PNG::Color.new(255,255,255,126).to_ascii
-    assert_equal ',,', PNG::Color.new(255,255,255, 64).to_ascii
-    assert_equal '..', PNG::Color.new(255,255,255, 63).to_ascii
-    assert_equal '..', PNG::Color.new(255,255,255,  1).to_ascii
-    assert_equal '  ', PNG::Color.new(255,255,255,  0).to_ascii
+    assert_equal "00", PNG::Color.new(255, 255, 255, 255).to_ascii
+    assert_equal "00", PNG::Color.new(255, 255, 255, 192).to_ascii
+    assert_equal "++", PNG::Color.new(255, 255, 255, 191).to_ascii
+    assert_equal ",,", PNG::Color.new(255, 255, 255, 127).to_ascii
+    assert_equal ",,", PNG::Color.new(255, 255, 255, 126).to_ascii
+    assert_equal ",,", PNG::Color.new(255, 255, 255, 64).to_ascii
+    assert_equal "..", PNG::Color.new(255, 255, 255, 63).to_ascii
+    assert_equal "..", PNG::Color.new(255, 255, 255,  1).to_ascii
+    assert_equal "  ", PNG::Color.new(255, 255, 255,  0).to_ascii
   end
 
   def test_to_s_name
-    assert_equal 'Red', PNG::Color::Red.to_s
+    assert_equal "Red", PNG::Color::Red.to_s
   end
 
   def test_to_s
-    obj = PNG::Color.new(255,255,255,  0)
-    assert_equal '#<PNG::Color:0xXXXXXX>', obj.to_s.sub(/0x[0-9a-f]+/, '0xXXXXXX')
+    obj = PNG::Color.new(255, 255, 255,  0)
+    assert_equal "#<PNG::Color:0xXXXXXX>", obj.to_s.sub(/0x[0-9a-f]+/, "0xXXXXXX")
   end
 
   def test_equals2
-    assert_equal PNG::Color.new(255,255,255,  0), PNG::Color.new(255,255,255,  0)
+    assert_equal PNG::Color.new(255, 255, 255,  0), PNG::Color.new(255, 255, 255,  0)
   end
 
   def test_hash
-    a = PNG::Color.new(255,255,255,  0)
-    b = PNG::Color.new(255,255,255,  0)
+    a = PNG::Color.new(255, 255, 255,  0)
+    b = PNG::Color.new(255, 255, 255,  0)
     assert_equal a.hash, b.hash
   end
 
-#   def test_values
-#     raise NotImplementedError, 'Need to write test_values'
-#   end
+  # def test_values
+  #   raise NotImplementedError, 'Need to write test_values'
+  # end
 end
 
-class TestPng::TestPie < MiniTest::Unit::TestCase
+class TestPng::TestPie < Minitest::Test
   def test_pie_chart_odd
     expected =
       ["          ..          ",
@@ -477,9 +455,9 @@ class TestPng::TestPie < MiniTest::Unit::TestCase
        "  ,,,,,,,,,,,,,,,,,,  ",
        "    ,,,,,,,,,,,,,,    ",
        "          ,,          ",
-      nil].join("\n")
+       nil].join("\n")
 
-    actual = PNG::pie_chart(11, 0.25, PNG::Color::Black, PNG::Color::Green)
+    actual = PNG.pie_chart(11, 0.25, PNG::Color::Black, PNG::Color::Green)
     assert_equal expected, actual.to_s
   end
 
@@ -496,38 +474,32 @@ class TestPng::TestPie < MiniTest::Unit::TestCase
        "  ,,,,,,,,,,,,,,,,,,  ",
        "    ,,,,,,,,,,,,,,    ",
        "          ,,          ",
-      nil].join("\n")
+       nil].join("\n")
 
-    actual = PNG::pie_chart(10, 0.25, PNG::Color::Black, PNG::Color::Green)
+    actual = PNG.pie_chart(10, 0.25, PNG::Color::Black, PNG::Color::Green)
     assert_equal expected, actual.to_s
   end
 
-  def util_angle(expect, x, y)
+  def assert_angle expect, x, y
     actual = PNG.angle(x, y)
-    case expect
-    when Integer then
-      assert_equal(expect, actual,
-                   "[#{x}, #{y}] should be == #{expect}, was #{actual}")
-    else
-      assert_in_delta(expect, actual, 0.5)
-    end
+    assert_in_epsilon expect, actual
   end
 
   def test_math_is_hard_lets_go_shopping
-    util_angle   0,  0,  0
+    assert_angle   0,  0,  0
     (25..500).step(25) do |n|
-      util_angle   0,  0,  n
-      util_angle  90,  n,  0
-      util_angle 180,  0, -n
-      util_angle 270, -n,  0
+      assert_angle   0,  0,  n
+      assert_angle  90,  n,  0
+      assert_angle 180,  0, -n
+      assert_angle 270, -n,  0
     end
 
-    util_angle 359.5, -1, 250
-    util_angle   0.0,  0, 250
-    util_angle   0.5,  1, 250
+    assert_angle 359.5, -1, 250
+    assert_angle   0.0,  0, 250
+    assert_angle   0.2292,  1, 250
 
-    util_angle 89.5, 250,  1
-    util_angle 90.0, 250,  0
-    util_angle 90.5, 250, -1
+    assert_angle 89.77, 250,  1
+    assert_angle 90.0, 250,  0
+    assert_angle 90.23, 250, -1
   end
 end

data/test/test_png_font.rb

@@ -1,16 +1,8 @@
-dir = File.expand_path "~/.ruby_inline"
-if test ?d, dir then
-  require 'fileutils'
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
-require 'rubygems'
-require 'minitest/autorun'
-require 'png/font'
+require "rubygems"
+require "minitest/autorun"
+require "png/font"
 
-class TestPngFont < MiniTest::Unit::TestCase
+class TestPngFont < Minitest::Test
 
   def setup
     @font = PNG::Font.default
@@ -25,13 +17,13 @@ class TestPngFont < MiniTest::Unit::TestCase
   end
 
   def test_coordinates
-    assert_equal [ 0,  0,  5,  5], @font.coordinates('(')
-    assert_equal [ 0,  6,  5, 11], @font.coordinates('0')
-    assert_equal [ 0, 12,  5, 17], @font.coordinates('a')
-    assert_equal [ 0, 18,  5, 23], @font.coordinates('A')
+    assert_equal [0,  0,  5,  5], @font.coordinates("(")
+    assert_equal [0,  6,  5, 11], @font.coordinates("0")
+    assert_equal [0, 12,  5, 17], @font.coordinates("a")
+    assert_equal [0, 18,  5, 23], @font.coordinates("A")
 
-    assert_equal [42, 12, 47, 17], @font.coordinates('h')
-    assert_equal [42, 18, 47, 23], @font.coordinates('H')
+    assert_equal [42, 12, 47, 17], @font.coordinates("h")
+    assert_equal [42, 18, 47, 23], @font.coordinates("H")
   end
 
   def test_index
@@ -44,7 +36,7 @@ class TestPngFont < MiniTest::Unit::TestCase
 000000000000
 ".strip + "\n"
 
-    assert_equal expected, @font['A'].to_s
+    assert_equal expected, @font["A"].to_s
 
     expected = "
 00000000..00
@@ -55,11 +47,11 @@ class TestPngFont < MiniTest::Unit::TestCase
 000000000000
 ".strip + "\n"
 
-    assert_equal expected, @font['l'].to_s
+    assert_equal expected, @font["l"].to_s
   end
 
   def test_index_identity
-    assert_same @font['A'], @font['A']
+    assert_same @font["A"], @font["A"]
   end
 
   def test_annotate

data/test/test_png_reader.rb

@@ -1,16 +1,8 @@
-dir = File.expand_path "~/.ruby_inline"
-if test ?d, dir then
-  require 'fileutils'
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
-require 'rubygems'
-require 'minitest/autorun'
-require 'png/reader'
+require "rubygems"
+require "minitest/autorun"
+require "png/reader"
 
-class TestPngReader < MiniTest::Unit::TestCase
+class TestPngReader < Minitest::Test
 
   def setup
     @canvas = PNG::Canvas.new 5, 10, PNG::Color::White
@@ -18,32 +10,30 @@ class TestPngReader < MiniTest::Unit::TestCase
 
     @IHDR_length = "\000\000\000\r"
     @IHDR_crc = "\2152\317\275"
-    @IHDR_crc_value = @IHDR_crc.unpack('N').first
+    @IHDR_crc_value = @IHDR_crc.unpack("N").first
     @IHDR_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000"
     @IHDR_chunk = "#{@IHDR_length}IHDR#{@IHDR_data}#{@IHDR_crc}"
 
-    @blob = <<-EOF.unpack('m*').first
+    @blob = <<-EOF.unpack("m*").first
 iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAD0lEQVR4nGP4
 jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
     EOF
   end
 
   def test_class_check_crc
-    assert PNG.check_crc('IHDR', @IHDR_data, @IHDR_crc_value)
+    assert PNG.check_crc("IHDR", @IHDR_data, @IHDR_crc_value)
   end
 
   def test_class_check_crc_exception
-    begin
-      PNG.check_crc('IHDR', @IHDR_data, @IHDR_crc_value + 1)
-    rescue ArgumentError => e
-      assert_equal "Invalid CRC encountered in IHDR chunk", e.message
-    else
-      flunk "exception wasn't raised"
-    end
+    PNG.check_crc("IHDR", @IHDR_data, @IHDR_crc_value + 1)
+  rescue ArgumentError => e
+    assert_equal "Invalid CRC encountered in IHDR chunk", e.message
+  else
+    flunk "exception wasn't raised"
   end
 
   def test_class_read_chunk
-    data = PNG.read_chunk 'IHDR', @IHDR_chunk
+    data = PNG.read_chunk "IHDR", @IHDR_chunk.dup
 
     assert_equal @IHDR_data, data
   end
@@ -51,8 +41,8 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
   def test_class_read_IDAT
     canvas = PNG::Canvas.new 5, 10, PNG::Color::White
 
-    data = ([ 0, [255] * (4*5) ] * 10)
-    data = data.flatten.map { |n| n.chr }.join
+    data = ([0, [255] * (4*5)] * 10)
+    data = data.flatten.map(&:chr).join
     data = Zlib::Deflate.deflate(data)
 
     PNG.read_IDAT data, 8, PNG::RGBA, canvas
@@ -61,13 +51,13 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
   end
 
   def test_class_read_IHDR
-    bit_depth, color_type, width, height = PNG.read_IHDR @IHDR_data
+    _, _, width, height = PNG.read_IHDR @IHDR_data
     assert_equal 10, width
     assert_equal 10, height
   end
 
   def test_class_load_metadata
-    png, canvas = util_png
+    png, _ = util_png
 
     width, height, bit_depth = PNG.load(png.to_blob, :metadata)