multi_exiftool 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08cd6e1d9c6c6ee77dcfc1a92dd00772419d0148'
-  data.tar.gz: 0e1252f4eebe67f630e7c4e6d79b8632a8bc8e08
+  metadata.gz: 850f9bf3ffdcf1fad5edae5579ce7b3a30161004
+  data.tar.gz: b1b87707b148d66125eb53c42a9795e90b4ea415
 SHA512:
-  metadata.gz: a50fefa13b79f31013369a5441416f01ca0f521302ab47c5e1f9bbf3da2872aa716bc859e22fc5ed9c8c710781f34093fd4b6d31de7364b42d155c8fe7c20eaa
-  data.tar.gz: add6854570c75de94fcb73aa2bdcd309cb3fbc4b424ac040ad1d518ff10e4d772e1c86a4cefbf3e753e286606c5654fc900f5d7c4cc0b46cd0d01583ba253e54
+  metadata.gz: 945117c1a4e70ca45ba9d57bf144d6ae4ad5170c155371d5e1c3a1e2f27839ce6c3c05c0cedc521a0b1ca8be90d6cfc0ef3ff59133233556aaf0e064c8a83a92
+  data.tar.gz: 1054902f432fdfab692da7cf23e7067f774f1bb92ad119dcd8680ddf94e283c352ecd9cc78ae4463a4a230eeb2affbd39e2ddc20e52b85efd71b573c887df610

data/Changelog

@@ -1,3 +1,7 @@
+0.6.0
+Handle UTC timestamps.
+Support timestamps with fractions of second.
+
 0.5.0
 New methods Values#to_h and #to_hash.
 Values#tags gives now an array instead of a set.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2016 Jan Friedrich
+Copyright (c) 2009-2017 Jan Friedrich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -0,0 +1,104 @@
+# MultiExiftool
+
+## Description
+
+This library is a 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.
+
+## Examples
+
+### Reading
+
+```ruby
+require 'multi_exiftool'
+
+# Object oriented approach
+reader = MultiExiftool::Reader.new
+reader.filenames = Dir['*.jpg']
+results = reader.read
+unless reader.errors.empty?
+  $stderr.puts reader.errors
+end
+results.each do |values|
+  puts "#{values.file_name}: #{values.comment}"
+end
+
+# Functional approach
+results, errors = MultiExiftool.read(Dir['*.jpg'])
+unless reader.errors.empty?
+  $stderr.puts reader.errors
+end
+results.each do |values|
+  puts "#{values.file_name}: #{values.comment}"
+end
+```
+
+### Writing
+
+```ruby
+require 'multi_exiftool'
+
+# Object oriented approach
+writer = MultiExiftool::Writer.new
+writer.filenames = Dir['*.jpg']
+writer.values = {creator: 'Jan Friedrich', copyright: 'Public Domain'}
+if writer.write
+  puts 'ok'
+else
+  puts writer.errors
+end
+
+# Functional approach
+errors = MultiExiftool.write(Dir['*.jpg'],  {creator: 'Jan Friedrich', copyright: 'Public Domain'})
+if errors.empty?
+  puts 'ok'
+else
+  puts writer.errors
+end
+```
+
+### Further Examples
+
+See the examples in the examples directory.
+
+
+## Requirements
+
+- Ruby 1.9.1 or higher
+- An installation of the ExifTool command-line application (version 7.65 or
+higher). Instructions for installation you can find under
+http://www.sno.phy.queensu.ca/~phil/exiftool/install.html .
+- If you have problems with special characters (like German umlauts) in
+filenames on windows system it is recommended to use exiftool version 9.79
+or higher.
+
+## Installation
+
+First you need ExifTool (see under Requirements above). Then you can simply
+install the gem with
+```sh
+gem install multi_exiftool
+```
+or in your Gemfile
+```ruby
+gem 'multi_exiftool'
+```
+
+## Contribution
+
+The code is also hosted in a git repository at
+http://github.com/janfri/multi_exiftool
+or
+https://bitbucket.org/janfri/multi_exiftool
+feel free to contribute!
+
+## Author
+
+Jan Friedrich <janfri26gmail.com>
+
+## MIT License
+
+See file LICENSE for details.

data/Rakefile

@@ -5,7 +5,7 @@ require 'regtest/task'
 
 Rim.setup do |p|
   p.name = 'multi_exiftool'
-  p.version = '0.5.0'
+  p.version = '0.6.0'
   p.authors = 'Jan Friedrich'
   p.email = 'janfri26@gmail.com'
   p.summary = 'This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).'

data/lib/multi_exiftool/values.rb

@@ -73,9 +73,11 @@ module MultiExiftool
     def parse_value val
       return val unless val.kind_of?(String)
       case val
-      when /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d)(?::(\d\d))?([-+]\d\d:\d\d)?(?: *DST)?$/
+      when /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d)(?::(\d\d)(?:\.\d+)?)?((?:[-+]\d\d:\d\d)|(?:Z))?(?: *DST)?$/
         arr = $~.captures[0,6].map {|cap| cap.to_i}
-        arr << $7 if $7
+        zone = $7
+        zone = '+00:00' if zone == 'Z'
+        arr << zone if zone
         Time.new(*arr)
       when %r(^(\d+)/(\d+)$)
         Rational($1, $2)

data/test/test_reader.rb

@@ -61,14 +61,14 @@ class TestReader < Test::Unit::TestCase
 
     test 'options with boolean argument' do
       @reader.filenames = %w(a.jpg b.jpg c.jpg)
-      @reader.options = {:e => true}
+      @reader.options = {e: true}
       exiftool_args = MANDATORY_ARGS + %w(-e a.jpg b.jpg c.jpg)
       assert_equal exiftool_args, @reader.exiftool_args
     end
 
     test 'options with value argument' do
       @reader.filenames = %w(a.jpg b.jpg c.jpg)
-      @reader.options = {:lang => 'de'}
+      @reader.options = {lang: 'de'}
       exiftool_args = MANDATORY_ARGS + %w(-lang de a.jpg b.jpg c.jpg)
       assert_equal exiftool_args, @reader.exiftool_args
     end

data/test/test_values.rb

@@ -35,10 +35,14 @@ class TestValues < Test::Unit::TestCase
       setup do
         hash = {
           'TimestampWithoutSeconds' => '2009:08:25 12:35',
-          'TimestampWithoutZone' => '2009:08:25 12:35:42',
+          'Timestamp' => '2009:08:25 12:35:42',
+          'TimestampWithFraction' => '2009:08:25 12:35:42.123',
           'TimestampWithPositiveZone' => '2009:08:26 20:22:24+05:00',
           'TimestampWithNegativeZone' => '2009:08:26 20:22:24-07:00',
-          'TimestampWithZoneAndDST' => '2016:07:23 15:40:55+02:00 DST'
+          'TimestampWithFractionAndZone' => '2016:07:23 15:40:55.123+02:00',
+          'TimestampWithZoneAndDST' => '2016:07:23 15:40:55+02:00 DST',
+          'TimestampWithZ' => '2017:04:08 17:57:27Z',
+          'TimestampWithFractionAndZ' => '2017:04:08 17:57:27.123Z'
         }
         @values = MultiExiftool::Values.new(hash)
       end
@@ -47,7 +51,8 @@ class TestValues < Test::Unit::TestCase
         time = Time.local(2009, 8, 25, 12, 35)
         assert_equal time, @values['TimestampWithoutSeconds']
         time = Time.local(2009, 8, 25, 12, 35, 42)
-        assert_equal time, @values['TimestampWithoutZone']
+        assert_equal time, @values['Timestamp']
+        assert_equal time, @values['TimestampWithFraction']
       end
 
       test 'Time object with given zone' do
@@ -59,6 +64,9 @@ class TestValues < Test::Unit::TestCase
         values_time = @values['TimestampWithNegativeZone']
         assert_equal time, values_time
         assert_equal -7 * 3600, values_time.utc_offset
+        time = Time.new(2016,7, 23,15, 40,55,'+02:00')
+        values_time = @values['TimestampWithFractionAndZone']
+        assert_equal time, values_time
       end
 
       test 'Time object with zone and DST' do
@@ -67,6 +75,16 @@ class TestValues < Test::Unit::TestCase
         assert_equal time, values_time
       end
 
+      test 'Time object with UTC zone' do
+        time = Time.new(2017, 4, 8, 17, 57, 27, '+00:00')
+        values_time = @values['TimestampWithZ']
+        assert_equal time, values_time
+        assert_equal 0, values_time.utc_offset
+        values_time = @values['TimestampWithFractionAndZ']
+        assert_equal time, values_time
+        assert_equal 0, values_time.utc_offset
+      end
+
     end
 
     context 'other values' do

data/test/test_writer.rb

@@ -62,7 +62,7 @@ class TestWriter < Test::Unit::TestCase
     end
 
     test 'tags with spaces in values' do
-      @writer.values = {title: 'title', :comment => 'some comment'}
+      @writer.values = {title: 'title', comment: 'some comment'}
       exiftool_args = MANDATORY_ARGS + ['-title=title', '-comment=some comment', 'a.jpg', 'b.jpg', 'c.jpg']
       assert_equal exiftool_args, @writer.exiftool_args
     end
@@ -82,7 +82,7 @@ class TestWriter < Test::Unit::TestCase
 
     test 'options with boolean argument' do
       @writer.values = {comment: 'foo'}
-      @writer.options = {:overwrite_original => true}
+      @writer.options = {overwrite_original: true}
       exiftool_args = MANDATORY_ARGS + %w(-overwrite_original -comment=foo a.jpg b.jpg c.jpg)
       assert_equal exiftool_args, @writer.exiftool_args
     end

data/test/test_writer_groups.rb

@@ -12,7 +12,7 @@ class TestWriterGroups < Test::Unit::TestCase
   end
 
   test 'simple case' do
-    @writer.values = {:exif => {:comment => 'test'}  }
+    @writer.values = {exif: {comment: 'test'}  }
     exiftool_args = MANDATORY_ARGS + %w(-exif:comment=test a.jpg b.jpg c.jpg)
     assert_equal exiftool_args, @writer.exiftool_args
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -63,7 +63,7 @@ extra_rdoc_files: []
 files:
 - Changelog
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/multi_exiftool.rb
 - lib/multi_exiftool/executable.rb
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - exiftool, version 7.65 or higher
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 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).

data/README.rdoc

@@ -1,115 +0,0 @@
-= MultiExiftool
-
-== Description
-
-This library 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.
-
-== Examples
-
-=== Reading
-
-  require 'multi_exiftool'
-
-  # Object oriented approach
-  reader = MultiExiftool::Reader.new
-  reader.filenames = Dir['*.jpg']
-  results = reader.read
-  unless reader.errors.empty?
-    $stderr.puts reader.errors
-  end
-  results.each do |values|
-   puts "#{values.file_name}: #{values.comment}"
-  end
-
-  # Functional approach
-  results, errors = MultiExiftool.read(Dir['*.jpg'])
-  unless reader.errors.empty?
-    $stderr.puts reader.errors
-  end
-  results.each do |values|
-   puts "#{values.file_name}: #{values.comment}"
-  end
-
-=== Writing
-
-  require 'multi_exiftool'
-
-  # Object oriented approach
-  writer = MultiExiftool::Writer.new
-  writer.filenames = Dir['*.jpg']
-  writer.values = {creator: 'Jan Friedrich', copyright: 'Public Domain'}
-  if writer.write
-    puts 'ok'
-  else
-    puts writer.errors
-  end
-
-  # Functional approach
-  errors = MultiExiftool.write(Dir['*.jpg'],  {creator: 'Jan Friedrich', copyright: 'Public Domain'})
-  if errors.empty?
-    puts 'ok'
-  else
-    puts writer.errors
-  end
-
-=== Further Examples
-
-See the examples in the examples directory.
-
-
-== Requirements
-
-- Ruby 1.9.1 or higher
-- An installation of the ExifTool command-line application (version 7.65 or
-  higher). Instructions for installation you can find under
-  http://www.sno.phy.queensu.ca/~phil/exiftool/install.html .
-- If you have problems with special characters (like German umlauts) in
-filenames on windows system it is recommended to use exiftool version 9.79
-or higher.
-
-== Installation
-
-First you need ExifTool (see under Requirements above). Then you can simply
-install the gem with
- gem install multi_exiftool
-
-== Contribution
-
-The code is also hosted in a git repository at
-http://github.com/janfri/multi_exiftool
-or
-https://bitbucket.org/janfri/multi_exiftool
-feel free to contribute!
-
-== Author
-
-Jan Friedrich <janfri26gmail.com>
-
-== Copyright / License
-
-  The MIT License
-
-  Copyright (c) 2009-2016 Jan Friedrich
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-