image_size 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9caeef6f83a5e285b9925268a389b46b2d15b6def554e0480c3b4105868022e8
-  data.tar.gz: b1933e6c5d7fdc6686d8fe15082a64d39b76433aa659fc203c6d09c0ed937b86
+  metadata.gz: 2e594fe6ec7b9018dd68867a5feaf557c6c22e7ed667876089fcbe35d6f3104c
+  data.tar.gz: a221e99d54a933452712df549e2b8b05ceb85c407b27f482042d35c97dbb95c8
 SHA512:
-  metadata.gz: be6a77d33b518ca07842b3b1d4bc8793949b0fb09ede5bc46c6753f7bd51255ee078f34714c851010b0b43df9ce32e2d52a236f990155ad5dd056fd5cc297214
-  data.tar.gz: d63e52caaa020d1b26e573a06d74b309f154542a82f7539fcb5c44d8ea7df7d44b5fbb54e51b502fe05e8e42e4191c8b0e8281f3d169a01717355016fa1fd9e5
+  metadata.gz: dbc4b3ec562040c3316edfc7412110eec1eef87028100f156e155a65bb38bccba7199b1094daa5ddc62317229a0fbe7241af0ba2089adf6ee03ab7eb4d85c634
+  data.tar.gz: db58b0bee4cf294cf44ac5b4afe01c8cd0420b0155e220e378755081ca1a655adb1ac30695966f150b094c648befbd8fb96f31d9a835afbefe1bffbc7ce717b4

data/.github/workflows/check.yml

@@ -19,8 +19,10 @@ jobs:
         - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
         - jruby-9.1
         - jruby-9.2
+        - jruby-9.3
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -50,6 +52,7 @@ jobs:
         - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -58,12 +61,3 @@ jobs:
         ruby-version: "${{ matrix.ruby }}"
         bundler-cache: true
     - run: bundle exec rspec --format documentation
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
-        bundler-cache: true
-    - run: bundle exec rubocop

data/.github/workflows/rubocop.yml

@@ -0,0 +1,16 @@
+name: rubocop
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 3
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -53,6 +53,9 @@ Style/EmptyCaseCondition:
 Style/Encoding:
   Enabled: false
 
+Style/FileRead:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: true
 
@@ -77,6 +80,9 @@ Style/ParallelAssignment:
 Style/SafeNavigation:
   Enabled: false
 
+Style/SlicingWithRange:
+  Enabled: false
+
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 

data/.rubocop_todo.yml

@@ -9,17 +9,17 @@
 # Offense count: 8
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 43
+  Enabled: false
 
 # Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 21
+  Enabled: false
 
 # Offense count: 2
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 21
+  Enabled: false
 
 # Offense count: 8
 # Cop supports --auto-correct.

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v3.0.2 (2022-05-19)
+
+* Fix handling empty files [#20](https://github.com/toy/image_size/issues/20) [@toy](https://github.com/toy)
+
 ## v3.0.1 (2021-10-21)
 
 * Fix reading file chunks starting after EOF and reading chunks non-consecutively [toy/image_optim_rails#12](https://github.com/toy/image_optim_rails/issues/12) [@toy](https://github.com/toy)

data/README.markdown

@@ -17,7 +17,7 @@ gem install image_size
 Add to your `Gemfile`:
 
 ```ruby
-gem 'image_size', '~> 2.0'
+gem 'image_size', '~> 3.0'
 ```
 
 ## Usage
@@ -94,4 +94,4 @@ end
 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-2021 Ivan Kuchin https://github.com/toy/image_size
+Further development 2010-2022 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.0.1'
+  s.version     = '3.0.2'
   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.homepage    = "https://github.com/toy/#{s.name}"
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.4'
-    s.add_development_dependency 'rubocop', '~> 1.0'
+  if RUBY_VERSION >= '2.5'
+    s.add_development_dependency 'rubocop', '~> 1.22'
     s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/lib/image_size/uri_reader.rb

@@ -34,6 +34,8 @@ class ImageSize
         @body = response.body
       when Net::HTTPPartialContent
         @chunks = { 0 => response.body }
+      when Net::HTTPRequestedRangeNotSatisfiable
+        @body = ''
       else
         raise "Unexpected response: #{response}"
       end

data/lib/image_size.rb

@@ -76,6 +76,7 @@ private
   def detect_format(ir)
     head = ir[0, 1024]
     case
+    when head.nil? || head.empty?                                 then nil
     when head[0, 6] =~ /GIF8[79]a/                                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

data/spec/image_size_spec.rb

@@ -27,11 +27,8 @@ describe ImageSize do
     @server_thread.join
   end
 
-  max_filesize = 16_384
-
-  (Dir['spec/images/*/*.*'] + [__FILE__[%r{spec/.+?\z}]]).each do |path|
-    filesize = File.size(path)
-    warn "#{path} is too big #{filesize} (max #{max_filesize})" if filesize > max_filesize
+  Dir['spec/**/*'].each do |path|
+    next unless File.file?(path)
 
     describe "for #{path}" do
       let(:name){ File.basename(path) }
@@ -49,6 +46,15 @@ describe ImageSize do
         }
       end
       let(:file_data){ File.open(path, 'rb', &:read) }
+      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})"
+        end
+      end
 
       context 'given as data' do
         it 'gets format and dimensions' do
@@ -65,7 +71,11 @@ describe ImageSize do
             image_size = ImageSize.new(io)
             expect(image_size).to have_attributes(attributes)
             expect(io).not_to be_closed
-            expect(io.pos).to_not be_zero
+            if file_size.zero?
+              expect(io.pos).to be_zero
+            else
+              expect(io.pos).to_not be_zero
+            end
             io.rewind
             expect(io.read).to eq(file_data)
           end
@@ -102,7 +112,11 @@ describe ImageSize do
             image_size = ImageSize.new(io)
             expect(image_size).to have_attributes(attributes)
             expect(io).not_to be_closed
-            expect(io.pos).to_not be_zero
+            if file_size.zero?
+              expect(io.pos).to be_zero
+            else
+              expect(io.pos).to_not be_zero
+            end
             io.rewind
             expect(io.read).to eq(file_data)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -85,6 +86,7 @@ files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/empty
 - spec/images/gif/668x481.gif
 - spec/images/ico/32x256.ico
 - spec/images/jp2/163x402.jp2
@@ -124,7 +126,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.0.1
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.0.2
   source_code_uri: https://github.com/toy/image_size
 post_install_message:
 rdoc_options: []
@@ -141,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Measure image size using pure Ruby
@@ -154,6 +156,7 @@ test_files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/empty
 - spec/images/gif/668x481.gif
 - spec/images/ico/32x256.ico
 - spec/images/jp2/163x402.jp2