exiftool 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d366da3c032228ce55518f4135d1b4fcfa10080cc8cfbd6ccc6ce4069003bfe7
-  data.tar.gz: b1d57d1cdf42903f6b89aae48e28a8c77ab94ee182fd4e9a93fa2ac06df1e84c
+  metadata.gz: 740491c0d853efc4f0b3aab04e6c2a842155d170ebe2ff76c4347cde06331e79
+  data.tar.gz: 8f18e6b628226461849dfb1645ce69aec92c70eb36dc60f6fe4e560c4f510635
 SHA512:
-  metadata.gz: d2490ea974066486fa54257751edfa550b4649ec010043f271cfcb3dc59df73a1e6eb9cb091468107b1408ce80b1ea2f23a1d812f74b19dac29e4d49ebf7731b
-  data.tar.gz: 01b2c53488d1df6e69ff010d3a14f3ee3b0746e94b4f6b20e428fb29036fadf78e8fb18f655fcfe9f7b117e356c1bbfa708914b4814073d666c27a7a4c94e3c2
+  metadata.gz: 1bb8fe9e9c957b24c766d16caa41a1daeeedfb0874fb770cdd3fc48f5c4a2a1014c94d5bdfcb791b280920fe7fefee6742cd3631de86843b3a3d0ed4ce3194e0
+  data.tar.gz: d88f7cafe96bd8b0c50f064bb8cdc0538486be07cf99b15085dfea6895e6bbeb912f6a9ab313f9690cd947a74856e295cdb2cff6918b9caf0c60b453a03c3640

data/lib/exiftool/field_parser.rb

@@ -14,7 +14,8 @@ class Exiftool
 
     def initialize(key, raw_value)
       @key = key
-      @display_key = WORD_BOUNDARY_RES.inject(key) { |k, regex| k.gsub(regex, '\1 \2') }
+      sanitized_key = key.gsub(Exiftool::CONTROL_CHAR_RE, ' ')
+      @display_key = WORD_BOUNDARY_RES.inject(sanitized_key) { |k, regex| k.gsub(regex, '\1 \2') }
       @sym_key = display_key.downcase.gsub(' ', '_').to_sym
       @raw_value = raw_value
     end

data/lib/exiftool/version.rb

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

data/lib/exiftool.rb

@@ -10,22 +10,30 @@ require 'stringio'
 
 # Exiftool Class
 class Exiftool
+  CONTROL_CHAR_RE = /[[:cntrl:]]/
+
   class NoSuchFile < StandardError; end
 
   class NotAFile < StandardError; end
 
+  class InvalidCommand < StandardError; end
+
+  class InvalidOption < StandardError; end
+
   class ExiftoolNotInstalled < StandardError; end
 
   class NoDefaultResultWithMultiget < StandardError; end
 
-  class << self
-    attr_writer :command
-  end
-
   def self.command
     @command ||= 'exiftool'
   end
 
+  def self.command=(command)
+    raise(InvalidCommand, command.inspect) if command.match?(CONTROL_CHAR_RE)
+
+    @command = command
+  end
+
   def self.exiftool_installed?
     exiftool_version.to_f.positive?
   end
@@ -49,6 +57,9 @@ class Exiftool
   end
 
   def self.expand_path(filename)
+    filename = filename.to_s
+    raise(NoSuchFile, filename.inspect) if filename.match?(CONTROL_CHAR_RE)
+
     raise(NoSuchFile, filename) unless File.exist?(filename)
 
     raise(NotAFile, filename) unless File.file?(filename)
@@ -56,6 +67,18 @@ class Exiftool
     File.expand_path(filename)
   end
 
+  def self.expand_paths(filenames)
+    filenames.map do |f|
+      f == '-' ? '-' : expand_path(f.to_s)
+    end
+  end
+
+  def self.exiftool_args(exiftool_opts)
+    raise(InvalidOption, exiftool_opts.inspect) if exiftool_opts.match?(CONTROL_CHAR_RE)
+
+    Shellwords.split(exiftool_opts)
+  end
+
   extend Forwardable
 
   def_delegators :first_result, :to_hash, :to_display_hash, :symbol_display_hash, :raw, :[]
@@ -71,12 +94,10 @@ class Exiftool
     filenames = [filenames] if filenames.is_a?(String) || filenames.is_a?(Pathname)
     return if filenames.empty?
 
-    expanded_filenames = filenames.map do |f|
-      f == '-' ? '-' : self.class.expand_path(f.to_s)
-    end
+    expanded_filenames = self.class.expand_paths(filenames)
     args = [
       self.class.command,
-      *Shellwords.split(exiftool_opts),
+      *self.class.exiftool_args(exiftool_opts),
       '-j',
       '-coordFormat', '%.8f',
       *expanded_filenames

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Matthew McEachen
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ExifTool (see http://exiftool.org)
-rubygems_version: 4.0.8
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Multiget ExifTool wrapper for ruby
 test_files: []