mini_exiftool 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1912be3f9461bf694e7907689e59f190dd57b8e3
-  data.tar.gz: 936637b9820b7dfcde601b5a3651511e09735f05
+  metadata.gz: 2970f3d46bd1c8af75467b6914b3bc0f13723615
+  data.tar.gz: 2ac12585911106fe8b086b24f8d881f4f2b830aa
 SHA512:
-  metadata.gz: 3473fbaae4cf7b83d3e0ac540eb2929ae8ce49d28d2466584199f41ddbf8d8f432603e99db695349a73627de8fc9ec5ad4662528c9891beea133987e7661465a
-  data.tar.gz: d59167d91ce3b8d6ff5686d909a3d12e87a5861c9ea948fd814267e96a0c62c02b47725d08fb26bd37ffd1f63fc855442d7b6445cf71b964562fd21e9ca3db9b
+  metadata.gz: 3b5379aefcce1ef0f88154f4026de05a1c227ed209b69eb35d0d4f1559531556ea8dab0ae78f4b518f77a6ad804b3ec756a8359211e266d1d0de4b597dff6a47
+  data.tar.gz: 8a85d9606d967cac3bde0041a8ce790cb5c4b34292204d4f662943b3ed49e6b81dc12aaee84e1081e33a82480361e05600e6924bfffeafbcf94d3c1280091486

data/Changelog

@@ -1,3 +1,18 @@
+2.2.0
+The Encoding Release
+- New option :replace_invalid_chars to handle "bad data"
+  invalid byte sequences in UTF-8
+  Thanks to Chris Salzberg (aka shioyama) and
+  Robert May (aka robotmay) for precious hints
+- Support of different encodings for commandline params
+  and filenames (neccessary to support Windows)
+  to allow filenames with special chars
+  Thanks to uwe58 and others for hints
+- Doing different commandline escaping for windows and POSIX
+  systems
+  Thanks to Michael Dungan for the hint
+- Update Tutorial
+
 2.1.0
 - insert require 'json'
 - Drop option :convert_encoding (use Ruby String

data/README.rdoc

@@ -53,6 +53,6 @@ February 1999 (see file COPYING for more details)
 
 == Usage
 
-For further information about using MiniExiftool read the
-Tutorial[link://file.Tutorial.html] and have a look at the examples in
-directory examples.
+For further information about using MiniExiftool read the Tutorial.rdoc
+in the project root folder and have a look at the examples in directory
+examples.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rim'
 require 'rim/check_version'
 require 'rim/gem'
+require 'rim/rdoc'
 require 'rim/test'
 
 $:.unshift 'lib'
@@ -13,6 +14,9 @@ Rim.setup do |p|
   p.email = 'janfri26@gmail.com'
   p.summary = 'This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).'
   p.homepage = 'http://gitorious.org/mini_exiftool'
+  p.gem_files << 'Tutorial.rdoc'
+  puts p.rdoc_files
+  p.rdoc_files << 'Tutorial.rdoc'
   p.install_message = %q{
 +-----------------------------------------------------------------------+
 | Please ensure you have installed exiftool at least version 7.65       |

data/Tutorial.rdoc

@@ -0,0 +1,151 @@
+= Mini Tutorial
+
+
+== Installation
+
+* Installing the Exiftool command-line application from Phil Harvey
+  (see http://www.sno.phy.queensu.ca/~phil/exiftool/install.html)
+* Installing the Ruby library (<code>gem install mini_exiftool</code>)
+
+
+== Lesson 1: Reading Meta Data
+
+=== A Simple Example
+
+ require 'rubygems'
+ require 'mini_exiftool'
+
+ photo = MiniExiftool.new 'photo.jpg'
+ puts photo['DateTimeOriginal']
+
+
+=== Smart Tag Names
+In the example above we use <code>photo['DateTimeOriginal']</code> to
+get the value for the time the photo was taken. But tag names are not
+case sensitive and additional underlines are also irrelevant. So
+following expressions are equivalent:
+ photo['DateTimeOriginal']
+ photo['datetimeoriginal']
+ photo['date_time_original']
+
+It is also possible to use symbols:
+ photo[:DateTimeOriginal]
+ photo[:datetimeoriginal]
+ photo[:date_time_original]
+
+=== Nicer Access Via Dynamic Methods
+
+Using the []-method is the safest way to access to values of tags
+(e. g. Self-timer you can only access this way) but the smarter way is
+using dynamic method access. You can write:
+ photo.datetimeoriginal
+or also
+ photo.date_time_original
+
+
+=== Value Types
+
+Following types of values are at the moment supported:
+* Array (e. g. Keywords => ['tree', 'gras'])
+* Fixnum (e. g. ISO => 400)
+* Float (e. g. FNumber => 9.5)
+* String (e. g. Model => DYNAX 7D)
+* Time (e. g. DateTimeOriginal => 2005:09:13 20:08:50)
+
+Be aware, if there is only one value in a tag which can hold multiple
+values the result is'nt an array! But you can get one with the Array
+method:
+  # only _one_ keyword
+  p1 = MiniExiftool.new 'p1.jpg'
+  p1.keywords # => 'red'
+  # _more than one_ keywords
+  p3 = MiniExiftool.new 'p3.jpg'
+  p3.keywords # => ['red', 'yellow', 'green']
+
+  # if we want to get an array in both cases and don't know
+  # if there is one ore more values set let's take Array()
+  Array(p1.keywords) # => ['red']
+  Array(p3.keywords) # => ['red', 'yellow', 'green']
+
+=== Using options
+
+The Exiftool command-line application has an option (-n) to get values
+as numbers if possible, in MiniExiftool you can do this with setting
+the <code>:numerical</code> option to +true+ while generating a new
+instance with new or using the <code>numerical=</code>-method
+combining with calling <code>reload</code>.
+
+Let's look at an example:
+ # standard: numerical is false
+ photo = MiniExiftool.new 'photo.jpg'
+ photo.exposure_time # => '1/60' (String)
+ # now with numerical is true
+ photo.numerical = true
+ photo.reload
+ photo.exposure_time # => 0.01666667 (Float)
+This behaviour can be useful if you want to do calculations on the
+value, if you only want to show the value the standard behaviour is
+maybe better.
+
+The Time class of Ruby cannot handle timestamps before 1st January 1970
+on some platforms. If there are timestamps in files before this date it
+will result in an error. In this case we can set the option
+<code>:timestamps</code> to +DateTime+ to use DateTime objects instead
+of Time objects.
+
+There is another option <code>:composite</code>. If this is set to
++false+ the composite tags are not calculated by the exiftool
+command-line application (option -e).
+
+Further options are
+* <code>:ignore_minor_errors</code> to 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>:replace_invalid_chars</code> replace string for invalid
+  UTF-8 characters or +false+ if no replacing should be done,
+  default is +false+
+
+=== Further Example
+
+For understanding reading access to meta data also have a look at the
+example file <code>print_portraits.rb</code> in the +examples+
+directory.
+
+== Lesson 2: Writing Meta Data
+
+
+=== Also A Very Simple Example
+
+ require 'rubygems'
+ require 'mini_exiftool'
+
+ photo = MiniExiftool.new 'photo.jpg'
+ photo.comment = 'hello world'
+ photo.save
+
+
+=== Save Is Atomar
+
+If you have changed serval values and call the +save+-method either
+all changes will be written to the file or nothing. The return value
+of the +save+-method is +true+ if all values are written to the file
+otherwise save returns +false+. In the last case you can use the
++errors+-method which returns a hash of the tags which values couldn't
+be writed with an error message for each of them.
+
+
+=== Interesting Methods
+
+Have a look at the <code>changed?</code>-method for checking if the
+value of a specific tag is changed or a changing in general is
+done. In the same way the +revert+-method reverts the value of a
+specific tag or in general all changes.
+
+You should also look at the rdoc information of MiniExiftool.
+
+=== Further Examples
+
+Have a look in the examples folder of MiniExiftool.

data/lib/mini_exiftool.rb

@@ -17,6 +17,7 @@ require 'fileutils'
 require 'json'
 require 'pstore'
 require 'rational'
+require 'rbconfig'
 require 'set'
 require 'tempfile'
 require 'time'
@@ -28,22 +29,30 @@ class MiniExiftool
   @@cmd = 'exiftool'
 
   # Hash of the standard options used when call MiniExiftool.new
-  @@opts = { :numerical => false, :composite => true, :ignore_minor_errors => false, :timestamps => Time }
+  @@opts = { :numerical => false, :composite => true, :ignore_minor_errors => false,
+   :replace_invalid_chars => false, :timestamps => Time }
+
+  # Encoding of the filesystem (filenames in command line)
+  @@fs_enc = Encoding.find('filesystem')
 
   attr_reader :filename
-  attr_accessor :numerical, :composite, :ignore_minor_errors, :errors, :timestamps
+  attr_accessor :numerical, :composite, :ignore_minor_errors, :errors,
+    :replace_invalid_chars, :timestamps
 
-  VERSION = '2.1.0'
+  VERSION = '2.2.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>:ignore_minor_errors</code> ignore minor errors (See -m-option
-  # of the exiftool command-line application, default is +false+)
+  #   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>:replace_invalid_chars</code> replace string for invalid
+  #   UTF-8 characters or +false+ if no replacing should be done,
+  #   default is +false+
   # * <code>:timestamps</code> generating DateTime objects instead of
   #   Time objects if set to <code>DateTime</code>, default is +Time+
   #
@@ -61,6 +70,7 @@ class MiniExiftool
     @ignore_minor_errors = opts[:ignore_minor_errors]
     @timestamps = opts[:timestamps]
     @coord_format = opts[:coord_format]
+    @replace_invalid_chars = opts[:replace_invalid_chars]
     @values = TagHash.new
     @tag_names = TagHash.new
     @changed_values = TagHash.new
@@ -70,12 +80,19 @@ class MiniExiftool
 
   def initialize_from_hash hash # :nodoc:
     hash.each_pair do |tag,value|
-      set_value tag, perform_conversions(value)
+      set_value tag, convert_after_load(value)
     end
     set_attributes_by_heuristic
     self
   end
 
+  def initialize_from_json json # :nodoc:
+    @output = json
+    @errors.clear
+    parse_output
+    self
+  end
+
   # Load the tags of filename.
   def load filename
     MiniExiftool.setup
@@ -89,12 +106,11 @@ class MiniExiftool
     @values.clear
     @tag_names.clear
     @changed_values.clear
-    opt_params = ''
-    opt_params << (@numerical ? '-n ' : '')
-    opt_params << (@composite ? '' : '-e ')
-    opt_params << (@coord_format ? "-c \"#{@coord_format}\"" : '')
-    cmd = %Q(#@@cmd -j -q -q -s -t #{opt_params} #{MiniExiftool.escape(filename)})
-    if run(cmd)
+    params = '-j '
+    params << (@numerical ? '-n ' : '')
+    params << (@composite ? '' : '-e ')
+    params << (@coord_format ? "-c \"#{@coord_format}\"" : '')
+    if run(cmd_gen(params, @filename))
       parse_output
     else
       raise MiniExiftool::Error.new(@error_text)
@@ -113,7 +129,7 @@ class MiniExiftool
   end
 
   # Set the value of a tag.
-  def []=(tag, val)
+  def []= tag, val
     @changed_values[tag] = val
   end
 
@@ -157,28 +173,26 @@ class MiniExiftool
     temp_file = Tempfile.new('mini_exiftool')
     temp_file.close
     temp_filename = temp_file.path
-    FileUtils.cp filename, temp_filename
+    FileUtils.cp filename.encode(@@fs_enc), temp_filename
     all_ok = true
     @changed_values.each do |tag, val|
       original_tag = MiniExiftool.original_tag(tag)
       arr_val = val.kind_of?(Array) ? val : [val]
-      arr_val.map! {|e| convert e}
-      tag_params = ''
+      arr_val.map! {|e| convert_before_save(e)}
+      params = '-q -P -overwrite_original '
+      params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
+      params << (@ignore_minor_errors ? '-m ' : '')
       arr_val.each do |v|
-        tag_params << %Q(-#{original_tag}=#{MiniExiftool.escape(v)} )
+        params << %Q(-#{original_tag}=#{escape(v)} )
       end
-      opt_params = ''
-      opt_params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
-      opt_params << (@ignore_minor_errors ? '-m' : '')
-      cmd = %Q(#@@cmd -q -P -overwrite_original #{opt_params} #{tag_params} #{temp_filename})
-      result = run(cmd)
+      result = run(cmd_gen(params, temp_filename))
       unless result
         all_ok = false
         @errors[tag] = @error_text.gsub(/Nothing to do.\n\z/, '').chomp
       end
     end
     if all_ok
-      FileUtils.cp temp_filename, filename
+      FileUtils.cp temp_filename, filename.encode(@@fs_enc)
       reload
     end
     temp_file.delete
@@ -211,13 +225,22 @@ class MiniExiftool
     to_hash.to_yaml
   end
 
-  # Create a MiniExiftool instance from a hash. Default value conversions will be applied if neccesary.
+  # Create a MiniExiftool instance from a hash. Default value
+  # conversions will be applied if neccesary.
   def self.from_hash hash
     instance = MiniExiftool.new
     instance.initialize_from_hash hash
     instance
   end
 
+  # Create a MiniExiftool instance from JSON data. Default value
+  # conversions will be applied if neccesary.
+  def self.from_json json, opts={}
+    instance = MiniExiftool.new nil, opts
+    instance.initialize_from_json json
+    instance
+  end
+
   # Create a MiniExiftool instance from YAML data created with
   # MiniExiftool#to_yaml
   def self.from_yaml yaml
@@ -291,6 +314,10 @@ class MiniExiftool
     @@setup_done = true
   end
 
+  def cmd_gen arg_str='', filename
+    [@@cmd, arg_str.encode('UTF-8'), escape(filename.encode(@@fs_enc))].map {|s| s.force_encoding('UTF-8')}.join(' ')
+  end
+
   def run cmd
     if $DEBUG
       $stderr.puts cmd
@@ -299,6 +326,7 @@ class MiniExiftool
     @status = $?
     unless @status.exitstatus == 0
       @error_text = File.readlines(@@error_file.path).join
+      @error_text.force_encoding('UTF-8')
       return false
     else
       @error_text = ''
@@ -306,7 +334,7 @@ class MiniExiftool
     end
   end
 
-  def convert val
+  def convert_before_save val
     case val
     when Time
       val = val.strftime('%Y:%m:%d %H:%M:%S')
@@ -324,13 +352,17 @@ class MiniExiftool
   end
 
   def parse_output
+    @output.force_encoding('UTF-8')
+    if @replace_invalid_chars && !@output.valid_encoding?
+      @output.encode!('UTF-16le', invalid: :replace, replace: @replace_invalid_chars).encode!('UTF-8')
+    end
     JSON.parse(@output)[0].each do |tag,value|
-      value = perform_conversions(value)
+      value = convert_after_load(value)
       set_value tag, value
     end
   end
 
-  def perform_conversions(value)
+  def convert_after_load value
     return value unless value.kind_of?(String)
     case value
     when /^\d{4}:\d\d:\d\d \d\d:\d\d:\d\d/
@@ -371,16 +403,6 @@ class MiniExiftool
     self.timestamps = self.FileModifyDate.kind_of?(DateTime) ? DateTime : Time
   end
 
-  def temp_filename
-    unless @temp_filename
-      temp_file = Tempfile.new('mini-exiftool')
-      temp_file.close
-      FileUtils.cp(@filename, temp_file.path)
-      @temp_filename = temp_file.path
-    end
-    @temp_filename
-  end
-
   def self.pstore_get attribute
     load_or_create_pstore unless defined? @@pstore
     result = nil
@@ -390,14 +412,16 @@ class MiniExiftool
     result
   end
 
+  @@running_on_windows = /mswin|mingw|cygwin/ === RbConfig::CONFIG['host_os']
+
   def self.load_or_create_pstore
     # This will hopefully work on *NIX and Windows systems
     home = ENV['HOME'] || ENV['HOMEDRIVE'] + ENV['HOMEPATH'] || ENV['USERPROFILE']
-    subdir = RUBY_PLATFORM =~ /\bmswin/i ? '_mini_exiftool' : '.mini_exiftool'
+    subdir = @@running_on_windows ? '_mini_exiftool' : '.mini_exiftool'
     FileUtils.mkdir_p(File.join(home, subdir))
-    filename = File.join(home, subdir, 'exiftool_tags_' << exiftool_version.gsub('.', '_') << '.pstore')
-    @@pstore = PStore.new filename
-    if !File.exist?(filename) || File.size(filename) == 0
+    pstore_filename = File.join(home, subdir, 'exiftool_tags_' << exiftool_version.gsub('.', '_') << '.pstore')
+    @@pstore = PStore.new pstore_filename
+    if !File.exist?(pstore_filename) || File.size(pstore_filename) == 0
       @@pstore.transaction do |ps|
         ps[:all_tags] = all_tags = determine_tags('list')
         ps[:writable_tags] = determine_tags('listw')
@@ -419,8 +443,14 @@ class MiniExiftool
     tags
   end
 
-  def self.escape(val)
-    '"' << val.to_s.gsub(/\\/, '\\'*4).gsub(/"/, '\"') << '"'
+  if @@running_on_windows
+    def escape val
+      '"' << val.to_s.gsub(/([\\"])/, "\\\\\\1") << '"'
+    end
+  else
+    def escape val
+      '"' << val.to_s.gsub(/([\\"$])/, "\\\\\\1") << '"'
+    end
   end
 
   # Hash with indifferent access:

data/test/data/invalid_byte_sequence_in_utf8.json

@@ -0,0 +1,4 @@
+[{
+  "SourceFile": "dba713d8-cf64-11e2-9b31-7586d7f9220b.jpg",
+  "ColorBalanceUnknown": "0212\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000X'%�Tq��_8l�w\u001A��덈܈�D��1�\u0000�Cj����f�7&n\u000C\tx\u0008�{\"6�MX��P5���\u0010��K~��.d�����ڠ\u0008)���\u0017)@��+|���\u000C3\u0005��\u000Fˁ��\u0019���o�<(m\u000B\u0002V��X\u000C\u0019>Rǐ�1\u00053���dP�1'v\u001F\u001E8o~�[p��K\u001CI�R�wa�@5�*.�5@�aw��I\u001C�M+br���,�\u001F�v�0�QeҚ�3\u0004$���]?\u0019�X\u0011��\u0002�l(=�n�\u0006-\u0001z`k#�K�� �-\u0017*���\ni-J’W=�L5�\u0012���tq�rzۇ�\u001B��f6^+�\u0000x��2#k\u000C\u0008]\t\u000F�&ɡ��\u000B��kCu��ͷP�y�܉�ꢲ\u001B��l9_޶�qT�%\u0013Z��E��Q\u0007\u0016|:Y̘�;\u0012B˭�|i�NF�AD�Ucʊ�\u0015�\u0004�W�\u000E�)��狈�{}،����G\u00114���:\u001AS��\u0014������\u001D��b+MȜ�O.f��$��\u0003��\u0003��$��f.Oɖ�G+b��\u001D��퟊���\u0014��S\u001A:���4\u0005Gܾ����}{҂����#�\u0004�W�\u0004�\u0015���cU�DA�FN�i|��B\u0012/���M?j\u0016\u0007Q��E��Z\u0007%�T{��_9l��\u001B��덂܃�!�\u0000uCj����d�7&n\u000F\t\\\u0008\rk\"3�\\x���^7g��\u0011���{s�pt'�`�B�L\u0019=���K,h��.����2 9�J\u000B#�`�\u0001�\u0006�o�<)m\n\u0002S��X\r\u0019~>Wǐ�1\u00112���e���'�\u001F\u001Fx,9�Zx��H\u001DI�R�aHA5�*+�4@�av��H\u001CIͪ�s[�8-y\u001E\u001Ew'0�QeҚ�3\u00040���V?\u0018\u000CY��R\u0003\u000Bl(=�n�\u0007�\u0000�a�\"\nK�� ��\u0016��/��i-J“�<\u0018Mپ����tq�rzۓ�\u0010��f6_߸�y]�2#k\u000C\u0008]\t\u000En'7�d����kCt\u0000�!��܉�ꢳ\u001B��m9^޷�pT�%\u0012Z��D��Q\u0006\u0016?X̙�:\u0012Cˬ�}i�NG�@D�Ubʋ�\u0014�\u0005�V�\u000F�(��튂�{|؍����G\u00104���:\u001BS��\u0015��������\u001D��c+Lȝ�N.g��$��\u0002��\u0003��%��f/OȜ�M*b�$\u0012G�\u0006�a�X���\u001A\\�5L�O;�H)�\u0000�sׂt-�t�W���񉨎���uŜZ_K���APf��RĽ\u001DIJgæ0�\u0019�^\u000B���\u0005U�*o[��IѠ6��\"\u0014M�\u0014�w�v�\u0011�H.\u001B\u000F�L��<�k^8�a�\u0006�\u0007�d�=dR��FС9��+\u001FZ�%u�ʏ{.�i�@ֳ\u0017´mʹ\"��\u0016 1���;/*�\u0005ܚ���������'�\u0004�R��[\u00088}?wǑ�0\u00056���B��1&�\u001F/x,8�[r��H\u001CIϮ�wa�@5�**�5@�aw��I\u001CHͫ�r[�8,y\u001F\u001Ev'1�PfҚ��\u0004\u0000���V?~XO\u001E��P\u0002#m+<�or\u0007H\u0000�c�0\nH��\u001D��\u0017��\t��h-�=mD��&@\u0001ix.��:��%lZ�+\u000E�ɡ F\u0013��d�ݔ�������^�\n<\u0015����\u001B�HY\u0011pv#wr\u0014]M�\"\u0007�Ơ!I\u0018��o��\u0005\u000C�\u000F\u000B���"
+}]

data/test/test_filename_access.rb

@@ -0,0 +1,60 @@
+# -- encoding: utf-8 --
+require 'helpers_for_test'
+require 'rbconfig'
+require 'tmpdir'
+
+# Thanks to uwe58 and others for hints
+
+class TestFilenameAccess < TestCase
+
+  @@running_on_windows = /mswin|mingw|cygwin/ === RbConfig::CONFIG['host_os']
+
+  @@fs_enc = Encoding.find('filesystem')
+
+  def create_testfile(basename_new)
+    tmpdir = Dir.tmpdir
+    filename_org = File.join(File.dirname(__FILE__), 'data/test.jpg')
+    filename_new = File.join(tmpdir, basename_new)
+    FileUtils.cp filename_org, filename_new.encode(@@fs_enc)
+    filename_new
+  end
+
+  def do_testing_with(basename)
+    filename_test = create_testfile(basename)
+    # read
+    m = MiniExiftool.new filename_test
+    assert_equal 400, m.iso
+    # save
+    m.iso = 200
+    m.save
+    assert_equal 200, m.iso
+    # Check original filename maybe with other encoding than filesystem
+    assert_equal basename, File.basename(m.filename)
+  rescue Exception => e
+    assert false, "File #{filename_test.inspect} not found!"
+  end
+
+  def test_access_filename_with_spaces
+    do_testing_with 'filename with spaces.jpg'
+  end
+
+  def test_access_filename_with_special_chars
+    do_testing_with 'filename_with_Ümläüts.jpg'
+  end
+
+  unless @@running_on_windows
+    def test_access_filename_with_doublequotes
+      do_testing_with 'filename_with_"doublequotes"_inside.jpg'
+    end
+  end
+
+  def test_access_filename_with_dollar_sign
+    # Thanks to Michael Dungan for the hint
+    do_testing_with 'filename_with_$_sign.jpg'
+  end
+
+  def test_access_filename_with_ampersand
+    do_testing_with 'filename_with_&_sign.jpg'
+  end
+
+end

data/test/test_invalid_byte_sequence_in_utf8.rb

@@ -0,0 +1,27 @@
+# -- encoding: utf-8 --
+require 'helpers_for_test'
+require 'json'
+
+# Thanks to Chris Salzberg (aka shioyama) and
+# Robert May (aka robotmay) for precious hints
+
+class TestInvalidByteSequenceInUtf8 < TestCase
+
+  def setup
+    @json = File.read(File.dirname(__FILE__) + '/data/invalid_byte_sequence_in_utf8.json')
+  end
+
+  def test_invalid_byte_sequence_in_utf8_cause_error
+    assert_raises ArgumentError do
+      MiniExiftool.from_json(@json)
+    end
+  end
+
+  def test_replace_invalid_chars
+    assert_nothing_raised do
+      mini_exiftool = MiniExiftool.from_json(@json, :replace_invalid_chars => '')
+      assert_equal 1036, mini_exiftool.color_balance_unknown.size
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -38,6 +38,7 @@ files:
 - test/data/Bad_PreviewIFD.jpg
 - test/data/Canon.jpg
 - test/data/INFORMATION
+- test/data/invalid_byte_sequence_in_utf8.json
 - test/data/test.jpg
 - test/data/test.jpg.json
 - test/data/test_coordinates.jpg
@@ -47,7 +48,9 @@ files:
 - test/test_class_methods.rb
 - test/test_composite.rb
 - test/test_dumping.rb
+- test/test_filename_access.rb
 - test/test_from_hash.rb
+- test/test_invalid_byte_sequence_in_utf8.rb
 - test/test_read.rb
 - test/test_read_coordinates.rb
 - test/test_read_numerical.rb
@@ -55,6 +58,7 @@ files:
 - test/test_special.rb
 - test/test_special_dates.rb
 - test/test_write.rb
+- Tutorial.rdoc
 homepage: http://gitorious.org/mini_exiftool
 licenses: []
 metadata: {}
@@ -81,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).