mini_exiftool 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d1b5a3906b34606e231c3ffda6a4df3d5a6026b
-  data.tar.gz: 9e63ae2193c37ab53810d371fae213200babb0e9
+  metadata.gz: 555a757bd0d6fa9f173ad23a76f48bd2117e3ae9
+  data.tar.gz: 7c68e025c963a564740852f4b28d4d647aa657f9
 SHA512:
-  metadata.gz: ff0a627dd02d2e7b42aa38094c591d688c7d352795f704e96c0e405215f468708472ea3f11365c46f3268615fc1825a72019a0862e2a13b54005047643cfbd04
-  data.tar.gz: 671b31da0a3925b287d2bc688292d706f00d12206384e8cbaf06a952ad86f96804a4ed8a3e79a3b0e8b0bfd2680e67e3b5d80feebb743c4908f089e622ff969d
+  metadata.gz: 0fa67b34cdfd38f95eea037087e1c9add9c203a62c8ddd907cb8a5c965daa3fbb3b24fe6114c51bf42085ffd829e6c18bd75f256274267538d90e881b4277b64
+  data.tar.gz: f074cd5e8087a431e282c923b6723330b12b547b1fc9b8f3b0cf718c6a5bc176555d6be9c931ee023cb832bc7f1daad85a05bb741f1f9b4c069eb5a831c41988

data/Changelog

@@ -1,3 +1,8 @@
+2.0.0
+- Drop Ruby 1.8 compatibility.
+- Using JSON to parse exiftool output (need
+  exiftool 7.65 or higher).
+
 1.7.0
 - Support exiftool -c option for formatting GPS
   coordinates.

data/README.rdoc

@@ -6,7 +6,10 @@ Read and write access is done in a clean OO manner.
 
 == Requirements
 
-An installation of the Exiftool command-line application.
+Ruby 1.9 or higher and an installation of the Exiftool
+command-line application at least version 7.65.
+If you run on Ruby 1.8 or with a prior exiftool version
+install mini_exiftool version 1.x.x.
 Instructions for installation you can find under
 http://www.sno.phy.queensu.ca/~phil/exiftool/install.html .
 
@@ -23,6 +26,9 @@ install the gem with
 respectively (on *nix sytems)
  sudo gem install mini_exiftool
 
+If you need support of older versione (see Requirements above)
+  gem install --version "< 2.0.0" mini_exiftool
+
 Alternative you can download the tarball or zip file and run
  ruby setup.rb config
  ruby setup.rb setup
@@ -32,13 +38,15 @@ Alternative you can download the tarball or zip file and run
 
 The code is also hostet in a git repository on Gitorious at
 http://gitorious.org/projects/mini_exiftool
+and github at
+https://github.com/janfri/mini_exiftool
 feel free to contribute!
 
 == Author
-Jan Friedrich <janfri26 AT gmail DOT com>
+Jan Friedrich <janfri26@gmail.com>
 
 == Copyright / License
-Copyright (c) 2007-2011 by Jan Friedrich
+Copyright (c) 2007-2013 by Jan Friedrich
 
 Licensed under terms of the GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1,
 February 1999 (see file COPYING for more details)

data/Rakefile

@@ -15,9 +15,13 @@ Rim.setup do |p|
   p.homepage = 'http://gitorious.org/mini_exiftool'
   p.install_message = %q{
 +-----------------------------------------------------------------------+
-| Please ensure you have installed exiftool and it's found in your PATH |
-| (Try "exiftool -ver" on your commandline). For more details see       |
+| Please ensure you have installed exiftool at least version 7.65       |
+| and it's found in your PATH (Try "exiftool -ver" on your commandline).|
+| For more details see                                                  |
 | http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |
+| You need also Ruby 1.9 or higher.                                     |
+| If you need support for Ruby 1.8 or exiftool prior 7.65 install       |
+| mini_exiftool version < 2.0.0.                                        |
 +-----------------------------------------------------------------------+
   }
 end

data/lib/mini_exiftool.rb

@@ -8,7 +8,7 @@
 # Read and write access is done in a clean OO manner.
 #
 # Author: Jan Friedrich
-# Copyright (c) 2007-2012 by Jan Friedrich
+# Copyright (c) 2007-2013 by Jan Friedrich
 # Licensed under the GNU LESSER GENERAL PUBLIC LICENSE,
 # Version 2.1, February 1999
 #
@@ -32,7 +32,7 @@ class MiniExiftool
   attr_reader :filename
   attr_accessor :numerical, :composite, :convert_encoding, :ignore_minor_errors, :errors, :timestamps
 
-  VERSION = '1.7.0'
+  VERSION = '2.0.0'
 
   # +opts+ support at the moment
   # * <code>:numerical</code> for numerical values, default is +false+
@@ -89,7 +89,7 @@ class MiniExiftool
     opt_params << (@composite ? '' : '-e ')
     opt_params << (@convert_encoding ? '-L ' : '')
     opt_params << (@coord_format ? "-c \"#{@coord_format}\"" : '')
-    cmd = %Q(#@@cmd -q -q -s -t #{opt_params} #{@@sep_op} #{MiniExiftool.escape(filename)})
+    cmd = %Q(#@@cmd -j -q -q -s -t #{opt_params} #{MiniExiftool.escape(filename)})
     if run(cmd)
       parse_output
     else
@@ -168,8 +168,8 @@ class MiniExiftool
       opt_params << (@convert_encoding ? '-L ' : '')
       opt_params << (@ignore_minor_errors ? '-m' : '')
       cmd = %Q(#@@cmd -q -P -overwrite_original #{opt_params} #{tag_params} #{temp_filename})
-      if convert_encoding && cmd.respond_to?(:encode)
-        cmd.encode('ISO-8859-1')
+      if convert_encoding
+        cmd.encode!('ISO-8859-1')
       end
       result = run(cmd)
       unless result
@@ -288,14 +288,6 @@ class MiniExiftool
     return if @@setup_done
     @@error_file = Tempfile.new 'errors'
     @@error_file.close
-
-    if Float(exiftool_version) < 7.41
-      @@separator = ', '
-      @@sep_op = ''
-    else
-      @@separator = '@@'
-      @@sep_op = '-sep @@'
-    end
     @@setup_done = true
   end
 
@@ -304,9 +296,6 @@ class MiniExiftool
       $stderr.puts cmd
     end
     @output = `#{cmd} 2>#{@@error_file.path}`
-    if convert_encoding && @output.respond_to?(:force_encoding)
-      @output.force_encoding('ISO-8859-1')
-    end
     @status = $?
     unless @status.exitstatus == 0
       @error_text = File.readlines(@@error_file.path).join
@@ -335,50 +324,43 @@ class MiniExiftool
   end
 
   def parse_output
-    @output.each_line do |line|
-      tag, value = parse_line line
+    JSON.parse(@output)[0].each do |tag,value|
+      value = perform_conversions(value)
       set_value tag, value
     end
   end
 
-  def parse_line line
-    if line =~ /^([^\t]+)\t(.*)$/
-      tag, value = $1, perform_conversions($2)
-    else
-      raise MiniExiftool::Error.new("Malformed line #{line.inspect} of exiftool output.")
-    end
-    return [tag, value]
-  end
-
   def perform_conversions(value)
-      case value
-      when /^\d{4}:\d\d:\d\d \d\d:\d\d:\d\d/
-        s = value.sub(/^(\d+):(\d+):/, '\1-\2-')
-        begin
-          if @timestamps == Time
-            value = Time.parse(s)
-            elsif @timestamps == DateTime
-            value = DateTime.parse(s)
-          else
-            raise MiniExiftool::Error.new("Value #@timestamps not allowed for option timestamps.")
-          end
-        rescue ArgumentError
-          value = false
+    return value unless value.kind_of?(String)
+    if convert_encoding
+      value.encode!('ISO-8859-1')
+    end
+    case value
+    when /^\d{4}:\d\d:\d\d \d\d:\d\d:\d\d/
+      s = value.sub(/^(\d+):(\d+):/, '\1-\2-')
+      begin
+        if @timestamps == Time
+          value = Time.parse(s)
+        elsif @timestamps == DateTime
+          value = DateTime.parse(s)
+        else
+          raise MiniExiftool::Error.new("Value #@timestamps not allowed for option timestamps.")
         end
-      when /^\d+\.\d+$/
-        value = value.to_f
-      when /^0+[1-9]+$/
-        # nothing => String
-      when /^-?\d+$/
-        value = value.to_i
-      when %r(^(\d+)/(\d+)$)
-        value = Rational($1.to_i, $2.to_i)
-      when /^[\d ]+$/
-        # nothing => String
-      when /#{@@separator}/
-        value = value.split @@separator
+      rescue ArgumentError
+        value = false
       end
-      value
+    when /^\+\d+\.\d+$/
+      value = value.to_f
+    when /^0+[1-9]+$/
+      # nothing => String
+    when /^-?\d+$/
+      value = value.to_i
+    when %r(^(\d+)/(\d+)$)
+      value = Rational($1.to_i, $2.to_i)
+    when /^[\d ]+$/
+      # nothing => String
+    end
+    value
   end
 
   def set_value tag, value

data/test/test_read.rb

@@ -42,11 +42,9 @@ class TestRead < TestCase
 
   def test_encoding_conversion
     @mini_exiftool_converted = MiniExiftool.new @filename_test, :convert_encoding => true
-    assert_equal 'Abenddämmerung', @mini_exiftool.title
-    converted = "Abendd\344mmerung"
-    if converted.respond_to?(:force_encoding)
-      converted.force_encoding('ISO-8859-1')
-    end
+    title_utf8 = 'Abenddämmerung'
+    assert_equal title_utf8, @mini_exiftool.title
+    converted = title_utf8.encode('ISO-8859-1')
     assert_equal converted, @mini_exiftool_converted.title
   end
 

data/test/test_read_coordinates.rb

@@ -10,8 +10,9 @@ class TestReadCoordinates < TestCase
 
   def test_access_coordinates
     mini_exiftool_coord = MiniExiftool.new @filename_test, :coord_format => "%+.6f"
-    assert_equal '+43.653167', mini_exiftool_coord['GPSLatitude']
-    assert_equal '-79.373167', mini_exiftool_coord['GPSLongitude']
+    # checking float equality is here ok ;-)
+    assert_equal +43.653167, mini_exiftool_coord['GPSLatitude']
+    assert_equal -79.373167, mini_exiftool_coord['GPSLongitude']
     assert_equal '+43.653167, -79.373167', mini_exiftool_coord['GPSPosition']
   end
 

data/test/test_save.rb

@@ -51,11 +51,7 @@ class TestSave < TestCase
 
   def test_encoding_conversion
     special_string = 'äöü'
-    if special_string.respond_to?(:encode)
-     special_string_latin1 = special_string.encode('ISO-8859-1')
-    else
-      special_string_latin1 = "\xE4\xF6\xFC"
-    end
+    special_string_latin1 = special_string.encode('ISO-8859-1')
     @mini_exiftool.title = special_string
     assert @mini_exiftool.save
     assert_equal false, @mini_exiftool.convert_encoding
@@ -64,9 +60,7 @@ class TestSave < TestCase
     @mini_exiftool.title = special_string_latin1
     assert @mini_exiftool.save
     assert_equal true, @mini_exiftool.convert_encoding
-    if special_string_latin1.respond_to?(:encode)
-      special_string_latin1.encode!('ISO-8859-1')
-    end
+    special_string_latin1.encode!('ISO-8859-1')
     assert_equal special_string_latin1, @mini_exiftool.title
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -59,9 +59,12 @@ homepage: http://gitorious.org/mini_exiftool
 licenses: []
 metadata: {}
 post_install_message: "\n+-----------------------------------------------------------------------+\n|
-  Please ensure you have installed exiftool and it's found in your PATH |\n| (Try
-  \"exiftool -ver\" on your commandline). For more details see       |\n| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html
-  \            |\n+-----------------------------------------------------------------------+\n
+  Please ensure you have installed exiftool at least version 7.65       |\n| and 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| You need also Ruby 1.9 or higher.                                     |\n|
+  If you need support for Ruby 1.8 or exiftool prior 7.65 install       |\n| mini_exiftool
+  version < 2.0.0.                                        |\n+-----------------------------------------------------------------------+\n
   \ "
 rdoc_options: []
 require_paths: