pngcheck 0.2.4-x64-mingw-ucrt → 0.2.5-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aca8ae1bc5d5342e1f4d185fb035afe1254f9f19c96280c002ba8c421ad2a49
-  data.tar.gz: 720fd1c3830b17cf9f0af0341fa317d92c37f620df1097b3e9ef6a7e48ef41aa
+  metadata.gz: 7ea66a67ea2478557283fc8550cd09bbea1243c492bbee19ef726601f7695ae7
+  data.tar.gz: 1b32274920f2e4630db46d66e072449a5a7f03e22f8b21888352cc740cb057a5
 SHA512:
-  metadata.gz: f3a6bd76ded8915d829ca3ad38c74f7e391c582de75742e87086e1d83131a53647ab5c7304bb76bae04992256af88464b507e8a5c9e2c0c5dde7393051b551a8
-  data.tar.gz: 7dae4a12dbb41512c7db7b0e4edd287c1ed6524a54581951fb572982b4a81ec9a8ae26f5bed9211c0a98991c770dc724a20a197595eb3537b6c6e0c1ebb9c17c
+  metadata.gz: 04dec712ea62ccb38d3016ed29a538d1cf24a99ea8667bb338a85d77200cda19676b04648f0c54f6dcf60417745d72fa3957fbcd723f1bd8a33e642be27719bc
+  data.tar.gz: 75a3ee1ed6553fdb4a8ebb68931cc0917e039f467b752ad9a10f338e8e661adf8218adf18a02ab58e7f386555a87fe136e2eea975a89bac4b014552ce39fea41

data/README.adoc

@@ -53,7 +53,7 @@ $ gem install pngcheck
 
 === Usage
 
-==== PngCeck status codes
+==== PngCheck status codes
 
 [source,ruby]
 ----
@@ -84,7 +84,7 @@ valid = PngCheck.check_file("spec/examples/correct.png")
 Where:
 
 * `valid` is `true` if the file is correct
-* otherwise an exception of type `PngCheck::CorruptPngError` is raised
+* otherwise an exception is raised. Possible exception types are `PngCheck::EmptyPngError`, `PngCheck::CorruptPngError`
 
 
 ==== Memory buffer processing
@@ -110,8 +110,8 @@ valid = PngCheck.check_buffer(data)
 
 Where:
 
-* `valid` is `true` if the file is correct
-* otherwise an exception of type `PngCheck::CorruptPngError` is raised
+* `valid` is `true` if the buffer is correct image
+* otherwise an exception is raised. Possible exception types are `PngCheck::EmptyPngError`, `PngCheck::CorruptPngError`
 
 
 ==== Pre-validation with libpng-ruby

data/lib/pngcheck/version.rb

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

data/lib/pngcheck.rb

@@ -5,8 +5,16 @@ require "tempfile"
 require_relative "pngcheck/version"
 
 module PngCheck
+  EMPTY_IMAGE = "Image is empty"
+
   class CorruptPngError < StandardError; end
 
+  class EmptyPngError < StandardError
+    def initialize(msg = EMPTY_IMAGE)
+      super
+    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)
@@ -37,25 +45,49 @@ module PngCheck
 
   class << self
     def analyze_file(path)
-      Tempfile.open("captured-stream-") do |captured_stream|
-        extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
-        @@semaphore.lock
-        status = pngcheck_file(path, captured_stream.path, extra_msg)
-        @@semaphore.unlock
-        # we assume that pngcheck_file returns either captured_stream
-        # or extra message but not both
-        [status, captured_stream.read + extra_msg.get_string(16)]
-      end
+      return [STATUS_CRITICAL_ERROR, EMPTY_IMAGE] if File.zero? path
+
+      do_analyze_file(path)
     end
 
     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
 
       true
     end
 
     def analyze_buffer(data)
+      return [STATUS_CRITICAL_ERROR, EMPTY_IMAGE] if data.empty?
+
+      do_analyze_buffer(data)
+    end
+
+    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
+
+      true
+    end
+
+    private
+
+    def do_analyze_file(path)
+      Tempfile.open("captured-stream-") do |captured_stream|
+        extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
+        @@semaphore.lock
+        status = pngcheck_file(path, captured_stream.path, extra_msg)
+        @@semaphore.unlock
+        # we assume that pngcheck_file returns either captured_stream
+        # or extra message but not both
+
+        [status, captured_stream.read + extra_msg.get_string(0)]
+      end
+    end
+
+    def do_analyze_buffer(data)
       Tempfile.open("captured-stream-") do |captured_stream|
         extra_msg = FFI::Buffer.alloc_out(EXTRA_MESSAGE_SIZE, 1, false)
         mem_buf = FFI::MemoryPointer.new(:char, data.bytesize)
@@ -64,15 +96,8 @@ module PngCheck
         status = pngcheck_buffer(mem_buf, data.bytesize, captured_stream.path,
                                  extra_msg)
         @@semaphore.unlock
-        [status, captured_stream.read + extra_msg.get_string(16)]
+        [status, captured_stream.read + extra_msg.get_string(0)]
       end
     end
-
-    def check_buffer(data)
-      status, info = analyze_buffer(data)
-      raise CorruptPngError.new info unless status == STATUS_OK
-
-      true
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: x64-mingw-ucrt
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi