fastimage 2.2.5 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa3d72608b0c236038f0d4917930580df5474e5b46b61bcbb5758190e0050e3
-  data.tar.gz: 759948e3de376e61a038c6a710b1d15a39d0459c2c20efa7fefbf3692bcc26b7
+  metadata.gz: 0365d74877c5c9bb640ef13fb701665b8fc511027ceba510be2cec62de03584c
+  data.tar.gz: d15af188ae269215bce75d21d1f796680bd66a488367ab9a935919b50fe10a68
 SHA512:
-  metadata.gz: 49a8af8f7dbed9c9c2de250a67cd9ff2810c7b0a5a41d79c5069b777331573de9633163cbc3a95b7a5710e695065a6266e37a255cfeb3ed380ddd29076ce34d9
-  data.tar.gz: 4c9136b413828a5ef790befb5b16144fdc277979c5e28b855886888ea513aa7343900269c302feb495639cd5647f0e58dcdb1a67dd812f4d1357c42adaf1ebe5
+  metadata.gz: e9b26747ff490133917388f29203c1d8272dfe88c28b9a5208a3df1a55728779c3cfe203784c6df9d1bca91bcf58df0cf64e60220a468a0c9f6ca4f47963b3e0
+  data.tar.gz: aa8f0a007f6cb710cbcea70241a56b9fd98fd54bb1a553be7c5533fca7b125b7df99ffbf5dcf5e996d87f60eb8a83933fd49aba848fc4a93c85ac540c8ae1577

data/README.textile

@@ -1,5 +1,5 @@
 !https://img.shields.io/gem/dt/fastimage.svg!:https://rubygems.org/gems/fastimage
-!https://travis-ci.org/sdsykes/fastimage.svg?branch=master!:https://travis-ci.org/sdsykes/fastimage
+!https://github.com/sdsykes/fastimage/actions/workflows/test.yml/badge.svg?branch=master!:https://github.com/sdsykes/fastimage/actions/workflows/test.yml
 
 h1. FastImage
 

data/lib/fastimage/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FastImage
-  VERSION = "2.2.5"
+  VERSION = '2.2.7'
 end

data/lib/fastimage.rb

@@ -85,6 +85,8 @@ class FastImage
   end
   class CannotParseImage < FastImageException # :nodoc:
   end
+  class BadImageURI < FastImageException # :nodoc:
+  end
 
   DefaultTimeout = 2 unless const_defined?(:DefaultTimeout)
 
@@ -228,6 +230,8 @@ class FastImage
       :size
     end
 
+    raise BadImageURI if uri.nil?
+
     @type, @state = nil
 
     if uri.respond_to?(:read)
@@ -254,7 +258,7 @@ class FastImage
     Errno::ENETUNREACH, ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT,
     OpenSSL::SSL::SSLError
     raise ImageFetchFailure if @options[:raise_on_failure]
-  rescue UnknownImageType
+  rescue UnknownImageType, BadImageURI
     raise if @options[:raise_on_failure]
   rescue CannotParseImage
     if @options[:raise_on_failure]
@@ -431,7 +435,7 @@ class FastImage
 
   def parse_animated
     @type = parse_type unless @type
-    @type == :gif ? send("parse_animated_for_#{@type}") : nil
+    %i(gif webp avif).include?(@type) ? send("parse_animated_for_#{@type}") : nil
   end
 
   def fetch_using_base64(uri)
@@ -544,12 +548,11 @@ class FastImage
       case @stream.peek(3).bytes.to_a.last
       when 0
         # http://www.ftyps.com/what.html
-        # HEIC is composed of nested "boxes". Each box has a header composed of
-        # - Size (32 bit integer)
-        # - Box type (4 chars)
-        # - Extended size: only if size === 1, the type field is followed by 64 bit integer of extended size
-        # - Payload: Type-dependent
         case @stream.peek(12)[4..-1]
+        when "ftypavif"
+          :avif
+        when "ftypavis"
+          :avif
         when "ftypheic"
           :heic
         when "ftypmif1"
@@ -584,7 +587,14 @@ class FastImage
   end
   alias_method :parse_size_for_cur, :parse_size_for_ico
 
-  class Heic # :nodoc:
+  # HEIC/AVIF are a special case of the general ISO_BMFF format, in which all data is encapsulated in typed boxes,
+  # with a mandatory ftyp box that is used to indicate particular file types. Is composed of nested "boxes". Each
+  # box has a header composed of
+  # - Size (32 bit integer)
+  # - Box type (4 chars)
+  # - Extended size: only if size === 1, the type field is followed by 64 bit integer of extended size
+  # - Payload: Type-dependent
+  class IsoBmff # :nodoc:
     def initialize(stream)
       @stream = stream
     end
@@ -735,14 +745,19 @@ class FastImage
     end
   end
 
+  def parse_size_for_avif
+    bmff = IsoBmff.new(@stream)
+    bmff.width_and_height
+  end
+
   def parse_size_for_heic
-    heic = Heic.new(@stream)
-    heic.width_and_height
+    bmff = IsoBmff.new(@stream)
+    bmff.width_and_height
   end
 
   def parse_size_for_heif
-    heic = Heic.new(@stream)
-    heic.width_and_height
+    bmff = IsoBmff.new(@stream)
+    bmff.width_and_height
   end
 
   class Gif # :nodoc:
@@ -1079,4 +1094,24 @@ class FastImage
     gif = Gif.new(@stream)
     gif.animated?
   end
+
+  def parse_animated_for_webp
+    vp8 = @stream.read(16)[12..15]
+    _len = @stream.read(4).unpack("V")
+    case vp8
+    when "VP8 "
+      false
+    when "VP8L"
+      false
+    when "VP8X"
+      flags = @stream.read(4).unpack("C")[0]
+      flags & 2 > 0
+    else
+      nil
+    end
+  end
+
+  def parse_animated_for_avif
+    @stream.peek(12)[4..-1] == "ftypavis"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.7
 platform: ruby
 authors:
 - Stephen Sykes
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: FastImage - Image info fast