pnm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d185b233565cd87cea47d7a47fa8cd53cbd3120d
-  data.tar.gz: 65754714716d6b399cc8950e0ff90584cb42485a
+  metadata.gz: 309f7c8934e624de40581059644cbda2d9ae575e
+  data.tar.gz: 36cb4969d02048d04064962091b2df86f8a24491
 SHA512:
-  metadata.gz: 0737d6700d5ce343d0e326006213640eebe097181a47e3d99a70610a4f4aed95765a2fc1ccbee7b767177a9279224ef5814ee4fd53891a9de9b1eb0b9ca8a131
-  data.tar.gz: 2633bcdac0cf6fae08e3c36a9a81a6af985712273a9dc5361824794713c778300f12fa5ebee86eff5a34a7bf8bc4f38b4287f4e97887f3ca5685ea447c4d607f
+  metadata.gz: 1d30ee950e419b1d83165f3e000ccb0769b6f9a50a223f94f6d50af048c8c8fcce9f3cb7799c0c7b74bcafddd1accbeae2fd78e6acef3b844ae1ec03b8208935
+  data.tar.gz: 561aaf230c4b41044bcaeb3ee62204963b032e9cbad3ea96c39e17510cd2608ef43e3334e4e6d9aba7b425f2eb1e65f80a73eb97e4030d2771428e50c672d812

data/README.md

@@ -82,7 +82,7 @@ Requirements
 
   - Ruby 2.0.0 on Linux and on Windows,
   - Ruby 1.9.3,
-  - JRuby 1.7.8,
+  - JRuby 1.7.9,
   - Rubinius 2.2.1.
 
 Documentation

data/benchmark/bm_converter.rb

@@ -52,7 +52,7 @@ class ConverterBenchmark
     Benchmark.bm(18) do |bm|
       bm.report("#{type_string} / ascii2array") {
         @repetitions.times do
-          PNM::Converter.ascii2array(type, ascii)
+          PNM::Converter.ascii2array(type, width, height, ascii)
         end
       }
 

data/lib/pnm.rb

@@ -139,7 +139,7 @@ module PNM
     height  = content[:height].to_i
     maxgray = content[:maxgray].to_i
     pixels = if encoding == :ascii
-               Converter.ascii2array(type, content[:data])
+               Converter.ascii2array(type, width, height, content[:data])
              else
                Converter.binary2array(type, width, height, content[:data])
              end

data/lib/pnm/converter.rb

@@ -19,17 +19,21 @@ module PNM
     # Converts from ASCII format to an array of pixel values.
     #
     # +type+:: +:pbm+, +:pgm+, or +:ppm+.
+    # +width+, +height+:: The image dimensions in pixels.
     # +data+:: A string containing the raw pixel data in ASCII format.
     #
     # Returns a two-dimensional array of bilevel, gray, or RGB values.
-    def self.ascii2array(type, data)
-      pixels = data.split("\n").map do |row|
-        row.split(/ +/).map {|value| value.to_i }
-      end
+    def self.ascii2array(type, width, height, data)
+      values = data.gsub(/\A[ \t\r\n]+/, '').split(/[ \t\r\n]+/).map {|value| value.to_i }
 
-      pixels.map! {|row| row.each_slice(3).to_a }  if type == :ppm
+      case type
+      when :pbm, :pgm
+        pixel_matrix = values.each_slice(width).to_a
+      when :ppm
+        pixel_matrix = values.each_slice(3 * width).map {|row| row.each_slice(3).to_a }
+      end
 
-      pixels
+      pixel_matrix
     end
 
     # Converts from binary format to an array of pixel values.
@@ -42,7 +46,7 @@ module PNM
     def self.binary2array(type, width, height, data)
       bytes_per_row = byte_width(type, width)
 
-      if data.size == bytes_per_row * height + 1 && data[-1] =~ /[ \n\t\r]/
+      if data.size == bytes_per_row * height + 1 && data[-1] =~ /[ \t\r\n]/
         data.slice!(-1)
       end
 
@@ -52,15 +56,15 @@ module PNM
 
       case type
       when :pbm
-        pixels = data.scan(/.{#{bytes_per_row}}/m)
-        pixels.map! {|row| row.unpack('B*').first[0, width].each_char.map {|char| char.to_i }  }
+        rows = data.scan(/.{#{bytes_per_row}}/m)
+        pixel_matrix = rows.map {|row| row.unpack('B*').first[0, width].each_char.map {|char| char.to_i } }
       when :pgm
-        pixels = data.each_byte.each_slice(bytes_per_row).to_a
+        pixel_matrix = data.each_byte.each_slice(bytes_per_row).to_a
       when :ppm
-        pixels = data.each_byte.each_slice(bytes_per_row).map {|row| row.each_slice(3).to_a }
+        pixel_matrix = data.each_byte.each_slice(bytes_per_row).map {|row| row.each_slice(3).to_a }
       end
 
-      pixels
+      pixel_matrix
     end
 
     # Converts a two-dimensional array of pixel values to an ASCII format string.
@@ -71,12 +75,12 @@ module PNM
     def self.array2ascii(data)
       case data.first.first
       when Array
-        output = data.map {|row| row.flatten.join(' ') }.join("\n")
+        data_string = data.map {|row| row.flatten.join(' ') }.join("\n")
       else
-        output = data.map {|row| row.join(' ') }.join("\n")
+        data_string = data.map {|row| row.join(' ') }.join("\n")
       end
 
-      output << "\n"
+      data_string << "\n"
     end
 
     # Converts a two-dimensional array of pixel values to a binary format string.

data/lib/pnm/image.rb

@@ -55,7 +55,7 @@ module PNM
       @height  = pixels.size
       @maxgray = options[:maxgray]
       @comment = (options[:comment] || '').chomp
-      @pixels  = pixels
+      @pixels  = pixels.dup
 
       @type ||= detect_type(@pixels, @maxgray)
 
@@ -66,7 +66,7 @@ module PNM
       end
 
       if type == :ppm && !pixels.first.first.kind_of?(Array)
-        @pixels = pixels.map {|row| row.map {|pixel| gray_to_rgb(pixel) } }
+        @pixels.map! {|row| row.map {|pixel| gray_to_rgb(pixel) } }
       end
     end
 

data/lib/pnm/parser.rb

@@ -23,9 +23,9 @@ module PNM
       comments = []
 
       until magic_number
-        token = get_next_token!(content)
+        token = next_token!(content)
 
-        if token[0] == '#'
+        if token.start_with?('#')
           comments << token.gsub(/# */, '')
         else
           magic_number = token
@@ -36,8 +36,9 @@ module PNM
 
       while tokens.size < token_number[magic_number]
         content.gsub!(/\A[ \t\r\n]+/, '')
-        token = get_next_token!(content)
-        if token[0] == '#'
+        token = next_token!(content)
+
+        if token.start_with?('#')
           comments << token.gsub(/# */, '')
         else
           tokens << token
@@ -69,13 +70,15 @@ module PNM
       }
     end
 
-    def self.get_next_token!(content)  # :nodoc:
-      if content[0] == '#'
-        token, rest = content.split("\n", 2)
-      else
-        token, rest = content.split(/[ \t\r\n]|(?=#)/, 2)
-      end
-      content.clear << rest
+    def self.next_token!(content)  # :nodoc:
+      delimiter = if content.start_with?('#')
+                    "\n"
+                  else
+                    %r{[ \t\r\n]|(?=#)}
+                  end
+
+      token, rest = content.split(delimiter, 2)
+      content.replace(rest)
 
       token
     end

data/lib/pnm/version.rb

@@ -1,4 +1,4 @@
 module PNM
-  VERSION  = '0.2.0'       # :nodoc:
-  DATE     = '2013-12-01'  # :nodoc:
+  VERSION  = '0.2.1'       # :nodoc:
+  DATE     = '2013-12-17'  # :nodoc:
 end

data/test/test_converter.rb

@@ -49,24 +49,39 @@ describe PNM::Converter do
   end
 
   it 'can convert from ASCII encoded PBM data' do
+    width    = @pbm[:width]
+    height   = @pbm[:height]
     data     = @pbm[:ascii]
     expected = @pbm[:array]
 
-    @converter.ascii2array(:pbm, data).must_equal expected
+    @converter.ascii2array(:pbm, width, height, data).must_equal expected
   end
 
   it 'can convert from ASCII encoded PGM data' do
+    width    = @pgm[:width]
+    height   = @pgm[:height]
     data     = @pgm[:ascii]
     expected = @pgm[:array]
 
-    @converter.ascii2array(:pgm, data).must_equal expected
+    @converter.ascii2array(:pgm, width, height, data).must_equal expected
   end
 
   it 'can convert from ASCII encoded PPM data' do
+    width    = @ppm[:width]
+    height   = @ppm[:height]
     data     = @ppm[:ascii]
     expected = @ppm[:array]
 
-    @converter.ascii2array(:ppm, data).must_equal expected
+    @converter.ascii2array(:ppm, width, height, data).must_equal expected
+  end
+
+  it 'accepts ASCII encoded PGM data with arbitrary whitespace' do
+    width    = 4
+    height   = 3
+    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
   end
 
   it 'can convert from binary encoded PBM data (width 6)' do

data/test/test_image.rb

@@ -103,6 +103,12 @@ describe PNM::Image do
     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::Image.new(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, :ascii)
     File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")

data/test/test_parser.rb

@@ -97,11 +97,11 @@ describe PNM::Parser do
   it 'can parse comments' do
     content =<<-EOF.chomp.gsub(/^ */, '')
       # Comment 1
-      P1   # Comment 2
-      6
-      #Comment 3
+      P1  # Comment 2
+      6# Comment 3
+      #Comment 4
       #
-      \r \t# Comment 5
+      \r \t# Comment 6
       2
       0 1 0 0 1 1
       0 0 0 1 1 1
@@ -110,7 +110,7 @@ describe PNM::Parser do
       :magic_number => 'P1',
       :width        => '6',
       :height       => '2',
-      :comments     => ['Comment 1', 'Comment 2', 'Comment 3', '', 'Comment 5'],
+      :comments     => ['Comment 1', 'Comment 2', 'Comment 3', 'Comment 4', '', 'Comment 6'],
       :data         => "0 1 0 0 1 1\n0 0 0 1 1 1"
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake