pnm 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66de49354358fed31c8299381599bb8b16d87d2143e2102ca61da00e6b8b2927
-  data.tar.gz: 2bd7e0d7491be12b5562c3a1de19ee7e538d95c3535fc9bb92723726b5e5787c
+  metadata.gz: 5a3dd7ccd09f9d5a2f16212910e8aba16f25c78648e965c42847a86bc057632e
+  data.tar.gz: 7f22c53142d2317692fa2e840a6b12758e39990123c1d297d9624abc26a71c4b
 SHA512:
-  metadata.gz: bd83d15feb8b65b28b43f64cd48ab23a5e3f710a991f781c43d6d74bc9ea9a02cb905d61bae70af1fe2476c551ece310050eccd0210acb5701d87efb40d61173
-  data.tar.gz: 574e62b56e1ac1fea7a9110f1c01c805f373bfafd50210bb2145fca4086054d7d1ace113d1e46eadfe0b5c9314b3ca221168cdc2dba2e7168742615a7462e728
+  metadata.gz: c7ca3afc52aac295f564ecb5222c1339ce9ae623db0213ee7c878d05591396d735a76e0a19d62acce0cb095802352ebd1f1442ea4a803c32aa2bc4d8bf169289
+  data.tar.gz: '08e3653dd113aabd4333c789a4077b95733a18f3422db4e6006e7f534692f365f35474791dfb6d8c66716bb5c6e16ced1f07e2fbf7b36e6ba2842a09911c00b1'

data/README.md

@@ -98,10 +98,9 @@ Requirements
 
 - PNM has been tested with
 
-  - Ruby 2.6, 2.5, 2.4, 2.3, 2.2, 2.1,
-  - Ruby 2.0.0,
-  - Ruby 1.9.3,
-  - JRuby 1.7.19,
+  - Ruby 2.7
+  - Ruby 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0.0, 1.9.3,
+  - JRuby 9.2.9.0,
   - Rubinius 2.5.2.
 
 Documentation
@@ -118,7 +117,7 @@ Report bugs on the PNM home page: <https://github.com/stomar/pnm/>
 License
 -------
 
-Copyright &copy; 2013-2019 Marcus Stollsteimer
+Copyright &copy; 2013-2020 Marcus Stollsteimer
 
 `PNM` is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 3 or later (GPLv3+),

data/Rakefile

@@ -2,7 +2,7 @@
 
 # rakefile for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "rake/testtask"
 

data/benchmark/bm_converter.rb

@@ -3,7 +3,7 @@
 
 # bm_converter.rb: Benchmarks for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "benchmark"
 require_relative "../lib/pnm"

data/lib/pnm.rb

@@ -87,7 +87,7 @@ require_relative "pnm/exceptions"
 #
 # == Author
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 #
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 #
@@ -98,7 +98,7 @@ module PNM
   TAGLINE  = "create/read/write PNM image files (PBM, PGM, PPM)"
 
   COPYRIGHT = <<-TEXT.gsub(/^ +/, "")
-    Copyright (C) 2013-2019 Marcus Stollsteimer.
+    Copyright (C) 2013-2020 Marcus Stollsteimer.
     License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
     This is free software: you are free to change and redistribute it.
     There is NO WARRANTY, to the extent permitted by law.

data/lib/pnm/converter.rb

@@ -113,8 +113,8 @@ module PNM
                          end
 
       values_as_string.map {|value| Integer(value) }
-    rescue ::ArgumentError => error
-      raise  unless error.message.start_with?("invalid value for Integer")
+    rescue ::ArgumentError => e
+      raise  unless e.message.start_with?("invalid value for Integer")
 
       raise PNM::DataError, "invalid pixel value: Integer expected"
     end

data/lib/pnm/parser.rb

@@ -22,7 +22,7 @@ module PNM
       content = content.dup
 
       magic_number = nil
-      tokens   = []
+      tokens = []
       comments = []
 
       until magic_number
@@ -50,17 +50,17 @@ module PNM
 
       width, height, maxgray = tokens
 
-      assert_integer(width,   "width")
-      assert_integer(height,  "height")
+      assert_integer(width, "width")
+      assert_integer(height, "height")
       assert_integer(maxgray, "maxgray")  if maxgray
 
-      width   = width.to_i
-      height  = height.to_i
+      width = width.to_i
+      height = height.to_i
       maxgray = maxgray.to_i  if maxgray
 
-      assert_value(width,   "width")   {|x| x > 0 }
-      assert_value(height,  "height")  {|x| x > 0 }
-      assert_value(maxgray, "maxgray") {|x| x > 0 && x <= 255 }  if maxgray
+      assert_positive(width, "width")
+      assert_positive(height, "height")
+      assert_in_maxgray_range(maxgray)  if maxgray
 
       result = {
         magic_number: magic_number,
@@ -114,10 +114,17 @@ module PNM
       raise PNM::ParserError, msg
     end
 
-    def self.assert_value(value, name)
-      return  if yield(value)
+    def self.assert_positive(value, name)
+      return  if value > 0
 
-      msg = "invalid #{name} value - `#{value}'"
+      msg = "#{name} must be greater than 0 - `#{value}'"
+      raise PNM::ParserError, msg
+    end
+
+    def self.assert_in_maxgray_range(value)
+      return  if value > 0 && value <= 255
+
+      msg = "invalid maxgray value - `#{value}'"
       raise PNM::ParserError, msg
     end
   end

data/lib/pnm/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module PNM
-  VERSION = "0.5.2"
-  DATE    = "2019-02-09"
+  VERSION = "0.5.3"
+  DATE    = "2020-01-19"
 end

data/test/backports.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module PNM
+  module Backports  # :nodoc:
+    module Minitest  # :nodoc:
+
+      # Provides workaround for missing value wrappers in minitest < 5.6.0.
+      def _(value = nil, &block)
+        block || value
+      end
+    end
+  end
+end
+
+
+if Gem.loaded_specs["minitest"].version < Gem::Version.new("5.6.0")
+  warn "Using workaround for missing value wrappers in minitest < 5.6.0."
+  include PNM::Backports::Minitest
+end

data/test/test_converter.rb

@@ -2,11 +2,13 @@
 
 # test_converter.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm/converter"
 
+require_relative "backports"
+
 
 describe PNM::Converter do
 
@@ -56,7 +58,7 @@ describe PNM::Converter do
     data     = @pbm[:ascii]
     expected = @pbm[:array]
 
-    @converter.ascii2array(:pbm, width, height, data).must_equal expected
+    _(@converter.ascii2array(:pbm, width, height, data)).must_equal expected
   end
 
   it "can convert from ASCII encoded PGM data" do
@@ -65,7 +67,7 @@ describe PNM::Converter do
     data     = @pgm[:ascii]
     expected = @pgm[:array]
 
-    @converter.ascii2array(:pgm, width, height, data).must_equal expected
+    _(@converter.ascii2array(:pgm, width, height, data)).must_equal expected
   end
 
   it "can convert from ASCII encoded PPM data" do
@@ -74,7 +76,7 @@ describe PNM::Converter do
     data     = @ppm[:ascii]
     expected = @ppm[:array]
 
-    @converter.ascii2array(:ppm, width, height, data).must_equal expected
+    _(@converter.ascii2array(:ppm, width, height, data)).must_equal expected
   end
 
   it "accepts ASCII encoded PBM data with omitted whitespace" do
@@ -83,7 +85,7 @@ describe PNM::Converter do
     data     = "  010100\n000110"
     expected = [[0, 1, 0, 1], [0, 0, 0, 0], [0, 1, 1, 0]]
 
-    @converter.ascii2array(:pbm, width, height, data).must_equal expected
+    _(@converter.ascii2array(:pbm, width, height, data)).must_equal expected
   end
 
   it "accepts ASCII encoded PGM data with arbitrary whitespace" do
@@ -92,7 +94,7 @@ describe PNM::Converter do
     data     = "  \n 10 90\t170\r250\n90 \t170   250 \t\r\n\t 10\n\n\n170\n250\n10\n90\n"
     expected = [[10, 90, 170, 250], [90, 170, 250, 10], [170, 250, 10, 90]]
 
-    @converter.ascii2array(:pgm, width, height, data).must_equal expected
+    _(@converter.ascii2array(:pgm, width, height, data)).must_equal expected
   end
 
   it "can convert from binary encoded PBM data (width 6)" do
@@ -101,7 +103,7 @@ describe PNM::Converter do
     data     = @pbm6[:binary]
     expected = @pbm6[:array]
 
-    @converter.binary2array(:pbm, width, height, data).must_equal expected
+    _(@converter.binary2array(:pbm, width, height, data)).must_equal expected
   end
 
   it "can convert from binary encoded PBM data (width 14)" do
@@ -110,7 +112,7 @@ describe PNM::Converter do
     data     = @pbm14[:binary]
     expected = @pbm14[:array]
 
-    @converter.binary2array(:pbm, width, height, data).must_equal expected
+    _(@converter.binary2array(:pbm, width, height, data)).must_equal expected
   end
 
   it "can convert from binary encoded PGM data" do
@@ -119,7 +121,7 @@ describe PNM::Converter do
     data     = @pgm[:binary]
     expected = @pgm[:array]
 
-    @converter.binary2array(:pgm, width, height, data).must_equal expected
+    _(@converter.binary2array(:pgm, width, height, data)).must_equal expected
   end
 
   it "can convert from binary encoded PPM data" do
@@ -128,7 +130,7 @@ describe PNM::Converter do
     data     = @ppm[:binary]
     expected = @ppm[:array]
 
-    @converter.binary2array(:ppm, width, height, data).must_equal expected
+    _(@converter.binary2array(:ppm, width, height, data)).must_equal expected
   end
 
   it "accepts an additional whitespace character for binary encoded data" do
@@ -137,73 +139,73 @@ describe PNM::Converter do
     data     = @pbm14[:binary] + "\t"
     expected = @pbm14[:array]
 
-    @converter.binary2array(:pbm, width, height, data).must_equal expected
+    _(@converter.binary2array(:pbm, width, height, data)).must_equal expected
   end
 
   it "can convert to ASCII encoded PBM data" do
     data     = @pbm[:array]
     expected = @pbm[:ascii]
 
-    @converter.array2ascii(data).must_equal expected
+    _(@converter.array2ascii(data)).must_equal expected
   end
 
   it "can convert to ASCII encoded PGM data" do
     data     = @pgm[:array]
     expected = @pgm[:ascii]
 
-    @converter.array2ascii(data).must_equal expected
+    _(@converter.array2ascii(data)).must_equal expected
   end
 
   it "can convert to ASCII encoded PPM data" do
     data     = @ppm[:array]
     expected = @ppm[:ascii]
 
-    @converter.array2ascii(data).must_equal expected
+    _(@converter.array2ascii(data)).must_equal expected
   end
 
   it "can convert to binary encoded PBM data (width 6)" do
     data     = @pbm6[:array]
     expected = @pbm6[:binary]
 
-    @converter.array2binary(:pbm, data).must_equal expected
+    _(@converter.array2binary(:pbm, data)).must_equal expected
   end
 
   it "can convert to binary encoded PBM data (width 14)" do
     data     = @pbm14[:array]
     expected = @pbm14[:binary]
 
-    @converter.array2binary(:pbm, data).must_equal expected
+    _(@converter.array2binary(:pbm, data)).must_equal expected
   end
 
   it "can convert to binary encoded PGM data" do
     data     = @pgm[:array]
     expected = @pgm[:binary]
 
-    @converter.array2binary(:pgm, data).must_equal expected
+    _(@converter.array2binary(:pgm, data)).must_equal expected
   end
 
   it "can convert to binary encoded PPM data" do
     data     = @ppm[:array]
     expected = @ppm[:binary]
 
-    @converter.array2binary(:ppm, data).must_equal expected
+    _(@converter.array2binary(:ppm, data)).must_equal expected
   end
 
   it "can calculate correct byte widths for a PBM image" do
-    @converter.byte_width(:pbm,  0).must_equal 0
-    @converter.byte_width(:pbm,  1).must_equal 1
-    @converter.byte_width(:pbm,  7).must_equal 1
-    @converter.byte_width(:pbm,  8).must_equal 1
-    @converter.byte_width(:pbm,  9).must_equal 2
-    @converter.byte_width(:pbm, 64).must_equal 8
-    @converter.byte_width(:pbm, 65).must_equal 9
+    _(@converter.byte_width(:pbm,  0)).must_equal 0
+    _(@converter.byte_width(:pbm,  1)).must_equal 1
+    _(@converter.byte_width(:pbm,  7)).must_equal 1
+    _(@converter.byte_width(:pbm,  8)).must_equal 1
+    _(@converter.byte_width(:pbm,  9)).must_equal 2
+    _(@converter.byte_width(:pbm, 64)).must_equal 8
+    _(@converter.byte_width(:pbm, 65)).must_equal 9
   end
 
   it "can calculate correct byte widths for a PGM image" do
-    @converter.byte_width(:pgm, 13).must_equal 13
+    _(@converter.byte_width(:pgm, 13)).must_equal 13
   end
 
   it "can calculate correct byte widths for a PPM image" do
-    @converter.byte_width(:ppm, 13).must_equal 39
+    _(@converter.byte_width(:ppm, 13)).must_equal 39
   end
 end

data/test/test_exceptions.rb

@@ -2,123 +2,125 @@
 
 # test_exceptions.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "stringio"
 require "pnm"
 
+require_relative "backports"
+
 
 describe "PNM.create" do
 
   it "raises an exception for invalid data type (String)" do
     data = "0"
-    proc { PNM.create(data) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid type" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, type: :abc) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, type: :abc) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (String)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: "255") }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: "255") }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (> 255)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: 256) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: 256) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (0)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: 0) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: 0) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid comment (Integer)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, comment: 1) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, comment: 1) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for image type and data mismatch (PBM)" do
     data = [[[0, 0, 0], [0, 0, 0]], [[0, 0, 0], [0, 0, 0]]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for image type and data mismatch (PGM)" do
     data = [[[0, 0, 0], [0, 0, 0]], [[0, 0, 0], [0, 0, 0]]]
-    proc { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for non-integer pixel value (String)" do
     data = [[0, 0], ["X", 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for non-integer pixel value (Float)" do
     data = [[0, 0], [0.5, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for rows of different size" do
     data = [[0, 0], [0, 0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#1)" do
     data = [0, 0, 0]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#2)" do
     data = [[0, 0], 0, 0]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#3)" do
     data = [[0, 0], [0, [0, 0]]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#4)" do
     data = [[[0, 0], [0, 0]], [[0, 0], [0, 0]]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#5)" do
     data = [[[0, 0, 0], [0, 0, 0]], [0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#6)" do
     data = [[[0, 0, 0], 0], [0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for an empty array" do
     data = [[]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PBM data (> 1)" do
     data = [[0, 0], [2, 0]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PBM data (< 0)" do
     data = [[0, 0], [-1, 0]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PGM data (> 255)" do
     data = [[0, 0], [1, 500]]
-    proc { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PGM data (> maxgray)" do
     data = [[0, 0], [1, 200]]
-    proc { PNM.create(data, maxgray: 100) }.must_raise PNM::DataError
+    _ { PNM.create(data, maxgray: 100) }.must_raise PNM::DataError
   end
 end
 
@@ -126,111 +128,111 @@ end
 describe "PNM.read" do
 
   it "raises an exception for integer argument" do
-    proc { PNM.read(123) }.must_raise PNM::ArgumentError
+    _ { PNM.read(123) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for unknown magic number" do
     file = StringIO.new("P0 1 1 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for an empty file" do
     file = StringIO.new("")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#1)" do
     file = StringIO.new("P1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#2)" do
     file = StringIO.new("P1 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#3)" do
     file = StringIO.new("P1 1 ")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#4)" do
     file = StringIO.new("P1 1 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#5)" do
     file = StringIO.new("P1 1  # Test\n 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#6)" do
     file = StringIO.new("P2 1 1 255")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#1)" do
     file = StringIO.new("P1 ? 1 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#2)" do
     file = StringIO.new("P1 1 X 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#3)" do
     file = StringIO.new("P2 1 1 foo 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for zero width" do
     file = StringIO.new("P2 0 1 255 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for zero height" do
     file = StringIO.new("P2 1 0 255 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for invalid maxgray (> 255)" do
     file = StringIO.new("P2 1 1 256 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for invalid maxgray (0)" do
     file = StringIO.new("P2 1 1 0 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for image dimension mismatch (#1)" do
     file = StringIO.new("P1 2 3 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#2)" do
     file = StringIO.new("P1 2 3 0 0 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#3)" do
     file = StringIO.new("P3 2 3 255 0 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#4)" do
     file = StringIO.new("P5 2 3 255 AAAAAAA")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#5)" do
     file = StringIO.new("P5 2 3 255 AAAAAAA")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for non-numeric image data" do
     file = StringIO.new("P1 2 3 0 X 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataError
+    _ { PNM.read(file) }.must_raise PNM::DataError
   end
 end

data/test/test_image.rb

@@ -2,11 +2,13 @@
 
 # test_image.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm"
 
+require_relative "backports"
+
 
 describe PNM::Image do
 
@@ -47,229 +49,229 @@ describe PNM::Image do
   end
 
   it "freezes pixel data" do
-    proc { @bilevel.pixels << [1, 1, 0, 1, 1] }.must_raise RuntimeError
+    _ { @bilevel.pixels << [1, 1, 0, 1, 1] }.must_raise RuntimeError
   end
 
   it "freezes comment string" do
-    proc { @bilevel.comment << "string" }.must_raise RuntimeError
+    _ { @bilevel.comment << "string" }.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
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   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
+    _(image.type).must_equal :pgm
+    _(image.maxgray).must_equal 255
   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
+    _(image.type).must_equal :ppm
+    _(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
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   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
+    _(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
+    _(image.type).must_equal :pgm
+    _(image.pixels).must_equal [[0, 1, 0], [1, 0, 1]]
+    _(image.maxgray).must_equal 255
   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
+    _(image.type).must_equal :pgm
   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
+    _(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" 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
+    _(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 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
+    _(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 "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]]]
+    _(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 "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]]
+    _(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, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")
+    _(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")
+    _(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
     @bilevel2.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_2_binary.pbm")
+    _(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")
+    _(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")
+    _(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")
+    _(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")
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/color_binary.ppm")
     File.delete(@temp_path)
   end
 
   it "can write a bilevel image to a file, adding the extension" do
     @bilevel.write_with_extension(@temp_path)
-    File.binread("#{@temp_path}.pbm").must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
+    _(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_with_extension(@temp_path, :ascii)
-    File.binread("#{@temp_path}.pgm").must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
+    _(File.binread("#{@temp_path}.pgm")).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
     File.delete("#{@temp_path}.pgm")
   end
 
   it "can write a color image to a file, adding the extension" do
     @color.write_with_extension(@temp_path, :binary)
-    File.binread("#{@temp_path}.ppm").must_equal File.binread("#{@srcpath}/color_binary.ppm")
+    _(File.binread("#{@temp_path}.ppm")).must_equal File.binread("#{@srcpath}/color_binary.ppm")
     File.delete("#{@temp_path}.ppm")
   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"
+    _(@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{^#<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>$}
+    _(@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, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
+    _(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")
+    _(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"
+    _(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
     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"
+    _(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]]
-    bilevel  = PNM.create(pixels, comment: "image")
+    bilevel1 = PNM.create(pixels, comment: "image")
     bilevel2 = PNM.create(pixels, comment: "image")
 
-    (bilevel2 == bilevel).must_equal true
+    _(bilevel2 == bilevel1).must_equal true
   end
 
   it "can check equality of images (2)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel  = PNM.create(pixels, comment: "image")
+    bilevel1 = PNM.create(pixels, comment: "image")
     bilevel2 = PNM.create(pixels, comment: "other image")
 
-    (bilevel2 == bilevel).must_equal false
+    _(bilevel2 == bilevel1).must_equal false
   end
 
   it "can check equality of images (3)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel  = PNM.create(pixels)
+    bilevel1 = PNM.create(pixels)
     bilevel2 = PNM.create(pixels.reverse)
 
-    (bilevel2 == bilevel).must_equal false
+    _(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)
+    bilevel = PNM.create(pixels, type: :pbm)
     graylevel = PNM.create(pixels, type: :pgm)
 
-    (graylevel == bilevel).must_equal false
+    _(graylevel == bilevel).must_equal false
   end
 
   it "can check equality of images (5)" do
     pixels = [[0, 1, 2], [3, 4, 5]]
-    graylevel  = PNM.create(pixels, maxgray: 10)
+    graylevel1 = PNM.create(pixels, maxgray: 10)
     graylevel2 = PNM.create(pixels, maxgray: 255)
 
-    (graylevel2 == graylevel).must_equal false
+    _(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
+    _(image == "a string").must_equal false
   end
 end

data/test/test_parser.rb

@@ -2,11 +2,13 @@
 
 # test_parser.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm/parser"
 
+require_relative "backports"
+
 
 describe PNM::Parser do
 
@@ -27,7 +29,7 @@ describe PNM::Parser do
       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
@@ -44,7 +46,7 @@ describe PNM::Parser do
       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
@@ -56,7 +58,7 @@ describe PNM::Parser do
       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
@@ -64,7 +66,7 @@ describe PNM::Parser do
     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
@@ -76,23 +78,23 @@ describe PNM::Parser do
       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"
+    _(@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"
+    _(@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"
+    _(@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"
+    _(@parser.parse("P4 8 2 AB\n")[:data]).must_equal "AB\n"
   end
 
   it "can parse comments" do
@@ -115,6 +117,6 @@ describe PNM::Parser do
       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

data/test/test_pnm.rb

@@ -2,11 +2,13 @@
 
 # test_pnm.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2020 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm"
 
+require_relative "backports"
+
 
 describe PNM do
 
@@ -18,89 +20,89 @@ describe PNM do
     file = File.expand_path("#{@srcpath}/bilevel_ascii.pbm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PBM 5x6 Bilevel}
-    image.maxgray.must_equal 1
-    image.comment.must_equal "Bilevel"
-    image.pixels.must_equal [[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]]
+    _(image.info).must_equal "PBM 5x6 Bilevel"
+    _(image.maxgray).must_equal 1
+    _(image.comment).must_equal "Bilevel"
+    _(image.pixels).must_equal [[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]]
   end
 
   it "can read an ASCII encoded PGM file" do
     file = File.expand_path("#{@srcpath}/grayscale_ascii.pgm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PGM 4x3 Grayscale}
-    image.maxgray.must_equal 250
-    image.comment.must_equal "Grayscale\n(with multiline comment)"
-    image.pixels.must_equal [[  0,  50, 100, 150],
-                             [ 50, 100, 150, 200],
-                             [100, 150, 200, 250]]
+    _(image.info).must_equal "PGM 4x3 Grayscale"
+    _(image.maxgray).must_equal 250
+    _(image.comment).must_equal "Grayscale\n(with multiline comment)"
+    _(image.pixels).must_equal [[  0,  50, 100, 150],
+                                [ 50, 100, 150, 200],
+                                [100, 150, 200, 250]]
   end
 
   it "can read an ASCII encoded PPM file" do
     file = File.expand_path("#{@srcpath}/color_ascii.ppm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PPM 5x3 Color}
-    image.maxgray.must_equal 6
-    image.pixels.must_equal [[[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]]]
+    _(image.info).must_equal "PPM 5x3 Color"
+    _(image.maxgray).must_equal 6
+    _(image.pixels).must_equal [[[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]]]
   end
 
   it "can read a binary encoded PBM file" do
     file = File.expand_path("#{@srcpath}/bilevel_binary.pbm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PBM 5x6 Bilevel}
-    image.maxgray.must_equal 1
-    image.comment.must_equal "Bilevel"
-    image.pixels.must_equal [[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]]
+    _(image.info).must_equal "PBM 5x6 Bilevel"
+    _(image.maxgray).must_equal 1
+    _(image.comment).must_equal "Bilevel"
+    _(image.pixels).must_equal [[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]]
   end
 
   it "can read a binary encoded PGM file" do
     file = File.expand_path("#{@srcpath}/grayscale_binary.pgm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PGM 4x3 Grayscale}
-    image.maxgray.must_equal 250
-    image.comment.must_equal "Grayscale\n(with multiline comment)"
-    image.pixels.must_equal [[  0,  50, 100, 150],
-                             [ 50, 100, 150, 200],
-                             [100, 150, 200, 250]]
+    _(image.info).must_equal "PGM 4x3 Grayscale"
+    _(image.maxgray).must_equal 250
+    _(image.comment).must_equal "Grayscale\n(with multiline comment)"
+    _(image.pixels).must_equal [[  0,  50, 100, 150],
+                                [ 50, 100, 150, 200],
+                                [100, 150, 200, 250]]
   end
 
   it "can read a binary encoded PPM file" do
     file = File.expand_path("#{@srcpath}/color_binary.ppm")
     image = PNM.read(file)
 
-    image.info.must_match %r{^PPM 5x3 Color}
-    image.maxgray.must_equal 6
-    image.pixels.must_equal [[[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]]]
+    _(image.info).must_equal "PPM 5x3 Color"
+    _(image.maxgray).must_equal 6
+    _(image.pixels).must_equal [[[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]]]
   end
 
   it "can read binary data containing CRLF" do
     file = File.expand_path("#{@srcpath}/grayscale_binary_crlf.pgm")
 
     image = PNM.read(file)
-    image.pixels.must_equal [[65, 66], [13, 10], [65, 66]]
+    _(image.pixels).must_equal [[65, 66], [13, 10], [65, 66]]
   end
 
   it "can read binary data containing CRLF from an I/O stream" do
     file = File.expand_path("#{@srcpath}/grayscale_binary_crlf.pgm")
 
     image = File.open(file, "r") {|f| PNM.read(f) }
-    image.pixels.must_equal [[65, 66], [13, 10], [65, 66]]
+    _(image.pixels).must_equal [[65, 66], [13, 10], [65, 66]]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -61,6 +61,7 @@ files:
 - lib/pnm/parser.rb
 - lib/pnm/version.rb
 - pnm.gemspec
+- test/backports.rb
 - test/bilevel_2_binary.pbm
 - test/bilevel_ascii.pbm
 - test/bilevel_binary.pbm
@@ -95,13 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: PNM - create/read/write PNM image files (PBM, PGM, PPM)
 test_files:
 - test/test_exceptions.rb
-- test/test_image.rb
 - test/test_converter.rb
 - test/test_pnm.rb
+- test/test_image.rb
 - test/test_parser.rb