exifr 1.3.2 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d2b292303046e5137f23317c7bf20d53730203a
-  data.tar.gz: f824911ca1a898a61394221f9172d93a6b7b02a1
+SHA256:
+  metadata.gz: 875a312186a0f46c69201e260de535974566c112d4198f91c603c5a57112910d
+  data.tar.gz: 5735851e875b2a76f9bb73fb6a4556548fa1ae18ad8d0a0f5ed970648769054c
 SHA512:
-  metadata.gz: c3adc6a2475688d765df840b66140e9309c3aa2d94a58a76b466de7794b196cea09cbaaca2379a8de25a2ace95636f8bb82260f1c9047ec9f4732d8cbe6f7ff1
-  data.tar.gz: 7f4abd34897c876ac7f09a03601c2f901ae54b3b607b7afae572d16a95e9434fcb445a9e5c3ba89b00703121b4ea37e86fe857841f5f6bc99ae25df52a505b34
+  metadata.gz: b7b828732884dddb926221ae91ab87e5bee58fdd39a31b26beb1b794db1764661864d2b67844e2ca2e8b5d6b728464005602c927dd0d7fb652f7f57d5a87040c
+  data.tar.gz: 828884d3ff08fa3b1855a233fe31868516c31b9cf6f2487dd0db4274e2fb28e643c02b5df3ae0b247033f7cc2afc45e46aef6826ec1ba14fe294a644a9a8f549

data/Gemfile

@@ -0,0 +1,2 @@
+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/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/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'
@@ -66,8 +66,12 @@ module EXIFR
       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

data/lib/exifr/tiff.rb

@@ -237,6 +237,7 @@ module EXIFR
         0x001c => :gps_area_information,
         0x001d => :gps_date_stamp,
         0x001e => :gps_differential,
+        0x001f => :gps_h_positioning_error
       },
     })
     IFD_TAGS = [:image, :exif, :gps] # :nodoc:
@@ -249,9 +250,9 @@ module EXIFR
 
     time_proc = proc do |value|
       value.map do |v|
-        if v =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+        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)
+            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
@@ -383,7 +384,12 @@ module EXIFR
         @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)]
+            if Integer === start && Integer === length
+              data[start..(start + length)]
+            else
+              EXIFR.logger.warn("Non numeric JpegInterchangeFormat data")
+              nil
+            end
           end
         end.compact
       end
@@ -423,8 +429,12 @@ module EXIFR
         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)
@@ -456,9 +466,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
 

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'
 
@@ -103,6 +103,13 @@ class JPEGTest < TestCase
     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
     assert JPEG.new(f('multiple-app1.jpg')).exif?
   end
@@ -119,4 +126,29 @@ class JPEGTest < 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,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'
 
@@ -112,6 +112,7 @@ class TIFFTest < 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
@@ -198,4 +199,11 @@ class TIFFTest < TestCase
   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,26 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.7
 platform: ruby
 authors:
 - R.W. van 't Veer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
-dependencies: []
+date: 2020-09-11 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: remco@remvee.net
+email: exifr@remworks.net
 executables:
 - exifr
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- CHANGELOG
+extra_rdoc_files: []
 files:
-- CHANGELOG
-- README.rdoc
+- Gemfile
 - Rakefile
 - bin/exifr
 - lib/exifr.rb
@@ -38,6 +63,7 @@ files:
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
 - tests/data/gopro_hd2.exif
+- tests/data/gps-altitude.jpg
 - tests/data/gps.exif
 - tests/data/image.jpg
 - tests/data/multiple-app1.jpg
@@ -46,6 +72,7 @@ files:
 - tests/data/out-of-range.exif
 - tests/data/plain.tif
 - tests/data/samsung-sc-02b.jpg
+- tests/data/sony-a7ii.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
 - tests/jpeg_test.rb
@@ -54,29 +81,29 @@ files:
 homepage: http://github.com/remvee/exifr/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
-rdoc_options:
-- "--title"
-- EXIF Reader for Ruby API Documentation
-- "--main"
-- README.rdoc
+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
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images
 test_files: []

data/CHANGELOG

@@ -1,145 +0,0 @@
-EXIF Reader 1.3.2
-* enhancement; "Add EXIF 2.3 lens information tags"; thanks Clay Gregory
-
-EXIF Reader 1.3.1
-* fix executable bin/exifr
-
-EXIF Reader 1.3.0
-* workaround warnings when using the ruby "-w" option
-* NOTE: requiring only 'exifr' will nolonger provide EXIFR::JPEG or EXIFR::TIFF, require 'exifr/jpeg' or 'exifr/tiff' instead
-
-EXIF Reader 1.2.6
-* bug fix; "[GH#48] handle empty file as malformed jpeg"; thanks Hoàng Xuân Phú
-
-EXIF Reader 1.2.5
-* bug fix; "[GH#46] Having stringified methods is not a good idea"; thanks Filipe Costa
-* bug fix; "Fix typo in subsec_time_original key"; thanks Filipe Costa
-
-EXIF Reader 1.2.4
-* bug fix; "[GH#43] Fix `respond_to?` signature"; thanks Pete Johns
-
-EXIF Reader 1.2.3.1
-* bug fix; "[GH#41] gopro_hd2.exif is not included in the gem"; thanks Peter Wilmott
-
-EXIF Reader 1.2.3
-* bug fix; "[GH#40] Handle NUL-terminated ASCII strings"; thanks Malte Rohde
-
-EXIF Reader 1.2.2
-* bug fix; "use Reader delegator instead of adding method to File instance"; thanks Ivan Kuchin
-
-EXIF Reader 1.2.1
-* bug fix: Value of infinity yields division by zero error
-
-EXIF Reader 1.2.0
-* enhancement; "log warnings when EXIF data is malformed"
-* enhancement; "allow alternative Time adapter"
-* enhancement; "[GH#33] add reader for orientation type"; thanks Damir Svrtan
-
-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,57 +0,0 @@
-= EXIF Reader
-{<img src="https://badge.fury.io/rb/exifr.svg" alt="Gem Version" />}[https://badge.fury.io/rb/exifr]
-{<img src="https://circleci.com/gh/remvee/exifr/tree/master.svg?style=shield&circle-token=7d957be2d7195f5d07a7c1962926ee626b050c2e" alt="Circle CI" />}[https://circleci.com/gh/remvee/exifr]
-
-EXIF Reader is a module to read metadata from JPEG and TIFF images.
-
-== Examples
-  require 'exifr/jpeg'
-  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::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
-  EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
-
-  require 'exifr/tiff'
-  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
-
-== Logging warnings
-When EXIF information is malformed, a warning is logged to STDERR with
-the standard Ruby logger.  Log to some other location by supplying an
-alternative implementation:
-
-  EXIFR.logger = SyslogLogger.new
-
-== Time zone support
-EXIF does not support time zones so this code does not support time
-zones.  All time stamps are created in the local time zone with:
-
-  Time.local(..)
-
-It is possible to change this behavior by supplying an alternative
-implementation.  For those who prefer UTC:
-
-  EXIFR::TIFF.mktime_proc = proc{|*args| Time.utc(*args)}
-
-Or when the application depends on ActiveSupport for time zone handling:
-
-  EXIFR::TIFF.mktime_proc = proc{|*args| Time.zone.local(*args)}
-
-== 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-2017 - R.W. van 't Veer