pnm 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d51775ecf00c43299084927b3ce8e0fb182127accb347f25806a840e7389a4
-  data.tar.gz: 0ac3e779bb1af09853cf6429fdb0fe5ec1a6d5e951eaf0f227e97e7c81b9f053
+  metadata.gz: fdfdb7ac32419e9381856654116f77070fabb87713e2353c10230fb6ac9c79c9
+  data.tar.gz: 06042a5b1c3d26d5b4e982b3e2e4983b652d1e1ffab8987d5f8b183a017c4abb
 SHA512:
-  metadata.gz: aa8584a19eb7f6aad9513cc379a1700dfe9e1f5b9e58feaba2ae80e18c670050f9ba3fbd39f7528f3bad2bd59eb31ba491ae0f8673669454cbae92b4f996c416
-  data.tar.gz: 87e0d5751baa549e9f2f14be763d6b77a40bde876c23f9ee44df5ef8b1ec642024091e6d06e32172aef09e33323bca2cf5f1945e8cecf7e7aa9945629f448811
+  metadata.gz: 17970b6a53282e449e76f9225e65c914f92084e4060b5fbe3b9bbbd56cae9ae830e122fbf8ed0bbb321bf443ef1c9538d4b8a2b859759528aa8862d479375796
+  data.tar.gz: b66f7f50567bb137a5b091293c7b77206966e570e300157a0ebde66647e46f2c09d07cb093499f3527a5b6149d01a0f88baa235c5450e61d9b0ba02db2a2cb5e

data/README.md

@@ -1,6 +1,8 @@
 PNM - A Ruby library for PNM image files (PBM, PGM, PPM)
 ========================================================
 
+![CI](https://github.com/stomar/pnm/actions/workflows/ci.yml/badge.svg)
+
 PNM is a pure [Ruby][Ruby] library for creating, reading,
 and writing of `PNM` image files (Portable Anymap):
 
@@ -98,9 +100,9 @@ Requirements
 
 - PNM has been tested with
 
-  - Ruby 2.7
-  - Ruby 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0.0,
-  - JRuby 9.2.13.0.
+  - Ruby 3.1, 3.0,
+  - Ruby 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0.0,
+  - JRuby 9.3.4.0.
 
 Documentation
 -------------
@@ -116,7 +118,7 @@ Report bugs on the PNM home page: <https://github.com/stomar/pnm/>
 License
 -------
 
-Copyright &copy; 2013-2020 Marcus Stollsteimer
+Copyright &copy; 2013-2022 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-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 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-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "benchmark"
 require_relative "../lib/pnm"

data/lib/pnm/converter.rb

@@ -11,7 +11,7 @@ module PNM
     def self.byte_width(type, width)
       case type
       when :pbm
-        (width - 1) / 8 + 1
+        ((width - 1) / 8) + 1
       when :pgm
         width
       when :ppm
@@ -107,7 +107,7 @@ module PNM
 
     def self.convert_to_integers(data, type)
       values_as_string = if type == :pbm
-                           data.gsub(/[ \t\r\n]+/, "").split("")
+                           data.gsub(/[ \t\r\n]+/, "").chars
                          else
                            data.gsub(/\A[ \t\r\n]+/, "").split(/[ \t\r\n]+/)
                          end

data/lib/pnm/image.rb

@@ -47,11 +47,7 @@ module PNM
       type ||= detect_type(pixels, maxgray)
 
       # except for type detection, the maxgray option must be ignored for PBM
-      maxgray = if type == :pbm
-                  nil
-                else
-                  maxgray
-                end
+      maxgray = nil  if type == :pbm
 
       image_class = case type
                     when :pbm
@@ -98,9 +94,10 @@ module PNM
     #
     # Returns the number of bytes written.
     def write(file, add_extension: false, encoding: :binary)
-      content = if encoding == :ascii
+      content = case encoding
+                when :ascii
                   to_ascii
-                elsif encoding == :binary
+                when :binary
                   to_binary
                 end
 
@@ -205,7 +202,7 @@ module PNM
 
       type = type.to_sym  if type.is_a?(String)
 
-      unless [:pbm, :pgm, :ppm].include?(type)
+      unless %i[pbm pgm ppm].include?(type)
         msg = "invalid image type - #{type.inspect}"
         raise PNM::ArgumentError, msg
       end
@@ -289,7 +286,6 @@ module PNM
     end
   end
 
-
   # Class for +PBM+ images. See the Image class for documentation.
   class PBMImage < Image
 
@@ -320,7 +316,6 @@ module PNM
     end
   end
 
-
   # Class for +PGM+ images. See the Image class for documentation.
   class PGMImage < Image
 
@@ -351,7 +346,6 @@ module PNM
     end
   end
 
-
   # Class for +PPM+ images. See the Image class for documentation.
   class PPMImage < Image
 

data/lib/pnm/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module PNM
-  VERSION = "0.6.0"
-  DATE    = "2020-09-23"
+  VERSION = "0.6.1"
+  DATE    = "2022-05-09"
 end

data/lib/pnm.rb

@@ -87,7 +87,7 @@ require_relative "pnm/exceptions"
 #
 # == Author
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 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-2020 Marcus Stollsteimer.
+    Copyright (C) 2013-2022 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.
@@ -119,20 +119,7 @@ module PNM
 
     content = Parser.parse(raw_data)
 
-    type, encoding = case content[:magic_number]
-                     when "P1"
-                       [:pbm, :ascii]
-                     when "P2"
-                       [:pgm, :ascii]
-                     when "P3"
-                       [:ppm, :ascii]
-                     when "P4"
-                       [:pbm, :binary]
-                     when "P5"
-                       [:pgm, :binary]
-                     when "P6"
-                       [:ppm, :binary]
-                     end
+    type, encoding = type_and_encoding[content[:magic_number]]
 
     width   = content[:width]
     height  = content[:height]
@@ -191,4 +178,16 @@ module PNM
       ppm: { ascii: "P3", binary: "P6" }
     }
   end
+
+  # @private
+  def self.type_and_encoding  # :nodoc:
+    {
+      "P1" => %i[pbm ascii],
+      "P2" => %i[pgm ascii],
+      "P3" => %i[ppm ascii],
+      "P4" => %i[pbm binary],
+      "P5" => %i[pgm binary],
+      "P6" => %i[ppm binary]
+    }
+  end
 end

data/pnm.gemspec

@@ -27,9 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0.0"
 
-  s.add_development_dependency "minitest", ">= 5.0"
-  s.add_development_dependency "rake", ">= 10.0"
-
   s.require_paths = ["lib"]
 
   s.test_files = Dir.glob("test/**/test_*.rb")

data/test/backports.rb

@@ -15,5 +15,5 @@ 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
+  MiniTest::Spec.send(:include, PNM::Backports::Minitest)
 end

data/test/test_converter.rb

@@ -2,7 +2,7 @@
 
 # test_converter.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm/converter"
@@ -136,9 +136,10 @@ describe PNM::Converter do
   it "accepts an additional whitespace character for binary encoded data" do
     width    = @pbm14[:width]
     height   = @pbm14[:height]
-    data     = @pbm14[:binary] + "\t"
+    data     = @pbm14[:binary].dup << "\t"
     expected = @pbm14[:array]
 
+    refute_equal data, @pbm14[:binary]
     _(@converter.binary2array(:pbm, width, height, data)).must_equal expected
   end
 

data/test/test_exceptions.rb

@@ -2,7 +2,7 @@
 
 # test_exceptions.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "stringio"

data/test/test_image.rb

@@ -2,7 +2,7 @@
 
 # test_image.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm"

data/test/test_parser.rb

@@ -2,7 +2,7 @@
 
 # test_parser.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm/parser"

data/test/test_pnm.rb

@@ -2,7 +2,7 @@
 
 # test_pnm.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2020 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm"

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pnm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
+date: 2022-05-09 00:00:00.000000000 Z
+dependencies: []
 description: 'PNM is a pure Ruby library for creating, reading, and writing of PNM
   image files (Portable Anymap): PBM (Portable Bitmap), PGM (Portable Graymap), and
   PPM (Portable Pixmap).'
@@ -96,13 +68,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: PNM - create/read/write PNM image files (PBM, PGM, PPM)
 test_files:
-- test/test_exceptions.rb
 - test/test_converter.rb
-- test/test_pnm.rb
+- test/test_exceptions.rb
 - test/test_image.rb
 - test/test_parser.rb
+- test/test_pnm.rb