image_size 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f086d46fca698649fed0a23adca9dc67e1fa3317d9f3c209f1fe7f07fcd2cb6b
-  data.tar.gz: ff8f5243aadd37691eb7dabaa7e4b0d3b6fb212aba286a10d86165dc174eabff
+  metadata.gz: d88e4be6d69bedc0f976c9b73544a20ac08ab66d6b44ce1061d1374f9d2a9dc8
+  data.tar.gz: 5b2986943b8bbeb339d0c31d0a98c5847a1a86141d5e754adaf0bd01e3d8d60f
 SHA512:
-  metadata.gz: 6ff23aa12846de6eaeb9a8ae02cde4a152f891e863056cf901732ef1c6cd1a580befab1cb62037feed500906901018cf8cdb64b63dd6538c07f0b84c5e8ce80e
-  data.tar.gz: fe6d488afbac72d4a8c16e3d1457c9ae3acf82b87ac9bd6df34e4077f0a0166c47862eac796f71e34084bb7c1314e49f79963eba41ad73de935232b2f2c35bd1
+  metadata.gz: 1b75df7c37cbcca0886eade3e47b082cde0468331c954d0605130cba564bb7718d777628599fea7332e2ae1ef9f15b80ce77072352a109dadbf9749fea049572
+  data.tar.gz: ffc57b47280776fc7be3cb2866699f32f90a2e036b2dca703ac4262aa77750032ffb54700437958ba7b4948c934d5ea6e41f2acad4e7e71ddec84a98f18edabf

data/.github/workflows/check.yml

@@ -10,9 +10,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-        - '2.0'
-        - '2.1'
-        - '2.2'
         - '2.3'
         - '2.4'
         - '2.5'
@@ -20,12 +17,13 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
-        - jruby-9.1
-        - jruby-9.2
+        - '3.2'
+        - '3.3'
         - jruby-9.3
+        - jruby-9.4
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
@@ -37,11 +35,13 @@ jobs:
     strategy:
       matrix:
         container:
-        - rspec/ci:1.8.7
         - rspec/ci:1.9.3
+        - ruby:2.0
+        - ruby:2.1
+        - ruby:2.2
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: bundle install
     - run: bundle exec rspec --format documentation
   windows:
@@ -53,9 +53,11 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"

data/.github/workflows/rubocop.yml

@@ -8,9 +8,9 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1'
+        ruby-version: '3'
         bundler-cache: true
     - run: bundle exec rubocop

data/.rubocop.yml

@@ -15,9 +15,6 @@ Layout/CaseIndentation:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
 Layout/LineLength:
   Max: 120
 
@@ -25,9 +22,6 @@ Layout/SpaceBeforeBlockBraces:
   EnforcedStyle: no_space
   EnforcedStyleForEmptyBraces: no_space
 
-Lint/PercentStringArray: # broken in rubocop 0.55.0
-  Enabled: false
-
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
@@ -41,42 +35,18 @@ Metrics/MethodLength:
 Naming/MethodParameterName:
   Enabled: false
 
-Style/AccessorGrouping:
-  Enabled: false
-
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/EmptyCaseCondition:
-  Enabled: false
-
-Style/Encoding:
-  Enabled: false
-
-Style/FileRead:
+Style/ArgumentsForwarding:
   Enabled: false
 
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false
-
-Style/IfUnlessModifier:
+Style/EmptyCaseCondition:
   Enabled: false
 
 Style/NumericPredicate:
   Enabled: false
 
-Style/ParallelAssignment:
-  Enabled: false
-
 Style/SafeNavigation:
   Enabled: false
 

data/CHANGELOG.markdown

@@ -2,6 +2,18 @@
 
 ## unreleased
 
+## v3.4.0 (2024-01-16)
+
+* Provide access to media types using media_type and media_types methods [#22](https://github.com/toy/image_size/issues/22) [@toy](https://github.com/toy)
+* Allow fetching from HTTP server by requiring image_size/uri [@toy](https://github.com/toy)
+* Fix for ArgumentError when requiring only image_size/uri_reader (without image_size) [@toy](https://github.com/toy)
+* Require ruby 1.9.3 [@toy](https://github.com/toy)
+
+## v3.3.0 (2023-05-30)
+
+* Support `HEIF` (`HEIC` and `AVIF`) images [#19](https://github.com/toy/image_size/issues/19) [@toy](https://github.com/toy)
+* Fix handling `JPEG 2000` 64 bit size boxes [@toy](https://github.com/toy)
+
 ## v3.2.0 (2022-11-03)
 
 * Support `EMF` images [#21](https://github.com/toy/image_size/pull/21) [@opoudjis](https://github.com/opoudjis)

data/README.markdown

@@ -1,11 +1,11 @@
 [![Gem Version](https://img.shields.io/gem/v/image_size?logo=rubygems)](https://rubygems.org/gems/image_size)
-[![Build Status](https://img.shields.io/github/workflow/status/toy/image_size/check/master?logo=github)](https://github.com/toy/image_size/actions/workflows/check.yml)
-[![Rubocop](https://img.shields.io/github/workflow/status/toy/image_size/rubocop/master?label=rubocop&logo=rubocop)](https://github.com/toy/image_size/actions/workflows/rubocop.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/toy/image_size/check.yml?logo=github)](https://github.com/toy/image_size/actions/workflows/check.yml)
+[![Rubocop](https://img.shields.io/github/actions/workflow/status/toy/image_size/rubocop.yml?label=rubocop&logo=rubocop)](https://github.com/toy/image_size/actions/workflows/rubocop.yml)
 
 # image_size
 
-Measure image size using pure Ruby.
-Formats: `apng`, `bmp`, `cur`, `emf`, `gif`, `ico`, `j2c`, `jp2`, `jpeg`, `jpx`, `mng`, `pam`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `svg`, `swf`, `tiff`, `webp`, `xbm`, `xpm`.
+Measure image size/dimensions using pure Ruby.
+Formats: `apng`, `avif`, `bmp`, `cur`, `emf`, `gif`, `heic`, `heif`, `ico`, `j2c`, `jp2`, `jpeg`, `jpx`, `mng`, `pam`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `svg`, `swf`, `tiff`, `webp`, `xbm`, `xpm`.
 
 ## Installation
 
@@ -26,7 +26,7 @@ gem 'image_size', '~> 3.0'
 ```ruby
 image_size = ImageSize.path('spec/images/jpeg/436x429.jpeg')
 
-image_size.format       #=> :jpec
+image_size.format       #=> :jpeg
 image_size.width        #=> 436
 image_size.height       #=> 429
 image_size.w            #=> 436
@@ -38,6 +38,8 @@ image_size.size.width   #=> 436
 image_size.size.height  #=> 429
 image_size.size.w       #=> 436
 image_size.size.h       #=> 429
+image_size.media_type   #=> "image/jpeg"
+image_size.media_types  #=> ["image/jpeg"]
 ```
 
 Or using `IO` object:
@@ -96,8 +98,7 @@ If server recognises Range header, only needed chunks will be fetched even for T
 of data will be fetched, in most cases first few kilobytes (TIFF images is an exception).
 
 ```ruby
-require 'image_size'
-require 'image_size/uri_reader'
+require 'image_size/uri'
 
 url = 'http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg'
 p ImageSize.url(url).size
@@ -144,4 +145,4 @@ puts Benchmark.measure{ p ImageSize.url(url).size }
 This code is free to use under the terms of the [Ruby's licence](LICENSE.txt).
 
 Original author: Keisuke Minami <keisuke@rccn.com>.\
-Further development 2010-2022 Ivan Kuchin https://github.com/toy/image_size
+Further development 2010-2024 Ivan Kuchin https://github.com/toy/image_size

data/image_size.gemspec

@@ -2,13 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '3.2.0'
-  s.summary     = %q{Measure image size using pure Ruby}
-  s.description = %q{Measure following file dimensions: apng, bmp, cur, emf, gif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
+  s.version     = '3.4.0'
+  s.summary     = %q{Measure image size/dimensions using pure Ruby}
+  s.description = %q{Measure following file dimensions: apng, avif, bmp, cur, emf, gif, heic, heif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Keisuke Minami', 'Ivan Kuchin']
   s.license     = 'Ruby'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
     'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",

data/lib/image_size/format_error.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class ImageSize
+  class FormatError < StandardError; end
+end

data/lib/image_size/isobmff.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'image_size/format_error'
+
+require 'set'
+
+class ImageSize
+  class ISOBMFF # :nodoc:
+    class Box # :nodoc:
+      attr_reader :type, :offset, :size, :relative_data_offset, :index
+
+      def initialize(attributes)
+        @type = attributes.fetch(:type)
+        @offset = attributes.fetch(:offset)
+        @size = attributes.fetch(:size) == 0 ? nil : attributes[:size]
+        @relative_data_offset = attributes.fetch(:relative_data_offset)
+        @index = attributes.fetch(:index)
+      end
+
+      def data_offset
+        offset + relative_data_offset
+      end
+
+      def data_size
+        size ? size - relative_data_offset : nil
+      end
+    end
+
+    class FullBox < Box # :nodoc:
+      attr_reader :version, :flags
+
+      def initialize(attributes)
+        super
+        @version = attributes.fetch(:version)
+        @flags = attributes.fetch(:flags)
+      end
+    end
+
+    S64_OVERFLOW = 1 << 63
+
+    def initialize(options = {})
+      @full = options.fetch(:full, []).to_set
+      @last = options.fetch(:last, []).to_set
+      @recurse = options.fetch(:recurse, []).to_set
+    end
+
+    def walk(reader, offset = 0, length = nil)
+      max_offset = length ? offset + length : S64_OVERFLOW
+      index = 1
+      while offset < max_offset && !['', nil].include?(reader[offset, 4])
+        size = reader.unpack1(offset, 4, 'N')
+        type = reader.fetch(offset + 4, 4)
+        relative_data_offset = 8
+
+        case size
+        when 1
+          size = reader.unpack1(offset + 8, 8, 'Q>')
+          relative_data_offset += 8
+          raise FormatError, "Unexpected ISOBMFF xl-box size #{size}" if size < 16
+        when 2..7
+          raise FormatError, "Reserved ISOBMFF box size #{size}"
+        end
+
+        attributes = {
+          type: type,
+          offset: offset,
+          size: size,
+          relative_data_offset: relative_data_offset,
+          index: index,
+        }
+
+        if @full.include?(type)
+          version_n_flags = reader.unpack1(offset + relative_data_offset, 4, 'N')
+          attributes[:version] = version_n_flags >> 24
+          attributes[:flags] = version_n_flags & 0xffffff
+
+          attributes[:relative_data_offset] += 4
+
+          yield FullBox.new(attributes)
+        else
+          yield Box.new(attributes)
+        end
+
+        break if size == 0 || @last.include?(type)
+
+        index += 1
+        offset += size
+      end
+    end
+
+    def recurse(reader, offset = 0, length = nil, &block)
+      walk(reader, offset, length) do |box|
+        yield box
+
+        recurse(reader, box.data_offset, box.data_size, &block) if @recurse.include?(box.type)
+      end
+    end
+  end
+end

data/lib/image_size/media_types.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class ImageSize
+  MEDIA_TYPES = {
+    apng: %w[image/apng image/vnd.mozilla.apng],
+    avif: %w[image/avif],
+    bmp: %w[image/bmp],
+    cur: %w[image/vnd.microsoft.icon],
+    emf: %w[image/emf],
+    gif: %w[image/gif],
+    heic: %w[image/heic image/heif],
+    ico: %w[image/x-icon image/vnd.microsoft.icon],
+    j2c: %w[image/j2c],
+    jp2: %w[image/jp2],
+    jpeg: %w[image/jpeg],
+    jpx: %w[image/jpx],
+    mng: %w[video/x-mng image/x-mng],
+    pam: %w[image/x-portable-arbitrarymap],
+    pbm: %w[image/x-portable-bitmap image/x-portable-anymap],
+    pcx: %w[image/x-pcx image/vnd.zbrush.pcx],
+    pgm: %w[image/x-portable-graymap image/x-portable-anymap],
+    png: %w[image/png],
+    ppm: %w[image/x-portable-pixmap image/x-portable-anymap],
+    psd: %w[image/vnd.adobe.photoshop],
+    svg: %w[image/svg+xml],
+    swf: %w[application/x-shockwave-flash application/vnd.adobe.flash.movie],
+    tiff: %w[image/tiff],
+    webp: %w[image/webp],
+    xbm: %w[image/x-xbitmap],
+    xpm: %w[image/x-xpixmap],
+  }.freeze
+end

data/lib/image_size/reader.rb

@@ -5,6 +5,19 @@ require 'stringio'
 
 class ImageSize
   module Reader # :nodoc:
+    class Stream # :nodoc:
+      def initialize(reader, offset)
+        @reader = reader
+        @offset = offset
+      end
+
+      def unpack1(length, format)
+        result = @reader.unpack1(@offset, length, format)
+        @offset += length
+        result
+      end
+    end
+
     class << self
       def open(input)
         case
@@ -60,5 +73,9 @@ class ImageSize
         fetch(offset, length).unpack(format)[0]
       end
     end
+
+    def stream(offset)
+      Stream.new(self, offset)
+    end
   end
 end

data/lib/image_size/uri.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'image_size/uri_reader'

data/lib/image_size/uri_reader.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'image_size'
 require 'image_size/reader'
 require 'image_size/chunky_reader'
 

data/lib/image_size.rb

@@ -1,6 +1,9 @@
 # encoding: BINARY
 # frozen_string_literal: true
 
+require 'image_size/isobmff'
+require 'image_size/format_error'
+require 'image_size/media_types'
 require 'image_size/reader'
 require 'image_size/seekable_io_reader'
 require 'image_size/stream_io_reader'
@@ -8,8 +11,6 @@ require 'image_size/string_reader'
 
 # Determine image format and size
 class ImageSize
-  class FormatError < StandardError; end
-
   # Array joining with 'x'
   class Size < Array
     # join using 'x'
@@ -69,6 +70,19 @@ class ImageSize
     Size.new([width, height]) if format
   end
 
+  # Media type (formerly known as a MIME type)
+  def media_type
+    MEDIA_TYPES.fetch(format, []).first
+  end
+
+  # All media types:
+  # * commonly used and official like for apng and ico
+  # * main and compatible like for heic and pnm (pbm, pgm, ppm)
+  # * multiple unregistered like for mng
+  def media_types
+    MEDIA_TYPES.fetch(format, [])
+  end
+
 private
 
   SVG_R = /<svg\b([^>]*)>/.freeze
@@ -77,25 +91,27 @@ private
     head = ir[0, 1024]
     case
     when head.nil? || head.empty?                                 then nil
-    when head[0, 6] =~ /GIF8[79]a/                                then :gif
+    when head[0, 6] =~ /\AGIF8[79]a\z/                            then :gif
     when head[0, 8] == "\211PNG\r\n\032\n"                        then detect_png_type(ir)
     when head[0, 8] == "\212MNG\r\n\032\n"                        then :mng
     when head[0, 2] == "\377\330"                                 then :jpeg
     when head[0, 2] == 'BM'                                       then :bmp
-    when head[0, 3] =~ /P[1-6]\s|P7\n/                            then detect_pnm_type(ir)
+    when head[0, 3] =~ /\AP([1-6]\s|7\n)\z/                       then detect_pnm_type(ir)
     when head =~ /\#define\s+\S+\s+\d+/                           then :xbm
     when %W[II*\0 MM\0*].include?(head[0, 4])                     then :tiff
     when head =~ %r{/\* XPM \*/}                                  then :xpm
     when head[0, 4] == '8BPS'                                     then :psd
-    when head[0, 3] =~ /[FC]WS/                                   then :swf
+    when head[0, 3] =~ /\A[FC]WS\z/                               then :swf
     when head =~ SVG_R || (head =~ XML_R && ir[0, 4096] =~ SVG_R) then :svg
     when head[0, 2] =~ /\n[\0-\5]/                                then :pcx
-    when head[0, 12] =~ /RIFF(?m:....)WEBP/                       then :webp
+    when head[0, 12] =~ /\ARIFF(?m:....)WEBP\z/                   then :webp
     when head[0, 4] == "\0\0\1\0"                                 then :ico
     when head[0, 4] == "\0\0\2\0"                                 then :cur
     when head[0, 12] == "\0\0\0\fjP  \r\n\207\n"                  then detect_jpeg2000_type(ir)
     when head[0, 4] == "\377O\377Q"                               then :j2c
     when head[0, 4] == "\1\0\0\0" && head[40, 4] == ' EMF'        then :emf
+    when head[4, 8] =~ /\Aftypavi[fs]\z/                          then :avif
+    when head[4, 8] =~ /\Aftyp(hei[cs]|mif[12]|msf1)\z/           then :heic
     end
   end
 
@@ -107,7 +123,7 @@ private
       return :apng if type == 'acTL'
 
       length = ir.unpack1(offset, 4, 'N')
-      offset += 8 + length + 4
+      offset += length + 8 + 4
     end
     :png
   end
@@ -126,7 +142,7 @@ private
 
     # using xl-box would be weird, but doesn't seem to contradict specification
     skip = ir[12, 4] == "\0\0\0\1" ? 16 : 8
-    case ir[12 + skip, 4]
+    case ir[skip + 12, 4]
     when 'jp2 ' then :jp2
     when 'jpx ' then :jpx
     end
@@ -137,17 +153,13 @@ private
   end
 
   def size_of_mng(ir)
-    unless ir[12, 4] == 'MHDR'
-      raise FormatError, 'MHDR not in place for MNG'
-    end
+    raise FormatError, 'MHDR not in place for MNG' unless ir[12, 4] == 'MHDR'
 
     ir.unpack(16, 8, 'NN')
   end
 
   def size_of_png(ir)
-    unless ir[12, 4] == 'IHDR'
-      raise FormatError, 'IHDR not in place for PNG'
-    end
+    raise FormatError, 'IHDR not in place for PNG' unless ir[12, 4] == 'IHDR'
 
     ir.unpack(16, 8, 'NN')
   end
@@ -165,14 +177,12 @@ private
     loop do
       offset += 1 until [nil, section_marker].include? ir[offset, 1]
       offset += 1 until section_marker != ir[offset + 1, 1]
-      raise FormatError, 'EOF in JPEG' if ir[offset, 1].nil?
+      raise FormatError, 'EOF in JPEG' unless ir[offset, 1]
 
       code, length = ir.unpack(offset, 4, 'xCn')
       offset += 4
 
-      if JPEG_CODE_CHECK.include?(code)
-        return ir.unpack(offset + 1, 4, 'nn').reverse
-      end
+      return ir.unpack(offset + 1, 4, 'nn').reverse if JPEG_CODE_CHECK.include?(code)
 
       offset += length - 2
     end
@@ -237,9 +247,7 @@ private
   def size_of_xpm(ir)
     length = 1024
     until (data = ir[0, length]) =~ /"\s*(\d+)\s+(\d+)(\s+\d+\s+\d+){1,2}\s*"/m
-      if data.length != length
-        raise FormatError, 'XPM size not found'
-      end
+      raise FormatError, 'XPM size not found' if data.length != length
 
       length += 1024
     end
@@ -268,7 +276,7 @@ private
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
 
-      next if packspec[type].nil?
+      next unless packspec[type]
 
       value = ifd[8, 4].unpack(packspec[type])[0]
       case tag
@@ -288,7 +296,7 @@ private
 
   def size_of_swf(ir)
     value_bit_length = ir.unpack1(8, 1, 'B5').to_i(2)
-    bit_length = 5 + (value_bit_length * 4)
+    bit_length = (value_bit_length * 4) + 5
     rect_bits = ir.unpack1(8, (bit_length / 8) + 1, "B#{bit_length}")
     values = rect_bits[5..-1].unpack("a#{value_bit_length}" * 4).map{ |bits| bits.to_i(2) }
     x_min, x_max, y_min, y_max = values
@@ -336,38 +344,13 @@ private
     end
   end
 
+  JP2_WALKER = ImageSize::ISOBMFF.new(
+    recurse: %w[jp2h],
+    last: %w[jp2h]
+  )
   def size_of_jp2(ir)
-    offset = 12
-    stop = nil
-    in_header = false
-    loop do
-      break if stop && offset >= stop
-      break if ir[offset, 4] == '' || ir[offset, 4].nil?
-
-      size = ir.unpack1(offset, 4, 'N')
-      type = ir.fetch(offset + 4, 4)
-
-      data_offset = 8
-      case size
-      when 1
-        size = ir.unpack1(offset, 8, 'Q>')
-        data_offset = 16
-        raise FormatError, "Unexpected xl-box size #{size}" if (1..15).include?(size)
-      when 2..7
-        raise FormatError, "Reserved box size #{size}"
-      end
-
-      if type == 'jp2h'
-        stop = offset + size unless size.zero?
-        offset += data_offset
-        in_header = true
-      elsif in_header && type == 'ihdr'
-        return ir.unpack(offset + data_offset, 8, 'NN').reverse
-      else
-        break if size.zero? # box to the end of file
-
-        offset += size
-      end
+    JP2_WALKER.recurse(ir) do |box|
+      return ir.unpack(box.data_offset, 8, 'NN').reverse if box.type == 'ihdr'
     end
   end
   alias_method :size_of_jpx, :size_of_jp2
@@ -391,4 +374,66 @@ private
       (n.to_f * dpi / 2540).round
     end
   end
+
+  HEIF_WALKER = ImageSize::ISOBMFF.new(
+    recurse: %w[meta iprp ipco],
+    full: %w[meta hdlr pitm ipma ispe],
+    last: %w[meta]
+  )
+  def size_of_heif(ir)
+    pitm = nil
+    ipma = nil
+    ispes = {}
+    claps = {}
+    irots = {}
+
+    HEIF_WALKER.recurse(ir) do |box, _path|
+      case box.type
+      when 'hdlr'
+        raise FormatError, "hdlr box too small (#{box.data_size})" if box.data_size < 8
+
+        return nil unless ir[box.data_offset + 4, 4] == 'pict'
+      when 'pitm'
+        raise FormatError, 'second pitm box encountered' if pitm
+
+        pitm = box.version == 0 ? ir.unpack1(box.data_offset, 2, 'n') : ir.unpack1(box.data_offset, 4, 'N')
+      when 'ipma'
+        stream = ir.stream(box.data_offset)
+
+        property_index_16b = (box.flags & 1) == 1
+
+        ipma ||= {}
+        stream.unpack1(4, 'N').times do
+          item_id = box.version == 0 ? stream.unpack1(2, 'n') : stream.unpack1(4, 'N')
+          ipma[item_id] ||= Array.new(stream.unpack1(1, 'C')) do
+            property_index_16b ? stream.unpack1(2, 'n') & 0x7fff : stream.unpack1(1, 'C') & 0x7f
+          end
+        end
+      when 'ispe'
+        ispes[box.index] ||= ir.unpack(box.data_offset, 8, 'NN')
+      when 'clap'
+        width_n, width_d, height_n, height_d = ir.unpack(box.data_offset, 16, 'N4')
+        claps[box.index] ||= [Rational(width_n, width_d).round, Rational(height_n, height_d).round]
+      when 'irot'
+        irots[box.index] ||= ir.unpack1(box.data_offset, 1, 'C') & 0b11
+      end
+    end
+
+    return unless ipma
+
+    properties = ipma[pitm || ipma.keys.min]
+    return unless properties
+
+    dimensions = claps.values_at(*properties).compact.first || ispes.values_at(*properties).compact.first
+    return unless dimensions
+
+    irot = irots.values_at(*properties).compact.first
+    if irot && irot.odd?
+      dimensions.reverse
+    else
+      dimensions
+    end
+  end
+  alias_method :size_of_avif, :size_of_heif
+  alias_method :size_of_heic, :size_of_heif
 end

data/spec/image_size/chunky_reader_spec.rb

@@ -29,7 +29,7 @@ describe ImageSize::ChunkyReader do
     {
       'empty string' => '',
       'a bit of data' => 'foo bar baz',
-      'a lot of data' => File.open('GPL', 'rb', &:read),
+      'a lot of data' => File.binread('GPL'),
     }.each do |data_description, data|
       {
         'default' => test_reader.new(data),

data/spec/image_size/isobmff_spec.rb

@@ -0,0 +1,352 @@
+# frozen_string_literal: true
+
+require 'rspec'
+require 'stringio'
+
+require 'image_size/string_reader'
+require 'image_size/isobmff'
+
+describe ImageSize::ISOBMFF do
+  boxes = Class.new do
+    def self.build(&block)
+      builder = new
+      builder.instance_eval(&block)
+      builder.string
+    end
+
+    def initialize
+      @io = StringIO.new
+    end
+
+    def box(type, size, size64 = nil)
+      @io << [size, type, size64].pack("Na4#{'Q>' if size64}")
+      yield if block_given?
+    end
+
+    def data(content)
+      @io << content
+    end
+
+    def string
+      @io.string
+    end
+  end
+
+  let(:instance){ described_class.new(options) }
+
+  let(:string_reader){ ImageSize::StringReader.new(data) }
+
+  describe '#walk' do
+    let(:options){ {} }
+
+    def is_expected
+      expect{ |b| instance.walk(string_reader, &b) }
+    end
+
+    describe 'for multiple boxes' do
+      let(:data) do
+        boxes.build do
+          box('abcd', 8 + 42){ data 'x' * 42 }
+          box('efgh', 8 + 10)
+        end
+      end
+
+      it do
+        is_expected.to yield_successive_args(
+          having_attributes(type: 'abcd', data_offset: 8, data_size: 42),
+          having_attributes(type: 'efgh', data_offset: 58, data_size: 10)
+        )
+      end
+    end
+
+    describe 'for empty data' do
+      let(:data){ '' }
+
+      it{ is_expected.not_to yield_control }
+    end
+
+    describe 'for not enough data' do
+      let(:data){ 'test' }
+
+      it{ is_expected.to raise_error ImageSize::FormatError }
+    end
+
+    describe 'for a box without content' do
+      let(:data){ boxes.build{ box('test', 8) } }
+
+      it{ is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 8, data_size: 0)) }
+    end
+
+    describe 'for a box with content' do
+      let(:data){ boxes.build{ box('test', 8 + 42) } }
+
+      it do
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 8, data_size: 42))
+      end
+    end
+
+    describe 'for not enough data in second box' do
+      let(:data) do
+        boxes.build do
+          box('test', 8)
+          data 'test'
+        end
+      end
+
+      it{ is_expected.to yield_control.and raise_error ImageSize::FormatError }
+    end
+
+    describe 'for size-less box' do
+      let(:data){ boxes.build{ box('test', 0) } }
+
+      it do
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 8, data_size: nil))
+      end
+    end
+
+    (2..7).each do |size|
+      describe "for wrong small box size #{size}" do
+        let(:data){ boxes.build{ box('test', size) } }
+
+        it{ is_expected.to raise_error ImageSize::FormatError }
+      end
+    end
+
+    describe 'for a big box without content' do
+      let(:data){ boxes.build{ box('test', 1, 16) } }
+
+      it do
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 16, data_size: 0))
+      end
+    end
+
+    describe 'for a big box with content' do
+      let(:data){ boxes.build{ box('test', 1, 16 + 42) } }
+
+      it do
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 16, data_size: 42))
+      end
+    end
+
+    describe 'for a full box' do
+      let(:options){ { full: %w[test] } }
+
+      let(:data) do
+        boxes.build do
+          box('test', 8 + 42)
+          data 'abcd'
+        end
+      end
+
+      it do
+        is_expected.to yield_successive_args(
+          having_attributes(
+            type: 'test',
+            data_offset: 12,
+            data_size: 38,
+            version: 0x61,
+            flags: 0x626364
+          )
+        )
+      end
+    end
+
+    describe 'for a big full box' do
+      let(:options){ { full: %w[test] } }
+
+      let(:data) do
+        boxes.build do
+          box('test', 1, 16 + 42)
+          data 'abcd'
+        end
+      end
+
+      it do
+        is_expected.to yield_successive_args(
+          having_attributes(
+            type: 'test',
+            data_offset: 20,
+            data_size: 38,
+            version: 0x61,
+            flags: 0x626364
+          )
+        )
+      end
+    end
+
+    16.times do |size|
+      describe "for wrong big box size #{size}" do
+        let(:data){ boxes.build{ box('test', 1, size) } }
+
+        it{ is_expected.to raise_error ImageSize::FormatError }
+      end
+    end
+
+    context 'given offset' do
+      let(:data) do
+        boxes.build do
+          box('test', 8)
+          box('fooo', 8)
+          box('barr', 8)
+        end
+      end
+
+      def is_expected
+        expect{ |b| instance.walk(string_reader, offset, &b) }
+      end
+
+      describe 'for offset at the end' do
+        let(:offset){ 24 }
+
+        it{ is_expected.not_to yield_control }
+      end
+
+      describe 'for offset at second box' do
+        let(:offset){ 8 }
+
+        it do
+          is_expected.to yield_successive_args(
+            having_attributes(type: 'fooo', data_offset: 16, data_size: 0),
+            having_attributes(type: 'barr', data_offset: 24, data_size: 0)
+          )
+        end
+      end
+    end
+
+    context 'given offset and length' do
+      def is_expected
+        expect{ |b| instance.walk(string_reader, offset, length, &b) }
+      end
+
+      describe 'for offset at second box' do
+        let(:data) do
+          boxes.build do
+            box('test', 8)
+            box('fooo', 8)
+            box('barr', 8)
+          end
+        end
+        let(:offset){ 8 }
+        let(:length){ 8 }
+
+        it do
+          is_expected.to yield_successive_args(having_attributes(type: 'fooo', data_offset: 16, data_size: 0))
+        end
+      end
+    end
+  end
+
+  describe '#recurse' do
+    let(:data) do
+      boxes.build do
+        box('fooA', 8 + 8 + 2) do
+          box('fooB', 8 + 2){ data '11' }
+        end
+        box('barA', 8 + 8 + 8 + 2) do
+          box('barB', 8 + 8 + 2) do
+            box('barC', 8 + 2) do
+              data '22'
+            end
+          end
+        end
+        box('bazA', 8 + 8 + 2) do
+          box('bazB', 8 + 2){ data '33' }
+        end
+      end
+    end
+
+    context 'when configured to recures all' do
+      let(:options){ { recurse: %w[fooA barA barB bazA] } }
+
+      it 'recurses complete tree' do
+        enum = instance.to_enum(:recurse, string_reader)
+
+        expect(enum.next).to have_attributes(type: 'fooA', data_offset: 8, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'fooB', data_offset: 16, data_size: 2)
+
+        expect(enum.next).to have_attributes(type: 'barA', data_offset: 26, data_size: 18)
+
+        expect(enum.next).to have_attributes(type: 'barB', data_offset: 34, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'barC', data_offset: 42, data_size: 2)
+
+        expect(enum.next).to have_attributes(type: 'bazA', data_offset: 52, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'bazB', data_offset: 60, data_size: 2)
+
+        expect{ enum.next }.to raise_exception(StopIteration)
+      end
+
+      it 'returns nil' do
+        expect(instance.recurse(string_reader){ :foo }).to be_nil
+      end
+    end
+
+    context 'when configured to recurse part' do
+      let(:options){ { recurse: %w[barA] } }
+
+      it 'recurses requested part' do
+        enum = instance.to_enum(:recurse, string_reader)
+
+        expect(enum.next).to have_attributes(type: 'fooA', data_offset: 8, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'barA', data_offset: 26, data_size: 18)
+
+        expect(enum.next).to have_attributes(type: 'barB', data_offset: 34, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'bazA', data_offset: 52, data_size: 10)
+
+        expect{ enum.next }.to raise_exception(StopIteration)
+      end
+
+      it 'returns nil' do
+        expect(instance.recurse(string_reader){ :foo }).to be_nil
+      end
+    end
+
+    context 'when configured to not recurse' do
+      let(:options){ {} }
+
+      it 'does not recurse' do
+        enum = instance.to_enum(:recurse, string_reader)
+
+        expect(enum.next).to have_attributes(type: 'fooA', data_offset: 8, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'barA', data_offset: 26, data_size: 18)
+
+        expect(enum.next).to have_attributes(type: 'bazA', data_offset: 52, data_size: 10)
+
+        expect{ enum.next }.to raise_exception(StopIteration)
+      end
+
+      it 'returns nil' do
+        expect(instance.recurse(string_reader){ :foo }).to be_nil
+      end
+    end
+
+    context 'when configured to stop' do
+      let(:options){ { recurse: %w[fooA barA barB bazA], last: %w[barA] } }
+
+      it 'recurses complete tree' do
+        enum = instance.to_enum(:recurse, string_reader)
+
+        expect(enum.next).to have_attributes(type: 'fooA', data_offset: 8, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'fooB', data_offset: 16, data_size: 2)
+
+        expect(enum.next).to have_attributes(type: 'barA', data_offset: 26, data_size: 18)
+
+        expect(enum.next).to have_attributes(type: 'barB', data_offset: 34, data_size: 10)
+
+        expect(enum.next).to have_attributes(type: 'barC', data_offset: 42, data_size: 2)
+
+        expect{ enum.next }.to raise_exception(StopIteration)
+      end
+
+      it 'returns nil' do
+        expect(instance.recurse(string_reader){ :foo }).to be_nil
+      end
+    end
+  end
+end

data/spec/image_size_spec.rb

@@ -10,6 +10,10 @@ require 'shellwords'
 
 require 'test_server'
 
+RSpec.configure do |config|
+  config.order = :random
+end
+
 describe ImageSize do
   before :all do
     @server = TestServer.new
@@ -19,6 +23,19 @@ describe ImageSize do
     @server.finish
   end
 
+  def retry_on(exception_class)
+    attempt = 1
+    begin
+      yield
+    rescue exception_class => e
+      warn "Attempt #{attempt}: #{e.inspect}"
+      raise unless attempt < 3
+
+      attempt += 1
+      retry
+    end
+  end
+
   def supported_formats
     ImageSize.private_instance_methods.map{ |name| name[/\Asize_of_(.*)\z/, 1] }.compact.sort
   end
@@ -45,19 +62,26 @@ describe ImageSize do
     describe "for #{path}" do
       let(:name){ File.basename(path) }
       let(:attributes) do
-        match = /(\d+)x(\d+)\.([^.]+)$/.match(name)
-        width, height, format = match[1].to_i, match[2].to_i, match[3].to_sym if match
+        if (match = /(\d+)x(\d+)\.([^.]+)$/.match(name))
+          width = match[1].to_i
+          height = match[2].to_i
+          format = match[3].to_sym
+        end
         size = format && [width, height]
+        media_types = ImageSize::MEDIA_TYPES[format] || []
+        media_type = format && media_types.first.to_s
         {
-          :format => format,
-          :width => width,
-          :height => height,
-          :w => width,
-          :h => height,
-          :size => size,
+          format: format,
+          width: width,
+          height: height,
+          w: width,
+          h: height,
+          size: size,
+          media_type: media_type,
+          media_types: media_types,
         }
       end
-      let(:file_data){ File.open(path, 'rb', &:read) }
+      let(:file_data){ File.binread(path) }
       let(:file_size){ file_data.length }
 
       before do
@@ -148,14 +172,18 @@ describe ImageSize do
         context 'supporting range' do
           context 'without redirects' do
             it 'gets format and dimensions' do
-              image_size = ImageSize.url(file_url)
+              image_size = retry_on Timeout::Error do
+                ImageSize.url(file_url)
+              end
               expect(image_size).to have_attributes(attributes)
             end
           end
 
           context 'with redirects' do
             it 'gets format and dimensions' do
-              image_size = ImageSize.url("#{file_url}?redirect=5")
+              image_size = retry_on Timeout::Error do
+                ImageSize.url("#{file_url}?redirect=5")
+              end
               expect(image_size).to have_attributes(attributes)
             end
           end
@@ -163,7 +191,9 @@ describe ImageSize do
           context 'with too many redirects' do
             it 'gets format and dimensions' do
               expect do
-                ImageSize.url("#{file_url}?redirect=6")
+                retry_on Timeout::Error do
+                  ImageSize.url("#{file_url}?redirect=6")
+                end
               end.to raise_error(/Too many redirects/)
             end
           end
@@ -172,14 +202,18 @@ describe ImageSize do
         context 'not supporting range' do
           context 'without redirects' do
             it 'gets format and dimensions' do
-              image_size = ImageSize.url("#{file_url}?ignore_range")
+              image_size = retry_on Timeout::Error do
+                ImageSize.url("#{file_url}?ignore_range")
+              end
               expect(image_size).to have_attributes(attributes)
             end
           end
 
           context 'with redirects' do
             it 'gets format and dimensions' do
-              image_size = ImageSize.url("#{file_url}?ignore_range&redirect=5")
+              image_size = retry_on Timeout::Error do
+                ImageSize.url("#{file_url}?ignore_range&redirect=5")
+              end
               expect(image_size).to have_attributes(attributes)
             end
           end
@@ -187,7 +221,9 @@ describe ImageSize do
           context 'with too many redirects' do
             it 'gets format and dimensions' do
               expect do
-                ImageSize.url("#{file_url}?ignore_range&redirect=6")
+                retry_on Timeout::Error do
+                  ImageSize.url("#{file_url}?ignore_range&redirect=6")
+                end
               end.to raise_error(/Too many redirects/)
             end
           end
@@ -203,8 +239,8 @@ describe ImageSize do
   end
 
   {
-    :png => "\211PNG\r\n\032\n",
-    :jpeg => "\377\330",
+    png: "\211PNG\r\n\032\n",
+    jpeg: "\377\330",
   }.each do |type, data|
     it "raises FormatError if invalid #{type} given" do
       expect do

data/spec/test_server.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
 require 'webrick'
+require 'stringio'
 
 class TestServer
   attr_reader :base_url
 
   def initialize(host = '127.0.0.1')
     server_options = {
-      :Logger => WEBrick::Log.new(StringIO.new),
-      :AccessLog => [],
-      :BindAddress => host,
-      :Port => 0, # get the next available port
-      :DocumentRoot => '.',
-      :RequestCallback => proc do |req, res|
+      Logger: WEBrick::Log.new(StringIO.new),
+      AccessLog: [],
+      BindAddress: host,
+      Port: 0, # get the next available port
+      DocumentRoot: '.',
+      RequestCallback: proc do |req, res|
         redirect = req.query['redirect'].to_i
         if redirect > 0
           res.set_redirect(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,9 +53,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 'Measure following file dimensions: apng, bmp, cur, emf, gif, ico, j2c,
-  jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm,
-  xpm'
+description: 'Measure following file dimensions: apng, avif, bmp, cur, emf, gif, heic,
+  heif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf,
+  tiff, webp, xbm, xpm'
 email:
 executables: []
 extensions: []
@@ -74,12 +74,17 @@ files:
 - image_size.gemspec
 - lib/image_size.rb
 - lib/image_size/chunky_reader.rb
+- lib/image_size/format_error.rb
+- lib/image_size/isobmff.rb
+- lib/image_size/media_types.rb
 - lib/image_size/reader.rb
 - lib/image_size/seekable_io_reader.rb
 - lib/image_size/stream_io_reader.rb
 - lib/image_size/string_reader.rb
+- lib/image_size/uri.rb
 - lib/image_size/uri_reader.rb
 - spec/image_size/chunky_reader_spec.rb
+- spec/image_size/isobmff_spec.rb
 - spec/image_size/seekable_io_reader_spec.rb
 - spec/image_size_spec.rb
 - spec/images/.gitattributes
@@ -91,6 +96,11 @@ files:
 - spec/images/emf/77x77.emf
 - spec/images/empty
 - spec/images/gif/668x481.gif
+- spec/images/heif/ap_maloletka_mariupol.452x301.heic
+- spec/images/heif/maxar_mariupol.400x300.avif
+- spec/images/heif/multiple.169x83.heic
+- spec/images/heif/rotate.73x173.avif
+- spec/images/heif/sequence.7x5.avif
 - spec/images/ico/32x256.ico
 - spec/images/jp2/163x402.jp2
 - spec/images/jp2/176x373.jpx
@@ -130,7 +140,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_size/issues
   changelog_uri: https://github.com/toy/image_size/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_size/3.2.0
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.4.0
   source_code_uri: https://github.com/toy/image_size
 post_install_message:
 rdoc_options: []
@@ -140,19 +150,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
-summary: Measure image size using pure Ruby
+summary: Measure image size/dimensions using pure Ruby
 test_files:
 - spec/image_size/chunky_reader_spec.rb
+- spec/image_size/isobmff_spec.rb
 - spec/image_size/seekable_io_reader_spec.rb
 - spec/image_size_spec.rb
 - spec/images/.gitattributes
@@ -164,6 +175,11 @@ test_files:
 - spec/images/emf/77x77.emf
 - spec/images/empty
 - spec/images/gif/668x481.gif
+- spec/images/heif/ap_maloletka_mariupol.452x301.heic
+- spec/images/heif/maxar_mariupol.400x300.avif
+- spec/images/heif/multiple.169x83.heic
+- spec/images/heif/rotate.73x173.avif
+- spec/images/heif/sequence.7x5.avif
 - spec/images/ico/32x256.ico
 - spec/images/jp2/163x402.jp2
 - spec/images/jp2/176x373.jpx