exifr 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6dc62b83679b17b8dae3f44910af4e9d1d2cfcc4e22cc4687df5f59c7eb6151
-  data.tar.gz: 7bd89d4a659431358c4e9bba56ff133466d0408da665b509b913be5a7960ce2c
+  metadata.gz: 46366399271dd2aea161ea1ba0d08d585bde0fe8f8d9e1d10864b2346eb72191
+  data.tar.gz: 00c070e8d534f48dc9b3b17c2c9be0e89b0976cbd8673feb67da7052a51d7782
 SHA512:
-  metadata.gz: 1fd9a7202ad01ea9b143d1a74aa97b1cb1e5cb649aa28b5bb6ae8c23f0982d19cbe4977b07f2f71a2ea9204554080d68d3e467acc25c375de23c9c1a12d0e85f
-  data.tar.gz: a00a1df2810fea82a32835998b1e249c99c40b92e4995bbed706a742536c408efe91935786c458dbb0ed7ba30de08cc6bcc73d6a274b850aff418d80df6b2747
+  metadata.gz: f150aa591f2896f9e8d4baffbceb2e2b18b6d2ebbff0c8fb27abfe6a3e66e941544abc4d6bacac8ffc13b3d09886aa0f971b8d6fe36903c9d050992004521465
+  data.tar.gz: 58e57fed9a922908389cb7d997c512736351efa3d048f4b9973df56b295488626d10c924bef561c86a179e1acaac1be84986b79975f21cb5a09404418bd136b2

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/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,
@@ -481,10 +484,44 @@ 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[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, :raw_fields, :fields, :offset
 

data/tests/jpeg_test.rb

@@ -158,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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - R.W. van 't Veer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -89,7 +88,6 @@ metadata:
   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
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images
 test_files: []