oximg 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9240896922269e6e8e96d3fa5b78de6e67b53aa58c1bfe93d20c0e15487def
-  data.tar.gz: 55b613d8b18ba178ed408ac16d867bc5728eae62eb9374ea9a0653c8108994da
+  metadata.gz: d8e96e80504c2840392866e6e3368bdc104960acc9353fee80817d2e031dd46c
+  data.tar.gz: f6b4a232dfb65542f5cc9dff93671201d43ce39a2d59f242847db439ffe5f68b
 SHA512:
-  metadata.gz: 49173ccb9d336081d7670a8e4e5abcbc329a1dc25c623d4c414f75aac4bd083bebb1ff416382f8a2d1edeb5dc84ff27947cb7b9e76c9405ca8e1afb763bff59a
-  data.tar.gz: 9e6d1cb6eceecaf1324d7f818f99b1596f664e442f9889e195f728a115c7895d36c35dd69abac3bba054c3b6caabdc82765b7c567a51bf8b53c94ea7aeaf15f3
+  metadata.gz: f1e6a68ea85cda538c21119eb5e1afff1e05f95b9278b9105330c3133c362ddb8c9d9b6719a459e7c492921fa36bf239a6566adad5ab1ec54175d7af293b3846
+  data.tar.gz: a84ed15c22a74222331e4f43444d182a7c9950ae4e646e2db7283463619776bfc937eeffa8e83a0a6c2cb71724102961f2ce9b342059d0806ef4003d754cc53a

data/README.md

@@ -22,6 +22,10 @@ Oximg.probe("in.jpg")
 #=> {content_type: "image/jpeg", format: :jpeg, width: 4000, height: 3000}
 ```
 
+A GIF source is read and probed like the others (`format: :gif`), but
+nothing encodes GIF: it leaves as the destination's format, WebP when
+the name does not say, and `:gif` is not a `format:` you can ask for.
+
 ## Resizing
 
 ```ruby

data/lib/oximg/version.rb

@@ -7,5 +7,5 @@ module Oximg
   # names a binary it does not carry. `Oximg.version` reports what the
   # resolved executable actually is, which can differ when it comes
   # from PATH.
-  VERSION = "0.11.0"
+  VERSION = "0.13.0"
 end

data/lib/oximg.rb

@@ -45,10 +45,25 @@ module Oximg
     "image/jpeg" => :jpeg,
     "image/png" => :png,
     "image/webp" => :webp,
-    "image/avif" => :avif
+    "image/avif" => :avif,
+    "image/gif" => :gif
   }.freeze
 
-  PROBE_LINE = /:\s+(\S+)\s+(\d+)x(\d+)\s+\(\d+\s+stored\s+pixels\)\s*\z/
+  # The line `oximg probe` prints (src/cli.rs):
+  #
+  #   in.gif: image/gif 120x90 (10800 stored pixels), 3 frames, 1500ms, looping forever
+  #
+  # The three fields the gem reports are pinned exactly. Everything after
+  # the comma — the animation summary, printed for an animated source
+  # only — is information the gem does not expose, and is deliberately
+  # left unparsed rather than matched: a pattern that stopped at
+  # `pixels)` is what broke probe when the CLI added that summary, and a
+  # pattern that spelled the summary out would break again on the next
+  # field. What is refused is output that is not exactly that one line:
+  # a field missing, a continuation without the comma, or anything
+  # printed before or after it. stderr is captured separately, so a
+  # warning never lands here.
+  PROBE_LINE = /\A[^\n]*: (\S+) (\d+)x(\d+) \(\d+ stored pixels\)(?:,[^\n]*)?\n?\z/
 
   class << self
     # Absolute path to the executable in use; raises
@@ -96,15 +111,7 @@ module Oximg
     # dimensions are the stored ones (an EXIF rotation is not applied).
     def probe(source)
       out, = Binary.run("probe", expand(source, "source"))
-      match = out.match(PROBE_LINE)
-      raise ProcessingError, "unparsable probe output: #{out.inspect}" unless match
-
-      {
-        content_type: match[1],
-        format: CONTENT_TYPE_FORMATS[match[1]],
-        width: Integer(match[2]),
-        height: Integer(match[3])
-      }
+      parse_probe(out)
     end
 
     # The argv `resize` would run, minus the executable. Public because
@@ -126,6 +133,22 @@ module Oximg
 
     private
 
+    # The hash `probe` builds from the line the CLI printed. Separate
+    # from `probe` so the parser can be tested against every line the
+    # CLI can print — the still form, each loop spelling — without a
+    # binary present; private because nothing outside needs it.
+    def parse_probe(output)
+      match = output.match(PROBE_LINE)
+      raise ProcessingError, "unparsable probe output: #{output.inspect}" unless match
+
+      {
+        content_type: match[1],
+        format: CONTENT_TYPE_FORMATS[match[1]],
+        width: Integer(match[2]),
+        height: Integer(match[3])
+      }
+    end
+
     # Absolute paths throughout: a relative name beginning with "-"
     # would otherwise reach the CLI's argument parser as a flag, and
     # the caller rarely controls what an uploaded file is called.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oximg
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - oximg contributors