mini_exiftool 1.4.4 → 1.5.0

data/Changelog

@@ -1,3 +1,9 @@
+v1.5.0
+- Supporting exiftool command-line option -m.
+  rubyforge request [#29587]
+  Thanks to Michael Grove for reporting.
+- Supporting rational values.
+
 v1.4.4
 - Fix escaping of values for older versions of Shellwords.
 

data/lib/mini_exiftool.rb

@@ -27,19 +27,21 @@ class MiniExiftool
   @@cmd = 'exiftool'
 
   # Hash of the standard options used when call MiniExiftool.new
-  @@opts = { :numerical => false, :composite => true, :convert_encoding => false, :timestamps => Time }
+  @@opts = { :numerical => false, :composite => true, :convert_encoding => false, :ignore_minor_errors => false, :timestamps => Time }
 
   attr_reader :filename
-  attr_accessor :numerical, :composite, :convert_encoding, :errors, :timestamps
+  attr_accessor :numerical, :composite, :convert_encoding, :ignore_minor_errors, :errors, :timestamps
 
-  VERSION = '1.4.4'
+  VERSION = '1.5.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+
+  #   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>:timestamps</code> generating DateTime objects instead of
   #   Time objects if set to <code>DateTime</code>, default is +Time+
   #
@@ -51,6 +53,7 @@ class MiniExiftool
     @numerical = opts[:numerical]
     @composite = opts[:composite]
     @convert_encoding = opts[:convert_encoding]
+    @ignore_minor_errors = opts[:ignore_minor_errors]
     @timestamps = opts[:timestamps]
     @values = TagHash.new
     @tag_names = TagHash.new
@@ -159,6 +162,7 @@ class MiniExiftool
       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.respond_to?(:encode)
         cmd.encode('ISO-8859-1')
@@ -341,6 +345,8 @@ class MiniExiftool
         # nothing => String
       when /^-?\d+$/
         value = value.to_i
+      when %r(^\d+/\d+$)
+        value = Rational(value)
       when /^[\d ]+$/
         # nothing => String
       when /#{@@separator}/

data/mini_exiftool.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mini_exiftool"
-  s.version = "1.4.4"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Friedrich"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = "This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool)."
   s.email = "janfri26@gmail.com"
   s.extra_rdoc_files = ["README.rdoc", "Tutorial.rdoc", "lib/mini_exiftool.rb"]
-  s.files = ["COPYING", "Changelog", "Manifest", "README.rdoc", "Rakefile", "TODO", "Tutorial.rdoc", ".yardopts", "examples/external_photo.rb", "examples/print_portraits.rb", "examples/shift_time.rb", "lib/mini_exiftool.rb", "setup.rb", "test/data/Canon.jpg", "test/data/INFORMATION", "test/data/test.jpg", "test/data/test_special_dates.jpg", "test/helpers_for_test.rb", "test/test_class_methods.rb", "test/test_composite.rb", "test/test_dumping.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", "mini_exiftool.gemspec"]
+  s.files = ["COPYING", "Changelog", "Manifest", "README.rdoc", "Rakefile", "TODO", "Tutorial.rdoc", ".yardopts", "examples/external_photo.rb", "examples/print_portraits.rb", "examples/shift_time.rb", "lib/mini_exiftool.rb", "setup.rb", "test/data/Canon.jpg", "test/data/INFORMATION", "test/data/test.jpg", "test/data/test_special_dates.jpg", "test/helpers_for_test.rb", "test/test_class_methods.rb", "test/test_composite.rb", "test/test_dumping.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", "mini_exiftool.gemspec", "test/test_bad_preview_ifd.rb"]
   s.homepage = "http://gitorious.org/mini_exiftool"
   s.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  "
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Mini_exiftool", "--main", "README.rdoc"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "mini_exiftool"
   s.rubygems_version = "1.8.24"
   s.summary = "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_read.rb", "test/test_read_numerical.rb", "test/test_save.rb", "test/test_special.rb", "test/test_special_dates.rb", "test/test_write.rb"]
+  s.test_files = ["test/helpers_for_test.rb", "test/test_bad_preview_ifd.rb", "test/test_class_methods.rb", "test/test_composite.rb", "test/test_dumping.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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_bad_preview_ifd.rb

@@ -0,0 +1,29 @@
+# -- encoding: utf-8 --
+require 'helpers_for_test'
+
+class TestBadPreviewIFD < TestCase
+
+  include TempfileTest
+
+  def setup
+    super
+    @org_filename = @data_dir + '/Bad_PreviewIFD.jpg'
+    FileUtils.cp @org_filename, @temp_filename
+    @bad_preview_ifd = MiniExiftool.new @temp_filename
+  end
+
+  # Feature request rubyforge [#29587]
+  # Thanks to Michael Grove for reporting
+  def test_m_option
+    title = 'anything'
+    @bad_preview_ifd.title = title
+    assert_equal false, @bad_preview_ifd.save, '-m option seems to be not neccessary'
+    @bad_preview_ifd.reload
+    @bad_preview_ifd.title = title
+    @bad_preview_ifd.ignore_minor_errors = true
+    assert_equal true, @bad_preview_ifd.save, 'Error while saving'
+    @bad_preview_ifd.reload
+    assert_equal title, @bad_preview_ifd.title
+  end
+
+end

data/test/test_read.rb

@@ -31,6 +31,7 @@ class TestRead < TestCase
     assert_kind_of String, (@mini_exiftool['SubjectLocation'] || @mini_exiftool['SubjectArea'])
     assert_kind_of Array, @mini_exiftool['Keywords']
     assert_kind_of String, @mini_exiftool['SupplementalCategories']
+    assert_kind_of Rational, @mini_exiftool.shutterspeed
   end
 
   def test_list_tags

data/test/test_write.rb

@@ -90,7 +90,7 @@ class TestWrite < TestCase
 
   def test_float_conversion
     assert_kind_of Float, @mini_exiftool_num['BrightnessValue']
-    new_time = @mini_exiftool_num['BrightnessValue'] + 1 
+    new_time = @mini_exiftool_num['BrightnessValue'] + 1
     @mini_exiftool_num['BrightnessValue'] = new_time
     assert_equal new_time, @mini_exiftool_num['BrightnessValue']
     assert_equal true, @mini_exiftool_num.changed_tags.include?('BrightnessValue')
@@ -109,6 +109,16 @@ class TestWrite < TestCase
     assert_equal new_mode, @mini_exiftool_num['MeteringMode']
   end
 
+  def test_rational_conversion
+    new_exposure_time = Rational(1, 125)
+    @mini_exiftool.exposure_time = new_exposure_time
+    assert @mini_exiftool.changed?, 'No changing of value.'
+    ok = @mini_exiftool.save
+    assert ok, 'Saving failed.'
+    @mini_exiftool.reload
+    assert_equal new_exposure_time, @mini_exiftool.exposure_time
+  end
+
   def test_list_conversion
     arr =  ['a', 'b', 'c']
     @mini_exiftool['Keywords'] = arr

metadata

@@ -2,7 +2,7 @@
 name: mini_exiftool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jan Friedrich
@@ -52,6 +52,7 @@ files:
 - test/test_special_dates.rb
 - test/test_write.rb
 - mini_exiftool.gemspec
+- test/test_bad_preview_ifd.rb
 homepage: http://gitorious.org/mini_exiftool
 licenses: []
 
@@ -91,6 +92,7 @@ specification_version: 3
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).
 test_files: 
 - test/helpers_for_test.rb
+- test/test_bad_preview_ifd.rb
 - test/test_class_methods.rb
 - test/test_composite.rb
 - test/test_dumping.rb