mini_exiftool 0.2.0 → 0.3.0

data/Changelog

@@ -1,3 +1,18 @@
+Version 0.3.0
+- Documentation completed and a Mini Tutorial added
+- Interface changes:
+  - Test if a value for a tag can be saved is now done in
+    MiniExiftool#save
+    => There is no check at the moment you set a value:
+       the tag occurs in MiniExiftool#changed_values
+    => While calling MiniExiftool#save errors can occur (see next point)
+  - MiniExiftool#save is a transaction: if one or more error occurs th file is
+    not changed! In such a case the errors can be found in MiniExiftool#errors
+  - Parameter opts of MiniExiftool.initialize is now a Hash with two options:
+    - :numerical => read metadata as numerical values
+    - :composite => read also composite tags
+- Tests added
+
 Version 0.2.0
 - Better error handling (i.e. error messages)
 - Checking if the exiftool command can be executed at loading the lib

data/README

@@ -19,51 +19,7 @@ Copyright (c) 2007 by Jan Friedrich
 Licensed under the GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1, 
 February 1999
 
-== Examples (for further information and use cases see tests):
+== Usage
 
- require 'mini_exiftool'
- 
- # copy the original test file therewith the original isn't changed
- # and the tests work
- require 'fileutils'
- FileUtils.cp('test/data/test.jpg', './test.jpg')
- 
- mini_exiftool = MiniExiftool.new 'test.jpg'
- 
- # different methods to read information
- 
- mini_exiftool['Orientation'] # ==> 'Horizontal (normal)'
- mini_exiftool['ISO'] # ==> 400
- mini_exiftool['iso'] # ==> 400
- mini_exiftool['DateTimeOriginal'].class # ==> Time
- 
- mini_exiftool.orientation # ==> 'Horizontal (normal)'
- mini_exiftool.iso # ==> 400
- mini_exiftool.datetimeoriginal.class # ==> Time
- mini_exiftool.date_time_original.class # ==> Time
- 
- # numerical access
- 
- mini_exiftool_num = MiniExiftool.new 'test.jpg', :numerical
- mini_exiftool_num['Orientation'] # ==> 1
- 
- 
- # write access
- 
- mini_exiftool_num['Orientation'] = 2
- mini_exiftool_num['ISO'] = 200
- mini_exiftool_num['Orientation'] # ==> 2
- mini_exiftool_num['ISO'] # ==> 200
- mini_exiftool_num.reload
- mini_exiftool_num['Orientation'] # ==> 1
- mini_exiftool_num['ISO'] # ==> 400
- 
- mini_exiftool_num['Orientation'] = 2
- mini_exiftool_num['ISO'] = 200
- mini_exiftool_num.changed? # ==> true
- mini_exiftool_num.changed_tags # ==> ["ISO", "Orientation"]
- mini_exiftool_num.save
- mini_exiftool_num.changed? # ==> false
- mini_exiftool_num.changed_tags # ==> []
- mini_exiftool_num['Orientation'] # ==> 2
- mini_exiftool_num['ISO'] # ==> 200
+For further information about using MiniExiftool read the Tutorial and
+have a look at the examples in directory examples.

data/Rakefile

@@ -60,7 +60,7 @@ GENERAL_RDOC_OPTS = {
 }
 
 # Additional RDoc formatted files, besides the Ruby source files.
-RDOC_FILES = FileList["README"]
+RDOC_FILES = FileList["README", 'Tutorial']
 # Remove the following line if you don't want to extract RDoc from
 # the extension C sources.
 RDOC_FILES.include(EXT_SOURCES)

data/Tutorial

@@ -0,0 +1,110 @@
+= Mini Tutorial
+
+
+== Installation
+
+* Installing the Exiftool command-line application from Phil Harvay
+  (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']
+
+
+=== 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. SubjectLocation => 1504 1000 256 304)
+* 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)
+
+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 make an example:
+ # standard: numerical is false
+ photo = MiniExiftool.new 'photo.jpg'
+ photo.exposure_time # => '1/16' (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.
+
+
+=== 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.
+
+
+=== Further Example
+
+See <code>shift_time.rb</code> in the +examples+ directory.

data/examples/external_photo.rb

@@ -0,0 +1,21 @@
+require 'open-uri'
+require 'rubygems'
+require 'mini_exiftool'
+
+unless ARGV.size == 1
+  puts "usage: ruby #{__FILE__} URI"
+  puts " i.e.: ruby #{__FILE__} http://www.23hq.com/janfri/photo/1535332/large"
+  exit -1
+end
+
+# Fetch an external photo
+filename = open(ARGV.first).path
+
+# Read the metadata
+photo = MiniExiftool.new filename
+
+# Print the metadata
+photo.tags.sort.each do |tag|
+#  puts "#{tag}: #{photo[tag]}"
+  puts tag.ljust(28) + photo[tag].to_s
+end

data/examples/print_portraits.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'mini_exiftool'
+
+unless ARGV.size > 0
+  puts "usage: ruby #{__FILE__} FILES"
+  puts " i.e.: ruby #{__FILE__} *.jpg"
+  exit -1
+end
+
+# Loop at all given files
+ARGV.each do |filename|
+  # If a given file isn't a photo MiniExiftool new method will throw
+  # an exception this we will catch
+  begin
+    photo = MiniExiftool.new filename
+    height = photo.image_height
+    width  = photo.image_width
+    # We define portait as a photo wich ratio of height to width is 
+    # larger than 0.7
+    if height / width > 0.7
+      puts filename
+    end
+  rescue MiniExiftool::Error => e
+    $stderr.puts e.message
+  end
+end

data/examples/shift_time.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'mini_exiftool'
+
+if ARGV.size < 2
+  puts "usage: ruby #{__FILE__} [+|-]SECONDS FILES"
+  puts " i.e.: ruby #{__FILE__} 3600 *.jpg"
+  exit -1
+end
+
+delta = ARGV.shift.to_i
+
+ARGV.each do |filename|
+  begin
+    photo = MiniExiftool.new filename
+  rescue MiniExiftool::Error => e
+    $stderr.puts e.message
+    exit -1
+  end
+  time = photo.date_time_original
+  # time is a Time object, so we can use the methods of it :)
+  photo.date_time_original = time + delta
+  save_ok = photo.save
+  if save_ok
+    fmt = '%Y-%m-%d %H:%M:%S'
+    puts "#{filename} changed: #{time.strftime(fmt)} -> #{(time + delta).strftime(fmt)}"
+  else
+    puts "#{filename} could not be changed"
+  end
+end

data/lib/mini_exiftool.rb

@@ -19,32 +19,45 @@ require 'set'
 # Simple OO access to the Exiftool command-line application.
 class MiniExiftool
 
-  # Name of the exiftool command
+  # Name of the Exiftool command-line application
   @@cmd = 'exiftool'
 
   attr_reader :filename
-  attr_accessor :numerical
+  attr_accessor :numerical, :composite, :errors
 
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
-  # opts at the moment only support :numerical for numerical values
-  # (the -n parameter in the command line)
-  def initialize filename, *opts
-    @numerical = opts.include? :numerical
+  # 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 +false+
+  def initialize filename, opts={}
+    std_opts = {:numerical => false, :composite => false}
+    opts = std_opts.update opts
+    @numerical = opts[:numerical]
+    @composite = opts[:composite]
+    @values = TagHash.new
+    @tag_names = TagHash.new
+    @changed_values = TagHash.new
+    @errors = TagHash.new
     load filename
   end
 
   # Load the tags of filename
   def load filename
-    unless File.exists? filename
+    if filename.nil? || !File.exists?(filename)
       raise MiniExiftool::Error.new("File '#{filename}' does not exist.")
+    elsif File.directory?(filename)
+      raise MiniExiftool::Error.new("'#{filename}' is a directory.")
     end
     @filename = filename
-    @values = {}
-    @tag_names = {}
-    @changed_values = {}
-    opt_params = @numerical ? '-n' : ''
-    cmd = %Q(#@@cmd -e -q -q -s -t #{opt_params} "#{filename}")
+    @values.clear
+    @tag_names.clear
+    @changed_values.clear
+    opt_params = ''
+    opt_params << (@numerical ? '-n ' : '')
+    opt_params << (@composite ? '' : '-e ')
+    cmd = %Q(#@@cmd -q -q -s -t #{opt_params} "#{filename}")
     if run(cmd)
       parse_output
     else
@@ -60,19 +73,12 @@ class MiniExiftool
 
   # Returns the value of a tag
   def [] tag
-    unified_tag = unify tag
-    @changed_values[unified_tag] || @values[unified_tag]
+    @changed_values[tag] || @values[tag]
   end
 
   # Set the value of a tag
   def []=(tag, val)
-    unified_tag = unify tag
-    converted_val = convert val
-    opt_params = converted_val.kind_of?(Numeric) ? '-n' : ''
-    cmd = %Q(#@@cmd -q -q -P -overwrite_original #{opt_params} -#{unified_tag}="#{converted_val}" "#{temp_filename}")
-    if run(cmd)
-      @changed_values[unified_tag] = val
-    end
+    @changed_values[tag] = val
   end
 
   # Return true if any tag value is changed or if the value of a
@@ -88,8 +94,7 @@ class MiniExiftool
   # Revert all changes or the change of a given tag
   def revert tag=nil
     if tag
-      unified_tag = unify tag
-      val = @changed_values.delete(unified_tag)
+      val = @changed_values.delete(tag)
       res = val != nil
     else
       res = @changed_values.size > 0
@@ -110,17 +115,29 @@ class MiniExiftool
 
   # Save the changes to the file
   def save
-    result = false
+    return false if @changed_values.empty?
+    @errors.clear
+    temp_file = Tempfile.new('mini_exiftool')
+    temp_file.close
+    temp_filename = temp_file.path
+    FileUtils.cp filename, temp_filename
+    all_ok = true
     @changed_values.each do |tag, val|
-      unified_tag = unify tag
       converted_val = convert val
       opt_params = converted_val.kind_of?(Numeric) ? '-n' : ''
-      cmd = %Q(#@@cmd -q -q -P -overwrite_original #{opt_params} -#{unified_tag}="#{converted_val}" "#{filename}")
-      run(cmd)
-      result = true
+      cmd = %Q(#@@cmd -q -P -overwrite_original #{opt_params} -#{tag}="#{converted_val}" "#{temp_filename}")
+      result = run(cmd)
+      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
+      reload
     end
-    reload
-    result
+    temp_file.delete
+    all_ok
   end
   
   # Returns the command name of the called Exiftool application
@@ -151,11 +168,10 @@ class MiniExiftool
   # Returns the version of the Exiftool command-line application
   def self.exiftool_version
     output = `#{MiniExiftool.command} -ver 2>&1`
-    if $?.exitstatus == 0
-      return output
-    else
+    unless $?.exitstatus == 0
       raise MiniExiftool::Error.new("Command '#{MiniExiftool.command}' not found")
     end
+    output.chomp!
   end
 
   private
@@ -175,10 +191,6 @@ class MiniExiftool
     end
   end
 
-  def unify name
-    name.gsub(/[_\-]/, '').downcase
-  end
-
   def convert val
     case val
     when Time
@@ -199,9 +211,8 @@ class MiniExiftool
   def parse_output
     @output.each_line do |line|
       tag, value = parse_line line
-      unified_tag = unify tag
-      @tag_names[unified_tag] = tag
-      @values[unified_tag] = value
+      @tag_names[tag] = tag
+      @values[tag] = value
     end
   end
 
@@ -236,6 +247,27 @@ class MiniExiftool
     @temp_filename
   end
 
+  # Hash with indifferent access: 
+  # DateTimeOriginal == datetimeoriginal == date_time_original
+  class TagHash < Hash
+    def[] k
+      super(unify(k))
+    end
+    def []= k, v
+      super(unify(k), v)
+    end
+    def delete k
+      super(unify(k))
+    end
+
+    private
+    def unify tag
+      tag.gsub(/[-_]/,'').downcase
+    end
+  end
+  
+
+  # Exception class
   class MiniExiftool::Error < Exception; end
 
 end

data/test/test_class_methods.rb

@@ -0,0 +1,61 @@
+require 'mini_exiftool'
+require 'test/unit'
+begin
+  require 'turn'
+rescue LoadError
+end
+
+class TestClassMethods < Test::Unit::TestCase
+
+  def test_new
+    assert_raises MiniExiftool::Error do
+      MiniExiftool.new nil
+    end
+    assert_raises MiniExiftool::Error do
+      MiniExiftool.new ''
+    end
+    assert_raises MiniExiftool::Error do
+      MiniExiftool.new 'not_existing_file'
+    end
+    assert_raises MiniExiftool::Error do
+      MiniExiftool.new '.' # directory
+    end
+    begin
+      MiniExiftool.new 'not_existing_file'
+    rescue MiniExiftool::Error => e
+      assert_match /File 'not_existing_file' does not exist/, e.message
+    end
+    assert_raises MiniExiftool::Error do
+      MiniExiftool.new __FILE__ # file type wich Exiftool can not handle
+    end
+    begin
+      MiniExiftool.new __FILE__ # file type wich Exiftool can not handle
+    rescue MiniExiftool::Error => e
+      assert_match /Error: Unknown (?:image|file) type/, e.message
+    end
+  end
+
+  def test_command
+    cmd = MiniExiftool.command
+    assert_equal 'exiftool', cmd
+    MiniExiftool.command = 'non_existend'
+    assert_equal 'non_existend', MiniExiftool.command
+    assert_raises MiniExiftool::Error do
+      met = MiniExiftool.new(File.join(File.dirname(__FILE__), 
+                                       'data/test.jpg'))
+    end
+    MiniExiftool.command = cmd
+  end
+
+  def test_writable_tags
+    w_tags = MiniExiftool.writable_tags
+    assert w_tags.include?('ISO')
+    assert_equal false, w_tags.include?('xxxxxx')
+  end
+
+  def test_exiftool_version
+    v = MiniExiftool.exiftool_version
+    assert_match /\A\d+\.\d+\z/, v
+  end
+
+end

data/test/test_composite.rb

@@ -0,0 +1,23 @@
+require 'mini_exiftool'
+require 'test/unit'
+begin
+  require 'turn'
+rescue LoadError
+end
+
+class TestComposite < Test::Unit::TestCase
+
+  def setup
+    @data_dir = File.dirname(__FILE__) + '/data'
+    @filename_test = @data_dir + '/test.jpg'
+    @mini_exiftool = MiniExiftool.new @filename_test
+    @mini_exiftool_c = MiniExiftool.new @filename_test, :composite => true
+  end
+
+  def test_composite_tags
+    assert_equal false, @mini_exiftool.tags.include?('Aperture')
+    assert_equal true, @mini_exiftool_c.tags.include?('Aperture')
+    assert_equal 9.5, @mini_exiftool_c['Aperture']
+  end
+
+end

data/test/test_read.rb

@@ -11,32 +11,6 @@ class TestRead < Test::Unit::TestCase
     @data_dir = File.dirname(__FILE__) + '/data'
     @filename_test = @data_dir + '/test.jpg'
     @mini_exiftool = MiniExiftool.new @filename_test
-    @mini_exiftool_num = MiniExiftool.new @filename_test, :numerical
-  end
-
-  def test_initialize
-    assert_raises MiniExiftool::Error do
-      MiniExiftool.new ''
-    end
-    assert_raises MiniExiftool::Error do
-      MiniExiftool.new 'not_existing_file'
-    end
-    begin
-      MiniExiftool.new 'not_existing_file'
-    rescue MiniExiftool::Error => e
-      assert_match /File 'not_existing_file' does not exist/, e.message
-    end
-  end
-
-  def test_wrong_file
-    assert_raises MiniExiftool::Error do
-      MiniExiftool.new __FILE__ # file type wich Exiftool can not handle
-    end
-    begin
-      MiniExiftool.new __FILE__ # file type wich Exiftool can not handle
-    rescue MiniExiftool::Error => e
-      assert_match /Error: Unknown image type/, e.message
-    end
   end
 
   def test_access
@@ -46,15 +20,8 @@ class TestRead < Test::Unit::TestCase
     assert_equal 400, @mini_exiftool.iso
   end
 
-  def test_access_numerical
-    assert_equal 'DYNAX 7D', @mini_exiftool_num['Model']
-    assert_equal 'MLT0', @mini_exiftool_num['maker_note_version']
-    assert_equal 'MLT0', @mini_exiftool_num.maker_note_version
-    assert_equal 400, @mini_exiftool_num.iso
-  end
-
   def test_tags
-    assert @mini_exiftool_num.tags.include?('FileSize')
+    assert @mini_exiftool.tags.include?('FileSize')
   end
 
   def test_conversion
@@ -66,14 +33,4 @@ class TestRead < Test::Unit::TestCase
     assert_kind_of Array, @mini_exiftool['SubjectLocation']
   end
 
-  def test_conversion_numerical
-    assert_kind_of String, @mini_exiftool_num.model
-    assert_kind_of Time, @mini_exiftool_num['DateTimeOriginal']
-    assert_kind_of Float, @mini_exiftool_num['MaxApertureValue']
-    assert_kind_of Fixnum, @mini_exiftool_num.flash
-    assert_kind_of String, @mini_exiftool_num.exif_version
-    assert_kind_of Fixnum, @mini_exiftool_num['ExposureCompensation']
-    assert_kind_of Array, @mini_exiftool_num['SubjectLocation']
-  end
-
 end

data/test/test_read_numerical.rb

@@ -0,0 +1,33 @@
+require 'mini_exiftool'
+require 'test/unit'
+begin
+  require 'turn'
+rescue LoadError
+end
+
+class TestReadNumerical < Test::Unit::TestCase
+
+  def setup
+    @data_dir = File.dirname(__FILE__) + '/data'
+    @filename_test = @data_dir + '/test.jpg'
+    @mini_exiftool_num = MiniExiftool.new @filename_test, :numerical => true
+  end
+
+  def test_access_numerical
+    assert_equal 'DYNAX 7D', @mini_exiftool_num['Model']
+    assert_equal 'MLT0', @mini_exiftool_num['maker_note_version']
+    assert_equal 'MLT0', @mini_exiftool_num.maker_note_version
+    assert_equal 400, @mini_exiftool_num.iso
+  end
+
+  def test_conversion_numerical
+    assert_kind_of String, @mini_exiftool_num.model
+    assert_kind_of Time, @mini_exiftool_num['DateTimeOriginal']
+    assert_kind_of Float, @mini_exiftool_num['MaxApertureValue']
+    assert_kind_of Fixnum, @mini_exiftool_num.flash
+    assert_kind_of String, @mini_exiftool_num.exif_version
+    assert_kind_of Fixnum, @mini_exiftool_num['ExposureCompensation']
+    assert_kind_of Array, @mini_exiftool_num['SubjectLocation']
+  end
+
+end

data/test/test_save.rb

@@ -0,0 +1,56 @@
+require 'digest/md5'
+require 'mini_exiftool'
+require 'fileutils'
+require 'tempfile'
+require 'test/unit'
+begin
+  require 'turn'
+rescue LoadError
+end
+
+class TestSave < Test::Unit::TestCase
+
+  def setup
+    @temp_file = Tempfile.new('test')
+    @temp_file.close
+    @temp_filename = @temp_file.path
+    @org_filename = File.dirname(__FILE__) + '/data/test.jpg'
+    FileUtils.cp(@org_filename, @temp_filename)
+    @mini_exiftool = MiniExiftool.new @temp_filename
+    @mini_exiftool_num = MiniExiftool.new @temp_filename, :numerical => true
+    @org_md5 = Digest::MD5.hexdigest(File.read(@org_filename))
+  end
+
+  def test_allowed_value
+    @mini_exiftool_num['Orientation'] = 2
+    result = @mini_exiftool_num.save
+    assert_equal true, result
+    assert_equal @org_md5, Digest::MD5.hexdigest(File.read(@org_filename))
+    assert_not_equal @org_md5, Digest::MD5.hexdigest(File.read(@temp_filename))
+    assert_equal false, @mini_exiftool_num.changed?
+    result = @mini_exiftool_num.save
+    assert_equal false, result
+  end
+
+  def test_non_allowed_value
+    @mini_exiftool['Orientation'] = 'some string'
+    result = @mini_exiftool.save
+    assert_equal false, result
+    assert_equal 1, @mini_exiftool.errors.size
+    assert_equal("Can't convert IFD0:Orientation (not in PrintConv)",
+                 @mini_exiftool.errors['Orientation'])
+    assert @mini_exiftool.changed?
+    assert @mini_exiftool.changed_tags.include?('Orientation')
+  end
+
+  def test_no_changing_of_file_when_error
+    @mini_exiftool['ISO'] = 800
+    @mini_exiftool['Orientation'] = 'some value'
+    @mini_exiftool['ExposureTime'] = '1/30'
+    result = @mini_exiftool.save
+    assert_equal false, result
+    assert_equal @org_md5, Digest::MD5.hexdigest(File.read(@org_filename))
+    assert_equal @org_md5, Digest::MD5.hexdigest(File.read(@temp_filename))
+  end
+
+end

data/test/test_write.rb

@@ -17,7 +17,7 @@ class TestWrite < Test::Unit::TestCase
     @org_filename = File.dirname(__FILE__) + '/data/test.jpg'
     FileUtils.cp(@org_filename, @temp_filename)
     @mini_exiftool = MiniExiftool.new @temp_filename
-    @mini_exiftool_num = MiniExiftool.new @temp_filename, :numerical
+    @mini_exiftool_num = MiniExiftool.new @temp_filename, :numerical => true
   end
 
   def teardown
@@ -27,7 +27,7 @@ class TestWrite < Test::Unit::TestCase
   def test_access_existing_tags
     assert_equal 'Horizontal (normal)', @mini_exiftool['Orientation']
     @mini_exiftool['Orientation'] = 'some string'
-    assert_equal 'Horizontal (normal)', @mini_exiftool['Orientation']
+    assert_equal 'some string', @mini_exiftool['Orientation']
     assert_equal false, @mini_exiftool.changed?('Orientation')
     @mini_exiftool['Orientation'] = 2
     assert_equal 2, @mini_exiftool['Orientation']
@@ -52,11 +52,11 @@ class TestWrite < Test::Unit::TestCase
     assert_equal 'Rotate 180', @mini_exiftool['Orientation']
   end
 
-  def test_access_not_existing_tags
+  def test_access_non_writable_tags
     @mini_exiftool_num['FileSize'] = 1
-    assert_equal false, @mini_exiftool_num.changed?
-    @mini_exiftool_num['SomeNotExitingName'] = 'test'
-    assert_equal false, @mini_exiftool_num.changed?
+    assert_equal true, @mini_exiftool_num.changed?
+    @mini_exiftool_num['SomeNonWritableName'] = 'test'
+    assert_equal true, @mini_exiftool_num.changed?
   end
 
   def test_time_conversion
@@ -113,20 +113,4 @@ class TestWrite < Test::Unit::TestCase
     assert_equal false, res
   end
 
-  def test_save
-    org_md5 = Digest::MD5.hexdigest(File.read(@org_filename))
-    temp_md5 = Digest::MD5.hexdigest(File.read(@temp_filename))
-    assert_equal org_md5, temp_md5
-    @mini_exiftool_num['Orientation'] = 2
-    result = @mini_exiftool_num.save
-    assert_equal true, result
-    org_md5_2 = Digest::MD5.hexdigest(File.read(@org_filename))
-    assert_equal org_md5, org_md5_2
-    temp_md5_2 = Digest::MD5.hexdigest(File.read(@temp_filename))
-    assert_not_equal temp_md5, temp_md5_2
-    assert_equal false, @mini_exiftool_num.changed?
-    result = @mini_exiftool_num.save
-    assert_equal false, result
-  end
-
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: mini_exiftool
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-02-22 00:00:00 +01:00
+  version: 0.3.0
+date: 2007-03-29 00:00:00 +02:00
 summary: A library for nice OO access to the Exiftool command-line application written by Phil Harvey.
 require_paths: 
 - lib
@@ -33,7 +33,13 @@ files:
 - test/test_write.rb
 - test/test_read.rb
 - test/test_special.rb
-- test/test_other.rb
+- test/test_class_methods.rb
+- test/test_save.rb
+- test/test_composite.rb
+- test/test_read_numerical.rb
+- examples/external_photo.rb
+- examples/print_portraits.rb
+- examples/shift_time.rb
 - Rakefile
 - COPYING
 - Changelog
@@ -41,11 +47,15 @@ files:
 - test/data/Canon.jpg
 - test/data/INFORMATION
 - README
+- Tutorial
 test_files: 
 - test/test_write.rb
 - test/test_read.rb
 - test/test_special.rb
-- test/test_other.rb
+- test/test_class_methods.rb
+- test/test_save.rb
+- test/test_composite.rb
+- test/test_read_numerical.rb
 rdoc_options: 
 - --title
 - MiniExiftool API documentation
@@ -53,6 +63,7 @@ rdoc_options:
 - README
 extra_rdoc_files: 
 - README
+- Tutorial
 executables: []
 
 extensions: []

data/test/test_other.rb

@@ -1,28 +0,0 @@
-require 'mini_exiftool'
-require 'test/unit'
-begin
-  require 'turn'
-rescue LoadError
-end
-
-class TestOther < Test::Unit::TestCase
-
-  def test_command
-    cmd = MiniExiftool.command
-    assert_equal 'exiftool', cmd
-    MiniExiftool.command = 'non_existend'
-    assert_equal 'non_existend', MiniExiftool.command
-    assert_raises MiniExiftool::Error do
-      met = MiniExiftool.new(File.join(File.dirname(__FILE__), 
-                                       'data/test.jpg'))
-    end
-    MiniExiftool.command = cmd
-  end
-
-  def test_writable_tags
-    w_tags = MiniExiftool.writable_tags
-    assert w_tags.include?('ISO')
-    assert_equal false, w_tags.include?('xxxxxx')
-  end
-
-end