pngcheck 0.2.2-arm64-darwin → 0.2.5-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc26ff286f4a09cb4371c13e8014699033301f6adf5d29f9fc5af395a5419df
-  data.tar.gz: 2a2cade83598e36b326cff04f80c13f94f3e86ca15bd3d2ad204acb0aaa7b4ff
+  metadata.gz: b59e7b19a3cde0042ffa31452f77e9482ce13acb72363cc10be783933892f60f
+  data.tar.gz: 15323656b677d9e622e4d53baef4d5e6e21f9b6519276ac19ec4c8e7fffd4fc3
 SHA512:
-  metadata.gz: ddf1b1b9dfd480be23cb1ef6d6e44b2f528b52efca26fdc21c6c10ee74db96f8e34bc7e659fe1cb9700fb143229f1c7cb7914a88a55760db9ed858e34faeee22
-  data.tar.gz: 6233beee43c0ae2645e3278bf8e40be4b4db024d0320f51cec91ca9618d98b17688204e05c8739d0f305ba0397916a8ce822deff187cb344382cafeb8b7fa1ad
+  metadata.gz: 9235a49253ac4f07c31ef42960921cc7caba5da97feb033ca0c421cc4ab7e28f851fd0b968707b38f5afe8c4ac535850e45a12b0d60e7251b81b03ae253be3a6
+  data.tar.gz: 4c65ac45be0848efcd9cec117ea585f510e798a8f1fdb167f93ea1b5f5018d880871e30e3977af4b32897be5dadfd26e1683b63cac6c5d41c1462ed24f612641

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.2"
+  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.2
+  version: 0.2.5
 platform: arm64-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