image_size 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0873a78a9fb9f84f07d0389071379dda288330bd38ee7516b442ffde85a3af8
-  data.tar.gz: 0b9fffd2311efa1c24379686821289951a4cd2ec895c27325148a886a24ff57b
+  metadata.gz: 4d0b43a481f6a18e76f7cf8325240014d2a1e07a52cfb462be37444e020ff036
+  data.tar.gz: 21edad5bbdd1a4e4b60953ee2769bd0648e8deb389f220f0dbd120f6a9dee09d
 SHA512:
-  metadata.gz: f6dede99002af9b9fc32f9776e42019079abcd846370c06b2aeee812a73c9ec46dcb6c703d1ae454f807d532c1d6b740aabb999892a6ef610cd17311f6a9a7f0
-  data.tar.gz: 819d8a3b7797b1f12b59eb608ffdeda9338314a923ca54711143832685853ed36b9ae8d165fcfa242ce4e1d72aecd5a03bd11714aa7aee3b464722ea8bb4688f
+  metadata.gz: 78e9a671390fc80747273ccd6555e2faa915c4186261f473e86aa274f3e93e75c5e26f4674f3fea307d8a94ca21e352dfeb44a2046f20fb453d7e394f56c13b5
+  data.tar.gz: 3dd7259403bb9aebc0d75834330f8db1b21d68bc619ec9204475e46e4c46b818ce28af2712d57a0c7ef3d7bb1a5922f3d91ba3a6b6779c7421e2fd2d9eaf4182

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,12 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
-        - jruby-9.1
-        - jruby-9.2
+        - '3.2'
         - 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 }}"
@@ -39,9 +36,12 @@ jobs:
         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'
       fail-fast: false
+    continue-on-error: ${{ matrix.ruby == '3.2' }}
     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/CHANGELOG.markdown

@@ -2,6 +2,15 @@
 
 ## unreleased
 
+## 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)
+
 ## v3.1.0 (2022-09-17)
 
 * Document experimental fetching from http server [#18](https://github.com/toy/image_size/issues/18) [@toy](https://github.com/toy)

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`, `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
 
@@ -144,4 +144,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-2023 Ivan Kuchin https://github.com/toy/image_size

data/image_size.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '3.1.0'
-  s.summary     = %q{Measure image size using pure Ruby}
-  s.description = %q{Measure following file dimensions: apng, bmp, cur, gif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
+  s.version     = '3.3.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'

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/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.rb

@@ -1,6 +1,8 @@
 # encoding: BINARY
 # frozen_string_literal: true
 
+require 'image_size/isobmff'
+require 'image_size/format_error'
 require 'image_size/reader'
 require 'image_size/seekable_io_reader'
 require 'image_size/stream_io_reader'
@@ -8,8 +10,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'
@@ -77,24 +77,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
 
@@ -106,7 +109,7 @@ private
       return :apng if type == 'acTL'
 
       length = ir.unpack1(offset, 4, 'N')
-      offset += 8 + length + 4
+      offset += length + 8 + 4
     end
     :png
   end
@@ -125,7 +128,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
@@ -287,7 +290,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
@@ -335,38 +338,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
@@ -374,4 +352,82 @@ private
   def size_of_j2c(ir)
     ir.unpack(8, 8, 'NN')
   end
+
+  EMF_UMAX = 256**4
+  EMF_SMAX = EMF_UMAX / 2
+
+  def size_of_emf(ir)
+    left, top, right, bottom =
+      if RUBY_VERSION < '1.9'
+        ir.unpack(24, 16, 'V*').map{ |u| u < EMF_SMAX ? u : u - EMF_UMAX }
+      else
+        ir.unpack(24, 16, 'L<*')
+      end
+    dpi = self.class.dpi
+    [right - left + 1, bottom - top + 1].map do |n|
+      (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/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

@@ -19,6 +19,26 @@ describe ImageSize do
     @server.finish
   end
 
+  def supported_formats
+    ImageSize.private_instance_methods.map{ |name| name[/\Asize_of_(.*)\z/, 1] }.compact.sort
+  end
+
+  describe 'README' do
+    let(:readme){ File.read('README.markdown') }
+
+    it 'lists all supported formats' do
+      expect(readme[/^Formats: .*$/]).to eq("Formats: #{supported_formats.map{ |format| "`#{format}`" }.join(', ')}.")
+    end
+  end
+
+  describe 'gemspec' do
+    let(:gemspec){ Gem::Specification.load('image_size.gemspec') }
+
+    it 'lists all supported formats in description' do
+      expect(gemspec.description).to eq("Measure following file dimensions: #{supported_formats.join(', ')}")
+    end
+  end
+
   Dir['spec/**/*'].each do |path|
     next unless File.file?(path)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,8 +53,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 'Measure following file dimensions: apng, bmp, cur, 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: []
@@ -73,12 +74,15 @@ 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/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_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
@@ -86,8 +90,15 @@ files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/emf/74x77.emf
+- 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
@@ -127,7 +138,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.1.0
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.3.0
   source_code_uri: https://github.com/toy/image_size
 post_install_message:
 rdoc_options: []
@@ -144,12 +155,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.12
 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
@@ -157,8 +169,15 @@ test_files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/emf/74x77.emf
+- 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