exifr 1.1.3 → 1.3.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 91531cf59588956e8b9675148197cdca2b8bcbe35edb42476bfe56f73959470b
+  data.tar.gz: ddd951e6773d11ce0a0db5214983774b8078e410451920cc441fdd55926c574e
+SHA512:
+  metadata.gz: a8ebe84816409a77d19b67d1ac8a244ef63bd3a8046e08f7193e40f8bb01c2866320aa52a3664a43ed07dc6d30c2f17005d33d2408e69574987b2e5127425b0a
+  data.tar.gz: 296a144056ee9da865e663c9ef47dfc59811e24485c133a28a2b6978b62b37f7e8419a6c76e6e6aaacb52a03b599f04e18a9715e287f89c9fbff9fbac67a2c63

data/Gemfile

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

data/Rakefile

@@ -1,39 +1,37 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
-require 'rake/rdoctask'
 require 'rake/testtask'
 
 task :default => :test
 
-desc 'Generate site'
-task :site => :rdoc do
-  system 'rsync -av --delete doc/ remvee@rubyforge.org:/var/www/gforge-projects/exifr'
-end
-
-Rake::RDocTask.new do |rd|
-  rd.title = 'EXIF Reader for Ruby API Documentation'
-  rd.main = "README.rdoc"
-  rd.rdoc_dir = "doc/api"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-end
-
-
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'tests'
   t.test_files = FileList['tests/*_test.rb']
+  t.warning = true
 end
 
 begin
-  require 'rcov/rcovtask'
+  begin
+    require 'rdoc/task'
+  rescue LoadError
+    require 'rake/rdoctask'
+  end
 
-  Rcov::RcovTask.new do |t|
-    t.libs << 'lib' << 'tests'
-    t.test_files = FileList['tests/*_test.rb']
+  desc 'Generate site'
+  task :site => :rdoc do
+    system 'rsync -av --delete doc/ remvee@rubyforge.org:/var/www/gforge-projects/exifr'
+  end
+
+  Rake::RDocTask.new do |rd|
+    rd.title = 'EXIF Reader for Ruby API Documentation'
+    rd.main = "README.rdoc"
+    rd.rdoc_dir = "doc/api"
+    rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   end
 
-  desc 'Remove all artifacts left by testing and packaging'
-  task :clean => [:clobber_rdoc, :clobber_rcov]
-rescue LoadError
   desc 'Remove all artifacts left by testing and packaging'
   task :clean => [:clobber_rdoc]
+
+rescue StandardError
+  nil
 end

data/bin/exifr

@@ -1,4 +1,7 @@
-require 'exifr'
+#!/usr/bin/env ruby
+
+require 'exifr/jpeg'
+require 'exifr/tiff'
 include EXIFR
 
 def pp_jpeg(fname)

data/lib/exifr/jpeg.rb

@@ -1,7 +1,9 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'exifr'
+require 'exifr/tiff'
 require 'stringio'
+require 'delegate'
 
 module EXIFR
   # = JPEG decoder
@@ -56,40 +58,47 @@ module EXIFR
     # +method+ does exist for EXIF data +nil+ will be returned.
     def method_missing(method, *args)
       super unless args.empty?
-      super unless methods.include?(method.to_s)
+      super unless methods.include?(method)
       @exif.send method if defined?(@exif) && @exif
     end
 
-    def respond_to?(method) # :nodoc:
-      super || methods.include?(method.to_s)
+    def respond_to?(method, include_all = false) # :nodoc:
+      super || methods.include?(method) || (include_all && private_methods.include?(method))
     end
 
-    def methods # :nodoc:
-      super + TIFF::TAGS << "gps"
+    def methods(regular=true) # :nodoc:
+      if regular
+        super + TIFF::TAGS << :gps
+      else
+        super
+      end
     end
 
     class << self
       alias instance_methods_without_jpeg_extras instance_methods
       def instance_methods(include_super = true) # :nodoc:
-        instance_methods_without_jpeg_extras(include_super) + TIFF::TAGS << "gps"
+        instance_methods_without_jpeg_extras(include_super) + TIFF::TAGS << :gps
       end
     end
 
   private
+
+    class Reader < SimpleDelegator
+      def readbyte; readchar; end unless File.method_defined?(:readbyte)
+      def readint; (readbyte << 8) + readbyte; end
+      def readframe; read(readint - 2); end
+      def readsof; [readint, readbyte, readint, readint, readbyte]; end
+      def next
+        c = readbyte while c != 0xFF
+        c = readbyte while c == 0xFF
+        c
+      end
+    end
+
     def examine(io)
-      class << io
-        def readbyte; readchar; end unless method_defined?(:readbyte)
-        def readint; (readbyte << 8) + readbyte; end
-        def readframe; read(readint - 2); end
-        def readsof; [readint, readbyte, readint, readint, readbyte]; end
-        def next
-          c = readbyte while c != 0xFF
-          c = readbyte while c == 0xFF
-          c
-        end
-      end unless io.respond_to? :readsof
+      io = Reader.new(io)
 
-      unless io.readbyte == 0xFF && io.readbyte == 0xD8 # SOI
+      unless io.getbyte == 0xFF && io.getbyte == 0xD8 # SOI
         raise MalformedJPEG, "no start of image marker found"
       end
 

data/lib/exifr/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2007-2017 - R.W. van 't Veer
 
 require 'exifr'
 require 'rational'
@@ -169,7 +169,7 @@ module EXIFR
         0x927c => :maker_note,
         0x9286 => :user_comment,
         0x9290 => :subsec_time,
-        0x9291 => :subsec_time_orginal,
+        0x9291 => :subsec_time_original,
         0x9292 => :subsec_time_digitized,
         0xa000 => :flashpix_version,
         0xa001 => :color_space,
@@ -199,7 +199,10 @@ module EXIFR
         0xa40a => :sharpness,
         0xa40b => :device_setting_description,
         0xa40c => :subject_distance_range,
-        0xa420 => :image_unique_id
+        0xa420 => :image_unique_id,
+        0xa433 => :lens_make,
+        0xa434 => :lens_model,
+        0xa435 => :lens_serial_number
       },
 
       :gps => {
@@ -234,16 +237,28 @@ module EXIFR
         0x001c => :gps_area_information,
         0x001d => :gps_date_stamp,
         0x001e => :gps_differential,
+        0x001f => :gps_h_positioning_error
       },
     })
     IFD_TAGS = [:image, :exif, :gps] # :nodoc:
 
+    class << self
+      # Callable to create a +Time+ object.  Defaults to <tt>proc{|*a|Time.local(*a)}</tt>.
+      attr_accessor :mktime_proc
+    end
+    self.mktime_proc = proc { |*args| Time.local(*args) }
+
     time_proc = proc do |value|
-      value.map do |value|
-        if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-          Time.mktime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i) rescue nil
+      value.map do |v|
+        if v =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d{3}))?$/
+          begin
+            mktime_proc.call($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, $7.to_i * 1000)
+          rescue => ex
+            EXIFR.logger.warn("Bad date/time value #{v.inspect}: #{ex}")
+            nil
+          end
         else
-          value
+          v
         end
       end
     end
@@ -259,6 +274,11 @@ module EXIFR
         @value
       end
 
+      # Symbolic value.
+      def to_sym
+        @type
+      end
+
       # Debugging output.
       def inspect
         "\#<EXIFR::TIFF::Orientation:#{@type}(#{@value})>"
@@ -300,9 +320,20 @@ module EXIFR
       const_set("#{type}Orientation", ORIENTATIONS[index] = Orientation.new(index, type))
     end
 
+    degrees_proc = proc do |v|
+      begin
+        Degrees.new(v)
+      rescue => ex
+        EXIFR.logger.warn("malformed GPS degrees: #{ex}")
+        nil
+      end
+    end
+
     class Degrees < Array
       def initialize(arr)
-        raise MalformedTIFF, "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
 
@@ -312,7 +343,13 @@ module EXIFR
     end
 
     def self.rational(n, d)
-      Rational.respond_to?(:reduce) ? Rational.reduce(n, d) : 1.quo(d)
+      if d == 0
+        n.to_f / d.to_f
+      elsif Rational.respond_to?(:reduce)
+        Rational.reduce(n, d)
+      else
+        n.quo(d)
+      end
     end
 
     def self.round(f, n)
@@ -325,19 +362,19 @@ module EXIFR
                       :date_time_original => time_proc,
                       :date_time_digitized => time_proc,
                       :date_time => time_proc,
-                      :orientation => proc { |v| v.map{|v| ORIENTATIONS[v]} },
-                      :gps_latitude => proc { |v| Degrees.new(v) },
-                      :gps_longitude => proc { |v| Degrees.new(v) },
-                      :gps_dest_latitude => proc { |v| Degrees.new(v) },
-                      :gps_dest_longitude => proc { |v| Degrees.new(v) },
-                      :shutter_speed_value => proc { |v| v.map { |v| v.abs < 100 ? rational(1, (2 ** v).to_i) : nil } },
-                      :aperture_value => proc { |v| v.map { |v| round(1.4142 ** v, 1) } }
+                      :orientation => proc { |x| x.map{|y| ORIENTATIONS[y]} },
+                      :gps_latitude => degrees_proc,
+                      :gps_longitude => degrees_proc,
+                      :gps_dest_latitude => degrees_proc,
+                      :gps_dest_longitude => degrees_proc,
+                      :shutter_speed_value => proc { |x| x.map { |y| y.abs < 100 ? rational(1, (2 ** y).to_i) : nil } },
+                      :aperture_value => proc { |x| x.map { |y| round(1.4142 ** y, 1) } }
                     })
 
     # Names for all recognized TIFF fields.
-    TAGS = ([TAG_MAPPING.keys, TAG_MAPPING.values.map{|v|v.values}].flatten.uniq - IFD_TAGS).map{|v|v.to_s}
+    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.
+    # +file+ is a filename or an +IO+ object.  Hint: use +StringIO+ when working with slurped data like blobs.
     def initialize(file)
       Data.open(file) do |data|
         @ifds = [IFD.new(data)]
@@ -346,10 +383,15 @@ module EXIFR
           @ifds << ifd
         end
 
-        @jpeg_thumbnails = @ifds.map do |ifd|
-          if ifd.jpeg_interchange_format && ifd.jpeg_interchange_format_length
-            start, length = ifd.jpeg_interchange_format, ifd.jpeg_interchange_format_length
-            data[start..(start + length)]
+        @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
       end
@@ -376,21 +418,33 @@ module EXIFR
 
       if @ifds.first.respond_to?(method)
         @ifds.first.send(method)
-      elsif TAGS.include?(method.to_s)
+      elsif TAGS.include?(method)
         @ifds.first.to_hash[method]
       else
         super
       end
     end
 
-    def respond_to?(method) # :nodoc:
+    def respond_to?(method, include_all = false) # :nodoc:
       super ||
-        (defined?(@ifds) && @ifds && @ifds.first && @ifds.first.respond_to?(method)) ||
-        TAGS.include?(method.to_s)
+        (defined?(@ifds) && @ifds && @ifds.first && @ifds.first.respond_to?(method, include_all)) ||
+        TAGS.include?(method)
     end
 
-    def methods # :nodoc:
-      (super + TAGS + IFD.instance_methods(false)).uniq
+    def methods(regular=true) # :nodoc:
+      if regular
+        (super + TAGS + IFD.instance_methods(false)).uniq
+      else
+        super
+      end
+    end
+
+    def encode_with(coder)
+      coder["ifds"] = @ifds
+    end
+
+    def to_yaml_properties
+      ['@ifds']
     end
 
     class << self
@@ -414,9 +468,12 @@ module EXIFR
     # Get GPS location, altitude and image direction return nil when not available.
     def gps
       return nil unless gps_latitude && gps_longitude
+
+      altitude = gps_altitude.is_a?(Array) ? gps_altitude.first : gps_altitude
+
       GPS.new(gps_latitude.to_f * (gps_latitude_ref == 'S' ? -1 : 1),
               gps_longitude.to_f * (gps_longitude_ref == 'W' ? -1 : 1),
-              gps_altitude && (gps_altitude.to_f * (gps_altitude_ref == "\1" ? -1 : 1)),
+              altitude && (altitude.to_f * (gps_altitude_ref == "\1" ? -1 : 1)),
               gps_img_direction && gps_img_direction.to_f)
     end
 
@@ -432,20 +489,23 @@ module EXIFR
 
         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)
-      rescue
-        @offset_next = 0
+          @offset_next = @data.readlong(pos)
+        end
+      rescue => ex
+        EXIFR.logger.warn("Badly formed IFD: #{ex}")
       end
 
       def method_missing(method, *args)
-        super unless args.empty? && TAGS.include?(method.to_s)
+        super unless args.empty? && TAGS.include?(method)
         to_hash[method]
       end
 
@@ -469,13 +529,17 @@ module EXIFR
       end
 
       def next?
-        @offset_next != 0 && @offset_next < @data.size
+        @offset_next && @offset_next > 0 && @offset_next < @data.size
       end
 
       def next
         IFD.new(@data, @offset_next) if next?
       end
 
+      def encode_with(coder)
+        coder["fields"] = @fields
+      end
+
       def to_yaml_properties
         ['@fields']
       end
@@ -507,7 +571,7 @@ module EXIFR
         when 6 # signed byte
           len, pack = count, proc { |d| sign_byte(d) }
         when 2 # ascii
-          len, pack = count, proc { |d| d.unpack("A*") }
+          len, pack = count, proc { |d| d.unpack('Z*') }
         when 3 # short
           len, pack = count * 2, proc { |d| d.unpack(data.short + '*') }
         when 8 # signed short
@@ -540,6 +604,8 @@ module EXIFR
             end
             rationals
           end
+        else
+          return
         end
 
         if len && pack && @type != 7

data/lib/exifr.rb

@@ -1,10 +1,12 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
+
+require 'logger'
 
 module EXIFR
   class MalformedImage < StandardError; end
   class MalformedJPEG < MalformedImage; end
   class MalformedTIFF < MalformedImage; end
-end
 
-require 'exifr/jpeg'
-require 'exifr/tiff'
+  class << self; attr_accessor :logger; end
+  self.logger = Logger.new(STDERR)
+end

data/tests/jpeg_test.rb

@@ -1,27 +1,28 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'test_helper'
 
-class JPEGTest < Test::Unit::TestCase
+class JPEGTest < TestCase
   def test_initialize
     all_test_jpegs.each do |fname|
-      assert_nothing_raised do
-        JPEG.new(fname)
-      end
-      assert_nothing_raised do
-        open(fname) { |rd| JPEG.new(rd) }
-      end
-      assert_nothing_raised do
-        JPEG.new(StringIO.new(File.read(fname)))
-      end
+      assert JPEG.new(fname)
+      open(fname) { |rd| assert JPEG.new(rd) }
+      assert JPEG.new(StringIO.new(File.read(fname)))
     end
   end
 
   def test_raises_malformed_jpeg
-    assert_raise MalformedJPEG do
+    begin
+      JPEG.new(StringIO.new(""))
+    rescue MalformedJPEG => ex
+      assert ex
+    end
+    begin
       JPEG.new(StringIO.new("djibberish"))
+    rescue MalformedJPEG => ex
+      assert ex
     end
   end
 
@@ -64,8 +65,8 @@ class JPEGTest < Test::Unit::TestCase
   def test_exif
     assert ! JPEG.new(f('image.jpg')).exif?
     assert JPEG.new(f('exif.jpg')).exif?
-    assert_not_nil JPEG.new(f('exif.jpg')).exif.date_time
-    assert_not_nil JPEG.new(f('exif.jpg')).exif.f_number
+    assert JPEG.new(f('exif.jpg')).exif.date_time
+    assert JPEG.new(f('exif.jpg')).exif.f_number
   end
 
   def test_to_hash
@@ -82,21 +83,31 @@ class JPEGTest < Test::Unit::TestCase
 
   def test_exif_dispatch
     j = JPEG.new(f('exif.jpg'))
-
-    assert JPEG.instance_methods.include?('date_time')
-    assert j.methods.include?('date_time')
+    assert JPEG.instance_methods.include?(:date_time)
+    assert j.methods.include?(:date_time)
     assert j.respond_to?(:date_time)
-    assert j.respond_to?('date_time')
-    assert_not_nil j.date_time
+    assert j.date_time
     assert_kind_of Time, j.date_time
 
-    assert_not_nil j.f_number
+    assert j.f_number
     assert_kind_of Rational, j.f_number
   end
 
   def test_no_method_error
-    assert_nothing_raised { JPEG.new(f('image.jpg')).f_number }
-    assert_raise(NoMethodError) { JPEG.new(f('image.jpg')).foo }
+    JPEG.new(f('image.jpg')).f_number
+
+    begin
+      JPEG.new(f('image.jpg')).foo
+    rescue NoMethodError => ex
+      assert ex
+    end
+  end
+
+  def test_methods_method
+    j = JPEG.new(f('exif.jpg'))
+    assert j.methods.include?(:date_time)
+    assert j.methods(true).include?(:date_time)
+    assert ! j.methods(false).include?(:date_time)
   end
 
   def test_multiple_app1
@@ -108,9 +119,7 @@ class JPEGTest < Test::Unit::TestCase
     all_test_jpegs.each do |fname|
       jpeg = JPEG.new(fname)
       unless jpeg.thumbnail.nil?
-        assert_nothing_raised 'thumbnail not a JPEG' do
-          JPEG.new(StringIO.new(jpeg.thumbnail))
-        end
+        assert JPEG.new(StringIO.new(jpeg.thumbnail))
         count += 1
       end
     end
@@ -118,4 +127,28 @@ class JPEGTest < Test::Unit::TestCase
     assert count > 0, 'no thumbnails found'
   end
 
+  def test_gps_with_altitude
+    t = JPEG.new(f('gps-altitude.jpg'))
+
+    assert_equal([Rational(230, 1), Rational(0, 1), Rational(0, 1)], t.gps_altitude)
+    assert_equal(230, t.gps.altitude)
+  end
+
+  def test_exif_datetime_milliseconds
+    if Time.now.strftime('%L') == '%L'
+      STDERR.puts("skipping milliseconds test; not supported on this platform")
+      return
+    end
+
+    j = JPEG.new(f('exif.jpg'))
+    assert_equal('000', j.date_time.strftime('%L'))
+    assert_equal('000', j.date_time_original.strftime('%L'))
+    assert_equal('000', j.date_time_digitized.strftime('%L'))
+
+    j = JPEG.new(f('ios-mspix-milliseconds.jpg'))
+    assert_equal('978', j.date_time.strftime('%L'))
+    assert_equal('978', j.date_time_original.strftime('%L'))
+    assert_equal('978', j.date_time_digitized.strftime('%L'))
+  end
+
 end

data/tests/test_helper.rb

@@ -1,21 +1,39 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
-require 'test/unit'
 require 'stringio'
 require 'pp'
 
+TestCase = begin
+             tc = begin
+                    gem 'minitest' rescue nil
+                    require 'minitest/autorun'
+                    case
+                    when defined?(Minitest::Test) ; Minitest::Test
+                    when defined?(Minitest::Unit::TestCase) ; Minitest::Unit::TestCase
+                    end
+                  rescue LoadError
+                    # nop
+                  end
+             unless tc
+               require "test/unit"
+               tc = Test::Unit::TestCase
+             end
+             tc
+           end
+
 $:.unshift("#{File.dirname(__FILE__)}/../lib")
-require 'exifr'
+require 'exifr/jpeg'
+require 'exifr/tiff'
 include EXIFR
 
+EXIFR.logger = Logger.new(StringIO.new)
 
 def all_test_jpegs
   Dir[f('*.jpg')]
 end
 
-
 def all_test_exifs
   Dir[f('*.exif')]
 end

data/tests/tiff_test.rb

@@ -1,31 +1,27 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2020 - R.W. van 't Veer
 
 require 'test_helper'
 
-class TIFFTest < Test::Unit::TestCase
+class TIFFTest < TestCase
   def setup
     @t = TIFF.new(f('nikon_d1x.tif'))
   end
 
   def test_initialize
     all_test_tiffs.each do |fname|
-      assert_nothing_raised do
-        TIFF.new(fname)
-      end
-      assert_nothing_raised do
-        open(fname) { |rd| TIFF.new(rd) }
-      end
-      assert_nothing_raised do
-        TIFF.new(StringIO.new(File.read(fname)))
-      end
+      assert TIFF.new(fname)
+      open(fname) { |rd| assert TIFF.new(rd) }
+      assert TIFF.new(StringIO.new(File.read(fname)))
     end
   end
-  
+
   def test_raises_malformed_tiff
-    assert_raise MalformedTIFF do
+    begin
       TIFF.new(StringIO.new("djibberish"))
+    rescue MalformedTIFF => ex
+      assert ex
     end
   end
 
@@ -59,12 +55,20 @@ class TIFFTest < Test::Unit::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
   end
 
+  def test_time_with_zone
+    old_proc = TIFF.mktime_proc
+    TIFF.mktime_proc = proc { |*args| "TIME-WITH-ZONE" }
+    assert_equal "TIME-WITH-ZONE", TIFF.new(f('nikon_d1x.tif')).date_time
+  ensure
+    TIFF.mktime_proc = old_proc
+  end
+
   def test_orientation
     tested = 0 # count tests because not all exif samples have an orientation field
     all_test_exifs.each do |fname|
@@ -80,6 +84,16 @@ class TIFFTest < Test::Unit::TestCase
           TIFF::RightBottomOrientation,
           TIFF::LeftBottomOrientation
         ].any? { |c| orientation == c }, 'not an orientation'
+        assert [
+          :TopLeft,
+          :TopRight,
+          :BottomRight,
+          :BottomLeft,
+          :LeftTop,
+          :RightTop,
+          :RightBottom,
+          :LeftBottom
+        ].any? { |c| orientation.to_sym == c }, 'not an orientation symbol'
         assert orientation.respond_to?(:to_i)
         assert orientation.respond_to?(:transform_rmagick)
         tested += 1
@@ -98,30 +112,37 @@ class TIFFTest < Test::Unit::TestCase
     assert_equal('WGS84', t.gps_map_datum)
     assert_equal(54, t.gps.latitude.round)
     assert_equal(-7, t.gps.longitude.round)
+    assert_nil(t.gps.altitude)
 
     (all_test_exifs - %w(gps user-comment out-of-range negative-exposure-bias-value).map{|v| f("#{v}.exif")}).each do |fname|
       assert_nil TIFF.new(fname).gps_version_id
     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)
+  end
+
   def test_ifd_dispatch
     assert @t.respond_to?(:f_number)
-    assert @t.respond_to?('f_number')
-    assert @t.methods.include?('f_number')
-    assert TIFF.instance_methods.include?('f_number')
+    assert @t.methods.include?(:f_number)
+    assert TIFF.instance_methods.include?(:f_number)
 
-    assert_not_nil @t.f_number
+    assert @t.f_number
     assert_kind_of Rational, @t.f_number
-    assert_not_nil @t[0].f_number
+    assert @t[0].f_number
     assert_kind_of Rational, @t[0].f_number
   end
 
   def test_avoid_dispatch_to_nonexistent_ifds
-    assert_nothing_raised do
-      all_test_tiffs.each do |fname|
-        t = TIFF.new(fname)
-        TIFF::TAGS.each { |tag| t.send(tag) }
-      end
+    all_test_tiffs.each do |fname|
+      assert t = TIFF.new(fname)
+      assert TIFF::TAGS.map { |tag| t.send(tag) }
     end
   end
 
@@ -135,9 +156,7 @@ class TIFFTest < Test::Unit::TestCase
   end
 
   def test_old_style
-    assert_nothing_raised do
-      assert_not_nil @t[:f_number]
-    end
+    assert @t[:f_number]
   end
 
   def test_yaml_dump_and_load
@@ -155,10 +174,8 @@ class TIFFTest < Test::Unit::TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       unless t.jpeg_thumbnails.empty?
-        assert_nothing_raised do
-          t.jpeg_thumbnails.each do |n|
-            JPEG.new(StringIO.new(n))
-          end
+        t.jpeg_thumbnails.each do |n|
+          assert JPEG.new(StringIO.new(n))
         end
         count += 1
       end
@@ -171,17 +188,31 @@ class TIFFTest < Test::Unit::TestCase
     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
 
   def test_handle_out_of_range_offset
-    assert_nothing_raised do
-      assert 'NIKON', TIFF.new(f('out-of-range.exif')).make
-    end
+    assert_equal 'NIKON', TIFF.new(f('out-of-range.exif')).make
   end
-  
+
   def test_negative_exposure_bias_value
     assert_equal(-1.quo(3), TIFF.new(f('negative-exposure-bias-value.exif')).exposure_bias_value)
   end
+
+  def test_nul_terminated_strings
+    assert_equal 'GoPro', TIFF.new(f('gopro_hd2.exif')).make
+  end
+
+  def test_methods_method
+    t = TIFF.new(f('gopro_hd2.exif'))
+    assert t.methods.include?(:make)
+    assert t.methods(true).include?(:make)
+    assert ! t.methods(false).include?(:make)
+  end
 end

metadata

@@ -1,81 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.3.9
 platform: ruby
 authors:
 - R.W. van 't Veer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
-dependencies: []
-description: 
-email: remco@remvee.net
+date: 2020-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+description: EXIF Reader is a module to read EXIF from JPEG and TIFF images.
+email: exifr@remworks.net
 executables:
 - exifr
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- CHANGELOG
+extra_rdoc_files: []
 files:
+- Gemfile
 - Rakefile
 - bin/exifr
 - lib/exifr.rb
 - lib/exifr/jpeg.rb
 - lib/exifr/tiff.rb
 - tests/data/1x1.jpg
-- tests/data/apple-aperture-1.5.exif
-- tests/data/canon-g3.exif
 - tests/data/Canon_PowerShot_A85.exif
 - tests/data/Casio-EX-S20.exif
+- tests/data/FUJIFILM-FinePix_S3000.exif
+- tests/data/Panasonic-DMC-LC33.exif
+- tests/data/Trust-DC3500_MINI.exif
+- tests/data/apple-aperture-1.5.exif
+- tests/data/bad-shutter_speed_value.exif
+- tests/data/canon-g3.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
-- tests/data/FUJIFILM-FinePix_S3000.exif
+- tests/data/gopro_hd2.exif
+- tests/data/gps-altitude.jpg
 - tests/data/gps.exif
 - tests/data/image.jpg
 - tests/data/multiple-app1.jpg
 - tests/data/negative-exposure-bias-value.exif
 - tests/data/nikon_d1x.tif
 - tests/data/out-of-range.exif
-- tests/data/Panasonic-DMC-LC33.exif
 - tests/data/plain.tif
-- tests/data/Trust-DC3500_MINI.exif
+- tests/data/samsung-sc-02b.jpg
+- tests/data/sony-a7ii.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
-- tests/data/bad-shutter_speed_value.exif
 - tests/jpeg_test.rb
 - tests/test_helper.rb
 - tests/tiff_test.rb
-- README.rdoc
-- CHANGELOG
 homepage: http://github.com/remvee/exifr/
-licenses: []
-post_install_message: 
-rdoc_options:
-- --title
-- EXIF Reader for Ruby API Documentation
-- --main
-- README.rdoc
+licenses:
+- MIT
+metadata:
+  bug_tracker_uri: https://github.com/remvee/exifr/issues
+  changelog_uri: https://github.com/remvee/exifr/blob/master/CHANGELOG
+  documentation_uri: https://remvee.github.io/exifr/api/
+  homepage_uri: https://remvee.github.io/exifr/
+  source_code_uri: https://github.com/remvee/exifr
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
-summary: EXIF Reader is a module to read EXIF from JPEG images.
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
+summary: Read EXIF from JPEG and TIFF images
 test_files: []

data/CHANGELOG

@@ -1,108 +0,0 @@
-EXIF Reader 1.1.3
-* bug fix; "[GH#27] some error when :shutter_speed_value is too big"; thanks to zamia
-
-EXIF Reader 1.1.2
-* bug fix; "[GH#25] Incorrect values being extracted for a number of fields"; thanks to Matthew McEachen
-
-EXIF Reader 1.1.1
-* feature; "added gps convenience method to make accessing location data easier (degrees to float conversion)"
-* bug fix; "[GH#22] Fix warnings about uninitialized @comment"; thanks to Ryan Greenberg"
-
-EXIF Reader 1.0.6
-* bug fix: "[GH#20] `readlong': undefined method `unpack' for nil:NilClass (NoMethodError)"
-
-EXIF Reader 1.0.5
-* bug fix: "[GH#19] files opened by TIFF initialize were not being closed"; thanks to Joe Van Overberghe
-
-EXIF Reader 1.0.4
-* bug fix: "[GH#17] avoid library search path pollution"
-* enhancement: "[GH#18] add EXIFR::JPEG#app1s method"
-
-EXIF Reader 1.0.3
-* enhancement; "raise specific exception to allow better error handling"; thanks to James Miller
-
-EXIF Reader 1.0.2
-* bug fix; "[GH#9/12] no block given"; thanks to Ian Leitch
-
-EXIF Reader 1.0.1
-* bug fix; "[GH#7] Unable to properly display exposure_bias_value"; thanks to John Krueger
-
-EXIF Reader 1.0.0
-* bug fix; "ArgumentError: invalid byte sequence in UTF-8" when reading messy field using Ruby 1.9+
-* enhancement; "[GH#4] more informative inspect for EXIFR::TIFF::Orientation instance"
-* bug fix; "[GH#6] ERROR RuntimeError: can't add a new key into hash during iteration"; thanks to KISHIMOTO, Makoto
-
-EXIF Reader 0.10.9
-* bug fix; "[GH#1] user_comment returns nil for jpeg with UserComment"; thanks to Mark Lundquist
-* bug fix; "[GH#2] Nil pointer in tiff.rb"
-* enhancement; "don't read entire files into memory"; thanks to Victor Bogado
-
-EXIF Reader 0.10.8
-* feature request; "[#23694] The object interface of JPEG is different from the TIFF one."
-
-EXIF Reader 0.10.7
-* bug fix; "[#22403] Wrong file size reported"
-
-EXIF Reader 0.10.6.1
-* moved to GitHub
-
-EXIF Reader 0.10.6
-* bug fix (thanks to Forian Munz for reporting it); endless loop when reading a malformed EXIF/TIFF
-
-EXIF Reader 0.10.5
-* bug fix; "[#15421] duplicate orientation field behavior", first field (of any type) is leading now
-* Ruby 1.9 compatible
-
-EXIF Reader 0.10.4
-* Thumbnail extraction; [#15317] Please add thumbnail extraction
-
-EXIF Reader 0.10.3
-* YAML friendly; can now safely (de)serialize
-
-EXIF Reader 0.10.2
-* bug fix (thanks to Alexander Staubo for providing me with sample data);
-  don't fail on out-of-range IFD offsets for Apple Aperture generated JPGs
-
-EXIF Reader 0.10.1
-* old style exif access
-
-EXIF Reader 0.10
-* TIFF support
-
-EXIF Reader 0.9.6
-* bug fix; "[#8458] Conversion from string to Time fails", weird dates will now reflect nil
-
-EXIF Reader 0.9.5.1
-* make tinderbox happy by hiding rcov task
-
-EXIF Reader 0.9.5
-* patch calls to jpeg through to exif, i.e. jpeg., i.e. jpeg.model == jpeg.exif.model
-* fix exifr commandline utility, needs require 'exifr' now
-* improve test helper
-* reduce size of test images
-* include tests for tinderbox
-
-EXIF Reader 0.9.4
-* bug fix (thanks to Benjamin Storrier for providing me with sample date);
-  multiple app1 frames will potentially overwrite EXIF tag
-
-EXIF Reader 0.9.3
-* bug fix; "[#4876] Unable to extract gpsinfo"
-* one-off bug in TiffHeader found and fixed
-* make "InteroperabilityIndex" available
-
-EXIF Reader 0.9.2
-* bug fix; "[#4595] EXIFR::JPEG doesn't support multiple comments", the
-  comment property of a JPEG object now contains an array instead of a string
-  when multiple COM frames are found
-* EXIF orientation modules including RMagick code to rotate to viewable state
-* access to thumbnail included in EXIF
-* simple commandline utility, "exifr", to view image properties
-* overall code improvements including documentation and tests
-
-EXIF Reader 0.9.1
-* bug fix; "4321 Can't create object", division by zero when
-  denominator of rational value is zero
-
-EXIF Reader 0.9
-* 1st release

data/README.rdoc

@@ -1,31 +0,0 @@
-= EXIF Reader
-EXIF Reader is a module to read metadata from JPEG and TIFF images.
-
-== Examples
-  EXIFR::JPEG.new('IMG_6841.JPG').width               # => 2272
-  EXIFR::JPEG.new('IMG_6841.JPG').height              # => 1704
-  EXIFR::JPEG.new('IMG_6841.JPG').exif?               # => true
-  EXIFR::JPEG.new('IMG_6841.JPG').model               # => "Canon PowerShot G3"
-  EXIFR::JPEG.new('IMG_6841.JPG').date_time           # => Fri Feb 09 16:48:54 +0100 2007
-  EXIFR::JPEG.new('IMG_6841.JPG').exposure_time.to_s  # => "1/15"
-  EXIFR::JPEG.new('IMG_6841.JPG').f_number.to_f       # => 2.0
-
-  EXIFR::TIFF.new('DSC_0218.TIF').width               # => 3008
-  EXIFR::TIFF.new('DSC_0218.TIF')[1].width            # => 160
-  EXIFR::TIFF.new('DSC_0218.TIF').model               # => "NIKON D1X"
-  EXIFR::TIFF.new('DSC_0218.TIF').date_time           # => Tue May 23 19:15:32 +0200 2006
-  EXIFR::TIFF.new('DSC_0218.TIF').exposure_time.to_s  # => "1/100"
-  EXIFR::TIFF.new('DSC_0218.TIF').f_number.to_f       # => 5.0
-
-  EXIFR::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
-  EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
-
-== XMP data access
-If you need to access XMP data you can use the xmp gem.  More info and
-examples at https://github.com/amberbit/xmp
-
-== Author
-R.W. van 't Veer
-
-== Copyright
-Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer