exifr 1.3.6 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d218b251891a0cf7e748402bc6e357c4ad3dfc3aa5aefa293372f60921a1be
-  data.tar.gz: 3d4d4d8b073067bba935cce965007feed1ce04aff3b0043c31caedd64dd4b6f2
+  metadata.gz: 42fbc8bb5f1d6bf15e8aff2b8b662549cf021dd0703f117c4da9be306ffe22c8
+  data.tar.gz: 212e0905aacf857cefd312fa428963a306a83be9ca53e0f572d5300fc4c79b2c
 SHA512:
-  metadata.gz: 3c785eff92ad9eb5c05599c6312a927764c602d26adb7e026e00218bdb6a52d98f79f113b7bc2c0784d207c83357ba787354f871edefac1c8ab18017f6b5160f
-  data.tar.gz: 03fe558a81381a3e49c36d1e7bbabe4e8831c1332c191267a7c8a56820dbcc56c478cb0727dd1407ccad64afb0b1ce2f4341218fead72e73fbee8dfe2a49a53a
+  metadata.gz: fdc4e04a08191d42d37b2fa283316729dfd2295ecca28edec8aa7d32b915625ca8992c68f5a03fd84eb7e4726c595e9c2e7f44744822b2e995f9bdee9249f92a
+  data.tar.gz: '090a90bd64c694434a9fed13cb3994b1a04da04e323ee3b8600d416ad7d0df0c19040aa92806985cb7e6da1e46a22e833cc88fb07b55faf8a89cc3e1172f7908'

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'rake/testtask'
 

data/bin/exifr

@@ -15,7 +15,7 @@ def pp_jpeg(fname)
     l << [k, v.inspect] if v
   end
   ks[4..-1].each do |k|
-    v = jpeg.exif.to_hash[k.to_sym]
+    v = jpeg.exif.send(k)
     l << [k, v.inspect] if v
   end
   pp(fname, l)
@@ -27,7 +27,7 @@ def pp_tiff(fname)
     l = []
     l << ['width', img.width] << ['height', img.height]
     img.to_hash.keys.map{|a|a.to_s}.sort{|a,b|a<=>b}.each do |key|
-      l << [key, img.to_hash[key.to_sym].inspect]
+      l << [key, img.send(key).inspect]
     end
     pp(tiff.size == 1 ? fname : "#{fname}[#{index}]", l)
   end

data/lib/exifr/jpeg.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'exifr'
 require 'exifr/tiff'
@@ -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

@@ -153,6 +153,9 @@ module EXIFR
         0x9000 => :exif_version,
         0x9003 => :date_time_original,
         0x9004 => :date_time_digitized,
+        0x9010 => :offset_time,
+        0x9011 => :offset_time_original,
+        0x9012 => :offset_time_digitized,
         0x9101 => :components_configuration,
         0x9102 => :compressed_bits_per_pixel,
         0x9201 => :shutter_speed_value,
@@ -331,7 +334,9 @@ module EXIFR
 
     class Degrees < Array
       def initialize(arr)
-        raise "expected [degrees, minutes, seconds]" unless arr.length == 3
+        unless arr.length == 3 && arr.all?{|v| Rational === v}
+          raise "expected [degrees, minutes, seconds]; got #{arr.inspect}"
+        end
         super
       end
 
@@ -373,7 +378,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
@@ -381,12 +386,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
-            data[start..(start + length)]
-          end
-        end.compact
+        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.compact
+        else
+          @jpeg_thumbnails = []
+        end
       end
     end
 
@@ -470,29 +484,65 @@ module EXIFR
               gps_img_direction && gps_img_direction.to_f)
     end
 
+    # File changed date time (with UTC offset when available).
+    def date_time
+      date_time_with_zone(:date_time, :offset_time)
+    end
+
+    # Date and time original image generated (with UTC offset when
+    # available).
+    def date_time_original
+      date_time_with_zone(:date_time_original, :offset_time_original)
+    end
+
+    # Date and time image digitized (with UTC offset when available).
+    def date_time_digitized
+      date_time_with_zone(:date_time_digitized, :offset_time_digitized)
+    end
+
     def inspect # :nodoc:
       @ifds.inspect
     end
 
+    private
+
+    def date_time_with_zone(date_time_field, offset_time_field)
+      if self[date_time_field] && self[date_time_field].is_a?(Time) && self[offset_time_field]
+        Time.new(
+          self[date_time_field].year,
+          self[date_time_field].month,
+          self[date_time_field].day,
+          self[date_time_field].hour,
+          self[date_time_field].min,
+          self[date_time_field].sec,
+          self[offset_time_field]
+        )
+      else
+        self[date_time_field]
+      end
+    end
+
     class IFD # :nodoc:
-      attr_reader :type, :fields, :offset
+      attr_reader :type, :raw_fields, :fields, :offset
 
       def initialize(data, offset = nil, type = :image)
-        @data, @offset, @type, @fields = data, offset, type, {}
+        @data, @offset, @type, @raw_fields, @fields = data, offset, type, {}, {}
 
         pos = offset || @data.readlong(4)
         num = @data.readshort(pos)
-        pos += 2
 
-        num.times do
-          add_field(Field.new(@data, pos))
-          pos += 12
-        end
+        if pos && num
+          pos += 2
+
+          num.times do
+            add_field(Field.new(@data, pos))
+            pos += 12
+          end
 
-        @offset_next = @data.readlong(pos)
+          @offset_next = @data.readlong(pos)
+        end
       rescue => ex
         EXIFR.logger.warn("Badly formed IFD: #{ex}")
-        @offset_next = 0
       end
 
       def method_missing(method, *args)
@@ -520,7 +570,7 @@ module EXIFR
       end
 
       def next?
-        @offset_next != 0 && @offset_next < @data.size
+        @offset_next && @offset_next > 0 && @offset_next < @data.size
       end
 
       def next
@@ -537,15 +587,16 @@ module EXIFR
 
     private
       def add_field(field)
-        return unless tag = TAG_MAPPING[@type][field.tag]
-        return if @fields[tag]
+        return if @raw_fields.include?(field.tag) # first encountered value wins
+        @raw_fields[field.tag] = field.value
 
-        if IFD_TAGS.include? tag
-          @fields[tag] = IFD.new(@data, field.offset, tag)
-        else
-          value = ADAPTERS[tag][field.value]
-          @fields[tag] = value.kind_of?(Array) && value.size == 1 ? value.first : value
-        end
+        return unless tag = TAG_MAPPING[@type][field.tag]
+        @fields[tag] = if IFD_TAGS.include?(tag)
+                         IFD.new(@data, field.offset, tag)
+                       else
+                         value = ADAPTERS[tag][field.value]
+                         value.kind_of?(Array) && value.size == 1 ? value.first : value
+                       end
       end
     end
 
@@ -595,6 +646,12 @@ module EXIFR
             end
             rationals
           end
+        when 11 # float
+          len, pack = count * 4, proc { |d| d.unpack(data.float + '*') }
+        when 12 # double
+          len, pack = count * 8, proc { |d| d.unpack(data.double + '*') }
+        else
+          return
         end
 
         if len && pack && @type != 7
@@ -627,7 +684,7 @@ module EXIFR
     end
 
     class Data #:nodoc:
-      attr_reader :short, :long, :file
+      attr_reader :short, :long, :float, :double, :file
 
       def initialize(file)
         @io = file.respond_to?(:read) ? file : (@file = File.open(file, 'rb'))
@@ -635,8 +692,8 @@ module EXIFR
         @pos = 0
 
         case self[0..1]
-        when 'II'; @short, @long = 'v', 'V'
-        when 'MM'; @short, @long = 'n', 'N'
+        when 'II'; @short, @long, @float, @double = 'v', 'V', 'e', 'E'
+        when 'MM'; @short, @long, @float, @double = 'n', 'N', 'g', 'G'
         else
           raise MalformedTIFF, "no byte order information found"
         end

data/lib/exifr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'logger'
 

data/tests/jpeg_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'test_helper'
 
@@ -107,7 +107,7 @@ class JPEGTest < TestCase
     j = JPEG.new(f('exif.jpg'))
     assert j.methods.include?(:date_time)
     assert j.methods(true).include?(:date_time)
-    refute j.methods(false).include?(:date_time)
+    assert ! j.methods(false).include?(:date_time)
   end
 
   def test_multiple_app1
@@ -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'))
 
@@ -151,4 +158,17 @@ class JPEGTest < TestCase
     assert_equal('978', j.date_time_digitized.strftime('%L'))
   end
 
+  def test_offset_times
+    j = JPEG.new(f('exif.jpg'))
+    assert_equal('-01:00', j.offset_time)
+    assert_equal('+01:00', j.offset_time_original)
+    assert_equal('+02:00', j.offset_time_digitized)
+  end
+
+  def test_data_time_with_utc_offset
+    j = JPEG.new(f('exif.jpg'))
+    assert_equal(Time.new(2004, 9, 9, 15, 14, 26, '-01:00'), j.date_time)
+    assert_equal(Time.new(2004, 9, 9, 15, 14, 26, '+01:00'), j.date_time_original)
+    assert_equal(Time.new(2004, 9, 9, 15, 14, 26, '+02:00'), j.date_time_digitized)
+  end
 end

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'stringio'
 require 'pp'

data/tests/tiff_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2017 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'test_helper'
 
@@ -55,7 +55,7 @@ class TIFFTest < TestCase
   end
 
   def test_dates
-    (all_test_tiffs - [f('weird_date.exif'), f('plain.tif'), f('endless-loop.exif')]).each do |fname|
+    (all_test_tiffs - [f('weird_date.exif'), f('plain.tif'), f('endless-loop.exif'), f('truncated.exif')]).each do |fname|
       assert_kind_of Time, TIFF.new(fname).date_time
     end
     assert_nil TIFF.new(f('weird_date.exif')).date_time
@@ -119,6 +119,10 @@ class TIFFTest < TestCase
     end
   end
 
+  def test_bad_gps
+    assert_nil TIFF.new(f('bad_gps.exif')).gps
+  end
+
   def test_lens_model
     t = TIFF.new(f('sony-a7ii.exif'))
     assert_equal('FE 16-35mm F4 ZA OSS', t.lens_model)
@@ -161,7 +165,12 @@ class TIFFTest < TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       y = YAML.dump(t)
-      assert_literally_equal t.to_hash, YAML.load(y).to_hash
+      v = if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(y)
+          else
+            YAML.load(y)
+          end
+      assert_literally_equal t.to_hash, v.to_hash
     end
   end
 
@@ -179,11 +188,23 @@ 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
   end
 
+  def test_should_read_truncated
+    TIFF.new(f('truncated.exif'))
+    assert true
+  end
+
   def test_user_comment
     assert_equal("Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment)
   end
@@ -204,6 +225,10 @@ class TIFFTest < TestCase
     t = TIFF.new(f('gopro_hd2.exif'))
     assert t.methods.include?(:make)
     assert t.methods(true).include?(:make)
-    refute t.methods(false).include?(:make)
+    assert ! t.methods(false).include?(:make)
+  end
+
+  def test_unknow_field
+    assert_equal [1, 1, 1, 1], TIFF.new(f('plain.tif')).first.raw_fields[0x0153] # TIFF Tag SampleFormat
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.5.1
 platform: ruby
 authors:
 - R.W. van 't Veer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
 description: EXIF Reader is a module to read EXIF from JPEG and TIFF images.
 email: exifr@remworks.net
 executables:
@@ -59,6 +58,7 @@ files:
 - tests/data/Trust-DC3500_MINI.exif
 - tests/data/apple-aperture-1.5.exif
 - tests/data/bad-shutter_speed_value.exif
+- tests/data/bad_gps.exif
 - tests/data/canon-g3.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
@@ -66,6 +66,7 @@ files:
 - tests/data/gps-altitude.jpg
 - tests/data/gps.exif
 - tests/data/image.jpg
+- tests/data/ios-mspix-milliseconds.jpg
 - tests/data/multiple-app1.jpg
 - tests/data/negative-exposure-bias-value.exif
 - tests/data/nikon_d1x.tif
@@ -73,16 +74,20 @@ files:
 - tests/data/plain.tif
 - tests/data/samsung-sc-02b.jpg
 - tests/data/sony-a7ii.exif
+- tests/data/truncated.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
 - tests/jpeg_test.rb
 - tests/test_helper.rb
 - tests/tiff_test.rb
-homepage: http://github.com/remvee/exifr/
+homepage: http://codeberg.org/rwv/exifr/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://codeberg.org/rwv/exifr/issues
+  changelog_uri: https://codeberg.org/rwv/exifr/raw/branch/master/CHANGELOG
+  documentation_uri: https://www.rubydoc.info/gems/exifr
+  homepage_uri: https://codeberg.org/rwv/exifr
 rdoc_options: []
 require_paths:
 - lib
@@ -90,16 +95,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: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images
 test_files: []