multi_exiftool 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db85645acf3c182d809fc2e7d451973e9ed076619f20c5ad589d873d8245cea1
-  data.tar.gz: 9e1e31248d31c431110a8aed55830b7b300582097cca5f44d29f5b1e3200b9c4
+  metadata.gz: 4c14256fd34812250504b309d7c3a3c9675c69f2e6da13e3001a557561ac3b1d
+  data.tar.gz: c95ff092b037374f294afb75a6a892074576b4bbdf0aed8a083f994ffff82cfd
 SHA512:
-  metadata.gz: 92f963afbfdea45ddae7cdb1c7cb2b993ea006b1f8deb94ad86e19e4925aef2148586bf56ef220dd17cf7fc87ed3d49a8ade4d649d96529303d3c6369da42835
-  data.tar.gz: 19df7c19363abc9714a14737d5eb86382dd01d9d087db873773a34ada2f275879740a0172e3a138d1b29b38653b2d0e212f08b62572583434dd73fbe359c24b6
+  metadata.gz: 410889a498ece01c7b8181c05a8f6c2f3eb63fd4355e89f6978db1f541d1a86097ec576b35aafef47286dfc50ecc1026ff07dfe5d9857d6e5ab4452bc792804e
+  data.tar.gz: 60a9ca8ef167f6b4ef8c8ac70b893243deb1c4291f9a5e4288619779403e2137cc0bfe6135e5beb2c35d0b910cbc83a071ac2b6812cc3c3defc00de40c38eac3

data/.aspell.pws

@@ -1,30 +1,33 @@
-personal_ws-1.1 en 29 
+personal_ws-1.1 en 32 
+utc
 UTC
-NONINFRINGEMENT
 szTheory
 janfri
 multi
 dir
+MultiExiftool
+MERCHANTABILITY
 api
 Gemfile
 sublicense
 tmpdir
-exiftool
 ExifTool
+exiftool
 gmail
 ok
 timestamps
 jpg
 refactoring
+NONINFRINGEMENT
 Gitorious
+MyConversion
 gemspec
 Friedrich
-MultiExiftool
+prepend
 filenames
 PartOfSet
 README
 stdin
-MERCHANTABILITY
 Coenen
 stderr
 gittycat

data/Changelog

@@ -1,3 +1,8 @@
+0.10.0
+Values#convert is now a public method. So you can simply adapt the value
+conversion to your needs.
+
+
 0.9.1
 Fix bug in handling of timestamps with fractions of second introduced in
 version 0.6.0. Thanks to Andrew Kendall for reporting and analyzing.

data/README.md

@@ -85,6 +85,69 @@ end
 See the examples in the examples directory.
 
 
+## Automatic conversion of values
+
+By default values are converted to useful instances of Ruby classes. The
+following conversions are implemented at the moment:
+
+* Timestamps => Time (with local time zone of no one given)
+* values of form "n/m" => Rational except PartOfSet and Track
+
+The conversion is done in the method Values#convert. So you can change it's
+behaviour as following examples shows.
+
+### Example 1
+
+```ruby
+module MyConversion
+  def convert tag, val
+    val # no conversion at all
+  end
+end
+
+MultiExiftool::Values.prepend MyConversion
+```
+
+### Example 2
+
+```ruby
+module MultiExiftool
+  module MyConversion
+    def convert tag, val
+      converted_val = super
+      case converted_val
+      when Time
+        converted_val.utc # convert Time objects to utc
+      when Rational
+        val # no conversion
+      else
+        converted_val # use default conversion
+      end
+    end
+  end
+
+  Values.prepend MyConversion
+end
+```
+
+### Example 3
+
+```ruby
+m = Module.new do
+  def convert tag, val
+    if val =~ MultiExiftool::Values::REGEXP_TIMESTAMP
+      val # no conversion
+    else
+      super # use default conversion
+    end
+  end
+end
+MultiExiftool::Values.prepend m
+```
+
+The method Values#convert is called each time a value is fetched.
+
+
 ## Requirements
 
 - Ruby 1.9.1 or higher

data/lib/multi_exiftool.rb

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

data/lib/multi_exiftool/values.rb

@@ -11,6 +11,12 @@ module MultiExiftool
   # method_missing.
   class Values
 
+    # Regular expression to determine timestamp values
+    REGEXP_TIMESTAMP = /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d)(?::((?:\d\d)(?:\.\d+)?))?((?:[-+]\d\d:\d\d)|(?:Z))?(?: *DST)?$/
+
+    # Regular expression to determine rational values
+    REGEXP_RATIONAL = %r(^(\d+)/(\d+)$)
+
     @tag_map = {}
 
     def initialize values
@@ -31,6 +37,29 @@ module MultiExiftool
       convert(unified_tag, @values[unified_tag])
     end
 
+    # Convert values on the basis of tag name and value. It is calles each time
+    # a value is fethed from a Values instance.
+    # @return (maybe) converted value
+    def convert tag, val
+      return val unless val.kind_of?(String)
+      case tag
+      when 'partofset', 'track'
+        return val
+      end
+      case val
+      when REGEXP_TIMESTAMP
+        year, month, day, hour, minute = $~.captures[0,5].map {|cap| cap.to_i}
+        second = $6.to_f
+        zone = $7
+        zone = '+00:00' if zone == 'Z'
+        Time.new(year, month, day, hour, minute, second, zone)
+      when REGEXP_RATIONAL
+        Rational($1, $2)
+      else
+        val
+      end
+    end
+
     # Gets the original tag names of this instance
     def tags
       @values.keys.map {|tag| Values.tag_map[tag]}
@@ -73,26 +102,6 @@ module MultiExiftool
       res
     end
 
-    def convert tag, val
-      return val unless val.kind_of?(String)
-      case tag
-      when 'partofset', 'track'
-        return val
-      end
-      case val
-      when /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d)(?::((?:\d\d)(?:\.\d+)?))?((?:[-+]\d\d:\d\d)|(?:Z))?(?: *DST)?$/
-        year, month, day, hour, minute = $~.captures[0,5].map {|cap| cap.to_i}
-        second = $6.to_f
-        zone = $7
-        zone = '+00:00' if zone == 'Z'
-        Time.new(year, month, day, hour, minute, second, zone)
-      when %r(^(\d+)/(\d+)$)
-        Rational($1, $2)
-      else
-        val
-      end
-    end
-
   end
 
 end

data/multi_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: multi_exiftool 0.9.1 ruby lib
+# stub: multi_exiftool 0.10.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,15 +7,15 @@
 
 Gem::Specification.new do |s|
   s.name = "multi_exiftool"
-  s.version = "0.9.1"
+  s.version = "0.10.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-07-31"
+  s.date = "2018-08-21"
   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/temp", "test/temp/a.jpg", "test/temp/a.jpg_original", "test/temp/b.jpg", "test/temp/b.jpg_original", "test/temp/c.jpg", "test/temp/c.jpg_original", "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"]
+  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"]
   s.homepage = "https://github.com/janfri/multi_exiftool"
   s.licenses = ["MIT"]
   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  "

data/regtest/read_all_tags.yml

@@ -4,7 +4,7 @@ result:
 - - !ruby/object:MultiExiftool::Values
     values:
       sourcefile: regtest/test.jpg
-      exiftoolversion: 10.55
+      exiftoolversion: 11.01
       filename: test.jpg
       directory: regtest
       filesize: 43 kB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,12 +108,6 @@ files:
 - test/data/b.jpg
 - test/data/c.jpg
 - test/helper.rb
-- test/temp/a.jpg
-- test/temp/a.jpg_original
-- test/temp/b.jpg
-- test/temp/b.jpg_original
-- test/temp/c.jpg
-- test/temp/c.jpg_original
 - test/test_executable.rb
 - test/test_exiftool_stuff.rb
 - test/test_functional_api.rb