pnm 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d0847dab61302cfee794dd2547bc4a2f05df11
-  data.tar.gz: 76a61a9dbeea6ade821e0a1beeb45207b74fa673
+  metadata.gz: e52a4e6c563756871e2e3da51503fcaad0afda14
+  data.tar.gz: 62cc1dc3452e1fa8678c918fc12cbd9c66288d6d
 SHA512:
-  metadata.gz: b19271212932a8f0e0a6ee573076cd119468fb885bd481f10c45eb9ad15f7ceee75ad0f81be925aec05ab7366ef6a3e87267489a55402673c1b4703744122939
-  data.tar.gz: 473810c88249b863763ff8f7e8733e0352c24765ff5d07b5372ffb8fbb136c6a05c79093193f4f983fc39cf08f5764ec37e2f05f5d68324a1933c194f9aaca4b
+  metadata.gz: 331134341d9a7fe5264c5e1fb4504dc6c5886ee63cf5648cad7f4958a8a15a14b03e59a0d6fb5b2b7b176553172b2d7397536bd8d16232437cc6de85c39947a4
+  data.tar.gz: 5808baad06957ebd956fa4dbe2c58898376427598c942634a63d2ae7a25aa1b9423c1afce226db31c9b883c51968aa089200f99d81018dfa74be2ce307b272bd

data/lib/pnm/converter.rb

@@ -26,7 +26,7 @@ module PNM
     def self.ascii2array(type, width, height, data)
       values_per_row = type == :ppm ? 3 * width : width
 
-      values = convert_to_integers(data)
+      values = convert_to_integers(data, type)
       assert_data_size(values.size, values_per_row * height)
 
       case type
@@ -103,8 +103,14 @@ 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|
+    def self.convert_to_integers(data, type)  # :nodoc:
+      if type == :pbm
+        values_as_string = data.gsub(/[ \t\r\n]+/, '').split('')
+      else
+        values_as_string = data.gsub(/\A[ \t\r\n]+/, '').split(/[ \t\r\n]+/)
+      end
+
+      values_as_string.map do |value|
         Integer(value)
       end
     rescue ::ArgumentError => e

data/lib/pnm/version.rb

@@ -1,4 +1,4 @@
 module PNM
-  VERSION  = '0.3.1'       # :nodoc:
-  DATE     = '2014-10-10'  # :nodoc:
+  VERSION  = '0.3.2'       # :nodoc:
+  DATE     = '2014-10-19'  # :nodoc:
 end

data/test/test_converter.rb

@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2013-2014 Marcus Stollsteimer
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'pnm/converter'
 
@@ -75,6 +74,15 @@ describe PNM::Converter do
     @converter.ascii2array(:ppm, width, height, data).must_equal expected
   end
 
+  it 'accepts ASCII encoded PBM data with omitted whitespace' do
+    width    = 4
+    height   = 3
+    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
+  end
+
   it 'accepts ASCII encoded PGM data with arbitrary whitespace' do
     width    = 4
     height   = 3

data/test/test_exceptions.rb

@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2013-2014 Marcus Stollsteimer
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'stringio'
 require 'pnm'

data/test/test_image.rb

@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2013-2014 Marcus Stollsteimer
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'pnm/image'
 

data/test/test_parser.rb

@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2013-2014 Marcus Stollsteimer
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'pnm/parser'
 

data/test/test_pnm.rb

@@ -2,7 +2,6 @@
 #
 # Copyright (C) 2013-2014 Marcus Stollsteimer
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'pnm'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake