pnm 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 309f7c8934e624de40581059644cbda2d9ae575e
-  data.tar.gz: 36cb4969d02048d04064962091b2df86f8a24491
+  metadata.gz: ef19db0d86c0c55bca6a6b6c3f9a5d4eaaac62f6
+  data.tar.gz: ffa665ee3688f90f201045230818b97dd5c11b22
 SHA512:
-  metadata.gz: 1d30ee950e419b1d83165f3e000ccb0769b6f9a50a223f94f6d50af048c8c8fcce9f3cb7799c0c7b74bcafddd1accbeae2fd78e6acef3b844ae1ec03b8208935
-  data.tar.gz: 561aaf230c4b41044bcaeb3ee62204963b032e9cbad3ea96c39e17510cd2608ef43e3334e4e6d9aba7b425f2eb1e65f80a73eb97e4030d2771428e50c672d812
+  metadata.gz: b8ff711e119c0950b4d249c9171735b0baf8e5c9401e10e8160e047def08df4d53f1db203be41a7220bd5e6a09945e56e308141fa23877b059b4242097916be7
+  data.tar.gz: 18d891b4969653b32f4d7d5c253a673479c14fcc3b53ea918b282528737a108714463538150552886d39ee61ae777f99c9950a23333869564262c26ca3e43212

data/README.md

@@ -80,10 +80,11 @@ Requirements
 
 - PNM has been tested with
 
+  - Ruby 2.1.0,
   - Ruby 2.0.0 on Linux and on Windows,
   - Ruby 1.9.3,
-  - JRuby 1.7.9,
-  - Rubinius 2.2.1.
+  - JRuby 1.7.10,
+  - Rubinius 2.2.4.
 
 Documentation
 -------------
@@ -98,7 +99,7 @@ Report bugs on the PNM home page: <https://github.com/stomar/pnm/>
 License
 -------
 
-Copyright &copy; 2013 Marcus Stollsteimer
+Copyright &copy; 2013-2014 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

@@ -1,6 +1,6 @@
 # rakefile for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'rake/testtask'
 

data/benchmark/bm_converter.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # bm_converter.rb: Benchmarks for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'benchmark'
 require_relative '../lib/pnm'

data/lib/pnm.rb

@@ -6,6 +6,7 @@ require_relative 'pnm/version'
 require_relative 'pnm/image'
 require_relative 'pnm/parser'
 require_relative 'pnm/converter'
+require_relative 'pnm/exceptions'
 
 
 # PNM is a pure Ruby library for creating, reading,
@@ -68,7 +69,7 @@ require_relative 'pnm/converter'
 #
 # == Author
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 #
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 #
@@ -94,7 +95,7 @@ module PNM
   TAGLINE  = 'create/read/write PNM image files (PBM, PGM, PPM)'  # :nodoc:
 
   COPYRIGHT = <<-copyright.gsub(/^ +/, '')                        # :nodoc:
-    Copyright (C) 2012-2013 Marcus Stollsteimer.
+    Copyright (C) 2013-2014 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.
@@ -104,12 +105,13 @@ module PNM
   #
   # Returns a PNM::Image object.
   def self.read(file)
-    raw_data = nil
     if file.kind_of?(String)
       raw_data = File.binread(file)
-    else
+    elsif file.respond_to?(:binmode)
       file.binmode
       raw_data = file.read
+    else
+      raise PNM::ArgumentError, "wrong argument type"
     end
 
     content = Parser.parse(raw_data)
@@ -135,9 +137,9 @@ module PNM
       encoding = :binary
     end
 
-    width   = content[:width].to_i
-    height  = content[:height].to_i
-    maxgray = content[:maxgray].to_i
+    width   = content[:width]
+    height  = content[:height]
+    maxgray = content[:maxgray]
     pixels = if encoding == :ascii
                Converter.ascii2array(type, width, height, content[:data])
              else

data/lib/pnm/converter.rb

@@ -5,7 +5,7 @@ module PNM
 
     # Returns the number of bytes needed for one row of pixels
     # (in binary encoding).
-    def self.byte_width(type, width)
+    def self.byte_width(type, width)  # :nodoc:
       case type
       when :pbm
         (width - 1) / 8 + 1
@@ -24,7 +24,10 @@ module PNM
     #
     # Returns a two-dimensional array of bilevel, gray, or RGB values.
     def self.ascii2array(type, width, height, data)
-      values = data.gsub(/\A[ \t\r\n]+/, '').split(/[ \t\r\n]+/).map {|value| value.to_i }
+      values_per_row = type == :ppm ? 3 * width : width
+
+      values = convert_to_integers(data)
+      assert_data_size(values.size, values_per_row * height)
 
       case type
       when :pbm, :pgm
@@ -50,9 +53,7 @@ module PNM
         data.slice!(-1)
       end
 
-      if data.size != bytes_per_row * height
-        raise 'data size does not match expected size'
-      end
+      assert_data_size(data.size, bytes_per_row * height)
 
       case type
       when :pbm
@@ -101,5 +102,23 @@ module PNM
 
       data_string
     end
+
+    def self.convert_to_integers(data)  # :nodoc:
+      data.gsub(/\A[ \t\r\n]+/, '').split(/[ \t\r\n]+/).map do |value|
+        Integer(value)
+      end
+    rescue ::ArgumentError => e
+      if e.message.start_with?('invalid value for Integer')
+        raise PNM::DataError, "invalid pixel value: Integer expected"
+      else
+        raise
+      end
+    end
+
+    def self.assert_data_size(actual, expected)  # :nodoc:
+      unless actual == expected
+        raise PNM::DataSizeError, 'data size does not match expected size'
+      end
+    end
   end
 end

data/lib/pnm/exceptions.rb

@@ -0,0 +1,10 @@
+module PNM
+
+  # Base class for all PNM exceptions.
+  class Error < StandardError; end
+
+  class ArgumentError < Error; end
+  class ParserError   < Error; end
+  class DataSizeError < Error; end
+  class DataError     < Error; end
+end

data/lib/pnm/image.rb

@@ -1,6 +1,11 @@
 module PNM
 
-  # Class for +PBM+, +PGM+, and +PPM+ images. See PNM module for examples.
+  # Class for +PBM+, +PGM+, and +PPM+ images.
+  #
+  # Images can be created from pixel values, see ::new,
+  # or read from a file or I/O stream, see PNM.read.
+  #
+  # See PNM module for examples.
   class Image
 
     # The type of the image. See ::new for details.
@@ -20,11 +25,13 @@ module PNM
     # See ::new for details.
     attr_reader :pixels
 
-    # An optional multiline comment string.
+    # An optional multiline comment string (or +nil+).
     attr_reader :comment
 
     # Creates an image from a two-dimensional array of bilevel,
     # gray, or RGB values.
+    # The image type is guessed from the provided pixel data,
+    # unless it is explicitly set with the +type+ option.
     #
     # +pixels+::  The pixel data, given as a two-dimensional array of
     #
@@ -33,38 +40,47 @@ module PNM
     #             * for PPM: an array of 3 values between 0 and +maxgray+,
     #               corresponding to red, green, and blue (RGB).
     #
-    #             PPM also accepts an array of bilevel or gray values.
-    #
     #             A value of 0 means that the color is turned off.
     #
     # Optional settings that can be specified in the +options+ hash:
     #
     # +type+::    The type of the image (+:pbm+, +:pgm+, or +:ppm+).
-    #             By default, the type is guessed from the provided
-    #             pixel data, unless this option is used.
+    #             By explicitly setting +type+, PGM images can be
+    #             created from bilevel pixel data, and PPM images can be
+    #             created from bilevel or gray pixel data.
     # +maxgray+:: The maximum gray or color value.
     #             For PGM and PPM, +maxgray+ must be less or equal 255
     #             (the default value).
     #             For PBM pixel data, setting +maxgray+ implies a conversion
     #             to +:pgm+. If +type+ is explicitly set to +:pbm+,
     #             the +maxgray+ setting is disregarded.
-    # +comment+:: A multiline comment string (default: empty string).
+    # +comment+:: A multiline comment string.
     def initialize(pixels, options = {})
       @type    = options[:type]
-      @width   = pixels.first.size
-      @height  = pixels.size
       @maxgray = options[:maxgray]
-      @comment = (options[:comment] || '').chomp
+      @comment = options[:comment]
       @pixels  = pixels.dup
 
+      assert_valid_type     if @type
+      assert_valid_maxgray  if @maxgray
+      assert_valid_comment  if @comment
+      assert_valid_array
+
+      @width   = pixels.first.size
+      @height  = pixels.size
+
       @type ||= detect_type(@pixels, @maxgray)
 
+      assert_matching_type_and_data
+
       if @type == :pbm
         @maxgray = 1
       else
         @maxgray ||= 255
       end
 
+      assert_valid_pixel_values
+
       if type == :ppm && !pixels.first.first.kind_of?(Array)
         @pixels.map! {|row| row.map {|pixel| gray_to_rgb(pixel) } }
       end
@@ -113,17 +129,89 @@ module PNM
     def detect_type(pixels, maxgray)  # :nodoc:
       if pixels.first.first.kind_of?(Array)
         :ppm
-      elsif pixels.flatten.max <= 1
-        maxgray ? :pgm : :pbm
-      else
+      elsif maxgray || pixels.flatten.max > 1
         :pgm
+      else
+        :pbm
+      end
+    end
+
+    def assert_valid_array  # :nodoc:
+      msg = "invalid pixel data: Array expected"
+      raise PNM::ArgumentError, msg  unless Array === pixels
+
+      msg = "invalid pixel array"
+      raise PNM::DataError, msg  unless Array === pixels.first
+
+      width = pixels.first.size
+      is_color = (Array === pixels.first.first)
+
+      pixels.each do |row|
+        raise PNM::DataError, msg  unless Array === row && row.size == width
+
+        if is_color
+          row.each {|pixel| assert_valid_color_pixel(pixel) }
+        else
+          row.each {|pixel| assert_valid_pixel(pixel) }
+        end
+      end
+    end
+
+    def assert_valid_pixel(pixel)  # :nodoc:
+      unless Fixnum === pixel
+        msg = "invalid pixel value: Fixnum expected - #{pixel.inspect}"
+        raise PNM::DataError, msg
+      end
+    end
+
+    def assert_valid_color_pixel(pixel)  # :nodoc:
+      unless Array === pixel && pixel.map(&:class) == [Fixnum, Fixnum, Fixnum]
+        msg =  "invalid pixel value: "
+        msg << "Array of 3 Fixnums expected - #{pixel.inspect}"
+
+        raise PNM::DataError, msg
+      end
+    end
+
+    def assert_valid_type  # :nodoc:
+      unless [:pbm, :pgm, :ppm].include?(type)
+        msg = "invalid image type - #{type.inspect}"
+        raise PNM::ArgumentError, msg
+      end
+    end
+
+    def assert_matching_type_and_data  # :nodoc:
+      if Array === pixels.first.first && [:pbm, :pgm].include?(type)
+        msg = "specified type does not match data - #{type.inspect}"
+        raise PNM::DataError, msg
+      end
+    end
+
+    def assert_valid_maxgray  # :nodoc:
+      unless Fixnum === maxgray && maxgray > 0 && maxgray <= 255
+        raise PNM::ArgumentError, "invalid maxgray value - #{maxgray.inspect}"
+      end
+    end
+
+    def assert_valid_comment  # :nodoc:
+      unless String === comment
+        raise PNM::ArgumentError, "invalid comment value - #{comment.inspect}"
+      end
+    end
+
+    def assert_valid_pixel_values  # :nodoc:
+      unless pixels.flatten.max <= maxgray
+        raise PNM::DataError, "invalid data: value(s) greater than maxgray"
+      end
+      unless pixels.flatten.min >= 0
+        raise PNM::DataError, "invalid data: value(s) less than zero"
       end
     end
 
     def header(encoding)  # :nodoc:
       header =  "#{PNM.magic_number[type][encoding]}\n"
-      if comment
-        comment.split("\n").each {|line| header << "# #{line}\n" }
+      comment_lines.each do |line|
+        header << (line.empty? ? "#\n" : "# #{line}\n")
       end
       header << "#{width} #{height}\n"
       header << "#{maxgray}\n"  unless type == :pbm
@@ -131,6 +219,14 @@ module PNM
       header
     end
 
+    def comment_lines  # :nodoc:
+      return []    unless comment
+      return ['']  if comment.empty?
+
+      keep_trailing_null_fields = -1  # magic value for split limit
+      comment.split(/\n/, keep_trailing_null_fields)
+    end
+
     def to_ascii  # :nodoc:
       data_string = Converter.array2ascii(pixels)
 

data/lib/pnm/parser.rb

@@ -7,13 +7,13 @@ module PNM
     #
     # +content+:: A string containing the image file content.
     #
-    # Returns a hash containing the parsed data as strings:
+    # Returns a hash containing the parsed data:
     #
-    # * +:magic_number+,
+    # * +:magic_number+ (<tt>"P1"</tt>, ..., <tt>"P6"</tt>),
     # * +:maxgray+ (only for PGM and PPM),
     # * +:width+,
     # * +:height+,
-    # * +:data+,
+    # * +:data+ (as string),
     # * +:comments+ (only if present): an array of comment strings.
     def self.parse(content)
       content = content.dup
@@ -32,7 +32,7 @@ module PNM
         end
       end
 
-      raise "Unknown magic number"  unless token_number[magic_number]
+      assert_valid_magic_number(magic_number)
 
       while tokens.size < token_number[magic_number]
         content.gsub!(/\A[ \t\r\n]+/, '')
@@ -47,6 +47,18 @@ module PNM
 
       width, height, maxgray = tokens
 
+      assert_integer(width,   "width")
+      assert_integer(height,  "height")
+      assert_integer(maxgray, "maxgray")  if maxgray
+
+      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
+
       result = {
         :magic_number => magic_number,
         :width        => width,
@@ -78,9 +90,32 @@ module PNM
                   end
 
       token, rest = content.split(delimiter, 2)
+      raise PNM::ParserError, 'not enough tokens in file'  unless rest
+
       content.replace(rest)
 
       token
     end
+
+    def self.assert_valid_magic_number(magic_number)  # :nodoc:
+      unless %w{P1 P2 P3 P4 P5 P6}.include?(magic_number)
+        msg = "unknown magic number - `#{magic_number}'"
+        raise PNM::ParserError, msg
+      end
+    end
+
+    def self.assert_integer(value_string, value_name)  # :nodoc:
+      unless /\A[0-9]+\Z/ === value_string
+        msg = "#{value_name} must be an integer - `#{value_string}'"
+        raise PNM::ParserError, msg
+      end
+    end
+
+    def self.assert_value(value, name)  # :nodoc:
+      unless yield(value)
+        msg = "invalid #{name} value - `#{value}'"
+        raise PNM::ParserError, msg
+      end
+    end
   end
 end

data/lib/pnm/version.rb

@@ -1,4 +1,4 @@
 module PNM
-  VERSION  = '0.2.1'       # :nodoc:
-  DATE     = '2013-12-17'  # :nodoc:
+  VERSION  = '0.3.0'       # :nodoc:
+  DATE     = '2014-02-08'  # :nodoc:
 end

data/test/test_converter.rb

@@ -1,6 +1,6 @@
 # test_converter.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'minitest/spec'
 require 'minitest/autorun'

data/test/test_exceptions.rb

@@ -0,0 +1,230 @@
+# test_exceptions.rb: Unit tests for the PNM library.
+#
+# Copyright (C) 2013-2014 Marcus Stollsteimer
+
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'stringio'
+require 'pnm'
+
+
+describe 'PNM::Image.new' do
+
+  it 'raises an exception for invalid data type (String)' do
+    data = '0'
+    lambda { PNM::Image.new(data) }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for invalid type (String)' do
+    data = [[0, 0], [0, 0]]
+    lambda { PNM::Image.new(data, :type => 'pbm') }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for invalid maxgray (String)' do
+    data = [[0, 0], [0, 0]]
+    lambda { PNM::Image.new(data, :maxgray => '255') }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for invalid maxgray (> 255)' do
+    data = [[0, 0], [0, 0]]
+    lambda { PNM::Image.new(data, :maxgray => 256) }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for invalid maxgray (0)' do
+    data = [[0, 0], [0, 0]]
+    lambda { PNM::Image.new(data, :maxgray => 0) }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for invalid comment (Fixnum)' do
+    data = [[0, 0], [0, 0]]
+    lambda { PNM::Image.new(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]]]
+    lambda { PNM::Image.new(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]]]
+    lambda { PNM::Image.new(data, :type => :pgm) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for non-integer pixel value (String)' do
+    data = [[0, 0], ['X', 0]]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for non-integer pixel value (Float)' do
+    data = [[0, 0], [0.5, 0]]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for rows of different size' do
+    data = [[0, 0], [0, 0, 0]]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid array dimensions (#1)' do
+    data = [0, 0, 0]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid array dimensions (#2)' do
+    data = [[0, 0], 0, 0]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid array dimensions (#3)' do
+    data = [[0, 0], [0, [0, 0]]]
+    lambda { PNM::Image.new(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]]]
+    lambda { PNM::Image.new(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]]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid array dimensions (#6)' do
+    data = [[[0,0,0], 0], [0 ,0]]
+    lambda { PNM::Image.new(data) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid PBM data (> 1)' do
+    data = [[0, 0], [2, 0]]
+    lambda { PNM::Image.new(data, :type => :pbm) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid PBM data (< 0)' do
+    data = [[0, 0], [-1, 0]]
+    lambda { PNM::Image.new(data, :type => :pbm) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid PGM data (> 255)' do
+    data = [[0, 0], [1, 500]]
+    lambda { PNM::Image.new(data, :type => :pgm) }.must_raise PNM::DataError
+  end
+
+  it 'raises an exception for invalid PGM data (> maxgray)' do
+    data = [[0, 0], [1, 200]]
+    lambda { PNM::Image.new(data, :maxgray => 100) }.must_raise PNM::DataError
+  end
+end
+
+
+describe 'PNM.read' do
+
+  it 'raises an exception for integer argument' do
+    lambda { PNM.read(123) }.must_raise PNM::ArgumentError
+  end
+
+  it 'raises an exception for unknown magic number' do
+    file = StringIO.new('P0 1 1 0')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for an empty file' do
+    file = StringIO.new('')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for missing tokens (#1)' do
+    file = StringIO.new('P1')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for missing tokens (#2)' do
+    file = StringIO.new('P1 1')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for missing tokens (#3)' do
+    file = StringIO.new('P1 1 ')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for missing tokens (#4)' do
+    file = StringIO.new('P1 1 1')
+    lambda { 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")
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for missing tokens (#6)' do
+    file = StringIO.new("P2 1 1 255")
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for zero width' do
+    file = StringIO.new('P2 0 1 255 0')
+    lambda { PNM.read(file) }.must_raise PNM::ParserError
+  end
+
+  it 'raises an exception for zero height' do
+    file = StringIO.new('P2 1 0 255 0')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { 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')
+    lambda { PNM.read(file) }.must_raise PNM::DataError
+  end
+end

data/test/test_image.rb

@@ -1,6 +1,6 @@
 # test_image.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -168,4 +168,18 @@ describe PNM::Image do
     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::Image.new([[0,0]], :comment => comment).write(@temp_path, :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
+    comment = "An empty line:\n"
+    PNM::Image.new([[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.delete(@temp_path)
+  end
 end

data/test/test_parser.rb

@@ -1,6 +1,6 @@
 # test_parser.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -21,8 +21,8 @@ describe PNM::Parser do
     EOF
     expected = {
       :magic_number => 'P1',
-      :width        => '6',
-      :height       => '2',
+      :width        => 6,
+      :height       => 2,
       :data         => "0 1 0 0 1 1\n0 0 0 1 1 1"
     }
 
@@ -37,9 +37,9 @@ describe PNM::Parser do
     EOF
     expected = {
       :magic_number => 'P2',
-      :width        => '4',
-      :height       => '2',
-      :maxgray      => '100',
+      :width        => 4,
+      :height       => 2,
+      :maxgray      => 100,
       :data         => "10 20 30 40\n50 60 70 80"
     }
 
@@ -50,8 +50,8 @@ describe PNM::Parser do
     content = 'P4 8 2 ' << ['05AF'].pack('H*')
     expected = {
       :magic_number => 'P4',
-      :width        => '8',
-      :height       => '2',
+      :width        => 8,
+      :height       => 2,
       :data         => ['05AF'].pack('H*')
     }
 
@@ -70,8 +70,8 @@ describe PNM::Parser do
     content = "P1  \n\t 3 \r \n2 0 1 0 0 1 1"
     expected = {
       :magic_number => 'P1',
-      :width        => '3',
-      :height       => '2',
+      :width        => 3,
+      :height       => 2,
       :data         => '0 1 0 0 1 1'
     }
 
@@ -108,8 +108,8 @@ describe PNM::Parser do
     EOF
     expected = {
       :magic_number => 'P1',
-      :width        => '6',
-      :height       => '2',
+      :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"
     }

data/test/test_pnm.rb

@@ -1,6 +1,6 @@
 # test_pnm.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013 Marcus Stollsteimer
+# Copyright (C) 2013-2014 Marcus Stollsteimer
 
 require 'minitest/spec'
 require 'minitest/autorun'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'PNM is a pure Ruby library for creating, reading, and writing of PNM
@@ -34,55 +34,58 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- pnm.gemspec
-- benchmark/random_image.ppm
 - benchmark/bm_converter.rb
-- benchmark/random_image.pgm
 - benchmark/random_image.pbm
+- benchmark/random_image.pgm
+- benchmark/random_image.ppm
 - lib/pnm.rb
+- lib/pnm/converter.rb
+- lib/pnm/exceptions.rb
 - lib/pnm/image.rb
 - lib/pnm/parser.rb
 - lib/pnm/version.rb
-- lib/pnm/converter.rb
+- pnm.gemspec
+- test/bilevel_2_binary.pbm
 - test/bilevel_ascii.pbm
+- test/bilevel_binary.pbm
+- test/color_ascii.ppm
+- test/color_binary.ppm
+- test/grayscale_ascii.pgm
 - test/grayscale_binary.pgm
-- test/test_image.rb
 - test/grayscale_binary_crlf.pgm
-- test/color_binary.ppm
-- test/bilevel_binary.pbm
-- test/test_parser.rb
 - test/test_converter.rb
-- test/bilevel_2_binary.pbm
-- test/color_ascii.ppm
+- test/test_exceptions.rb
+- test/test_image.rb
+- test/test_parser.rb
 - test/test_pnm.rb
-- test/grayscale_ascii.pgm
 homepage: https://github.com/stomar/pnm
 licenses:
 - GPL-3
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: PNM - create/read/write PNM image files (PBM, PGM, PPM)
 test_files:
 - test/test_image.rb
+- test/test_exceptions.rb
 - test/test_parser.rb
 - test/test_converter.rb
 - test/test_pnm.rb