image_size 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88e4be6d69bedc0f976c9b73544a20ac08ab66d6b44ce1061d1374f9d2a9dc8
-  data.tar.gz: 5b2986943b8bbeb339d0c31d0a98c5847a1a86141d5e754adaf0bd01e3d8d60f
+  metadata.gz: 2a128281e6674bd684b8485151f3938a5d34d8fdf146e293e908e8cfb5c762d5
+  data.tar.gz: 0615d7750931da9cf45ec6003fd1f20dba7638e393a6d18bbec53901c078e864
 SHA512:
-  metadata.gz: 1b75df7c37cbcca0886eade3e47b082cde0468331c954d0605130cba564bb7718d777628599fea7332e2ae1ef9f15b80ce77072352a109dadbf9749fea049572
-  data.tar.gz: ffc57b47280776fc7be3cb2866699f32f90a2e036b2dca703ac4262aa77750032ffb54700437958ba7b4948c934d5ea6e41f2acad4e7e71ddec84a98f18edabf
+  metadata.gz: d2d3cf28085954077a3016735c15ede7827dd1a72afd0617182d4278f0890f8ef41cbc8e84fe7d2661a270a8ce570b6e3cfeaa148c8be4d141c3a233cb712a59
+  data.tar.gz: a6dd7107a1c344a4963cf527d80e76c08e6b64cf22ae2edb6d2c7dad022f3452505a369fc9a4b4c665136e34ee2379a41b235e5d89881a32721c49ae14c6b6aa

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+    cooldown:
+      default-days: 7

data/.github/workflows/check.yml

@@ -6,10 +6,13 @@ on:
   - cron: 45 4 * * 3
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ruby:
+        - '1.9.3'
+        - '2.0'
+        - '2.1'
         - '2.3'
         - '2.4'
         - '2.5'
@@ -19,31 +22,18 @@ jobs:
         - '3.1'
         - '3.2'
         - '3.3'
-        - jruby-9.3
+        - '3.4'
+        - '4.0'
         - jruby-9.4
+        - jruby-10.1
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
         bundler-cache: true
     - run: bundle exec rspec --format documentation
-  legacy:
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    strategy:
-      matrix:
-        container:
-        - rspec/ci:1.9.3
-        - ruby:2.0
-        - ruby:2.1
-        - ruby:2.2
-      fail-fast: false
-    steps:
-    - uses: actions/checkout@v3
-    - run: bundle install
-    - run: bundle exec rspec --format documentation
   windows:
     runs-on: windows-latest
     strategy:
@@ -55,9 +45,11 @@ jobs:
         - '3.1'
         - '3.2'
         - '3.3'
+        - '3.4'
+        - '4.0'
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - 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@v3
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3'
+        ruby-version: '4'
         bundler-cache: true
     - run: bundle exec rubocop

data/.rubocop.yml

@@ -50,6 +50,9 @@ Style/NumericPredicate:
 Style/SafeNavigation:
   Enabled: false
 
+Style/SignalException:
+  EnforcedStyle: semantic
+
 Style/SlicingWithRange:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -20,9 +20,3 @@ Metrics/CyclomaticComplexity:
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'lib/image_size.rb'

data/CHANGELOG.markdown

@@ -2,11 +2,20 @@
 
 ## unreleased
 
+## v3.5.0 (2026-05-03)
+
+* Add `byte_size` method to expose the size of the image data in bytes [#27](https://github.com/toy/image_size/pull/27) [@dgodd](https://github.com/dgodd)
+* Add minimal validation of `dpi` global configuration [@toy](https://github.com/toy)
+* Make `chunk_size` globally configurable [@toy](https://github.com/toy)
+* Make `max_redirects` globally configurable [@toy](https://github.com/toy)
+* Prevent requesting chunks over http after end of file [#29](https://github.com/toy/image_size/issues/29) [@toy](https://github.com/toy)
+* Add ability to restrict fetched URIs by setting `uri_checker` proc [@toy](https://github.com/toy)
+
 ## 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)
+* 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)

data/README.markdown

@@ -1,5 +1,5 @@
 [![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/actions/workflow/status/toy/image_size/check.yml?logo=github)](https://github.com/toy/image_size/actions/workflows/check.yml)
+[![Check](https://img.shields.io/github/actions/workflow/status/toy/image_size/check.yml?label=check&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
@@ -40,6 +40,7 @@ image_size.size.w       #=> 436
 image_size.size.h       #=> 429
 image_size.media_type   #=> "image/jpeg"
 image_size.media_types  #=> ["image/jpeg"]
+image_size.byte_size    #=> 10938
 ```
 
 Or using `IO` object:
@@ -92,6 +93,20 @@ File.open('spec/images/jpeg/436x429.jpeg', 'rb') do |fh|
 end
 ```
 
+### Configuration
+
+DPI used for converting `svg` and `emf` dimensions can be configured from default 72:
+
+```ruby
+ImageSize.dpi = 150
+```
+
+Chunk size used for reading files, IO and from remote can be configured from default 4096:
+
+```ruby
+ImageSize.chunk_size = 256
+```
+
 ### Experimental: fetch image meta from HTTP server
 
 If server recognises Range header, only needed chunks will be fetched even for TIFF images, otherwise required amount
@@ -140,9 +155,41 @@ puts Benchmark.measure{ p ImageSize.url(url).size }
   0.006247   0.001045   0.007292 (  0.197631)
 ```
 
+#### Configuration
+
+Maximum number of redirects can be configured from default 5:
+
+```ruby
+ImageSize.max_redirects = 10
+```
+
+Or redirects can be disabled:
+
+```ruby
+ImageSize.max_redirects = 0
+```
+
+A url checker can be added to reduce SSRF risk:
+
+```ruby
+ImageSize.uri_checker = lambda do |uri|
+  raise 'host is not allowed' unless uri.host == 'upload.wikipedia.org'
+end
+```
+
+Alternatively `private_address_check` gem can be of help:
+
+```ruby
+require "private_address_check/tcpsocket_ext"
+
+PrivateAddressCheck.only_public_connections do
+  ImageSize.url(url).size
+end
+```
+
 ## Licence
 
 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-2024 Ivan Kuchin https://github.com/toy/image_size
+Further development 2010-2026 Ivan Kuchin https://github.com/toy/image_size

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '3.4.0'
+  s.version     = '3.5.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}"
@@ -16,11 +16,20 @@ Gem::Specification.new do |s|
     'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
     'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
     'source_code_uri'   => "https://github.com/toy/#{s.name}",
-  }
+  } if s.respond_to?(:metadata=)
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = Dir[*%w[
+    .gitignore
+    .rubocop*.yml
+    Gemfile
+    LICENSE.txt
+    GPL
+    *.markdown
+    *.gemspec
+    {.github,lib,spec}/**/{*,.gitattributes}
+  ]].reject(&File.method(:directory?))
+
+  s.test_files = Dir['spec/**/{*,.gitattributes}'].reject(&File.method(:directory?))
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'

data/lib/image_size/chunky_reader.rb

@@ -8,7 +8,7 @@ class ImageSize
 
     # Size of a chunk in which to read
     def chunk_size
-      4096
+      @chunk_size ||= ImageSize.chunk_size
     end
 
     # Including class should define method chunk that accepts the chunk number
@@ -18,7 +18,7 @@ class ImageSize
     # substring, behaves same as str[start, length] except start can't be
     # negative.
     def [](offset, length)
-      raise ArgumentError, "expected offset not to be negative, got #{offset}" if offset < 0
+      fail ArgumentError, "expected offset not to be negative, got #{offset}" if offset < 0
       return if length < 0
 
       first = offset / chunk_size

data/lib/image_size/isobmff.rb

@@ -56,9 +56,9 @@ class ImageSize
         when 1
           size = reader.unpack1(offset + 8, 8, 'Q>')
           relative_data_offset += 8
-          raise FormatError, "Unexpected ISOBMFF xl-box size #{size}" if size < 16
+          fail FormatError, "Unexpected ISOBMFF xl-box size #{size}" if size < 16
         when 2..7
-          raise FormatError, "Reserved ISOBMFF box size #{size}"
+          fail FormatError, "Reserved ISOBMFF box size #{size}"
         end
 
         attributes = {

data/lib/image_size/reader.rb

@@ -30,14 +30,15 @@ class ImageSize
         when input.is_a?(Pathname)
           input.open('rb'){ |f| yield for_io(f) }
         else
-          raise ArgumentError, "expected data as String or an object responding to read and eof?, got #{input.class}"
+          fail ArgumentError, 'expected a String, a Pathname, a StringIO or an object responding to read and eof? ' \
+                              "(IO), got #{input.class}"
         end
       end
 
     private
 
       def for_io(io)
-        if io.respond_to?(:stat) && !io.stat.file?
+        if (io.respond_to?(:stat) && !io.stat.file?) || !io.respond_to?(:seek)
           StreamIOReader.new(io)
         else
           begin
@@ -54,7 +55,7 @@ class ImageSize
       chunk = self[offset, length]
 
       unless chunk && chunk.length == length
-        raise FormatError, "Expected #{length} bytes at offset #{offset}, got #{chunk.inspect}"
+        fail FormatError, "Expected #{length} bytes at offset #{offset}, got #{chunk.inspect}"
       end
 
       chunk

data/lib/image_size/seekable_io_reader.rb

@@ -12,6 +12,10 @@ class ImageSize
       @chunks = {}
     end
 
+    def byte_size
+      @io.size
+    end
+
   private
 
     def chunk(i)

data/lib/image_size/stream_io_reader.rb

@@ -11,6 +11,12 @@ class ImageSize
       @chunks = []
     end
 
+    def byte_size
+      return nil unless @io.respond_to?(:stat) && @io.stat.file?
+
+      @io.stat.size
+    end
+
   private
 
     def chunk(i)

data/lib/image_size/string_reader.rb

@@ -17,5 +17,9 @@ class ImageSize
     def [](offset, length)
       @string[offset, length]
     end
+
+    def byte_size
+      @string.bytesize
+    end
   end
 end

data/lib/image_size/uri_reader.rb

@@ -17,17 +17,24 @@ class ImageSize
     module HTTPChunkyReader # :nodoc:
       include ChunkyReader
 
+      def chunk_start(i)
+        chunk_size * i
+      end
+
       def chunk_range_header(i)
-        { 'Range' => "bytes=#{chunk_size * i}-#{(chunk_size * (i + 1)) - 1}" }
+        { 'Range' => "bytes=#{chunk_start(i)}-#{chunk_start(i + 1) - 1}" }
       end
     end
 
     class BodyReader # :nodoc:
       include ChunkyReader
 
+      attr_reader :byte_size
+
       def initialize(response)
         @body = String.new
         @body_reader = response.to_enum(:read_body)
+        @byte_size = response.content_length
       end
 
       def [](offset, length)
@@ -46,20 +53,32 @@ class ImageSize
     class RangeReader # :nodoc:
       include HTTPChunkyReader
 
-      def initialize(http, request_uri, chunk0)
+      attr_reader :byte_size
+
+      def initialize(http, request_uri, chunk0, byte_size)
         @http = http
         @request_uri = request_uri
         @chunks = { 0 => chunk0 }
+        @byte_size = byte_size
+        @last_chunk = nil
       end
 
       def chunk(i)
+        return if @byte_size && chunk_start(i) >= @byte_size
+        return if @last_chunk && i > @last_chunk
+
         unless @chunks.key?(i)
           response = @http.get(@request_uri, chunk_range_header(i))
           case response
           when Net::HTTPPartialContent
-            @chunks[i] = response.body
+            body = response.body
+            @chunks[i] = body
+            @last_chunk = i if body.length < chunk_size
+          when Net::HTTPRequestedRangeNotSatisfiable
+            @chunks[i] = nil
+            @last_chunk = i if !@last_chunk || @last_chunk > i
           else
-            raise "Unexpected response: #{response}"
+            fail "Unexpected response: #{response}"
           end
         end
 
@@ -70,9 +89,11 @@ class ImageSize
     class << self
       include HTTPChunkyReader
 
-      def open(uri, max_redirects = 5)
+      def open(uri)
         http = nil
-        (max_redirects + 1).times do
+        (ImageSize.max_redirects + 1).times do
+          ImageSize.uri_checker.call(uri)
+
           unless http && http.address == uri.host && http.port == uri.port
             http.finish if http
 
@@ -92,17 +113,19 @@ class ImageSize
           when Net::HTTPRedirection
             uri += response['location']
           when Net::HTTPPartialContent
-            return yield RangeReader.new(http, uri.request_uri, response.body)
+            m = response['content-range'].match(%r{\bbytes\s+\d+-\d+/(\d+)}i) if response['content-range']
+            byte_size = m[1].to_i if m
+            return yield RangeReader.new(http, uri.request_uri, response.body, byte_size)
           when Net::HTTPRequestedRangeNotSatisfiable
             return yield StringReader.new('')
           else
-            raise "Unexpected response: #{response}"
+            fail "Unexpected response: #{response}"
           end
         end
 
-        raise "Too many redirects: #{uri}"
+        fail "Too many redirects: #{uri}"
       ensure
-        http.finish if http.started?
+        http.finish if http && http.started?
       end
     end
   end
@@ -124,4 +147,32 @@ class ImageSize
   def self.url(url)
     new(url.is_a?(URI) ? url : URI(url))
   end
+
+  # Maximum number of redirects
+  def self.max_redirects
+    @max_redirects || 5
+  end
+
+  # Set maximum number of redirects
+  def self.max_redirects=(max_redirects)
+    unless max_redirects.nil? || (max_redirects.is_a?(Integer) && max_redirects >= 0)
+      fail ArgumentError, "max_redirects should be 0, a positive Integer or nil, got #{max_redirects}"
+    end
+
+    @max_redirects = max_redirects
+  end
+
+  # Hook to call before making every request
+  def self.uri_checker
+    @uri_checker || proc{ |_uri| }
+  end
+
+  # Set hook to call before making every request
+  def self.uri_checker=(uri_checker)
+    unless uri_checker.nil? || uri_checker.respond_to?(:call)
+      fail ArgumentError, "uri_checker should respond to call or be nil, got #{uri_checker}"
+    end
+
+    @uri_checker = uri_checker
+  end
 end

data/lib/image_size.rb

@@ -36,14 +36,30 @@ class ImageSize
     new(Pathname.new(path))
   end
 
-  # Used for svg
+  # Used for svg and emf
   def self.dpi
-    @dpi || 72
+    @dpi || 72.0
   end
 
-  # Used for svg
+  # Used for svg and emf
   def self.dpi=(dpi)
-    @dpi = dpi.to_f
+    fail ArgumentError, "dpi should be nil or positive, got #{dpi}" unless dpi.nil? || dpi > 0
+
+    @dpi = dpi ? dpi.to_f : nil
+  end
+
+  # Size of chunk to use by IO and URI readers
+  def self.chunk_size
+    @chunk_size || 4096
+  end
+
+  # Set size of chunk to use by IO and URI readers
+  def self.chunk_size=(chunk_size)
+    unless chunk_size.nil? || (chunk_size.is_a?(Integer) && chunk_size > 0)
+      fail ArgumentError, "chunk_size should be a positive Integer or nil, got #{chunk_size}"
+    end
+
+    @chunk_size = chunk_size
   end
 
   # Given image as any class responding to read and eof? or data as String, finds its format and dimensions
@@ -51,6 +67,7 @@ class ImageSize
     Reader.open(data) do |ir|
       @format = detect_format(ir)
       @width, @height = send("size_of_#{@format}", ir) if @format
+      @byte_size = ir.byte_size
     end
   end
 
@@ -65,6 +82,8 @@ class ImageSize
   attr_reader :height
   alias_method :h, :height
 
+  attr_reader :byte_size
+
   # get image width and height as an array which to_s method returns "#{width}x#{height}"
   def size
     Size.new([width, height]) if format
@@ -72,7 +91,7 @@ class ImageSize
 
   # Media type (formerly known as a MIME type)
   def media_type
-    MEDIA_TYPES.fetch(format, []).first
+    media_types.first
   end
 
   # All media types:
@@ -153,13 +172,13 @@ private
   end
 
   def size_of_mng(ir)
-    raise FormatError, 'MHDR not in place for MNG' unless ir[12, 4] == 'MHDR'
+    fail FormatError, 'MHDR not in place for MNG' unless ir[12, 4] == 'MHDR'
 
     ir.unpack(16, 8, 'NN')
   end
 
   def size_of_png(ir)
-    raise FormatError, 'IHDR not in place for PNG' unless ir[12, 4] == 'IHDR'
+    fail FormatError, 'IHDR not in place for PNG' unless ir[12, 4] == 'IHDR'
 
     ir.unpack(16, 8, 'NN')
   end
@@ -177,7 +196,7 @@ 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' unless ir[offset, 1]
+      fail FormatError, 'EOF in JPEG' unless ir[offset, 1]
 
       code, length = ir.unpack(offset, 4, 'xCn')
       offset += 4
@@ -206,8 +225,7 @@ private
   def size_of_ppm(ir)
     header = ir[0, 1024]
     header.gsub!(/^\#[^\n\r]*/m, '')
-    header =~ /^(P[1-6])\s+?(\d+)\s+?(\d+)/m
-    [$2.to_i, $3.to_i]
+    header.match(/^(?:P[1-6])\s+?(\d+)\s+?(\d+)/m)[1..2].map(&:to_i)
   end
   alias_method :size_of_pbm, :size_of_ppm
   alias_method :size_of_pgm, :size_of_ppm
@@ -223,35 +241,37 @@ private
         chunk = ir[offset, 32]
         case chunk
         when /\AWIDTH (\d+)\n/
-          width = $1.to_i
+          width = Regexp.last_match[1].to_i
         when /\AHEIGHT (\d+)\n/
-          height = $1.to_i
+          height = Regexp.last_match[1].to_i
         when /\AENDHDR\n/
           break
         when /\A(?:DEPTH|MAXVAL) \d+\n/, /\ATUPLTYPE \S+\n/
           # ignore
         else
-          raise FormatError, "Unexpected data in PAM header: #{chunk.inspect}"
+          fail FormatError, "Unexpected data in PAM header: #{chunk.inspect}"
         end
-        offset += $&.length
+        offset += Regexp.last_match[0].length
       end
     end
     [width, height]
   end
 
   def size_of_xbm(ir)
-    ir[0, 1024] =~ /^\#define\s*\S*\s*(\d+)\s*\n\#define\s*\S*\s*(\d+)/mi
-    [$1.to_i, $2.to_i]
+    ir[0, 1024].match(/^\#define\s*\S*\s*(\d+)\s*\n\#define\s*\S*\s*(\d+)/mi)[1..2].map(&:to_i)
   end
 
   def size_of_xpm(ir)
     length = 1024
-    until (data = ir[0, length]) =~ /"\s*(\d+)\s+(\d+)(\s+\d+\s+\d+){1,2}\s*"/m
-      raise FormatError, 'XPM size not found' if data.length != length
+    loop do
+      data = ir[0, length]
+      m = data.match(/"\s*(\d+)\s+(\d+)(?:\s+\d+\s+\d+){1,2}\s*"/m)
+      return m[1..2].map(&:to_i) if m
+
+      fail FormatError, 'XPM size not found' if data.length != length
 
       length += 1024
     end
-    [$1.to_i, $2.to_i]
   end
 
   def size_of_psd(ir)
@@ -271,7 +291,7 @@ private
     width = height = nil
     until width && height
       ifd = ir.fetch(offset, 12)
-      raise FormatError, 'Reached end of directory entries in TIFF' if offset > num_dirent
+      fail FormatError, 'Reached end of directory entries in TIFF' if offset > num_dirent
 
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
@@ -390,11 +410,11 @@ private
     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
+        fail 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
+        fail 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'
@@ -436,4 +456,6 @@ private
   end
   alias_method :size_of_avif, :size_of_heif
   alias_method :size_of_heic, :size_of_heif
+
+  private_constant :SVG_R, :XML_R, :JPEG_CODE_CHECK, :JP2_WALKER, :EMF_UMAX, :EMF_SMAX, :HEIF_WALKER
 end

data/spec/image_size/seekable_io_reader_spec.rb

@@ -6,45 +6,40 @@ require 'image_size/seekable_io_reader'
 
 describe ImageSize::SeekableIOReader do
   context :[] do
-    def ios
-      @ios ||= []
-    end
-
-    def io
-      File.open('GPL', 'rb').tap do |io|
-        ios << io
-      end
-    end
-
-    after do
-      ios.pop.close until ios.empty?
+    def new_io(&block)
+      File.open('GPL', 'rb', &block)
     end
 
     def new_reader
-      ImageSize::SeekableIOReader.new(io)
+      new_io do |io|
+        yield ImageSize::SeekableIOReader.new(io)
+      end
     end
 
-    let(:content){ io.read }
+    let(:content){ new_io(&:read) }
 
     it 'reads as expected when pieces are read consecutively' do
-      reader = new_reader
-      0.step(content.length + 4096, 100) do |offset|
-        expect(reader[offset, 100]).to eq(content[offset, 100])
+      new_reader do |reader|
+        0.step(content.length + 4096, 100) do |offset|
+          expect(reader[offset, 100]).to eq(content[offset, 100])
+        end
       end
     end
 
     it 'reads as expected when pieces are read backwards' do
-      reader = new_reader
-      (content.length + 4096).step(0, -100) do |offset|
-        expect(reader[offset, 100]).to eq(content[offset, 100])
+      new_reader do |reader|
+        (content.length + 4096).step(0, -100) do |offset|
+          expect(reader[offset, 100]).to eq(content[offset, 100])
+        end
       end
     end
 
     it 'reads as expected when pieces are read in random order' do
       100.times do
-        reader = new_reader
-        0.step(content.length + 4096, 100).to_a.shuffle.each do |offset|
-          expect(reader[offset, 100]).to eq(content[offset, 100])
+        new_reader do |reader|
+          0.step(content.length + 4096, 100).to_a.shuffle.each do |offset|
+            expect(reader[offset, 100]).to eq(content[offset, 100])
+          end
         end
       end
     end

data/spec/image_size_spec.rb

@@ -14,6 +14,20 @@ RSpec.configure do |config|
   config.order = :random
 end
 
+class RestrictedIO
+  def initialize(data)
+    @io = StringIO.new(data)
+  end
+
+  def read(length = nil)
+    @io.read(length)
+  end
+
+  def eof?
+    @io.eof?
+  end
+end
+
 describe ImageSize do
   before :all do
     @server = TestServer.new
@@ -67,7 +81,7 @@ describe ImageSize do
           height = match[2].to_i
           format = match[3].to_sym
         end
-        size = format && [width, height]
+        size = [width, height] if format
         media_types = ImageSize::MEDIA_TYPES[format] || []
         media_type = format && media_types.first.to_s
         {
@@ -79,6 +93,7 @@ describe ImageSize do
           size: size,
           media_type: media_type,
           media_types: media_types,
+          byte_size: file_size,
         }
       end
       let(:file_data){ File.binread(path) }
@@ -88,7 +103,7 @@ describe ImageSize do
         max_file_size = 16_384
 
         if file_size > max_file_size
-          raise "reduce resulting gem size, #{path} is too big (#{file_size} > #{max_file_size})"
+          fail "reduce resulting gem size, #{path} is too big (#{file_size} > #{max_file_size})"
         end
       end
 
@@ -119,6 +134,8 @@ describe ImageSize do
       end
 
       context 'given as unseekable IO' do
+        let(:attributes){ super().merge(byte_size: nil) }
+
         it 'gets format and dimensions' do
           IO.popen(%W[cat #{path}].shelljoin, 'rb') do |io|
             image_size = ImageSize.new(io)
@@ -128,6 +145,16 @@ describe ImageSize do
         end
       end
 
+      context 'given an object allowing only read and eof?' do
+        let(:attributes){ super().merge(byte_size: nil) }
+
+        it 'gets format and dimensions' do
+          io = RestrictedIO.new(file_data)
+          image_size = ImageSize.new(io)
+          expect(image_size).to have_attributes(attributes)
+        end
+      end
+
       context 'given as StringIO' do
         it 'gets format and dimensions' do
           io = StringIO.new(file_data)
@@ -167,64 +194,74 @@ describe ImageSize do
       end
 
       context 'fetching from webserver' do
-        let(:file_url){ @server.base_url + path }
+        let(:url){ "#{@server.base_url}#{path}#{query}" }
+
+        before{ ImageSize.chunk_size = 64 }
+        after{ ImageSize.chunk_size = nil }
+
+        subject do
+          retry_on Timeout::Error do
+            ImageSize.url(url)
+          end
+        end
 
         context 'supporting range' do
           context 'without redirects' do
+            let(:query){ '' }
+
             it 'gets format and dimensions' do
-              image_size = retry_on Timeout::Error do
-                ImageSize.url(file_url)
-              end
-              expect(image_size).to have_attributes(attributes)
+              is_expected.to have_attributes(attributes)
             end
           end
 
           context 'with redirects' do
+            let(:query){ '?redirect=5' }
+
             it 'gets format and dimensions' do
-              image_size = retry_on Timeout::Error do
-                ImageSize.url("#{file_url}?redirect=5")
-              end
-              expect(image_size).to have_attributes(attributes)
+              is_expected.to have_attributes(attributes)
             end
           end
 
           context 'with too many redirects' do
+            let(:query){ '?redirect=6' }
+
+            it 'raises error' do
+              expect{ subject }.to raise_error(/Too many redirects/)
+            end
+          end
+
+          context 'with unknown file size' do
+            let(:query){ '?unknown_file_size' }
+            let(:attributes){ super().merge(byte_size: file_size.zero? ? 0 : nil) }
+
             it 'gets format and dimensions' do
-              expect do
-                retry_on Timeout::Error do
-                  ImageSize.url("#{file_url}?redirect=6")
-                end
-              end.to raise_error(/Too many redirects/)
+              is_expected.to have_attributes(attributes)
             end
           end
         end
 
         context 'not supporting range' do
+          let(:query){ '?ignore_range' }
+
           context 'without redirects' do
             it 'gets format and dimensions' do
-              image_size = retry_on Timeout::Error do
-                ImageSize.url("#{file_url}?ignore_range")
-              end
-              expect(image_size).to have_attributes(attributes)
+              is_expected.to have_attributes(attributes)
             end
           end
 
           context 'with redirects' do
+            let(:query){ '?ignore_range&redirect=5' }
+
             it 'gets format and dimensions' do
-              image_size = retry_on Timeout::Error do
-                ImageSize.url("#{file_url}?ignore_range&redirect=5")
-              end
-              expect(image_size).to have_attributes(attributes)
+              is_expected.to have_attributes(attributes)
             end
           end
 
           context 'with too many redirects' do
-            it 'gets format and dimensions' do
-              expect do
-                retry_on Timeout::Error do
-                  ImageSize.url("#{file_url}?ignore_range&redirect=6")
-                end
-              end.to raise_error(/Too many redirects/)
+            let(:query){ '?ignore_range&redirect=6' }
+
+            it 'raises error' do
+              expect{ subject }.to raise_error(/Too many redirects/)
             end
           end
         end
@@ -248,4 +285,164 @@ describe ImageSize do
       end.to raise_error(ImageSize::FormatError)
     end
   end
+
+  describe '.dpi' do
+    subject{ ImageSize.dpi }
+
+    after{ ImageSize.dpi = nil }
+
+    it 'is 72 by default' do
+      is_expected.to eql(72.0)
+    end
+
+    it 'is can be set and get converted to Float' do
+      ImageSize.dpi = 42
+
+      is_expected.to eql(42.0)
+    end
+
+    it 'is can not be set to 0' do
+      expect{ ImageSize.dpi = 0 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(72.0)
+    end
+
+    it 'is can not be set to a negative value' do
+      expect{ ImageSize.dpi = -42 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(72.0)
+    end
+
+    it 'can be reset' do
+      ImageSize.dpi = 42
+      ImageSize.dpi = nil
+
+      is_expected.to eql(72.0)
+    end
+  end
+
+  describe '.chunk_size' do
+    subject{ ImageSize.chunk_size }
+
+    after{ ImageSize.chunk_size = nil }
+
+    it 'is 4096 by default' do
+      is_expected.to eql(4096)
+    end
+
+    it 'is can be set to an Integer' do
+      ImageSize.chunk_size = 256
+
+      is_expected.to eql(256)
+    end
+
+    it 'is can not be set to 0' do
+      expect{ ImageSize.chunk_size = 0 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(4096)
+    end
+
+    it 'is can not be set to a negative value' do
+      expect{ ImageSize.chunk_size = -1 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(4096)
+    end
+
+    it 'is can not be set to a Float' do
+      expect{ ImageSize.chunk_size = 3.5 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(4096)
+    end
+
+    it 'can be reset' do
+      ImageSize.chunk_size = 256
+      ImageSize.chunk_size = nil
+
+      is_expected.to eql(4096)
+    end
+  end
+
+  describe '.max_redirects' do
+    subject{ ImageSize.max_redirects }
+
+    after{ ImageSize.max_redirects = nil }
+
+    it 'is 4096 by default' do
+      is_expected.to eql(5)
+    end
+
+    it 'is can be set to an Integer' do
+      ImageSize.max_redirects = 3
+
+      is_expected.to eql(3)
+    end
+
+    it 'is can be set to 0' do
+      ImageSize.max_redirects = 0
+
+      is_expected.to eql(0)
+    end
+
+    it 'is can not be set to a negative value' do
+      expect{ ImageSize.max_redirects = -1 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(5)
+    end
+
+    it 'is can not be set to a Float' do
+      expect{ ImageSize.max_redirects = 3.5 }.to raise_error(ArgumentError)
+
+      is_expected.to eql(5)
+    end
+
+    it 'can be reset' do
+      ImageSize.max_redirects = 3
+      ImageSize.max_redirects = nil
+
+      is_expected.to eql(5)
+    end
+  end
+
+  describe '.uri_checker' do
+    before{ ImageSize.chunk_size = 64 }
+    after do
+      ImageSize.chunk_size = nil
+      ImageSize.uri_checker = nil
+    end
+
+    it 'can be reset to the default checker' do
+      ImageSize.uri_checker = proc{ |uri| fail 'forbidden' if uri.port == @server.base_url.port }
+      ImageSize.uri_checker = nil
+
+      expect do
+        retry_on Timeout::Error do
+          ImageSize.url("#{@server.base_url}spec/images/empty")
+        end
+      end.not_to raise_error
+    end
+
+    it 'requires an object responding to call' do
+      expect{ ImageSize.uri_checker = Object.new }.to raise_error(ArgumentError)
+    end
+
+    it 'is checked before initial request' do
+      ImageSize.uri_checker = proc{ |uri| fail 'forbidden' if uri.port == @server.base_url.port }
+
+      expect do
+        retry_on Timeout::Error do
+          ImageSize.url("#{@server.base_url}spec/images/empty")
+        end
+      end.to raise_error('forbidden')
+    end
+
+    it 'is checked before redirect request' do
+      ImageSize.uri_checker = proc{ |uri| fail 'forbidden' if uri.port == @server.second_url.port }
+
+      expect do
+        retry_on Timeout::Error do
+          ImageSize.url("#{@server.base_url}spec/images/empty?redirect=1")
+        end
+      end.to raise_error('forbidden')
+    end
+  end
 end

data/spec/images/svg/768b.430x430.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="430" height="430">
+  <g font-family="'Arial Black'" text-anchor="middle">
+    <text x="266.322" y="79.322" fill="#0057b7" stroke-width=".817" font-size="108.96" transform="scale(.80705 1.2391)">RUSSIAN</text>
+    <text x="276.58" y="163.322" fill="#0057b7" stroke-width=".794" font-size="105.9" transform="scale(.78387 1.2757)">WARSHIP</text>
+    <text x="268.809" y="252.317" fill="gold" stroke-width=".803" font-size="107.02" transform="scale(.79274 1.2615)">GO FUCK</text>
+    <text x="303.286" y="306.546" fill="gold" stroke-width=".725" font-size="96.629" transform="scale(.71575 1.3971)">YOURSELF!</text>
+  </g>
+</svg><!-- today is day 1529 of full-scale russian invasion of Ukraine -->
+
+
+<!-- pad to 768 bytes -->

data/spec/test_server.rb

@@ -4,15 +4,37 @@ require 'webrick'
 require 'stringio'
 
 class TestServer
-  attr_reader :base_url
+  class FileHandler < WEBrick::HTTPServlet::FileHandler
+    def service(req, res)
+      super
+    rescue WEBrick::HTTPStatus::PartialContent
+      if req.query['unknown_file_size']
+        m = %r{\Abytes (\d+)-(\d+)/\d+\z}.match(res['content-range'])
+        raise "Unexpected content-range: #{res['content-range']}" unless m
+
+        res['content-range'] = "bytes #{m[1]}-#{m[2]}/*"
+
+        # need to manually get the chunk, as webrick internally relies on content-range header with total size
+        if res.body.is_a?(IO)
+          offset = m[1].to_i
+          size = m[2].to_i - offset + 1
+
+          res.body.seek(offset, IO::SEEK_SET)
+          res.body = res.body.read(size)
+        end
+      end
+
+      raise
+    end
+  end
+
+  attr_reader :base_url, :second_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|
         redirect = req.query['redirect'].to_i
         if redirect > 0
@@ -30,7 +52,11 @@ class TestServer
       end,
     }
 
+    server_options[:Logger] = WEBrick::Log.new(StringIO.new) unless ENV['CI']
+
     @server = WEBrick::HTTPServer.new(server_options)
+    @server.mount('/', FileHandler, '.')
+
     @server.listen(host, 0) # listen on second port
 
     @base_url = URI("http://#{host}:#{@server.listeners[0].addr[1]}/")

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Keisuke Minami
 - Ivan Kuchin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,11 +55,11 @@ dependencies:
 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: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/check.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
@@ -120,6 +119,7 @@ files:
 - spec/images/pnm/ascii.22x25.ppm
 - spec/images/psd/16x20.psd
 - spec/images/svg/72x100.svg
+- spec/images/svg/768b.430x430.svg
 - spec/images/svg/crlf.72x100.svg
 - spec/images/svg/long.72x100.svg
 - spec/images/svg/long.crlf.72x100.svg
@@ -140,9 +140,8 @@ 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.4.0
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.5.0
   source_code_uri: https://github.com/toy/image_size
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Measure image size/dimensions using pure Ruby
 test_files:
@@ -199,6 +197,7 @@ test_files:
 - spec/images/pnm/ascii.22x25.ppm
 - spec/images/psd/16x20.psd
 - spec/images/svg/72x100.svg
+- spec/images/svg/768b.430x430.svg
 - spec/images/svg/crlf.72x100.svg
 - spec/images/svg/long.72x100.svg
 - spec/images/svg/long.crlf.72x100.svg