multi_exiftool 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8854c3ecd3b7d994ee26ac7ec90fdac4611143fd50fba1d96d1557a4e4ff2c
-  data.tar.gz: 66714930cb460368f930dbc655c4dfbd502d0e45b371f21786fe3d4c6c124e0c
+  metadata.gz: 52fde3f1ec2afcca37970b15b006910cfe5204fb309d09d2fed6aaf1058f6d99
+  data.tar.gz: fe392422e2a5076648d8b8995cbb7cc15cb1a42c340948ba5670ab713a9426f5
 SHA512:
-  metadata.gz: a0783ca4711efe4a88dd30a23a10ab357d250ada9d8fae6474cbe5356d6fc59e88743868449495bb36efaf8f65d4db1eaff889b07903fdb4fc5f64d3b2813866
-  data.tar.gz: 9c91eb43576561b7dc712f3d0b05bda741fd2c4fb6f3542d7a56204cec09d2543e4d301060b66f3deb5a1b07c49537f32dcb4d0c5b869ec91b695b1409c035db
+  metadata.gz: 6d53477588cd9280322452eff83a8c31e12c878afeaac0462374f138cb05289a4a963fc373528f7efbfdd475609444d9b090d4a81c54a48b1fbec074cd5a808a
+  data.tar.gz: 5b0c7b775164a0032a2da1f2896c354bc32df822c85ffda2e1a36544fac88abc1044bb437395bea4adfee0915d50568fa360b75c3e12953c82a6b91b9bfe80aa

data/Changelog

@@ -1,3 +1,6 @@
+0.14.0
+Improve api for batch processing.
+
 0.13.0
 Implement batch processing to allow to write different values to multiple file
 with only one call of the ExifTool command-line application.

data/README.md

@@ -66,11 +66,11 @@ If it is necessary to write different values to multiple files there is batch pr
 require 'multi_exiftool'
 
 # Object oriented approach
-batch = Batch.new do
-  Dir['*.jpg'].each_with_index do |filename, i|
-    values = {creator: 'Jan Friedrich', copyright: 'Public Domain', comment: "This is file number #{i+1}."}
-    write filename, values
-  end
+
+batch = MultiExiftool::Batch.new
+Dir['*.jpg'].each_with_index do |filename, i|
+  values = {creator: 'Jan Friedrich', copyright: 'Public Domain', comment: "This is file number #{i+1}."}
+  batch.write filename, values
 end
 if batch.execute
   puts 'ok'
@@ -79,6 +79,7 @@ else
 end
 
 # Functional approach
+
 errors = MultiExiftool.batch do
   Dir['*.jpg'].each_with_index do |filename, i|
     values = {creator: 'Jan Friedrich', copyright: 'Public Domain', comment: "This is file number #{i+1}."}
@@ -88,7 +89,21 @@ end
 if errors.empty?
   puts 'ok'
 else
-  puts batch.errors
+  puts errors
+end
+
+# or alternative with block parameter as yielded Batch instance
+
+errors = MultiExiftool.batch do |batch|
+  Dir['*.jpg'].each_with_index do |filename, i|
+    values = {creator: 'Jan Friedrich', copyright: 'Public Domain', comment: "This is file number #{i+1}."}
+    batch.write filename, values
+  end
+end
+if errors.empty?
+  puts 'ok'
+else
+  puts errors
 end
 ```
 

data/lib/multi_exiftool.rb

@@ -8,7 +8,7 @@ require_relative 'multi_exiftool/batch'
 
 module MultiExiftool
 
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 
   @exiftool_command = 'exiftool'
 
@@ -78,7 +78,12 @@ module MultiExiftool
     #     # do error handling
     #   end
     def batch &block
-      batch = Batch.new &block
+      batch = Batch.new
+      if block.arity == 0
+        batch.instance_exec &block
+      else
+        yield batch
+      end
       batch.execute
       batch.errors
     end

data/lib/multi_exiftool/batch.rb

@@ -14,7 +14,7 @@ module MultiExiftool
     # Define batch operation inside a block
     def initialize &blk
       @writers = []
-      instance_exec &blk
+      instance_exec &blk if block_given?
     end
 
     # Define a write operation for the batch.

data/multi_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: multi_exiftool 0.13.0 ruby lib
+# stub: multi_exiftool 0.14.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.13.0"
+  s.version = "0.14.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 = "2020-02-03"
+  s.date = "2020-02-04"
   s.description = "This library a is wrapper for the ExifTool command-line application (https://exiftool.org) 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/batch.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_batch.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"]

data/regtest/read_all_tags.yml

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

data/test/test_batch.rb

@@ -17,29 +17,23 @@ class TestBatch < Test::Unit::TestCase
     end
 
     test 'only filenames and values' do
-      filenames = @filenames
-      multiple_values = @multiple_values
-      batch = MultiExiftool::Batch.new do
-        filenames.zip multiple_values do |filename, values|
-          write filename, values
-        end
+      batch = MultiExiftool::Batch.new
+      @filenames.zip @multiple_values do |filename, values|
+        batch.write filename, values
       end
-      exiftool_args = filenames.zip(multiple_values).map do |filename, values|
+      exiftool_args = @filenames.zip(@multiple_values).map do |filename, values|
         [MANDATORY_WRITER_ARGS, '-author=janfri', "-comment=Comment for file #{filename}", filename, '-execute']
       end.flatten
       assert_equal exiftool_args, batch.exiftool_args
     end
 
     test 'filenames, values and options' do
-      filenames = @filenames
-      multiple_values = @multiple_values
       options = {overwrite_original: true}
-      batch = MultiExiftool::Batch.new do
-        filenames.zip multiple_values do |filename, values|
-          write filename, values, options
-        end
+      batch = MultiExiftool::Batch.new
+      @filenames.zip @multiple_values do |filename, values|
+        batch.write filename, values, options
       end
-      exiftool_args = filenames.zip(multiple_values).map do |filename, _values|
+      exiftool_args = @filenames.zip(@multiple_values).map do |filename, _values|
         [MANDATORY_WRITER_ARGS, '-overwrite_original', '-author=janfri', "-comment=Comment for file #{filename}", filename, '-execute']
       end.flatten
       assert_equal exiftool_args, batch.exiftool_args

data/test/test_functional_api.rb

@@ -189,6 +189,7 @@ class TestFunctionalApi < Test::Unit::TestCase
   end
 
   context 'batch' do
+
     setup do
       @filenames = %w(a.jpg b.jpg c.jpg)
       @multiple_values = @filenames.map do |fn|
@@ -196,41 +197,82 @@ class TestFunctionalApi < Test::Unit::TestCase
       end
     end
 
-    test 'only filenames and values' do
-      run_in_temp_dir do
-        filenames = @filenames
-        multiple_values = @multiple_values
-        errors = MultiExiftool.batch do
-          filenames.zip multiple_values do |filename, values|
-            write filename, values
+    context 'instance_exec' do
+
+      test 'only filenames and values' do
+        run_in_temp_dir do
+          filenames = @filenames
+          multiple_values = @multiple_values
+          errors = MultiExiftool.batch do
+            filenames.zip multiple_values do |filename, values|
+              write filename, values
+            end
           end
+          assert_equal [], errors
+          values, errors = MultiExiftool.read(@filenames)
+          assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
+          assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
+          assert_equal [], errors
+          assert_equal 3, Dir['*_original'].size
         end
-        assert_equal [], errors
-        values, errors = MultiExiftool.read(@filenames)
-        assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
-        assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
-        assert_equal [], errors
-        assert_equal 3, Dir['*_original'].size
       end
+
+      test 'options with boolean argument' do
+        run_in_temp_dir do
+          filenames = @filenames
+          multiple_values = @multiple_values
+          options = {overwrite_original: true}
+          errors = MultiExiftool.batch do
+            filenames.zip multiple_values do |filename, values|
+              write filename, values, options
+            end
+          end
+          assert_equal [], errors
+          values, errors = MultiExiftool.read(@filenames)
+          assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
+          assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
+          assert_equal [], errors
+          assert_equal [], Dir['*_original']
+        end
+      end
+
     end
 
-    test 'options with boolean argument' do
-      run_in_temp_dir do
-        filenames = @filenames
-        multiple_values = @multiple_values
-        options = {overwrite_original: true}
-        errors = MultiExiftool.batch do
-          filenames.zip multiple_values do |filename, values|
-            write filename, values, options
+    context 'yield' do
+
+      test 'only filenames and values' do
+        run_in_temp_dir do
+          errors = MultiExiftool.batch do |batch|
+            @filenames.zip @multiple_values do |filename, values|
+              batch.write filename, values
+            end
           end
+          assert_equal [], errors
+          values, errors = MultiExiftool.read(@filenames)
+          assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
+          assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
+          assert_equal [], errors
+          assert_equal 3, Dir['*_original'].size
+        end
+      end
+
+      test 'options with boolean argument' do
+        run_in_temp_dir do
+          options = {overwrite_original: true}
+          errors = MultiExiftool.batch do |batch|
+            @filenames.zip @multiple_values do |filename, values|
+              batch.write filename, values, options
+            end
+          end
+          assert_equal [], errors
+          values, errors = MultiExiftool.read(@filenames)
+          assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
+          assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
+          assert_equal [], errors
+          assert_equal [], Dir['*_original']
         end
-        assert_equal [], errors
-        values, errors = MultiExiftool.read(@filenames)
-        assert_equal ['Jan Friedrich'] * 3, values.map {|e| e['Author']}
-        assert_equal ['Comment for file a.jpg', 'Comment for file b.jpg', 'Comment for file c.jpg'], values.map {|e| e['Comment']}
-        assert_equal [], errors
-        assert_equal [], Dir['*_original']
       end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake