mini_exiftool 1.3.1 → 1.4.0

data/Changelog

@@ -1,3 +1,7 @@
+v1.4.0
+- Allow symbols for tag access with [].
+- Refactoring tests.
+
 v1.3.1
 - Remove TestEscapeFilename test and releating test photo
   because the latter produces errors on windows systems.
@@ -35,7 +39,7 @@ v1.0.1
 
 v1.0.0
 - Be aware changing in the interface:
-  - List tags (e.g. Keywords, SupplementalCategories) are now handled as 
+  - List tags (e.g. Keywords, SupplementalCategories) are now handled as
     arrays.
   - Tag SubjectLocation is not longer an array value but a string value!
 
@@ -64,7 +68,7 @@ v0.5.1
 v0.5.0
 - New option :timestamps to create DateTime objects instead of Time objects
   for timestamps (Fixing bug #16328)
-- Invalid values of timestamps (i.e. 0000:00:00 00:00:00) are now mapped 
+- Invalid values of timestamps (i.e. 0000:00:00 00:00:00) are now mapped
   to false
 
 v0.4.1
@@ -74,7 +78,7 @@ v0.4.0
 - MiniExiftool::Error inherits now from StandardError
 - Alternative installation via setup.rb
 - Bugfix
-  Saving of non-readed tags doesn't work with tags with hyphen
+  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

data/TODO

@@ -1,4 +1,2 @@
 * Tests for managing tags with pstore
-* Update Tutorial
-  * Describing the options :composite and :timestamps
 * Looking for a solution to dump and restore DateTime instances with YAML

data/Tutorial

@@ -28,6 +28,10 @@ following expressions are equivalent:
  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
 
@@ -44,7 +48,7 @@ or also
 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) 
+* Float (e. g. FNumber => 9.5)
 * String (e. g. Model => DYNAX 7D)
 * Time (e. g. DateTimeOriginal => 2005:09:13 20:08:50)
 
@@ -83,7 +87,7 @@ 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 
+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.
 

data/lib/mini_exiftool.rb

@@ -9,7 +9,7 @@
 #
 # Author: Jan Friedrich
 # Copyright (c) 2007-2011 by Jan Friedrich
-# Licensed under the GNU LESSER GENERAL PUBLIC LICENSE, 
+# Licensed under the GNU LESSER GENERAL PUBLIC LICENSE,
 # Version 2.1, February 1999
 #
 
@@ -32,13 +32,13 @@ class MiniExiftool
   attr_reader :filename
   attr_accessor :numerical, :composite, :convert_encoding, :errors, :timestamps
 
-  VERSION = '1.3.1'
+  VERSION = '1.4.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 
+  # * <code>:convert_encoding</code> convert encoding (See -L-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+
@@ -59,7 +59,7 @@ class MiniExiftool
     load filename unless filename.nil?
   end
 
-  def initialize_from_hash hash # :nodoc: 
+  def initialize_from_hash hash # :nodoc:
     hash.each_pair do |tag,value|
       set_value tag, value
     end
@@ -92,7 +92,7 @@ class MiniExiftool
     self
   end
 
-  # Reload the tags of an already readed file.
+  # Reload the tags of an already read file.
   def reload
     load @filename
   end
@@ -129,7 +129,7 @@ class MiniExiftool
     res
   end
 
-  # Returns an array of the tags (original tag names) of the readed file.
+  # Returns an array of the tags (original tag names) of the read file.
   def tags
     @values.keys.map { |key| @tag_names[key] }
   end
@@ -185,9 +185,9 @@ class MiniExiftool
       result[@tag_names[k]] = v
     end
     result
-  end 
+  end
 
-  # Returns a YAML representation of the original loaded values of the 
+  # Returns a YAML representation of the original loaded values of the
   # MiniExiftool instance.
   def to_yaml
     to_hash.to_yaml
@@ -255,7 +255,7 @@ class MiniExiftool
   end
 
   def self.unify tag
-    tag.gsub(/[-_]/,'').downcase
+    tag.to_s.gsub(/[-_]/,'').downcase
   end
 
   # Exception class
@@ -420,7 +420,7 @@ class MiniExiftool
   end
 
 
-  # Hash with indifferent access: 
+  # Hash with indifferent access:
   # DateTimeOriginal == datetimeoriginal == date_time_original
   class TagHash < Hash # :nodoc:
     def[] k
@@ -437,7 +437,7 @@ class MiniExiftool
       MiniExiftool.unify tag
     end
   end
-  
+
 end
 
 # Add to_a to Numerical if it's not yet defined

data/mini_exiftool.gemspec

@@ -1,30 +1,24 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mini_exiftool}
-  s.version = "1.3.1"
+  s.name = "mini_exiftool"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Jan Friedrich}]
-  s.date = %q{2011-07-29}
-  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 = [%q{README}, %q{Tutorial}, %q{lib/mini_exiftool.rb}]
-  s.files = [%q{COPYING}, %q{Changelog}, %q{Manifest}, %q{README}, %q{Rakefile}, %q{TODO}, %q{Tutorial}, %q{examples/external_photo.rb}, %q{examples/print_portraits.rb}, %q{examples/shift_time.rb}, %q{lib/mini_exiftool.rb}, %q{setup.rb}, %q{test/data/Canon.jpg}, %q{test/data/INFORMATION}, %q{test/data/test.jpg}, %q{test/data/test_special_dates.jpg}, %q{test/helpers_for_test.rb}, %q{test/test_class_methods.rb}, %q{test/test_composite.rb}, %q{test/test_dumping.rb}, %q{test/test_read.rb}, %q{test/test_read_numerical.rb}, %q{test/test_save.rb}, %q{test/test_special.rb}, %q{test/test_special_dates.rb}, %q{test/test_write.rb}, %q{mini_exiftool.gemspec}]
-  s.homepage = %q{http://gitorious.org/mini_exiftool}
-  s.post_install_message = %q{
-+-----------------------------------------------------------------------+
-| Please ensure you have installed exiftool and it's found in your PATH |
-| (Try "exiftool -ver" on your commandline). For more details see       |
-| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |
-+-----------------------------------------------------------------------+
-  }
-  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Mini_exiftool}, %q{--main}, %q{README}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{mini_exiftool}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).}
-  s.test_files = [%q{test/helpers_for_test.rb}, %q{test/test_class_methods.rb}, %q{test/test_composite.rb}, %q{test/test_dumping.rb}, %q{test/test_read.rb}, %q{test/test_read_numerical.rb}, %q{test/test_save.rb}, %q{test/test_special.rb}, %q{test/test_special_dates.rb}, %q{test/test_write.rb}]
+  s.authors = ["Jan Friedrich"]
+  s.date = "2012-04-11"
+  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", "Tutorial", "lib/mini_exiftool.rb"]
+  s.files = ["COPYING", "Changelog", "Manifest", "README", "Rakefile", "TODO", "Tutorial", "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.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"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "mini_exiftool"
+  s.rubygems_version = "1.8.21"
+  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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/helpers_for_test.rb

@@ -1,6 +1,8 @@
 # -- encoding: utf-8 --
 require 'mini_exiftool'
 require 'test/unit'
+require 'fileutils'
+require 'tempfile'
 begin
   require 'turn'
 rescue LoadError
@@ -12,3 +14,15 @@ rescue LoadError
 end
 
 include Test::Unit
+
+module TempfileTest
+  def setup
+    @temp_file = Tempfile.new('test')
+    @temp_filename = @temp_file.path
+    @data_dir = File.dirname(__FILE__) + '/data'
+  end
+
+  def teardown
+    @temp_file.close
+  end
+end

data/test/test_read.rb

@@ -12,6 +12,8 @@ class TestRead < TestCase
   def test_access
     assert_equal 'DYNAX 7D', @mini_exiftool['Model']
     assert_equal 'MLT0', @mini_exiftool['maker_note_version']
+    assert_equal 'MLT0', @mini_exiftool[:MakerNoteVersion]
+    assert_equal 'MLT0', @mini_exiftool[:maker_note_version]
     assert_equal 'MLT0', @mini_exiftool.maker_note_version
     assert_equal 400, @mini_exiftool.iso
   end

data/test/test_read_numerical.rb

@@ -12,6 +12,8 @@ class TestReadNumerical < TestCase
   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[:MakerNoteVersion]
+    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

data/test/test_save.rb

@@ -6,11 +6,11 @@ require 'helpers_for_test'
 
 class TestSave < TestCase
 
+  include TempfileTest
+
   def setup
-    @temp_file = Tempfile.new('test')
-    @temp_file.close
-    @temp_filename = @temp_file.path
-    @org_filename = File.dirname(__FILE__) + '/data/test.jpg'
+    super
+    @org_filename = @data_dir + '/test.jpg'
     FileUtils.cp(@org_filename, @temp_filename)
     @mini_exiftool = MiniExiftool.new @temp_filename
     @mini_exiftool_num = MiniExiftool.new @temp_filename, :numerical => true

data/test/test_special.rb

@@ -1,19 +1,16 @@
 # -- encoding: utf-8 --
-require 'fileutils'
-require 'tempfile'
 require 'helpers_for_test'
 
 class TestSpecial < TestCase
 
+  include TempfileTest
+
   CAPTION_ABSTRACT =  'Some text for caption abstract'
 
   def setup
-    data_dir = File.dirname(__FILE__) + '/data'
-    temp_file = Tempfile.new('test')
-    temp_file.close
-    @temp_filename = temp_file.path
-    org_filename = data_dir + '/Canon.jpg'
-    FileUtils.cp org_filename, @temp_filename
+    super
+    @org_filename = @data_dir + '/Canon.jpg'
+    FileUtils.cp @org_filename, @temp_filename
     @canon = MiniExiftool.new @temp_filename
   end
 

data/test/test_special_dates.rb

@@ -1,18 +1,15 @@
 # -- encoding: utf-8 --
 require 'date'
-require 'fileutils'
-require 'tempfile'
 require 'helpers_for_test'
 
 class TestSpecialDates < TestCase
 
+  include TempfileTest
+
   def setup
-    data_dir = File.dirname(__FILE__) + '/data'
-    temp_file = Tempfile.new('test')
-    temp_file.close
-    @temp_filename = temp_file.path
-    org_filename = data_dir + '/test_special_dates.jpg'
-    FileUtils.cp org_filename, @temp_filename
+    super
+    @org_filename = @data_dir + '/test_special_dates.jpg'
+    FileUtils.cp @org_filename, @temp_filename
     @mini_exiftool = MiniExiftool.new @temp_filename
     @mini_exiftool_datetime = MiniExiftool.new @temp_filename,
       :timestamps => DateTime
@@ -21,7 +18,7 @@ class TestSpecialDates < TestCase
   # Catching bug [#16328] (1st part)
   # Thanks to unknown
   def test_datetime
-    datetime_original = @mini_exiftool.datetime_original 
+    datetime_original = @mini_exiftool.datetime_original
     if datetime_original
       assert_kind_of Time, datetime_original
     else

metadata

@@ -2,7 +2,7 @@
 name: mini_exiftool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jan Friedrich
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: []
 
 description: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mini_exiftool
-rubygems_version: 1.8.5
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).