image_size 3.3.0 → 3.5.0

data/spec/image_size_spec.rb

@@ -10,6 +10,24 @@ require 'shellwords'
 
 require 'test_server'
 
+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
@@ -19,6 +37,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,26 +76,34 @@ 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
-        size = format && [width, height]
+        if (match = /(\d+)x(\d+)\.([^.]+)$/.match(name))
+          width = match[1].to_i
+          height = match[2].to_i
+          format = match[3].to_sym
+        end
+        size = [width, height] if format
+        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,
+          byte_size: file_size,
         }
       end
-      let(:file_data){ File.open(path, 'rb', &:read) }
+      let(:file_data){ File.binread(path) }
       let(:file_size){ file_data.length }
 
       before 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
 
@@ -95,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)
@@ -104,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)
@@ -143,52 +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 = ImageSize.url(file_url)
-              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 = ImageSize.url("#{file_url}?redirect=5")
-              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
-                ImageSize.url("#{file_url}?redirect=6")
-              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 = ImageSize.url("#{file_url}?ignore_range")
-              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 = ImageSize.url("#{file_url}?ignore_range&redirect=5")
-              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
-                ImageSize.url("#{file_url}?ignore_range&redirect=6")
-              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
@@ -203,8 +276,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
@@ -212,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

@@ -1,18 +1,41 @@
 # frozen_string_literal: true
 
 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|
+      AccessLog: [],
+      BindAddress: host,
+      Port: 0, # get the next available port
+      RequestCallback: proc do |req, res|
         redirect = req.query['redirect'].to_i
         if redirect > 0
           res.set_redirect(
@@ -29,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.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Keisuke Minami
 - Ivan Kuchin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 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"
@@ -76,10 +75,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
@@ -118,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
@@ -138,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.3.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
@@ -148,15 +149,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
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Measure image size/dimensions using pure Ruby
 test_files:
@@ -197,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