mini_exiftool 1.2.2 → 1.3.0

data/Changelog

@@ -1,3 +1,7 @@
+v1.3.0
+- MiniExiftool is now ready for Ruby 1.9
+  All tests in the test suite pass. :)
+
 v1.2.2
 - Fixing ptore directory naming convention for darwin.
   Thanks to Denis Barushev for the hint.

data/examples/external_photo.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'open-uri'
 require 'rubygems'
 require 'mini_exiftool'

data/examples/print_portraits.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'rubygems'
 require 'mini_exiftool'
 

data/examples/shift_time.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'rubygems'
 require 'mini_exiftool'
 

data/lib/mini_exiftool.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 #
 # MiniExiftool
 #
@@ -31,7 +32,7 @@ class MiniExiftool
   attr_reader :filename
   attr_accessor :numerical, :composite, :convert_encoding, :errors, :timestamps
 
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 
   # +opts+ support at the moment
   # * <code>:numerical</code> for numerical values, default is +false+
@@ -159,6 +160,9 @@ class MiniExiftool
       opt_params << (arr_val.detect {|x| x.kind_of?(Numeric)} ? '-n ' : '')
       opt_params << (@convert_encoding ? '-L ' : '')
       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')
+      end
       result = run(cmd)
       unless result
         all_ok = false
@@ -277,6 +281,9 @@ 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

data/mini_exiftool.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mini_exiftool}
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Friedrich"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-04-07}
   s.description = %q{This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).}
   s.email = %q{janfri26@gmail.com}
   s.extra_rdoc_files = ["README", "Tutorial", "lib/mini_exiftool.rb"]
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Mini_exiftool", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mini_exiftool}
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).}
   s.test_files = ["test/helpers_for_test.rb", "test/test_class_methods.rb", "test/test_composite.rb", "test/test_dumping.rb", "test/test_escape_filename.rb", "test/test_read.rb", "test/test_read_numerical.rb", "test/test_save.rb", "test/test_special.rb", "test/test_special_dates.rb", "test/test_write.rb"]
 

data/setup.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 #
 # setup.rb
 #

data/test/helpers_for_test.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'mini_exiftool'
 require 'test/unit'
 begin

data/test/test_class_methods.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'helpers_for_test'
 
 class TestClassMethods < TestCase

data/test/test_composite.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'helpers_for_test'
 
 class TestComposite < TestCase

data/test/test_dumping.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'helpers_for_test'
 require 'yaml'
 

data/test/test_read.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'helpers_for_test'
 
 class TestRead < TestCase
@@ -40,7 +41,11 @@ class TestRead < TestCase
   def test_encoding_conversion
     @mini_exiftool_converted = MiniExiftool.new @filename_test, :convert_encoding => true
     assert_equal 'Abenddämmerung', @mini_exiftool.title
-    assert_equal "Abendd\344mmerung", @mini_exiftool_converted.title
+    converted = "Abendd\344mmerung"
+    if converted.respond_to?(:force_encoding)
+      converted.force_encoding('ISO-8859-1')
+    end
+    assert_equal converted, @mini_exiftool_converted.title
   end
 
 end

data/test/test_read_numerical.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'helpers_for_test'
 
 class TestReadNumerical < TestCase

data/test/test_save.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'digest/md5'
 require 'fileutils'
 require 'tempfile'
@@ -49,16 +50,24 @@ class TestSave < TestCase
   end
 
   def test_encoding_conversion
-    special_string = 'ÄÖÜ'
+    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
     @mini_exiftool.title = special_string
     assert @mini_exiftool.save
     assert_equal false, @mini_exiftool.convert_encoding
     assert_equal special_string, @mini_exiftool.title
     @mini_exiftool.convert_encoding = true
-    @mini_exiftool.title = special_string
+    @mini_exiftool.title = special_string_latin1
     assert @mini_exiftool.save
     assert_equal true, @mini_exiftool.convert_encoding
-    assert_equal special_string, @mini_exiftool.title
+    if special_string_latin1.respond_to?(:encode)
+      special_string_latin1.encode!('ISO-8859-1')
+    end
+    assert_equal special_string_latin1, @mini_exiftool.title
   end
 
 end

data/test/test_special.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'fileutils'
 require 'tempfile'
 require 'helpers_for_test'

data/test/test_special_dates.rb

@@ -1,3 +1,5 @@
+# -- encoding: utf-8 --
+require 'date'
 require 'fileutils'
 require 'tempfile'
 require 'helpers_for_test'

data/test/test_write.rb

@@ -1,3 +1,4 @@
+# -- encoding: utf-8 --
 require 'digest/md5'
 require 'fileutils'
 require 'tempfile'
@@ -58,7 +59,7 @@ class TestWrite < TestCase
     t = Time.now
     @mini_exiftool_num['DateTimeOriginal'] = t
     assert_kind_of Time, @mini_exiftool_num['DateTimeOriginal']
-    assert true, @mini_exiftool_num.changed_tags.include?('DateTimeOriginal')
+    assert_equal true, @mini_exiftool_num.changed_tags.include?('DateTimeOriginal')
     @mini_exiftool_num.save
     assert_equal false, @mini_exiftool_num.changed?
     assert_kind_of Time, @mini_exiftool_num['DateTimeOriginal']
@@ -70,7 +71,7 @@ class TestWrite < TestCase
     new_time = @mini_exiftool_num['BrightnessValue'] + 1 
     @mini_exiftool_num['BrightnessValue'] = new_time
     assert_equal new_time, @mini_exiftool_num['BrightnessValue']
-    assert true, @mini_exiftool_num.changed_tags.include?('BrightnessValue')
+    assert_equal true, @mini_exiftool_num.changed_tags.include?('BrightnessValue')
     @mini_exiftool_num.save
     assert_kind_of Float, @mini_exiftool_num['BrightnessValue']
     assert_equal new_time, @mini_exiftool_num['BrightnessValue']

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mini_exiftool
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jan Friedrich
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
+date: 2011-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -83,24 +78,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: mini_exiftool
-rubygems_version: 1.6.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).