fastimage 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0337307f5e98ae916e46768e148812f0f6dbb93a1c67d193ca981540779336
-  data.tar.gz: 8600c44df8eed5762ec526709d46e32841a099c0c453e7c255c2a87611dcb822
+  metadata.gz: e4eedb99b6314f24fb47381046bf63595b90b8eb8045a6b9b238a92acebc00ba
+  data.tar.gz: 10db6080223fb596a5fcfc904563a5f25b8209af1c4166260831e7aef9d7613e
 SHA512:
-  metadata.gz: 57b4e77535ee1022ec9b1d3209536729dd5e980c2799fc6987d3c91731f5dd4dce3d93ef29f97c8762b6021b12795554efbc3ca1db7a49713aa119bdb5df5088
-  data.tar.gz: 83741942ce879586ae813fda60da760bee079ff1000dbbf7ee118b2513d579ae4cff8acf98de0bafe5313d429352053380e8d0293a101b0a3b1a799ce457f5a1
+  metadata.gz: eae9ad37f27b853c2927183802b015ca6a066e413a112d80bb119603944d07d9fba5aac36712bc12c12acb327e3031a6b8c6875120e6f8de501e0526d4e2be14
+  data.tar.gz: 2b8e2add3af30fe7e856b84e18ba6f9425fb939e5e789f1601fb360abb91ee5197b15adaa6cff79a2bdb89ea7a9d95306ebc0513c4882cd0a30b7ab3261173d2

data/README.md

@@ -96,38 +96,78 @@ http://sdsykes.github.io/fastimage/rdoc/FastImage.html
 
 ## Maintainer
 
-FastImage is maintained by Stephen Sykes (`sdsykes). Support this project by using [LibPixel](https://libpixel.com) cloud based image resizing and processing service.
+FastImage is maintained by Stephen Sykes (sdsykes). SamSaffron also helps out from time to time (thanks!).
 
 ## Benchmark
 
-It's way faster than conventional methods (for example the image_size gem) for most types of file when fetching over the wire.
+It's way faster than conventional methods for most types of file when fetching over the wire. Compared here by using OpenURI which will fetch the whole file.
 
 ```ruby
-irb> uri = "http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg"
-irb> puts Benchmark.measure {open(uri, 'rb') {|fh| p ImageSize.new(fh).size}}
+require 'benchmark'
+require 'fastimage'
+require 'open-uri'
+
+uri = "http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg"
+puts Benchmark.measure {URI.open(uri, 'rb') {|fh| p FastImage.size(fh)}}
 [9545, 6623]
-  0.680000   0.250000   0.930000 (  7.571887)
+  0.059088   0.067694   0.126782 (  0.808131)
 
-irb> puts Benchmark.measure {p FastImage.size(uri)}
+puts Benchmark.measure {p FastImage.size(uri)}
 [9545, 6623]
-  0.010000   0.000000   0.010000 (  0.090640)
+  0.006198   0.001563   0.007761 (  0.162021)
 ```
 
-The file is fetched in about 7.5 seconds in this test (the number in brackets is the total time taken), but as FastImage doesn't need to fetch the whole thing, it completes in less than 0.1s.
+The file is fetched in about 0.8 seconds in this test (the number in brackets is the total time taken), but as FastImage doesn't need to fetch the whole thing, it completes in 0.16s.
+
+You'll see similar excellent results for the other file types.
+
+```ruby
+require 'benchmark'
+require 'fastimage'
+require 'open-uri'
+
+uri = "https://upload.wikimedia.org/wikipedia/commons/a/a9/Augustine_Herrman_1670_Map_Virginia_Maryland.tiff"
+puts Benchmark.measure {URI.open(uri, 'rb') {|fh| p FastImage.size(fh)}}
+[12805, 10204]
+  1.332587   2.049915   3.382502 ( 19.925270)
 
-You'll see similar excellent results for the other file types, except for TIFF. Unfortunately TIFFs tend to have their
-metadata towards the end of the file, so it makes little difference to do a minimal fetch. The result shown below is
-mostly dependent on the exact internet conditions during the test, and little to do with the library used.
+puts Benchmark.measure {p FastImage.size(uri)}
+[12805, 10204]
+  0.004593   0.000924   0.005517 (  0.100592)
+```
+
+Some tiff files however do not have their metadata near the start of the file.
 
 ```ruby
-irb> uri = "http://upload.wikimedia.org/wikipedia/commons/1/11/Shinbutsureijoushuincho.tiff"
-irb> puts Benchmark.measure {open(uri, 'rb') {|fh| p ImageSize.new(fh).size}}
-[1120, 1559]
-  1.080000   0.370000   1.450000 ( 13.766962)
-
-irb> puts Benchmark.measure {p FastImage.size(uri)}
-[1120, 1559]
-  3.490000   3.810000   7.300000 ( 11.754315)
+require 'benchmark'
+require 'fastimage'
+require 'open-uri'
+
+uri = "https://upload.wikimedia.org/wikipedia/commons/1/14/Center-Filled_LIMA.tif"
+puts Benchmark.measure {URI.open(uri, 'rb') {|fh| p FastImage.size(fh)}}
+[22841, 19404]
+  0.350304   0.321104   0.671408 (  3.053605)
+
+puts Benchmark.measure {p FastImage.size(uri)}
+[22841, 19404]
+  0.163443   0.214301   0.377744 (  2.880414)
+```
+
+Note that if you want a really fast result for this file type, [image_size](https://github.com/toy/image_size?tab=readme-ov-file#experimental-fetch-image-meta-from-http-server) might be useful as it has an optimisation for this (fetching only the needed data range).
+
+```ruby
+require 'benchmark'
+require 'image_size/uri'
+require 'fastimage'
+
+uri = "https://upload.wikimedia.org/wikipedia/commons/1/14/Center-Filled_LIMA.tif"
+puts Benchmark.measure {p ImageSize.url(uri).size }
+[22841, 19404]
+  0.008983   0.001311   0.010294 (  0.128986)
+
+puts Benchmark.measure {p FastImage.size(uri)}
+[22841, 19404]
+  0.163443   0.214301   0.377744 (  2.880414)
 ```
 
 ## Tests

data/lib/fastimage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class FastImage
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/lib/fastimage.rb

@@ -321,6 +321,7 @@ class FastImage
         res.read_body do |str|
           Fiber.yield str
         end
+        nil
       end
 
       case res['content-encoding']
@@ -335,6 +336,7 @@ class FastImage
           while data = gzip.readline
             Fiber.yield data
           end
+          nil
         end
       end
 
@@ -388,12 +390,14 @@ class FastImage
           Fiber.yield str
           offset += LocalFileChunkSize
         end
+        nil
       end
     else
       read_fiber = Fiber.new do
         while str = readable.read(LocalFileChunkSize)
           Fiber.yield str
         end
+        nil
       end
     end
 
@@ -471,6 +475,9 @@ class FastImage
     include StreamUtil
     attr_reader :pos
 
+    # read_fiber should return nil if it no longer has anything to return when resumed
+    # so the result of the whole Fiber block should be set to be nil in case yield is no
+    # longer called
     def initialize(read_fiber)
       @read_fiber = read_fiber
       @pos = 0
@@ -484,7 +491,6 @@ class FastImage
         unused_str = @str[@strpos..-1]
 
         new_string = @read_fiber.resume
-        new_string = @read_fiber.resume if new_string.is_a? Net::ReadAdapter
         raise CannotParseImage if !new_string
         # we are dealing with bytes here, so force the encoding
         new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
@@ -573,7 +579,7 @@ class FastImage
       # the file, and is within the first 1000 chars.
       begin
         :svg if (1..100).detect {|n| @stream.peek(10 * n).include?("<svg")}
-      rescue FiberError
+      rescue FiberError, CannotParseImage
         nil
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb-fi
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: FastImage - Image info fast