pngcheck 0.2.4-x86_64-darwin → 0.2.5-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6c199fa73ba33534c330bf9bd193e1a843e383db879c8d7ed391456129a55a
-  data.tar.gz: 50affe163398919ca433e862abae5df6fc38bcdee5577c84afc4fdaf2e53fdbb
+  metadata.gz: 6ef6b5400dda798aa679ae92fc2d815eb5e5331dd5fb5a9c0a5ef3e928bfeef8
+  data.tar.gz: 20f435518b35ee7de06b74dbe82da2b455993341c5c95a112c76dc5ddf920df0
 SHA512:
-  metadata.gz: 1eb08fbf3ffc4b98ace318df638e79c0072c665dae866b56d59e2f009ba7d28e393de3f7a90fce7813bdc50fe9ebb47e72d4d78aa71eaf6d7f82186142dd3bb9
-  data.tar.gz: bd9b60d1619dac9087cb3b7c259701ece75be66b92dd16659b3ec10977c06cb03045ab6de28854237cf0c53a750184847582da3a2cfd651548eecc3ac214fef1
+  metadata.gz: b92367c4009e877e1ad8d27501b0377c506c4d58a904f75ab427bcc1c2fa763e3b3e3b49dbd667c128cdd1253f47a4037ace5e3889c03ac56a032968597088c6
+  data.tar.gz: 956795e0fe1c16f5fb8c01c49ef9bd81decffda368de047affc8aebef4e11a641b9ee583ba61c85cd73bbb8883382a6adc20c19cea240f5d07ca1c0833ac3032

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: x86_64-darwin
 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