exiftool 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97259a73d984b1500a49c2fa2545249ec1cdd682
-  data.tar.gz: f1965f7a95174db85c78524b1e6d6ea125bae65f
+SHA256:
+  metadata.gz: 8e9801146be9164bb998b8ef8cd5bbc1c74d280e7f78200429296c1dde2a56b9
+  data.tar.gz: 7905c172857802486f3f9525233a7e20bfce8c6adee7f53e49f6ce49d57e0822
 SHA512:
-  metadata.gz: 0000eadf8d52d63100335c1d63e396586cfc20c4cace3152480d0ae8bb456fa5d2c60c4f44e790a66560a0195a0dc8dcdab740cd4506e8b1d9d66587ab33f9e5
-  data.tar.gz: c07ce1223ca7a06ff3975dae9f305d160fa7254e6777fe1f7b0982df9e475e58525735e351df20cac12ef8a619155accc0bd7e18c1e873869caf9c720db8fc55
+  metadata.gz: 1988ab26fb045372c7362f62a07b32353d8e6b5acfd41b963f3b281b357d02d9b24bba234844f9ee9d2b2bf73e655dd95ddd58b5d24f15f7f0a2583a531156e8
+  data.tar.gz: a393570684163893fab56518ab1dfa6be33a6dd124b7ec914e6b95b4465571ab69393935f22c18510eea7e8009ef5887b5b1c5f1a351fbe205dff08fc2144ab3

data/lib/exiftool.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'shellwords'
 require 'exiftool/result'
 require 'forwardable'
 
+# Exiftool Class
 class Exiftool
-  class NoSuchFile < StandardError ; end
-  class NotAFile < StandardError ; end
-  class ExiftoolNotInstalled < StandardError ; end
-  class NoDefaultResultWithMultiget < StandardError ; end
+  class NoSuchFile < StandardError; end
+  class NotAFile < StandardError; end
+  class ExiftoolNotInstalled < StandardError; end
+  class NoDefaultResultWithMultiget < StandardError; end
 
-  def self.command=(path_to_exiftool)
-    @command = path_to_exiftool
+  class << self
+    attr_writer :command
   end
 
   def self.command
@@ -18,7 +21,7 @@ class Exiftool
   end
 
   def self.exiftool_installed?
-    exiftool_version.to_f > 0
+    exiftool_version.to_f.positive?
   end
 
   # This is a string, not a float, to handle versions like "9.40" properly.
@@ -28,7 +31,9 @@ class Exiftool
 
   def self.expand_path(filename)
     raise(NoSuchFile, filename) unless File.exist?(filename)
+
     raise(NotAFile, filename) unless File.file?(filename)
+
     File.expand_path(filename)
   end
 
@@ -38,28 +43,29 @@ class Exiftool
 
   def initialize(filenames, exiftool_opts = '')
     @file2result = {}
-    filenames = [filenames] if (filenames.is_a?(String) || filenames.is_a?(Pathname))
-    unless filenames.empty?
-      escaped_filenames = filenames.map do |f|
-        Shellwords.escape(self.class.expand_path(f.to_s))
-      end.join(' ')
-      # I'd like to use -dateformat, but it doesn't support timezone offsets properly,
-      # nor sub-second timestamps.
-      cmd = "#{self.class.command} #{exiftool_opts} -j -coordFormat \"%.8f\" #{escaped_filenames} 2> /dev/null"
-      json = `#{cmd}`.chomp
-      raise ExiftoolNotInstalled if json == ''
-      JSON.parse(json).each do |raw|
-        result = Result.new(raw)
-        @file2result[result.source_file] = result
-      end
+    filenames = [filenames] if filenames.is_a?(String) || filenames.is_a?(Pathname)
+    return if filenames.empty?
+
+    escaped_filenames = filenames.map do |f|
+      Shellwords.escape(self.class.expand_path(f.to_s))
+    end.join(' ')
+    # I'd like to use -dateformat, but it doesn't support timezone offsets properly,
+    # nor sub-second timestamps.
+    cmd = "#{self.class.command} #{exiftool_opts} -j -coordFormat \"%.8f\" #{escaped_filenames} 2> /dev/null"
+    json = `#{cmd}`.chomp
+    raise ExiftoolNotInstalled if json == ''
+
+    JSON.parse(json).each do |raw|
+      result = Result.new(raw)
+      @file2result[result.source_file] = result
     end
   end
 
-  def results(include_results_with_errors = false)
+  def results(include_results_with_errors: false)
     if include_results_with_errors
       @file2result.values
     else
-      @file2result.values.select { |ea| !ea.errors? }
+      @file2result.values.reject(&:errors?)
     end
   end
 
@@ -68,17 +74,18 @@ class Exiftool
   end
 
   def files_with_results
-    results.map { |ea| ea.source_file }
+    results.map(&:source_file)
   end
 
   def errors?
-    @file2result.values.any? { |ea| ea.errors? }
+    @file2result.values.any?(&:errors?)
   end
 
   private
 
   def first_result
     raise(NoDefaultResultWithMultiget, 'use #result_for when multiple filenames are used') if @file2result.size > 1
+
     @file2result.values.first
   end
 end

data/lib/exiftool/field_parser.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 require 'time'
-require 'rational'
 
 class Exiftool
+  # Exiftool FiledParser Class
   class FieldParser
-
-    WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
-    FRACTION_RE = /^(\d+)\/(\d+)$/
-    YMD_RE = /\A(\d{4}):(\d{2}):(\d{2})\b/
-    ZERO_DATE_RE = /\A[+:0 ]+\z/
+    WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/].freeze
+    FRACTION_RE = %r{^(\d+)/(\d+)$}.freeze
+    YMD_RE = /\A(\d{4}):(\d{2}):(\d{2})\b/.freeze
+    ZERO_DATE_RE = /\A[+:0 ]+\z/.freeze
 
     attr_reader :key, :display_key, :sym_key, :raw_value
 
@@ -20,26 +21,28 @@ class Exiftool
 
     def value
       @value ||= if lat_long?
-        as_lat_long
-      elsif date?
-        as_date
-      elsif fraction?
-        as_fraction
-      else
-        raw_value
-      end
+                   as_lat_long
+                 elsif date?
+                   as_date
+                 elsif fraction?
+                   as_fraction
+                 else
+                   raw_value
+                 end
     rescue StandardError => e
+      # :nocov:
       "Warning: Parsing '#{raw_value}' for attribute '#{key}' raised #{e.message}"
+      # :nocov:
     end
 
     def civil_date
-      if date? && !zero_date?
-        ymd = raw_value.scan(YMD_RE).first
-        if (ymd) then
-            ymd_a = ymd.map { |ea| ea.to_i }
-            Date.civil(*ymd_a) if Date.valid_civil?(*ymd_a)
-        end
-      end
+      return unless date? && !zero_date?
+
+      ymd = raw_value.scan(YMD_RE).first
+      return unless ymd
+
+      ymd_a = ymd.map(&:to_i)
+      Date.civil(*ymd_a) if Date.valid_civil?(*ymd_a)
     end
 
     private
@@ -50,10 +53,11 @@ class Exiftool
 
     def as_lat_long
       return raw_value if raw_value.is_a?(Numeric)
+
       value, direction = raw_value.split(' ')
-      if value =~ /\A\d+\.?\d*\z/
-        value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
-      end
+      return unless value =~ /\A\d+\.?\d*\z/
+
+      value.to_f * (%w[S W].include?(direction) ? -1 : 1)
     end
 
     def date?
@@ -82,7 +86,7 @@ class Exiftool
 
     def as_fraction
       scan = raw_value.scan(FRACTION_RE).first
-      Rational(*scan.map { |ea| ea.to_i }) unless scan.nil?
+      Rational(*scan.map(&:to_i)) unless scan.nil?
     end
   end
 end

data/lib/exiftool/result.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'exiftool/field_parser'
 
 class Exiftool
+  # Exiftool Result
   class Result
     attr_reader :raw, :to_hash, :to_display_hash, :sym2display, :display2sym
 

data/lib/exiftool/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Exiftool
-  VERSION = Gem::Version.new('1.2.1')
+  VERSION = Gem::Version.new('1.2.2')
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: exiftool
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Matthew McEachen
+- Sergey Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: minitest-great_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-great_expectations
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +96,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +153,8 @@ dependencies:
         version: '0'
 description: Multiget ExifTool wrapper for ruby
 email:
-- matthew-github@mceachen.org
+- matthew+github@mceachen.org
+- morozgrafix@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,7 +163,7 @@ files:
 - lib/exiftool/field_parser.rb
 - lib/exiftool/result.rb
 - lib/exiftool/version.rb
-homepage: https://github.com/mceachen/exiftool.rb
+homepage: https://github.com/exiftool-rb/exiftool.rb
 licenses:
 - MIT
 metadata: {}
@@ -131,16 +175,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)
-rubyforge_project: 
-rubygems_version: 2.6.8
+- ExifTool (see http://exiftool.org)
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Multiget ExifTool wrapper for ruby