mini_exiftool 1.6.0 → 1.7.0

checksums.yaml

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

data/Changelog

@@ -1,3 +1,11 @@
+1.7.0
+- Support exiftool -c option for formatting GPS
+  coordinates.
+  Thanks to Lee Horrocks for the patch.
+- Switching from shellwords to manual escaping.
+  Hopefully it works now on Windows systems.
+  Thanks to uwe58 and jpg0 for the hints.
+
 1.6.0
 - Type conversion in MiniExiftool.from_hash.
   Thanks to Ethan Soutar-Rau for the merge request.

data/README.rdoc

@@ -10,6 +10,11 @@ An installation of the Exiftool command-line application.
 Instructions for installation you can find under
 http://www.sno.phy.queensu.ca/~phil/exiftool/install.html .
 
+Alternatively Wil Gieseler has bundled a meta-gem that eliminates the
+need for a seperate Exiftool installation. Have a look at
+http://github.com/wilg/mini_exiftool_vendored or
+http://rubygems.org/gems/mini_exiftool_vendored .
+
 == Installation
 
 First you need Exiftool (see under Requirements above). Then you can simply

data/lib/mini_exiftool.rb

@@ -18,7 +18,6 @@ require 'tempfile'
 require 'pstore'
 require 'rational'
 require 'set'
-require 'shellwords'
 require 'time'
 
 # Simple OO access to the Exiftool command-line application.
@@ -33,7 +32,7 @@ class MiniExiftool
   attr_reader :filename
   attr_accessor :numerical, :composite, :convert_encoding, :ignore_minor_errors, :errors, :timestamps
 
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 
   # +opts+ support at the moment
   # * <code>:numerical</code> for numerical values, default is +false+
@@ -56,6 +55,7 @@ class MiniExiftool
     @convert_encoding = opts[:convert_encoding]
     @ignore_minor_errors = opts[:ignore_minor_errors]
     @timestamps = opts[:timestamps]
+    @coord_format = opts[:coord_format]
     @values = TagHash.new
     @tag_names = TagHash.new
     @changed_values = TagHash.new
@@ -88,7 +88,8 @@ class MiniExiftool
     opt_params << (@numerical ? '-n ' : '')
     opt_params << (@composite ? '' : '-e ')
     opt_params << (@convert_encoding ? '-L ' : '')
-    cmd = %Q(#@@cmd -q -q -s -t #{opt_params} #{@@sep_op} #{Shellwords.escape(filename)})
+    opt_params << (@coord_format ? "-c \"#{@coord_format}\"" : '')
+    cmd = %Q(#@@cmd -q -q -s -t #{opt_params} #{@@sep_op} #{MiniExiftool.escape(filename)})
     if run(cmd)
       parse_output
     else
@@ -160,7 +161,7 @@ class MiniExiftool
       arr_val.map! {|e| convert e}
       tag_params = ''
       arr_val.each do |v|
-        tag_params << %Q(-#{original_tag}=#{Shellwords.escape(v.to_s)} )
+        tag_params << %Q(-#{original_tag}=#{MiniExiftool.escape(v)} )
       end
       opt_params = ''
       opt_params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
@@ -440,6 +441,9 @@ class MiniExiftool
     tags
   end
 
+  def self.escape(val)
+    '"' << val.to_s.gsub(/\\/, '\\'*4).gsub(/"/, '\"') << '"'
+  end
 
   # Hash with indifferent access:
   # DateTimeOriginal == datetimeoriginal == date_time_original

data/test/test_read_coordinates.rb

@@ -0,0 +1,18 @@
+# -- encoding: utf-8 --
+require 'helpers_for_test'
+
+class TestReadCoordinates < TestCase
+
+  def setup
+    @data_dir = File.dirname(__FILE__) + '/data'
+    @filename_test = @data_dir + '/test_coordinates.jpg'
+  end
+
+  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']
+    assert_equal '+43.653167, -79.373167', mini_exiftool_coord['GPSPosition']
+  end
+
+end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.7.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.2
 description: ''
 email: janfri26@gmail.com
 executables: []
@@ -43,6 +40,7 @@ files:
 - test/data/INFORMATION
 - test/data/test.jpg
 - test/data/test.jpg.json
+- test/data/test_coordinates.jpg
 - test/data/test_special_dates.jpg
 - test/helpers_for_test.rb
 - test/test_bad_preview_ifd.rb
@@ -51,6 +49,7 @@ files:
 - test/test_dumping.rb
 - test/test_from_hash.rb
 - test/test_read.rb
+- test/test_read_coordinates.rb
 - test/test_read_numerical.rb
 - test/test_save.rb
 - test/test_special.rb
@@ -58,7 +57,8 @@ files:
 - test/test_write.rb
 homepage: http://gitorious.org/mini_exiftool
 licenses: []
-post_install_message: ! "\n+-----------------------------------------------------------------------+\n|
+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
@@ -67,21 +67,19 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).
 test_files: []