mini_exiftool 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f207a729994bb4e72cb5957037646c49a35a09f
-  data.tar.gz: 020d0c56fd4ff0287ac289abd877f86d28d9719a
+  metadata.gz: 85c8d58c8a6e5dd3372fab24ddcbad3d8ec940a5
+  data.tar.gz: 2de6dc0ca9ea4fc221d9e019dca237d555c8bc13
 SHA512:
-  metadata.gz: 34de6483132b8ed9847799b7b6fdf85d49c3590322366a89eb5a5af890c4c063e681297e962bac6b73f57ec8a685fc87199e701fe6833cd3513436d1db678100
-  data.tar.gz: 0d19ac96d865f72e9edfee75a787a8d9487afb6f8580b94ca3b9af18f1f22d589aa99fcc69b05f6e83723cb87037857400988acd79109843e7bffc4dfb7f9526
+  metadata.gz: 01aafd921026ba2f6828cb3cb1355d86bfaa9dbac7b5d09da7db514aa3109b4d88680ea702bf7fbba4b3360bf6c35f6336c5770dbb7d29e518af66e24380e87f
+  data.tar.gz: 2d7b5ef57000167e18523b47cf9945a6c74598469be6d74957e2095bd29b78dc7ebcae8e3dbea854eba4847a334906d6c188fa3cd79b9d7c375451805f513665

data/Changelog

@@ -1,3 +1,6 @@
+2.4.2
+- Bugfix: Don't ignoring *_encoding options when saving.
+
 2.4.1
 - Handling tag values of the form x/0 correct.
   Thanks to Picturelife for a clever solution to solve this.
@@ -150,7 +153,7 @@ The Encoding Release
   - MiniExiftool#to_yaml
   Thanks to Andrew Bennett for the initial idea of YAML-serialization
 - Refactoring of tests
-- Small documetation update
+- Small documentation update
 
 0.5.1
 - Warning "parenthesize argument(s) for future version" removed
@@ -172,7 +175,7 @@ The Encoding Release
   Saving of non-read tags doesn't work with tags with hyphen
   Thanks to Robin Romahn for reporting the bug
 - New methods: MiniExiftool.all_tags and MiniExiftool.original_tag
-- Interna: Original tag names (all and writable) are now saved via pstore in
+- Internal: Original tag names (all and writable) are now saved via pstore in
   a file for better performance
 
 0.3.1

data/README.rdoc

@@ -14,7 +14,7 @@ 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
+need for a separate Exiftool installation. Have a look at
 http://github.com/wilg/mini_exiftool_vendored or
 http://rubygems.org/gems/mini_exiftool_vendored .
 
@@ -51,7 +51,7 @@ examples.
 
 == Contribution
 
-The code is hostet in a git repository on Gitorious at
+The code is hosted in a git repository on Gitorious at
 http://gitorious.org/mini_exiftool
 and github at
 https://github.com/janfri/mini_exiftool

data/Rakefile

@@ -1,7 +1,5 @@
-require 'rim'
-require 'rim/check_version'
-require 'rim/gem'
-require 'rim/test'
+require 'rim/tire'
+require 'rim/version'
 require 'regtest/task'
 
 $:.unshift 'lib'
@@ -14,6 +12,7 @@ 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.license = 'LPGLv2'
   p.gem_files << 'Tutorial.rdoc'
   p.install_message = %q{
 +-----------------------------------------------------------------------+

data/lib/mini_exiftool.rb

@@ -25,7 +25,7 @@ require 'time'
 # Simple OO access to the Exiftool command-line application.
 class MiniExiftool
 
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 
   # Name of the Exiftool command-line application
   @@cmd = 'exiftool'
@@ -130,11 +130,7 @@ class MiniExiftool
     params << (@opts[:numerical] ? '-n ' : '')
     params << (@opts[:composite] ? '' : '-e ')
     params << (@opts[:coord_format] ? "-c \"#{@opts[:coord_format]}\"" : '')
-    @@encoding_types.each do |enc_type|
-      if enc_val = @opts[MiniExiftool.encoding_opt(enc_type)]
-        params << "-charset #{enc_type}=#{enc_val} "
-      end
-    end
+    params << generate_encoding_params
     if run(cmd_gen(params, @filename))
       parse_output
     else
@@ -207,6 +203,7 @@ class MiniExiftool
       params = '-q -P -overwrite_original '
       params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
       params << (@opts[:ignore_minor_errors] ? '-m ' : '')
+      params << generate_encoding_params
       arr_val.each do |v|
         params << %Q(-#{original_tag}=#{escape(v)} )
       end
@@ -506,6 +503,16 @@ class MiniExiftool
     end
   end
 
+  def generate_encoding_params
+    params = ''
+    @@encoding_types.each do |enc_type|
+      if enc_val = @opts[MiniExiftool.encoding_opt(enc_type)]
+        params << "-charset #{enc_type}=#{enc_val} "
+      end
+    end
+    params
+  end
+
   # Hash with indifferent access:
   # DateTimeOriginal == datetimeoriginal == date_time_original
   class TagHash < Hash # :nodoc:

data/test/test_encodings.rb

@@ -3,7 +3,10 @@ require 'helpers_for_test'
 
 class TestEncodings < TestCase
 
+  include TempfileTest
+
   def setup
+    super
     @data_dir = File.dirname(__FILE__) + '/data'
     @filename_test = @data_dir + '/test_encodings.jpg'
     @mini_exiftool = MiniExiftool.new @filename_test
@@ -14,6 +17,14 @@ class TestEncodings < TestCase
     assert_not_equal object_name, @mini_exiftool.object_name
     correct_iptc = MiniExiftool.new(@filename_test, iptc_encoding: 'MacRoman')
     assert_equal object_name, correct_iptc.object_name
+    FileUtils.cp(@filename_test, @temp_filename)
+    correct_iptc_write = MiniExiftool.new(@temp_filename, iptc_encoding: 'MacRoman')
+    caption = 'Das ist eine Möhre'
+    correct_iptc_write.caption_abstract = caption
+    correct_iptc_write.save!
+    correct_iptc_write.reload
+    assert_equal object_name, correct_iptc_write.object_name
+    assert_equal caption, correct_iptc_write.caption_abstract
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '2.4'
 description: ''
 email: janfri26@gmail.com
 executables: []
@@ -65,7 +65,8 @@ files:
 - test/test_special_dates.rb
 - test/test_write.rb
 homepage: http://gitorious.org/mini_exiftool
-licenses: []
+licenses:
+- LPGLv2
 metadata: {}
 post_install_message: "\n+-----------------------------------------------------------------------+\n|
   Please ensure you have installed exiftool at least version 7.65       |\n| and it's