pnm 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7322d852ff78a5d37b2b0b15dcecc9780cec7ed
-  data.tar.gz: 0583fe925b357baed8eb99f57d3a202340f839fe
+  metadata.gz: 6a67b8402e945e8d27962981006428433aa2bf5d
+  data.tar.gz: adc0238ba64a48028c43c4a2daa60d94e3074297
 SHA512:
-  metadata.gz: cf955fa0db64c7b42676f332a37f65b72cc6049fb28d7cba270a08fbf1c62a234508cd9ee8e01bd0bfb27d937235dd54b83c1d7b3ed9bad5f98387abde622fc2
-  data.tar.gz: b603ee0e3e53392553af4e121ff1cd62160116600fc037ad7016effbcab0c4a4c8635daf71dfb67de2840babab9005a7caf30904a71f682b941b1aaacbaa4284
+  metadata.gz: 3ac2f0cf568b65fe2d70e6b9665db5c88c8011003446bea7858a74c2367bbc71d6af34c855b669dc7c1e2682aef15d7571a0c24ce73312c09c4c84882143ef7f
+  data.tar.gz: 3501103cd58fa19bf20ef47e9f482ed4d1243c9bc2acf8b4e1b270e5a1a46cb94d4162b4efd6d32547f251bace34e21a0c385766bd41f62780cd3562b93002b8

data/README.md

@@ -91,7 +91,7 @@ Requirements
 
 - PNM has been tested with
 
-  - Ruby 2.1.3,
+  - Ruby 2.1.5,
   - Ruby 2.0.0 on Linux and on Windows,
   - Ruby 1.9.3,
   - JRuby 1.7.16,

data/lib/pnm/image.rb

@@ -47,6 +47,8 @@ module PNM
     #             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.
+    #             String values (<tt>"pbm"</tt>, <tt>"pgm"</tt>,
+    #             or <tt>"ppm"</tt>) are also accepted.
     # +maxgray+:: The maximum gray or color value.
     #             For PGM and PPM, +maxgray+ must be less or equal 255
     #             (the default value).
@@ -61,6 +63,8 @@ module PNM
       @comment = options[:comment]
       @pixels  = pixels.dup
 
+      @type = @type.to_sym  if @type && String === @type
+
       assert_valid_type     if @type
       assert_valid_maxgray  if @maxgray
       assert_valid_comment  if @comment
@@ -124,7 +128,7 @@ module PNM
 
     private
 
-    def type_string
+    def type_string  # :nodoc:
       case type
       when :pbm
         'Bilevel'
@@ -135,7 +139,7 @@ module PNM
       end
     end
 
-    def detect_type(pixels, maxgray)
+    def detect_type(pixels, maxgray)  # :nodoc:
       if pixels.first.first.kind_of?(Array)
         :ppm
       elsif (maxgray && maxgray > 1) || pixels.flatten.max > 1
@@ -145,7 +149,7 @@ module PNM
       end
     end
 
-    def assert_valid_array
+    def assert_valid_array  # :nodoc:
       msg = "invalid pixel data: Array expected"
       raise PNM::ArgumentError, msg  unless Array === pixels
 
@@ -166,14 +170,14 @@ module PNM
       end
     end
 
-    def assert_valid_pixel(pixel)
+    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)
+    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}"
@@ -182,33 +186,33 @@ module PNM
       end
     end
 
-    def assert_valid_type
+    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
+    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
+    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
+    def assert_valid_comment  # :nodoc:
       unless String === comment
         raise PNM::ArgumentError, "invalid comment value - #{comment.inspect}"
       end
     end
 
-    def assert_valid_pixel_values
+    def assert_valid_pixel_values  # :nodoc:
       unless pixels.flatten.max <= maxgray
         raise PNM::DataError, "invalid data: value(s) greater than maxgray"
       end
@@ -217,7 +221,7 @@ module PNM
       end
     end
 
-    def header(encoding)
+    def header(encoding)  # :nodoc:
       header =  "#{PNM.magic_number[type][encoding]}\n"
       comment_lines.each do |line|
         header << (line.empty? ? "#\n" : "# #{line}\n")
@@ -228,7 +232,7 @@ module PNM
       header
     end
 
-    def comment_lines
+    def comment_lines  # :nodoc:
       return []    unless comment
       return ['']  if comment.empty?
 
@@ -236,19 +240,19 @@ module PNM
       comment.split(/\n/, keep_trailing_null_fields)
     end
 
-    def to_ascii
+    def to_ascii  # :nodoc:
       data_string = Converter.array2ascii(pixels)
 
       header(:ascii) << data_string
     end
 
-    def to_binary
+    def to_binary  # :nodoc:
       data_string = Converter.array2binary(type, pixels)
 
       header(:binary) << data_string
     end
 
-    def gray_to_rgb(gray_value)
+    def gray_to_rgb(gray_value)  # :nodoc:
       Array.new(3, gray_value)
     end
   end

data/lib/pnm/version.rb

@@ -1,4 +1,4 @@
 module PNM
-  VERSION  = '0.3.3'
-  DATE     = '2014-11-20'
+  VERSION  = '0.3.4'
+  DATE     = '2014-11-21'
 end

data/test/test_exceptions.rb

@@ -14,9 +14,9 @@ describe 'PNM::Image.new' do
     lambda { PNM::Image.new(data) }.must_raise PNM::ArgumentError
   end
 
-  it 'raises an exception for invalid type (String)' do
+  it 'raises an exception for invalid type' do
     data = [[0, 0], [0, 0]]
-    lambda { PNM::Image.new(data, :type => 'pbm') }.must_raise PNM::ArgumentError
+    lambda { PNM::Image.new(data, :type => :abc) }.must_raise PNM::ArgumentError
   end
 
   it 'raises an exception for invalid maxgray (String)' do

data/test/test_image.rb

@@ -81,6 +81,11 @@ describe PNM::Image do
     image.maxgray.must_equal 255
   end
 
+  it 'also accepts types given as string instead of symbol' do
+    image = PNM::Image.new([[0,1,0], [1,0,1]], {:type => "pgm"})
+    image.type.must_equal :pgm
+  end
+
   it 'can create a grayscale image from bilevel values (using maxgray)' do
     image = PNM::Image.new([[0,1,0], [1,0,1]], {:maxgray => 2})
     image.type.must_equal :pgm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake