image_size 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0b43a481f6a18e76f7cf8325240014d2a1e07a52cfb462be37444e020ff036
-  data.tar.gz: 21edad5bbdd1a4e4b60953ee2769bd0648e8deb389f220f0dbd120f6a9dee09d
+  metadata.gz: d88e4be6d69bedc0f976c9b73544a20ac08ab66d6b44ce1061d1374f9d2a9dc8
+  data.tar.gz: 5b2986943b8bbeb339d0c31d0a98c5847a1a86141d5e754adaf0bd01e3d8d60f
 SHA512:
-  metadata.gz: 78e9a671390fc80747273ccd6555e2faa915c4186261f473e86aa274f3e93e75c5e26f4674f3fea307d8a94ca21e352dfeb44a2046f20fb453d7e394f56c13b5
-  data.tar.gz: 3dd7259403bb9aebc0d75834330f8db1b21d68bc619ec9204475e46e4c46b818ce28af2712d57a0c7ef3d7bb1a5922f3d91ba3a6b6779c7421e2fd2d9eaf4182
+  metadata.gz: 1b75df7c37cbcca0886eade3e47b082cde0468331c954d0605130cba564bb7718d777628599fea7332e2ae1ef9f15b80ce77072352a109dadbf9749fea049572
+  data.tar.gz: ffc57b47280776fc7be3cb2866699f32f90a2e036b2dca703ac4262aa77750032ffb54700437958ba7b4948c934d5ea6e41f2acad4e7e71ddec84a98f18edabf

data/.github/workflows/check.yml

@@ -18,6 +18,7 @@ jobs:
         - '3.0'
         - '3.1'
         - '3.2'
+        - '3.3'
         - jruby-9.3
         - jruby-9.4
       fail-fast: false
@@ -34,7 +35,6 @@ jobs:
     strategy:
       matrix:
         container:
-        - rspec/ci:1.8.7
         - rspec/ci:1.9.3
         - ruby:2.0
         - ruby:2.1
@@ -54,8 +54,8 @@ jobs:
         - '3.0'
         - '3.1'
         - '3.2'
+        - '3.3'
       fail-fast: false
-    continue-on-error: ${{ matrix.ruby == '3.2' }}
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

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,13 @@
 
 ## 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)

data/README.markdown

@@ -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-2023 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.3.0'
+  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/isobmff.rb

@@ -62,11 +62,11 @@ class ImageSize
         end
 
         attributes = {
-          :type => type,
-          :offset => offset,
-          :size => size,
-          :relative_data_offset => relative_data_offset,
-          :index => index,
+          type: type,
+          offset: offset,
+          size: size,
+          relative_data_offset: relative_data_offset,
+          index: index,
         }
 
         if @full.include?(type)

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

@@ -3,6 +3,7 @@
 
 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'
@@ -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
@@ -139,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
@@ -167,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
@@ -239,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
@@ -270,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
@@ -339,8 +345,8 @@ private
   end
 
   JP2_WALKER = ImageSize::ISOBMFF.new(
-    :recurse => %w[jp2h],
-    :last => %w[jp2h]
+    recurse: %w[jp2h],
+    last: %w[jp2h]
   )
   def size_of_jp2(ir)
     JP2_WALKER.recurse(ir) do |box|
@@ -370,9 +376,9 @@ private
   end
 
   HEIF_WALKER = ImageSize::ISOBMFF.new(
-    :recurse => %w[meta iprp ipco],
-    :full => %w[meta hdlr pitm ipma ispe],
-    :last => %w[meta]
+    recurse: %w[meta iprp ipco],
+    full: %w[meta hdlr pitm ipma ispe],
+    last: %w[meta]
   )
   def size_of_heif(ir)
     pitm = nil

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

@@ -53,8 +53,8 @@ describe ImageSize::ISOBMFF do
 
       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)
+          having_attributes(type: 'abcd', data_offset: 8, data_size: 42),
+          having_attributes(type: 'efgh', data_offset: 58, data_size: 10)
         )
       end
     end
@@ -74,14 +74,14 @@ describe ImageSize::ISOBMFF do
     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)) }
+      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))
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 8, data_size: 42))
       end
     end
 
@@ -100,7 +100,7 @@ describe ImageSize::ISOBMFF 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))
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 8, data_size: nil))
       end
     end
 
@@ -116,7 +116,7 @@ describe ImageSize::ISOBMFF 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))
+        is_expected.to yield_successive_args(having_attributes(type: 'test', data_offset: 16, data_size: 0))
       end
     end
 
@@ -124,12 +124,12 @@ describe ImageSize::ISOBMFF 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))
+        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(:options){ { full: %w[test] } }
 
       let(:data) do
         boxes.build do
@@ -141,18 +141,18 @@ describe ImageSize::ISOBMFF do
       it do
         is_expected.to yield_successive_args(
           having_attributes(
-            :type => 'test',
-            :data_offset => 12,
-            :data_size => 38,
-            :version => 0x61,
-            :flags => 0x626364
+            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(:options){ { full: %w[test] } }
 
       let(:data) do
         boxes.build do
@@ -164,11 +164,11 @@ describe ImageSize::ISOBMFF do
       it do
         is_expected.to yield_successive_args(
           having_attributes(
-            :type => 'test',
-            :data_offset => 20,
-            :data_size => 38,
-            :version => 0x61,
-            :flags => 0x626364
+            type: 'test',
+            data_offset: 20,
+            data_size: 38,
+            version: 0x61,
+            flags: 0x626364
           )
         )
       end
@@ -206,8 +206,8 @@ describe ImageSize::ISOBMFF do
 
         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)
+            having_attributes(type: 'fooo', data_offset: 16, data_size: 0),
+            having_attributes(type: 'barr', data_offset: 24, data_size: 0)
           )
         end
       end
@@ -230,7 +230,7 @@ describe ImageSize::ISOBMFF do
         let(:length){ 8 }
 
         it do
-          is_expected.to yield_successive_args(having_attributes(:type => 'fooo', :data_offset => 16, :data_size => 0))
+          is_expected.to yield_successive_args(having_attributes(type: 'fooo', data_offset: 16, data_size: 0))
         end
       end
     end
@@ -256,24 +256,24 @@ describe ImageSize::ISOBMFF do
     end
 
     context 'when configured to recures all' do
-      let(:options){ { :recurse => %w[fooA barA barB bazA] } }
+      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: '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: '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: '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: '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: '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: '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 have_attributes(type: 'bazB', data_offset: 60, data_size: 2)
 
         expect{ enum.next }.to raise_exception(StopIteration)
       end
@@ -284,18 +284,18 @@ describe ImageSize::ISOBMFF do
     end
 
     context 'when configured to recurse part' do
-      let(:options){ { :recurse => %w[barA] } }
+      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: '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: '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: '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 have_attributes(type: 'bazA', data_offset: 52, data_size: 10)
 
         expect{ enum.next }.to raise_exception(StopIteration)
       end
@@ -311,11 +311,11 @@ describe ImageSize::ISOBMFF do
       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: '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: '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 have_attributes(type: 'bazA', data_offset: 52, data_size: 10)
 
         expect{ enum.next }.to raise_exception(StopIteration)
       end
@@ -326,20 +326,20 @@ describe ImageSize::ISOBMFF do
     end
 
     context 'when configured to stop' do
-      let(:options){ { :recurse => %w[fooA barA barB bazA], :last => %w[barA] } }
+      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: '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: '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: '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: '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: 'barC', data_offset: 42, data_size: 2)
 
         expect{ enum.next }.to raise_exception(StopIteration)
       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.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,10 +76,12 @@ files:
 - 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
@@ -138,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.3.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: []
@@ -148,14 +150,14 @@ 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.4.12
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Measure image size/dimensions using pure Ruby