pnm 0.4.1 → 0.6.0

data/test/test_image.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 # test_image.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2015 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
+
+require "minitest/autorun"
+require "pnm"
 
-require 'minitest/autorun'
-require 'pnm'
+require_relative "backports"
 
 
 describe PNM::Image do
@@ -12,190 +16,262 @@ describe PNM::Image do
     @srcpath   = File.dirname(__FILE__)
     @temp_path = File.expand_path("#{@srcpath}/temp.pnm")
 
-    pixels = [[0,0,0,0,0],
-              [0,1,1,1,0],
-              [0,0,1,0,0],
-              [0,0,1,0,0],
-              [0,0,1,0,0],
-              [0,0,0,0,0]]
-    comment = 'Bilevel'
-    @bilevel = PNM.create(pixels, {:comment => comment})
-
-    pixels = [[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
-              [0,1,1,1,0,1,1,1,1,0,1,1,1,1,1,0],
-              [0,0,1,0,0,1,0,0,1,0,1,0,1,0,1,0],
-              [0,0,1,0,0,1,0,0,1,0,1,0,1,0,1,0],
-              [0,0,1,0,0,1,1,1,1,0,1,0,1,0,1,0],
-              [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]
-    @bilevel_2 = PNM.create(pixels)
-
-    pixels = [[  0, 50,100,150],
-              [ 50,100,150,200],
-              [100,150,200,250]]
+    pixels = [[0, 0, 0, 0, 0],
+              [0, 1, 1, 1, 0],
+              [0, 0, 1, 0, 0],
+              [0, 0, 1, 0, 0],
+              [0, 0, 1, 0, 0],
+              [0, 0, 0, 0, 0]]
+    comment = "Bilevel"
+    @bilevel = PNM.create(pixels, comment: comment)
+
+    pixels = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+              [0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0],
+              [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0],
+              [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0],
+              [0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0],
+              [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
+    @bilevel2 = PNM.create(pixels)
+
+    pixels = [[  0,  50, 100, 150],
+              [ 50, 100, 150, 200],
+              [100, 150, 200, 250]]
     comment = "Grayscale\n(with multiline comment)"
-    @grayscale = PNM.create(pixels, {:maxgray => 250, :comment => comment})
+    @grayscale = PNM.create(pixels, maxgray: 250, comment: comment)
 
-    pixels = [[65,66], [13,10], [65,66]]
+    pixels = [[65, 66], [13, 10], [65, 66]]
     @grayscale_crlf = PNM.create(pixels)
 
-    pixels = [[[0,6,0], [1,5,1], [2,4,2], [3,3,4], [4,2,6]],
-              [[1,5,2], [2,4,2], [3,3,2], [4,2,2], [5,1,2]],
-              [[2,4,6], [3,3,4], [4,2,2], [5,1,1], [6,0,0]]]
-    @color = PNM.create(pixels, {:maxgray => 6})
+    pixels = [[[0, 6, 0], [1, 5, 1], [2, 4, 2], [3, 3, 4], [4, 2, 6]],
+              [[1, 5, 2], [2, 4, 2], [3, 3, 2], [4, 2, 2], [5, 1, 2]],
+              [[2, 4, 6], [3, 3, 4], [4, 2, 2], [5, 1, 1], [6, 0, 0]]]
+    @color = PNM.create(pixels, maxgray: 6)
+  end
+
+  it "freezes pixel data" do
+    _ { @bilevel.pixels << [1, 1, 0, 1, 1] }.must_raise RuntimeError
   end
 
-  it 'sets maxgray to 1 for bilevel images' do
-    image = PNM.create([[0,1,0], [1,0,1]])
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+  it "freezes comment string" do
+    _ { @bilevel.comment << "string" }.must_raise RuntimeError
   end
 
-  it 'sets maxgray by default to 255 for grayscale images' do
-    image = PNM.create([[0,10,20], [10,20,30]])
-    image.type.must_equal :pgm
-    image.maxgray.must_equal 255
+  it "sets maxgray to 1 for bilevel images" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]])
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
-  it 'sets maxgray by default to 255 for color images' do
-    image = PNM.create([[[0,0,0], [10,10,10]], [[10,10,10], [20,20,20]]])
-    image.type.must_equal :ppm
-    image.maxgray.must_equal 255
+  it "sets maxgray by default to 255 for grayscale images" do
+    image = PNM.create([[0, 10, 20], [10, 20, 30]])
+    _(image.type).must_equal :pgm
+    _(image.maxgray).must_equal 255
   end
 
-  it 'accepts setting of maxgray to 1 for bilevel images' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:maxgray => 1})
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+  it "sets maxgray by default to 255 for color images" do
+    image = PNM.create([[[0, 0, 0], [10, 10, 10]], [[10, 10, 10], [20, 20, 20]]])
+    _(image.type).must_equal :ppm
+    _(image.maxgray).must_equal 255
   end
 
-  it 'ignores invalid maxgray for bilevel images and sets it to 1' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:type => :pbm, :maxgray => 255})
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+  it "accepts setting of maxgray to 1 for bilevel images" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], maxgray: 1)
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
-  it 'can create a grayscale image from bilevel values (using type)' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:type => :pgm})
-    image.type.must_equal :pgm
-    image.pixels.must_equal [[0,1,0], [1,0,1]]
-    image.maxgray.must_equal 255
+  it "ignores invalid maxgray for bilevel images and sets it to 1" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :pbm, maxgray: 255)
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
-  it 'also accepts types given as string instead of symbol' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:type => "pgm"})
-    image.type.must_equal :pgm
+  it "can create a grayscale image from bilevel values (using type)" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :pgm)
+    _(image.type).must_equal :pgm
+    _(image.pixels).must_equal [[0, 1, 0], [1, 0, 1]]
+    _(image.maxgray).must_equal 255
   end
 
-  it 'can create a grayscale image from bilevel values (using maxgray)' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:maxgray => 2})
-    image.type.must_equal :pgm
-    image.pixels.must_equal [[0,1,0], [1,0,1]]
-    image.maxgray.must_equal 2
+  it "also accepts types given as string instead of symbol" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], type: "pgm")
+    _(image.type).must_equal :pgm
   end
 
-  it 'can create a color image from bilevel values' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:type => :ppm})
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0,0,0], [1,1,1], [0,0,0]], [[1,1,1], [0,0,0], [1,1,1]]]
-    image.maxgray.must_equal 255
+  it "can create a grayscale image from bilevel values (using maxgray)" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], maxgray: 2)
+    _(image.type).must_equal :pgm
+    _(image.pixels).must_equal [[0, 1, 0], [1, 0, 1]]
+    _(image.maxgray).must_equal 2
   end
 
-  it 'can create a color image from bilevel values with a given maxgray' do
-    image = PNM.create([[0,1,0], [1,0,1]], {:type => :ppm, :maxgray => 2})
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0,0,0], [1,1,1], [0,0,0]], [[1,1,1], [0,0,0], [1,1,1]]]
-    image.maxgray.must_equal 2
+  it "can create a color image from bilevel values" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :ppm)
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
+    _(image.maxgray).must_equal 255
   end
 
-  it 'can create a color image from gray values' do
-    image = PNM.create([[0,3,6], [3,6,9]], {:type => :ppm})
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0,0,0], [3,3,3], [6,6,6]], [[3,3,3], [6,6,6], [9,9,9]]]
+  it "can create a color image from bilevel values with a given maxgray" do
+    image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :ppm, maxgray: 2)
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
+    _(image.maxgray).must_equal 2
   end
 
-  it 'does not modify the input data for color images created from gray values' do
-    data = [[0,3,6], [3,6,9]]
-    PNM.create(data, {:type => :ppm})
-    data.must_equal [[0,3,6], [3,6,9]]
+  it "can create a color image from gray values" do
+    image = PNM.create([[0, 3, 6], [3, 6, 9]], type: :ppm)
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [3, 3, 3], [6, 6, 6]], [[3, 3, 3], [6, 6, 6], [9, 9, 9]]]
   end
 
-  it 'can write a bilevel image to an ASCII encoded file' do
-    @bilevel.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")
+  it "does not modify the input data for color images created from gray values" do
+    data = [[0, 3, 6], [3, 6, 9]]
+    PNM.create(data, type: :ppm)
+    _(data).must_equal [[0, 3, 6], [3, 6, 9]]
+  end
+
+  it "can write a bilevel image to an ASCII encoded file" do
+    @bilevel.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")
     File.delete(@temp_path)
   end
 
-  it 'can write a bilevel image (width 5) to a binary encoded file' do
-    @bilevel.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
+  it "can write a bilevel image (width 5) to a binary encoded file" do
+    @bilevel.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
     File.delete(@temp_path)
   end
 
-  it 'can write a bilevel image (width 16) to a binary encoded file' do
-    @bilevel_2.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_2_binary.pbm")
+  it "can write a bilevel image (width 16) to a binary encoded file" do
+    @bilevel2.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_2_binary.pbm")
     File.delete(@temp_path)
   end
 
-  it 'can write a grayscale image to an ASCII encoded file' do
-    @grayscale.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
+  it "can write a grayscale image to an ASCII encoded file" do
+    @grayscale.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
     File.delete(@temp_path)
   end
 
-  it 'can write a grayscale image to a binary encoded file' do
-    @grayscale.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary.pgm")
+  it "can write a grayscale image to a binary encoded file" do
+    @grayscale.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary.pgm")
     File.delete(@temp_path)
   end
 
-  it 'can write a color image to an ASCII encoded file' do
-    @color.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/color_ascii.ppm")
+  it "can write a color image to an ASCII encoded file" do
+    @color.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/color_ascii.ppm")
     File.delete(@temp_path)
   end
 
-  it 'can write a color image to a binary encoded file' do
-    @color.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/color_binary.ppm")
+  it "can write a color image to a binary encoded file" do
+    @color.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/color_binary.ppm")
     File.delete(@temp_path)
   end
 
-  it 'can return image information' do
-    @bilevel.info.must_equal 'PBM 5x6 Bilevel'
-    @grayscale.info.must_equal 'PGM 4x3 Grayscale'
-    @color.info.must_equal 'PPM 5x3 Color'
+  it "can write a bilevel image to a file, adding the extension" do
+    @bilevel.write(@temp_path, add_extension: true)
+    _(File.binread("#{@temp_path}.pbm")).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
+    File.delete("#{@temp_path}.pbm")
+  end
+
+  it "can write a grayscale image to a file, adding the extension" do
+    @grayscale.write(@temp_path, add_extension: true, encoding: :ascii)
+    _(File.binread("#{@temp_path}.pgm")).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
+    File.delete("#{@temp_path}.pgm")
   end
 
-  it 'can return meaningful debugging information' do
-    @bilevel.inspect.must_match   %r{^#<PNM::\w+Image:0x\h+ PBM 5x6 Bilevel>$}
-    @grayscale.inspect.must_match %r{^#<PNM::\w+Image:0x\h+ PGM 4x3 Grayscale, maxgray=250>$}
-    @color.inspect.must_match     %r{^#<PNM::\w+Image:0x\h+ PPM 5x3 Color, maxgray=6>$}
+  it "can write a color image to a file, adding the extension" do
+    @color.write(@temp_path, add_extension: true, encoding: :binary)
+    _(File.binread("#{@temp_path}.ppm")).must_equal File.binread("#{@srcpath}/color_binary.ppm")
+    File.delete("#{@temp_path}.ppm")
   end
 
-  it 'can write binary data containing CRLF' do
-    @grayscale_crlf.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
+  it "can return image information" do
+    _(@bilevel.info).must_equal "PBM 5x6 Bilevel"
+    _(@grayscale.info).must_equal "PGM 4x3 Grayscale"
+    _(@color.info).must_equal "PPM 5x3 Color"
+  end
+
+  it "can return meaningful debugging information" do
+    _(@bilevel.inspect).must_match   %r{\A#<PNM::PBMImage:0x\h+ PBM 5x6 Bilevel>\z}
+    _(@grayscale.inspect).must_match %r{\A#<PNM::PGMImage:0x\h+ PGM 4x3 Grayscale, maxgray=250>\z}
+    _(@color.inspect).must_match     %r{\A#<PNM::PPMImage:0x\h+ PPM 5x3 Color, maxgray=6>\z}
+  end
+
+  it "can write binary data containing CRLF" do
+    @grayscale_crlf.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
     File.delete(@temp_path)
   end
 
-  it 'can write binary data containing CRLF to an I/O stream' do
-    File.open(@temp_path, 'w') {|f| @grayscale_crlf.write(f, :binary) }
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
+  it "can write binary data containing CRLF to an I/O stream" do
+    File.open(@temp_path, "w") {|f| @grayscale_crlf.write(f, encoding: :binary) }
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
     File.delete(@temp_path)
   end
 
-  it 'can write zero-length comments' do
-    comment = ''
-    PNM.create([[0,0]], :comment => comment).write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal "P1\n#\n2 1\n0 0\n"
+  it "can write zero-length comments" do
+    comment = ""
+    PNM.create([[0, 0]], comment: comment).write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal "P1\n#\n2 1\n0 0\n"
     File.delete(@temp_path)
   end
 
-  it 'can write comments with trailing zero-length line' do
+  it "can write comments with trailing zero-length line" do
     comment = "An empty line:\n"
-    PNM.create([[0,0]], :comment => comment).write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal "P1\n# An empty line:\n#\n2 1\n0 0\n"
+    PNM.create([[0, 0]], comment: comment).write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal "P1\n# An empty line:\n#\n2 1\n0 0\n"
     File.delete(@temp_path)
   end
+
+  it "can check equality of images (1)" do
+    pixels = [[0, 1, 0], [1, 0, 1]]
+    bilevel1 = PNM.create(pixels, comment: "image")
+    bilevel2 = PNM.create(pixels, comment: "image")
+
+    _(bilevel2 == bilevel1).must_equal true
+  end
+
+  it "can check equality of images (2)" do
+    pixels = [[0, 1, 0], [1, 0, 1]]
+    bilevel1 = PNM.create(pixels, comment: "image")
+    bilevel2 = PNM.create(pixels, comment: "other image")
+
+    _(bilevel2 == bilevel1).must_equal false
+  end
+
+  it "can check equality of images (3)" do
+    pixels = [[0, 1, 0], [1, 0, 1]]
+    bilevel1 = PNM.create(pixels)
+    bilevel2 = PNM.create(pixels.reverse)
+
+    _(bilevel2 == bilevel1).must_equal false
+  end
+
+  it "can check equality of images (4)" do
+    pixels = [[0, 1, 0], [1, 0, 1]]
+    bilevel = PNM.create(pixels, type: :pbm)
+    graylevel = PNM.create(pixels, type: :pgm)
+
+    _(graylevel == bilevel).must_equal false
+  end
+
+  it "can check equality of images (5)" do
+    pixels = [[0, 1, 2], [3, 4, 5]]
+    graylevel1 = PNM.create(pixels, maxgray: 10)
+    graylevel2 = PNM.create(pixels, maxgray: 255)
+
+    _(graylevel2 == graylevel1).must_equal false
+  end
+
+  it "can check equality of images (6)" do
+    image = PNM.create([[0, 1, 2], [3, 4, 5]])
+
+    _(image == "a string").must_equal false
+  end
 end

data/test/test_parser.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 # test_parser.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2015 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
+
+require "minitest/autorun"
+require "pnm/parser"
 
-require 'minitest/autorun'
-require 'pnm/parser'
+require_relative "backports"
 
 
 describe PNM::Parser do
@@ -12,89 +16,89 @@ describe PNM::Parser do
     @parser = PNM::Parser
   end
 
-  it 'can parse ASCII encoded PBM data' do
-    content =<<-EOF.chomp.gsub(/^ */, '')
+  it "can parse ASCII encoded PBM data" do
+    content = <<-PBM.chomp.gsub(/^ */, "")
       P1 6 2
       0 1 0 0 1 1
       0 0 0 1 1 1
-    EOF
+    PBM
     expected = {
-      :magic_number => 'P1',
-      :width        => 6,
-      :height       => 2,
-      :data         => "0 1 0 0 1 1\n0 0 0 1 1 1"
+      magic_number: "P1",
+      width:        6,
+      height:       2,
+      data:         "0 1 0 0 1 1\n0 0 0 1 1 1"
     }
 
-    @parser.parse(content).must_equal expected
+    _(@parser.parse(content)).must_equal expected
   end
 
-  it 'can parse ASCII encoded PGM data' do
-    content =<<-EOF.chomp.gsub(/^ */, '')
+  it "can parse ASCII encoded PGM data" do
+    content = <<-PGM.chomp.gsub(/^ */, "")
       P2 4 2 100
       10 20 30 40
       50 60 70 80
-    EOF
+    PGM
     expected = {
-      :magic_number => 'P2',
-      :width        => 4,
-      :height       => 2,
-      :maxgray      => 100,
-      :data         => "10 20 30 40\n50 60 70 80"
+      magic_number: "P2",
+      width:        4,
+      height:       2,
+      maxgray:      100,
+      data:         "10 20 30 40\n50 60 70 80"
     }
 
-    @parser.parse(content).must_equal expected
+    _(@parser.parse(content)).must_equal expected
   end
 
-  it 'can parse binary encoded data' do
-    content = 'P4 8 2 ' << ['05AF'].pack('H*')
+  it "can parse binary encoded data" do
+    content = "P4 8 2 ".dup << ["05AF"].pack("H*")
     expected = {
-      :magic_number => 'P4',
-      :width        => 8,
-      :height       => 2,
-      :data         => ['05AF'].pack('H*')
+      magic_number: "P4",
+      width:        8,
+      height:       2,
+      data:         ["05AF"].pack("H*")
     }
 
-    @parser.parse(content).must_equal expected
+    _(@parser.parse(content)).must_equal expected
   end
 
-  it 'does not change the passed data' do
-    content = 'P1 3 2 0 1 0 0 1 1'
+  it "does not change the passed data" do
+    content = "P1 3 2 0 1 0 0 1 1"
     original_content = content.dup
     @parser.parse(content)
 
-    content.must_equal original_content
+    _(content).must_equal original_content
   end
 
-  it 'does accept multiple whitespace as delimiter' do
+  it "does accept multiple whitespace as delimiter" do
     content = "P1  \n\t 3 \r \n2 0 1 0 0 1 1"
     expected = {
-      :magic_number => 'P1',
-      :width        => 3,
-      :height       => 2,
-      :data         => '0 1 0 0 1 1'
+      magic_number: "P1",
+      width:        3,
+      height:       2,
+      data:         "0 1 0 0 1 1"
     }
 
-    @parser.parse(content).must_equal expected
+    _(@parser.parse(content)).must_equal expected
   end
 
-  it 'can parse binary encoded data including whitespace' do
-    @parser.parse("P4 16 4 A\nB\rC D\t")[:data].must_equal "A\nB\rC D\t"
+  it "can parse binary encoded data including whitespace" do
+    _(@parser.parse("P4 16 4 A\nB\rC D\t")[:data]).must_equal "A\nB\rC D\t"
   end
 
-  it 'can parse binary encoded data starting with whitespace' do
-    @parser.parse("P4 8 2 \nA")[:data].must_equal "\nA"
+  it "can parse binary encoded data starting with whitespace" do
+    _(@parser.parse("P4 8 2 \nA")[:data]).must_equal "\nA"
   end
 
-  it 'can parse binary encoded data starting with comment character' do
-    @parser.parse("P4 8 2 #A")[:data].must_equal "#A"
+  it "can parse binary encoded data starting with comment character" do
+    _(@parser.parse("P4 8 2 #A")[:data]).must_equal "#A"
   end
 
-  it 'does not chomp newlines from parsed binary encoded data' do
-    @parser.parse("P4 8 2 AB\n")[:data].must_equal "AB\n"
+  it "does not chomp newlines from parsed binary encoded data" do
+    _(@parser.parse("P4 8 2 AB\n")[:data]).must_equal "AB\n"
   end
 
-  it 'can parse comments' do
-    content =<<-EOF.chomp.gsub(/^ */, '')
+  it "can parse comments" do
+    content = <<-PBM.chomp.gsub(/^ */, "")
       # Comment 1
       P1  # Comment 2
       6# Comment 3
@@ -104,15 +108,15 @@ describe PNM::Parser do
       2
       0 1 0 0 1 1
       0 0 0 1 1 1
-    EOF
+    PBM
     expected = {
-      :magic_number => 'P1',
-      :width        => 6,
-      :height       => 2,
-      :comments     => ['Comment 1', 'Comment 2', 'Comment 3', 'Comment 4', '', 'Comment 6'],
-      :data         => "0 1 0 0 1 1\n0 0 0 1 1 1"
+      magic_number: "P1",
+      width:        6,
+      height:       2,
+      comments:     ["Comment 1", "Comment 2", "Comment 3", "Comment 4", "", "Comment 6"],
+      data:         "0 1 0 0 1 1\n0 0 0 1 1 1"
     }
 
-    @parser.parse(content).must_equal expected
+    _(@parser.parse(content)).must_equal expected
   end
 end