pngcheck 0.2.8 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9014c01557052b2b5a66aeef6910309871615749692205ca0ad5e6872ef420e1
-  data.tar.gz: 296d674f35113d068fc8c641628b8abb0dfdf89525c22146ad91598bc9e8a10a
+  metadata.gz: '09edc8320b2c09d38d9d7936ac49e71e4acb8385b3154f452d74f60e00999693'
+  data.tar.gz: b626e168407f629d396cc07be2e182a0b4e4970e48d9c803fdcabc01126a7470
 SHA512:
-  metadata.gz: ff8ff007d23e62aae50dc3d392a701392dfb43063ad963738a18864d8e257c2341c75b0d1b0dd6fa0c44df6236320527b38d87ae879fc47f248d7e248a9c29e8
-  data.tar.gz: 9fd0238c153a571a82b2fb85e1864d517a266cf47f5ccbdbb60d5d5fc6b94c9207dc40ca0985fe5941df6c1644e553466ad7c7cf233dcfa3f6935219f0a0743a
+  metadata.gz: a6321ee31d50a8be3d08289cc4a754446a90d33575e3b87a4af203c247372baac2eea77a3db33876c0292a69eef2c5966b79c6d2b641e2f08c5b4aaccca5f3ee
+  data.tar.gz: 1777d07c2786118e5b442d8c5f01f969f7281471ef6cd865ccb4c55f391074c464e934d5f298c2e23ec163d1d2de56c3242ac1830d92c41b2b86d742bb1c08fe

data/README.adoc

@@ -113,6 +113,8 @@ Where:
 * `valid` is `true` if the buffer is correct image
 * otherwise an exception is raised. Possible exception types are `PngCheck::EmptyPngError`, `PngCheck::CorruptPngError`
 
+Both exception classes have additional status attribute that is set to one of STATUX_XXX codes described above. We believe that
+exceptions with STATUS_WARNING can be ignored in the majority of applications.
 
 ==== Pre-validation with libpng-ruby
 

data/ext/layout.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-PNGCHECK_ARCH = "pngcheck-3.0.3.tar.gz"
-PNGCHECK_URI = "http://www.libpng.org/pub/png/src/#{PNGCHECK_ARCH}"
+PNGCHECK_VER = "3.0.4"
+PNGCHECK_ARCH = "pngcheck-#{PNGCHECK_VER}.tar.gz"
+PNGCHECK_URI = "https://github.com/metanorma/pngcheck/archive/refs/tags/metanorma-v#{PNGCHECK_VER}.tar.gz"
 PNGCHECK_LOCAL = "ext/#{PNGCHECK_ARCH}"

data/lib/pngcheck/recipe.rb

@@ -17,8 +17,8 @@ module PngCheck
 
     def files_to_load_all
       @files << {
-        url: "file:#{ROOT}/#{PNGCHECK_LOCAL}", # "http://www.libpng.org/pub/png/src/pngcheck-3.0.3.tar.gz"
-        sha256: "c36a4491634af751f7798ea421321642f9590faa032eccb0dd5fb4533609dee6", # rubocop:disable Layout/LineLength
+        url: "file:#{ROOT}/#{PNGCHECK_LOCAL}",
+        sha256: "f8ff6033dc0008a90a468213a96ac5d72476b1e59378e267341fcf3734ebb2b3", # rubocop:disable Layout/LineLength
       }
     end
 
@@ -33,7 +33,7 @@ module PngCheck
     end
 
     def initialize
-      super("pngcheck", "3.0.3")
+      super("pngcheck", PNGCHECK_VER)
       files_to_load_all
       files_to_load_cross
       @target = ROOT.join(@target).to_s

data/lib/pngcheck/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PngCheck
-  VERSION = "0.2.8"
+  VERSION = "0.3.1"
 end

data/lib/pngcheck.rb

@@ -5,21 +5,30 @@ require "tempfile"
 require_relative "pngcheck/version"
 
 module PngCheck
+  STATUS_OK = 0
+  STATUS_WARNING = 1        # an error in some circumstances but not in all
+  STATUS_MINOR_ERROR = 3    # minor spec errors (e.g., out-of-range values)
+  STATUS_MAJOR_ERROR = 4    # file corruption, invalid chunk length/layout, etc.
+  STATUS_CRITICAL_ERROR = 5 # unexpected EOF or other file(system) error
+
   EMPTY_IMAGE = "Image is empty"
 
-  class CorruptPngError < StandardError; end
+  class CorruptPngError < StandardError
+    def initialize(msg, sts = STATUS_MAJOR_ERROR)
+      super(msg)
+      @status = sts
+    end
 
-  class EmptyPngError < StandardError
-    def initialize(msg = EMPTY_IMAGE)
-      super
+    def status
+      @status
     end
   end
 
-  STATUS_OK = 0
-  STATUS_WARNING = 1        # an error in some circumstances but not in all
-  STATUS_MINOR_ERROR = 3    # minor spec errors (e.g., out-of-range values)
-  STATUS_MAJOR_ERROR = 4    # file corruption, invalid chunk length/layout, etc.
-  STATUS_CRITICAL_ERROR = 5 # unexpected EOF or other file(system) error
+  class EmptyPngError < CorruptPngError
+    def initialize(msg = EMPTY_IMAGE)
+      super(msg, STATUS_CRITICAL_ERROR)
+    end
+  end
 
   EXTRA_MESSAGE_SIZE = 1024
 
@@ -53,7 +62,7 @@ module PngCheck
     def check_file(path)
       status, info = analyze_file(path)
       raise EmptyPngError.new if info.eql? EMPTY_IMAGE
-      raise CorruptPngError.new info unless status == STATUS_OK
+      raise CorruptPngError.new(info, status) unless status == STATUS_OK
 
       true
     end
@@ -67,7 +76,7 @@ module PngCheck
     def check_buffer(data)
       status, info = analyze_buffer(data)
       raise EmptyPngError.new if info.eql? EMPTY_IMAGE
-      raise CorruptPngError.new info unless status == STATUS_OK
+      raise CorruptPngError.new(info, status) unless status == STATUS_OK
 
       true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,10 +117,7 @@ dependencies:
 description: 
 email:
 - open.source@ribose.com
-executables:
-- console
-- rspec
-- setup
+executables: []
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
@@ -133,13 +130,10 @@ files:
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - ext/Makefile
 - ext/extconf.rb
 - ext/layout.rb
-- ext/pngcheck-3.0.3.tar.gz
+- ext/pngcheck-3.0.4.tar.gz
 - ext/wrapper.c
 - lib/pngcheck.rb
 - lib/pngcheck/recipe.rb

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "pngcheck"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-                                           Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here