multi_exiftool 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c14256fd34812250504b309d7c3a3c9675c69f2e6da13e3001a557561ac3b1d
-  data.tar.gz: c95ff092b037374f294afb75a6a892074576b4bbdf0aed8a083f994ffff82cfd
+  metadata.gz: ca498fb96cf61bd299f2c0d8b7219ad540e9a5b8cbc760c1244ad7d860d5acb2
+  data.tar.gz: adb0634ba2229c3b8c570ebc027a7ded120b8f94f1889cfaca5604aa3e40ec09
 SHA512:
-  metadata.gz: 410889a498ece01c7b8181c05a8f6c2f3eb63fd4355e89f6978db1f541d1a86097ec576b35aafef47286dfc50ecc1026ff07dfe5d9857d6e5ab4452bc792804e
-  data.tar.gz: 60a9ca8ef167f6b4ef8c8ac70b893243deb1c4291f9a5e4288619779403e2137cc0bfe6135e5beb2c35d0b910cbc83a071ac2b6812cc3c3defc00de40c38eac3
+  metadata.gz: dc19963fce64259c8c9a2d62b475c9f19fa52c34d092b09c81e4770c882bc6abd26010c5b912e4ab94554f87765219c5216e06c4f6bd98690db3ed860656bd3d
+  data.tar.gz: 259ecd2569794568dc10115403426b2deab1bf789fd45809ed0c8f1bcb136b98413757906ee691a65fac5f34413d7adac587784618233519f18a0b45d6fedd20

data/Changelog

@@ -1,3 +1,9 @@
+0.11.0
+New method Values#has_tag? to check if a tag is present.
+Handle invalid values for timestamps and rationals: Timestamps where month or
+day is zero (i.e. 0000:00:00 00:00:00) are converted to nil. Strings of the
+form n/0 are not interpreted as rational value and are not converted.
+
 0.10.0
 Values#convert is now a public method. So you can simply adapt the value
 conversion to your needs.

data/lib/multi_exiftool.rb

@@ -7,7 +7,7 @@ require_relative 'multi_exiftool/writer'
 
 module MultiExiftool
 
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 
   @exiftool_command = 'exiftool'
 

data/lib/multi_exiftool/values.rb

@@ -49,17 +49,27 @@ module MultiExiftool
       case val
       when REGEXP_TIMESTAMP
         year, month, day, hour, minute = $~.captures[0,5].map {|cap| cap.to_i}
+        if month == 0 || day == 0
+          return nil
+        end
         second = $6.to_f
         zone = $7
         zone = '+00:00' if zone == 'Z'
         Time.new(year, month, day, hour, minute, second, zone)
       when REGEXP_RATIONAL
+        return val if $2.to_i == 0
         Rational($1, $2)
       else
         val
       end
     end
 
+    # Checks if a tag is present
+    # @param Tag as string or symbol (will be unified)
+    def has_tag? tag
+      @values.has_key?(Values.unify_tag(tag.to_s))
+    end
+
     # Gets the original tag names of this instance
     def tags
       @values.keys.map {|tag| Values.tag_map[tag]}

data/multi_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: multi_exiftool 0.10.0 ruby lib
+# stub: multi_exiftool 0.11.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,12 +7,12 @@
 
 Gem::Specification.new do |s|
   s.name = "multi_exiftool"
-  s.version = "0.10.0"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2018-08-21"
+  s.date = "2018-08-22"
   s.description = "This library a is wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey. It is designed for dealing with multiple files at once by creating commands to call exiftool with various arguments, call it and parsing the results."
   s.email = "janfri26@gmail.com"
   s.files = ["./.aspell.pws", "Changelog", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/multi_exiftool", "lib/multi_exiftool.rb", "lib/multi_exiftool/executable.rb", "lib/multi_exiftool/reader.rb", "lib/multi_exiftool/values.rb", "lib/multi_exiftool/writer.rb", "multi_exiftool.gemspec", "regtest/read_all_tags.rb", "regtest/read_all_tags.yml", "regtest/test.jpg", "test/data", "test/data/a.jpg", "test/data/b.jpg", "test/data/c.jpg", "test/helper.rb", "test/test_executable.rb", "test/test_exiftool_stuff.rb", "test/test_functional_api.rb", "test/test_reader.rb", "test/test_values.rb", "test/test_values_using_groups.rb", "test/test_writer.rb", "test/test_writer_groups.rb"]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.post_install_message = "\n+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool version 7.65 or higher and  |\n| it's found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more details see                                                  |\n| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |\n+-----------------------------------------------------------------------+\n  "
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.requirements = ["exiftool, version 7.65 or higher"]
-  s.rubygems_version = "3.0.0.beta1"
+  s.rubygems_version = "2.7.6"
   s.summary = "This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool)."
 
   if s.respond_to? :specification_version then

data/test/test_values.rb

@@ -113,6 +113,45 @@ class TestValues < Test::Unit::TestCase
 
     end
 
+    context 'invalid values' do
+
+      test 'timestamp with only zeros' do
+        values = MultiExiftool::Values.new('TimeWithOnlyZeros' => '0000:00:00 00:00:00')
+        assert_nil values['TimeWithOnlyZeros']
+      end
+
+      test 'rational with denominator zero' do
+        values = MultiExiftool::Values.new('DenominatorZero' => '1/0')
+        assert_equal '1/0', values['DenominatorZero']
+      end
+
+    end
+
+  end
+
+  context 'has_tag?' do
+    setup do
+      @hash = {'FNumber' => 8, 'Author' => 'janfri', 'E-MailAddress' => 'janfri26@gmail.com', 'DateTimeOriginal' => '2018:08:22 11:50:00'}
+      @values = MultiExiftool::Values.new(@hash)
+    end
+
+    test 'different formats as string' do
+      @hash.keys.each do |k|
+        assert_true @values.has_tag? k
+      end
+    end
+
+    test 'different formats as symbol' do
+      @hash.keys.each do |k|
+        assert_true @values.has_tag? k.to_sym
+      end
+    end
+
+    test 'non existent key' do
+      ['iso', 'ISO', :iso, :ISO].each do |t|
+        assert_false @values.has_tag? t
+      end
+    end
   end
 
   context 'tags and to_h' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - exiftool, version 7.65 or higher
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).