exifr 1.3.10 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fa3270a4d14398a02e6bd725753980ae12b74c2f0a6e3c160b840c59c7febf
-  data.tar.gz: ec8ed547c94ad6dd83c0a07bb78530408d48637b18edfeb68dcb157a55c5c618
+  metadata.gz: 2799bf290120d558fe48495596a987705abb4bc394622e459d597a746c5b57d6
+  data.tar.gz: e84597a7f20fa3f45219372403851390679841a27f90e50b57bf4d0aba88d1be
 SHA512:
-  metadata.gz: 3d10126d25f29634c46c8b5dce11ebd9dbc373c02fc892a74cdb8cbf6aa3cef8086e2a6be2eaac2a65bc83fa64a6f517617e22dc47bc4ea56db631b678a3ee3a
-  data.tar.gz: b98ee638dc85ab51c1f86d5b9c34c417047a79d2abb920ee8a13e7decfaf8b66fb484d7d804461de276a3f87fd40f5e30c1a420e3b25e46db51e801f77acc9c3
+  metadata.gz: c6eef386c693e4ba34e715dbc8c1334a48dbc2d454abeda218beed9cf4184a868089576e5253f3f592a3c0ab4efc9e0315da908332bfb962b070f0519ea549db
+  data.tar.gz: 421ecfff8bffbb3300b48ab7e0c670f3980ce7d39c33c079d7b53096ae7527d6ee47edaf151396979f96c78bb7fd841c31227ab66ceea9dc0590fd90f8b76c14

data/lib/exifr/jpeg.rb

@@ -29,11 +29,11 @@ module EXIFR
     attr_reader :app1s
 
     # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
-    def initialize(file)
+    def initialize(file, load_thumbnails: true)
       if file.kind_of? String
-        File.open(file, 'rb') { |io| examine(io) }
+        File.open(file, 'rb') { |io| examine(io, load_thumbnails: load_thumbnails) }
       else
-        examine(file.dup)
+        examine(file.dup, load_thumbnails: load_thumbnails)
       end
     end
 
@@ -95,7 +95,7 @@ module EXIFR
       end
     end
 
-    def examine(io)
+    def examine(io, load_thumbnails: true)
       io = Reader.new(io)
 
       unless io.getbyte == 0xFF && io.getbyte == 0xD8 # SOI
@@ -121,7 +121,7 @@ module EXIFR
 
       if app1 = @app1s.find { |d| d[0..5] == "Exif\0\0" }
         @exif_data = app1[6..-1]
-        @exif = TIFF.new(StringIO.new(@exif_data))
+        @exif = TIFF.new(StringIO.new(@exif_data), load_thumbnails: load_thumbnails)
       end
     end
   end

data/lib/exifr/tiff.rb

@@ -375,7 +375,7 @@ module EXIFR
     TAGS = [TAG_MAPPING.keys, TAG_MAPPING.values.map{|v|v.values}].flatten.uniq - IFD_TAGS
 
     # +file+ is a filename or an +IO+ object.  Hint: use +StringIO+ when working with slurped data like blobs.
-    def initialize(file)
+    def initialize(file, load_thumbnails: true)
       Data.open(file) do |data|
         @ifds = [IFD.new(data)]
         while ifd = @ifds.last.next
@@ -383,17 +383,21 @@ module EXIFR
           @ifds << ifd
         end
 
-        @jpeg_thumbnails = @ifds.map do |v|
-          if v.jpeg_interchange_format && v.jpeg_interchange_format_length
-            start, length = v.jpeg_interchange_format, v.jpeg_interchange_format_length
-            if Integer === start && Integer === length
-              data[start..(start + length)]
-            else
-              EXIFR.logger.warn("Non numeric JpegInterchangeFormat data")
-              nil
+        if load_thumbnails
+          @jpeg_thumbnails = @ifds.map do |v|
+            if v.jpeg_interchange_format && v.jpeg_interchange_format_length
+              start, length = v.jpeg_interchange_format, v.jpeg_interchange_format_length
+              if Integer === start && Integer === length
+                data[start..(start + length)]
+              else
+                EXIFR.logger.warn("Non numeric JpegInterchangeFormat data")
+                nil
+              end
             end
-          end
-        end.compact
+          end.compact
+        else
+          @jpeg_thumbnails = []
+        end
       end
     end
 

data/tests/jpeg_test.rb

@@ -127,6 +127,13 @@ class JPEGTest < TestCase
     assert count > 0, 'no thumbnails found'
   end
 
+  def test_skippable_thumbnail
+    all_test_jpegs.each do |fname|
+      jpeg = JPEG.new(fname, load_thumbnails: false)
+      assert jpeg.thumbnail.nil?
+    end
+  end
+
   def test_gps_with_altitude
     t = JPEG.new(f('gps-altitude.jpg'))
 

data/tests/tiff_test.rb

@@ -188,6 +188,13 @@ class TIFFTest < TestCase
     assert count > 0, 'no thumbnails found'
   end
 
+  def test_skippable_jpeg_thumbnails
+    all_test_tiffs.each do |fname|
+      t = TIFF.new(fname, load_thumbnails: false)
+      assert t.jpeg_thumbnails.empty?
+    end
+  end
+
   def test_should_not_loop_endlessly
     TIFF.new(f('endless-loop.exif'))
     assert true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.0
 platform: ruby
 authors:
 - R.W. van 't Veer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -98,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images