image_size 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44be96b790fd826a8e6471928ce381cda6a0269bb9a24d7111142b54ff1556bb
-  data.tar.gz: 494d270c18e0e9583ce226e53a478bf5829ce3823cc212c392dc933445962a89
+  metadata.gz: 9caeef6f83a5e285b9925268a389b46b2d15b6def554e0480c3b4105868022e8
+  data.tar.gz: b1933e6c5d7fdc6686d8fe15082a64d39b76433aa659fc203c6d09c0ed937b86
 SHA512:
-  metadata.gz: e33c991f5c78de857a38591d62b6b71f9c95693b0222bdfa7141b94a0359cf76f3e94e3cdf1c424e2935a8f1f397072473c00ac53d0656aeece5ff5e077466dc
-  data.tar.gz: aec5519f54c0dafcc0ae424703567276161ca1c5f53306134c3c3995642a67533d7196b1671e1c74158ffed604a90d2ef61f3e7f5d175246b935954b697afe5d
+  metadata.gz: be6a77d33b518ca07842b3b1d4bc8793949b0fb09ede5bc46c6753f7bd51255ee078f34714c851010b0b43df9ce32e2d52a236f990155ad5dd056fd5cc297214
+  data.tar.gz: d63e52caaa020d1b26e573a06d74b309f154542a82f7539fcb5c44d8ea7df7d44b5fbb54e51b502fe05e8e42e4191c8b0e8281f3d169a01717355016fa1fd9e5

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## 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)
+
 ## v3.0.0 (2021-10-17)
 
 * Read only required chunks of data for files and seekable IOs [@toy](https://github.com/toy)

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '3.0.0'
+  s.version     = '3.0.1'
   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}"

data/lib/image_size/seekable_io_reader.rb

@@ -18,7 +18,8 @@ class ImageSize
       unless @chunks.key?(i)
         @io.seek((chunk_size * i) - @pos, IO::SEEK_CUR)
         data = @io.read(chunk_size)
-        @pos += data.length
+        @pos = chunk_size * i
+        @pos += data.length if data
         @chunks[i] = data
       end
 

data/spec/image_size/seekable_io_reader_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rspec'
+
+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?
+    end
+
+    def new_reader
+      ImageSize::SeekableIOReader.new(io)
+    end
+
+    let(:content){ 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])
+      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])
+      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])
+        end
+      end
+    end
+  end
+end

data/spec/image_size_spec.rb

@@ -19,7 +19,7 @@ describe ImageSize do
       :DocumentRoot => '.',
     })
     @server_thread = Thread.new{ @server.start }
-    @server_base_url = URI("http://localhost:#{@server.config[:Port]}/")
+    @server_base_url = URI("http://127.0.0.1:#{@server.config[:Port]}/")
   end
 
   after :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -78,6 +78,7 @@ files:
 - lib/image_size/string_reader.rb
 - lib/image_size/uri_reader.rb
 - spec/image_size/chunky_reader_spec.rb
+- spec/image_size/seekable_io_reader_spec.rb
 - spec/image_size_spec.rb
 - spec/images/.gitattributes
 - spec/images/bmp/v2.42x50.bmp
@@ -123,7 +124,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.0
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.0.1
   source_code_uri: https://github.com/toy/image_size
 post_install_message:
 rdoc_options: []
@@ -146,6 +147,7 @@ specification_version: 4
 summary: Measure image size using pure Ruby
 test_files:
 - spec/image_size/chunky_reader_spec.rb
+- spec/image_size/seekable_io_reader_spec.rb
 - spec/image_size_spec.rb
 - spec/images/.gitattributes
 - spec/images/bmp/v2.42x50.bmp