mini_exiftool 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555a757bd0d6fa9f173ad23a76f48bd2117e3ae9
-  data.tar.gz: 7c68e025c963a564740852f4b28d4d647aa657f9
+  metadata.gz: 1912be3f9461bf694e7907689e59f190dd57b8e3
+  data.tar.gz: 936637b9820b7dfcde601b5a3651511e09735f05
 SHA512:
-  metadata.gz: 0fa67b34cdfd38f95eea037087e1c9add9c203a62c8ddd907cb8a5c965daa3fbb3b24fe6114c51bf42085ffd829e6c18bd75f256274267538d90e881b4277b64
-  data.tar.gz: f074cd5e8087a431e282c923b6723330b12b547b1fc9b8f3b0cf718c6a5bc176555d6be9c931ee023cb832bc7f1daad85a05bb741f1f9b4c069eb5a831c41988
+  metadata.gz: 3473fbaae4cf7b83d3e0ac540eb2929ae8ce49d28d2466584199f41ddbf8d8f432603e99db695349a73627de8fc9ec5ad4662528c9891beea133987e7661465a
+  data.tar.gz: d59167d91ce3b8d6ff5686d909a3d12e87a5861c9ea948fd814267e96a0c62c02b47725d08fb26bd37ffd1f63fc855442d7b6445cf71b964562fd21e9ca3db9b

data/Changelog

@@ -1,3 +1,10 @@
+2.1.0
+- insert require 'json'
+- Drop option :convert_encoding (use Ruby String
+  methods instead)
+- Make the test_access_coordinate work on different
+  exiftool version.
+
 2.0.0
 - Drop Ruby 1.8 compatibility.
 - Using JSON to parse exiftool output (need

data/lib/mini_exiftool.rb

@@ -14,10 +14,11 @@
 #
 
 require 'fileutils'
-require 'tempfile'
+require 'json'
 require 'pstore'
 require 'rational'
 require 'set'
+require 'tempfile'
 require 'time'
 
 # Simple OO access to the Exiftool command-line application.
@@ -27,21 +28,22 @@ class MiniExiftool
   @@cmd = 'exiftool'
 
   # Hash of the standard options used when call MiniExiftool.new
-  @@opts = { :numerical => false, :composite => true, :convert_encoding => false, :ignore_minor_errors => false, :timestamps => Time }
+  @@opts = { :numerical => false, :composite => true, :ignore_minor_errors => false, :timestamps => Time }
 
   attr_reader :filename
-  attr_accessor :numerical, :composite, :convert_encoding, :ignore_minor_errors, :errors, :timestamps
+  attr_accessor :numerical, :composite, :ignore_minor_errors, :errors, :timestamps
 
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 
   # +opts+ support at the moment
   # * <code>:numerical</code> for numerical values, default is +false+
   # * <code>:composite</code> for including composite tags while loading,
   #   default is +true+
-  # * <code>:convert_encoding</code> convert encoding (See -L-option of
-  #   the exiftool command-line application, default is +false+)
   # * <code>:ignore_minor_errors</code> ignore minor errors (See -m-option
   # of the exiftool command-line application, default is +false+)
+  # * <code>:coord_format</code> set format for GPS coordinates (See
+  #   -c-option of the exiftool command-line application, default is +nil+
+  #   that means exiftool standard)
   # * <code>:timestamps</code> generating DateTime objects instead of
   #   Time objects if set to <code>DateTime</code>, default is +Time+
   #
@@ -52,7 +54,10 @@ class MiniExiftool
     opts = @@opts.merge opts
     @numerical = opts[:numerical]
     @composite = opts[:composite]
-    @convert_encoding = opts[:convert_encoding]
+    if opts[:convert_encoding]
+      warn 'Option :convert_encoding is not longer supported!'
+      warn 'Please use the String#encod* methods.'
+    end
     @ignore_minor_errors = opts[:ignore_minor_errors]
     @timestamps = opts[:timestamps]
     @coord_format = opts[:coord_format]
@@ -87,7 +92,6 @@ class MiniExiftool
     opt_params = ''
     opt_params << (@numerical ? '-n ' : '')
     opt_params << (@composite ? '' : '-e ')
-    opt_params << (@convert_encoding ? '-L ' : '')
     opt_params << (@coord_format ? "-c \"#{@coord_format}\"" : '')
     cmd = %Q(#@@cmd -j -q -q -s -t #{opt_params} #{MiniExiftool.escape(filename)})
     if run(cmd)
@@ -165,12 +169,8 @@ class MiniExiftool
       end
       opt_params = ''
       opt_params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
-      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.encode!('ISO-8859-1')
-      end
       result = run(cmd)
       unless result
         all_ok = false
@@ -332,9 +332,6 @@ class MiniExiftool
 
   def perform_conversions(value)
     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-')
@@ -371,7 +368,6 @@ class MiniExiftool
   def set_attributes_by_heuristic
     self.composite = tags.include?('ImageSize') ? true : false
     self.numerical = self.file_size.kind_of?(Integer) ? true : false
-    # TODO: Is there a heuristic to determine @convert_encoding?
     self.timestamps = self.FileModifyDate.kind_of?(DateTime) ? DateTime : Time
   end
 

data/test/test_read.rb

@@ -40,12 +40,10 @@ class TestRead < TestCase
     assert_equal ['Natur'], Array(@mini_exiftool['SupplementalCategories'])
   end
 
-  def test_encoding_conversion
-    @mini_exiftool_converted = MiniExiftool.new @filename_test, :convert_encoding => true
-    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
+  def test_value_encoding
+    title= 'Abenddämmerung'
+    assert_equal Encoding::UTF_8, @mini_exiftool.title.encoding
+    assert_equal title, @mini_exiftool.title
   end
 
 end

data/test/test_read_coordinates.rb

@@ -9,11 +9,10 @@ class TestReadCoordinates < TestCase
   end
 
   def test_access_coordinates
-    mini_exiftool_coord = MiniExiftool.new @filename_test, :coord_format => "%+.6f"
-    # 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']
+    mini_exiftool_coord = MiniExiftool.new @filename_test, :coord_format => "%.6f degrees"
+    assert_match /^43.653167 degrees/, mini_exiftool_coord['GPSLatitude']
+    assert_match /^79.373167 degrees/, mini_exiftool_coord['GPSLongitude']
+    assert_match /^43.653167 degrees.*, 79.373167 degrees/, mini_exiftool_coord['GPSPosition']
   end
 
 end

data/test/test_save.rb

@@ -49,19 +49,13 @@ class TestSave < TestCase
     assert_equal @org_md5, Digest::MD5.hexdigest(File.read(@temp_filename))
   end
 
-  def test_encoding_conversion
+  def test_value_encoding
     special_string = 'äöü'
-    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
+    @mini_exiftool.reload
+    assert_equal Encoding::UTF_8, @mini_exiftool.title.encoding
     assert_equal special_string, @mini_exiftool.title
-    @mini_exiftool.convert_encoding = true
-    @mini_exiftool.title = special_string_latin1
-    assert @mini_exiftool.save
-    assert_equal true, @mini_exiftool.convert_encoding
-    special_string_latin1.encode!('ISO-8859-1')
-    assert_equal special_string_latin1, @mini_exiftool.title
   end
 
   def test_save_bang

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
 description: ''
 email: janfri26@gmail.com
 executables: []