multi_exiftool 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 336f2936dab3e01ed677d0ebd9f6584ec23c3f43
-  data.tar.gz: f5fe22977414dbfb347fa630502e6f2f3efca0f9
+SHA256:
+  metadata.gz: 8b015e9af2e57bc797d737a4dc8d69ad8916eaa5d57a593571674ebcd66bd4bd
+  data.tar.gz: 5d1f4bfd5b5b8673e2bcb5721dac40932229f173688c1cb5e3179dd44d66b19c
 SHA512:
-  metadata.gz: b0e6c188bb957da09426ce4ca7d76376a6cdbcc2e1419d2acb4450a0dfe22cfacae0f025ef8942384d3bbebe1bc541e8580b21c05a79928f8f8a8bfc84cc15fd
-  data.tar.gz: 0e5c953e9da646a239ea2537e67d4d0215d4f320ec609071329bfbda5041ca896a6ead151f14e43d2c4f2df269755e234aa1999afebf796ba4e3ec442b24c779
+  metadata.gz: d6d71bd49a05fd9776cc509a897766a1e6c1e8bd2d5f8adf697843b0be65a370fc78d49845aa65e309bb26053d03844b798e72c2cbead89a668dc4fa13fc656c
+  data.tar.gz: 5c96b7c4d26243e2047a85916d6d075f7add191b48edc07d181a8cf89dc42cedbcb005d5665bc10a24904f0bcd8eb36faca5fb71c86e4670f2daaae0835860de

data/.aspell.pws

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

data/Changelog

@@ -1,3 +1,13 @@
+0.8.0
+Add MultiExiftool::VERSION.
+Rename method Values#parse_value -> convert and add parameter tag to allow tag
+based conversions.
+So PartOfSet and Track values are not longer converted to Rational.  Fix a
+really big bug in test suite: Would always pass because run_in_temp_dir was
+broken, so the block was never executed. Therefor 46 assertions were not
+executed since version 0.7.0. Many thanks to szTheory for this great catch!
+
+
 0.7.0
 Use Dir.tmpdir instead of test/temp for tests which manipulates images.
 Update to rim 2.15.

data/README.md

@@ -1,4 +1,4 @@
-# MultiExiftool
+# MultiExiftool [![Build Status](https://travis-ci.org/janfri/multi_exiftool.svg?branch=master)](https://travis-ci.org/janfri/multi_exiftool)
 
 ## Description
 

data/Rakefile

@@ -1,10 +1,14 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require_relative 'lib/multi_exiftool'
 require 'rim/tire'
 require 'rim/version'
 require 'rim/regtest'
 
 Rim.setup do |p|
   p.name = 'multi_exiftool'
-  p.version = '0.7.0'
+  p.version = MultiExiftool::VERSION
   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.rb

@@ -1,10 +1,14 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'multi_exiftool/values'
 require_relative 'multi_exiftool/reader'
 require_relative 'multi_exiftool/writer'
 
 module MultiExiftool
 
+  VERSION = '0.8.0'
+
   # Reading metadata
   # Be aware: it returns an array of two elements:
   # values, errors

data/lib/multi_exiftool/executable.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'open3'
 
 module MultiExiftool

data/lib/multi_exiftool/reader.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'executable'
 require 'json'
 

data/lib/multi_exiftool/values.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'date'
 require 'set'
 
@@ -25,7 +27,8 @@ module MultiExiftool
     # (tag will be unified, i.e. FNumber, fnumber or f_number
     # can be used for FNumber)
     def [](tag)
-      parse_value(@values[Values.unify_tag(tag)])
+      unified_tag = Values.unify_tag(tag)
+      convert(unified_tag, @values[unified_tag])
     end
 
     # Gets the original tag names of this instance
@@ -37,9 +40,9 @@ module MultiExiftool
     # with original tag names es keys and converted
     # values as values
     def to_h
-      @values.inject(Hash.new) do |h,a|
-        k, v = a
-        h[Values.tag_map[k]] = parse_value(v)
+      @values.inject(Hash.new) do |h, a|
+        tag, val = a
+        h[Values.tag_map[tag]] = convert(Values.unify_tag(tag), val)
         h
       end
     end
@@ -70,8 +73,12 @@ module MultiExiftool
       res
     end
 
-    def parse_value val
+    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)?$/
         arr = $~.captures[0,6].map {|cap| cap.to_i}

data/lib/multi_exiftool/writer.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'executable'
 
 module MultiExiftool

data/multi_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: multi_exiftool 0.7.0 ruby lib
+# stub: multi_exiftool 0.8.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,21 +7,21 @@
 
 Gem::Specification.new do |s|
   s.name = "multi_exiftool"
-  s.version = "0.7.0"
+  s.version = "0.8.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 = "2017-09-19"
+  s.date = "2018-04-04"
   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", "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.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.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  "
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.requirements = ["exiftool, version 7.65 or higher"]
-  s.rubygems_version = "2.6.13"
+  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
@@ -29,22 +29,22 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rim>, ["~> 2.15"])
+      s.add_development_dependency(%q<rim>, ["~> 2.17"])
       s.add_development_dependency(%q<contest>, ["~> 0.1"])
       s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<regtest>, ["~> 1.0"])
+      s.add_development_dependency(%q<regtest>, ["~> 2"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rim>, ["~> 2.15"])
+      s.add_dependency(%q<rim>, ["~> 2.17"])
       s.add_dependency(%q<contest>, ["~> 0.1"])
       s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<regtest>, ["~> 1.0"])
+      s.add_dependency(%q<regtest>, ["~> 2"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rim>, ["~> 2.15"])
+    s.add_dependency(%q<rim>, ["~> 2.17"])
     s.add_dependency(%q<contest>, ["~> 0.1"])
     s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<regtest>, ["~> 1.0"])
+    s.add_dependency(%q<regtest>, ["~> 2"])
   end
 end

data/regtest/read_all_tags.rb

@@ -1,8 +1,6 @@
 require 'regtest'
 require 'multi_exiftool'
 
-include Regtest
-
-sample 'read all tags' do
+Regtest.sample 'read all tags' do
   MultiExiftool.read('regtest/test.jpg', tags: %w(-filemodifydate -fileaccessdate -fileinodechangedate -filepermissions))
 end

data/test/helper.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative '../lib/multi_exiftool'
 require 'contest'
 require 'fileutils'
@@ -7,11 +9,11 @@ require 'tmpdir'
 
 module TestHelper
 
-  DATA_DIR = File.join(File.dirname(__FILE__), 'data')
+  DATA_FILES = Dir.glob(File.join(File.dirname(__FILE__), 'data/*'))
 
   def run_in_temp_dir &block
-    Dir.tmpdir do |tmpdir|
-      FileUtils.cp_r DATA_DIR, tmpdir
+    Dir.mktmpdir do |tmpdir|
+      FileUtils.cp_r DATA_FILES, tmpdir
       Dir.chdir tmpdir do
         block.call
       end

data/test/test_executable.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestExecutable < Test::Unit::TestCase

data/test/test_exiftool_stuff.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestExiftoolStuff < Test::Unit::TestCase
@@ -20,7 +22,7 @@ class TestExiftoolStuff < Test::Unit::TestCase
       v = MultiExiftool.exiftool_version
       assert_not_nil v
     end
-    assert t_now * 100 < t_org
+    assert t_now * 10 < t_org, 'access to cached version of attribute exiftool_version should be 10 times faster'
   end
 
   protected

data/test/test_functional_api.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestFunctionalApi < Test::Unit::TestCase

data/test/test_reader.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestReader < Test::Unit::TestCase

data/test/test_values.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 require 'date'
 
@@ -91,7 +93,9 @@ class TestValues < Test::Unit::TestCase
 
       setup do
         hash = {
-          'ShutterSpeed' => '1/200'
+          'ShutterSpeed' => '1/200',
+          'PartOfSet' => '1/2',
+          'Track' => '1/5'
         }
         @values = MultiExiftool::Values.new(hash)
       end
@@ -100,6 +104,11 @@ class TestValues < Test::Unit::TestCase
         assert_equal Rational(1, 200), @values['ShutterSpeed']
       end
 
+      test 'no rational conversion' do
+        assert_equal '1/2', @values['PartOfSet']
+        assert_equal '1/5', @values['Track']
+      end
+
     end
 
   end

data/test/test_values_using_groups.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestValuesUsingGroups < Test::Unit::TestCase

data/test/test_writer.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 
 class TestWriter < Test::Unit::TestCase

data/test/test_writer_groups.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'helper'
 require 'yaml'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: contest
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 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
@@ -103,10 +103,17 @@ files:
 - multi_exiftool.gemspec
 - regtest/read_all_tags.rb
 - regtest/read_all_tags.yml
+- regtest/test.jpg
 - test/data/a.jpg
 - 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
@@ -141,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - exiftool, version 7.65 or higher
 rubyforge_project: 
-rubygems_version: 2.6.13
+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).