mini_exiftool 0.4.1 → 0.5.0

data/Changelog

@@ -1,3 +1,9 @@
+Version 0.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 
+  to false
+
 Version 0.4.1
 - Compatibility for Ruby 1.9
 

data/Tutorial

@@ -54,7 +54,7 @@ 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:
+Let's look at an example:
  # standard: numerical is false
  photo = MiniExiftool.new 'photo.jpg'
  photo.exposure_time # => '1/60' (String)
@@ -66,13 +66,14 @@ 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.
 
+<b>TODO:</b> Describing the options <code>:composite</code> and
+<code>:timestamps</code>!
 
 == Lesson 2: Writing Meta Data
 
@@ -104,7 +105,8 @@ 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.
 
+You should also look at the rdoc information of MiniExiftool.
 
 === Further Example
 
-See <code>shift_time.rb</code> in the +examples+ directory.
+See <code>shift_time.rb</code> in the +examples+ directory.

data/lib/mini_exiftool.rb

@@ -25,19 +25,26 @@ class MiniExiftool
   @@cmd = 'exiftool'
 
   attr_reader :filename
-  attr_accessor :numerical, :composite, :errors
+  attr_accessor :numerical, :composite, :errors, :timestamps
 
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 
-  # opts support at the moment
+  # +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+
+  # * <code>:timestamps</code> generating DateTime objects instead of
+  #   Time objects if set to <code>DateTime</code>, default is +Time+
+  #
+  #   <b>ATTENTION:</b> Time objects are created using <code>Time.local</code>
+  #   therefore they use <em>your local timezone</em>, DateTime objects instead
+  #   are created <em>without timezone</em>!
   def initialize filename, opts={}
-    std_opts = {:numerical => false, :composite => false}
+    std_opts = {:numerical => false, :composite => false, :timestamps => Time}
     opts = std_opts.update opts
     @numerical = opts[:numerical]
     @composite = opts[:composite]
+    @timestamps = opts[:timestamps]
     @values = TagHash.new
     @tag_names = TagHash.new
     @changed_values = TagHash.new
@@ -244,7 +251,17 @@ class MiniExiftool
       when /^\d{4}:\d\d:\d\d \d\d:\d\d:\d\d$/
         arr = value.split /[: ]/
         arr.map! {|elem| elem.to_i}
-        value = Time.local *arr
+        begin
+          if @timestamps == Time
+            value = Time.local *arr
+          elsif @timestamps == DateTime
+            value = DateTime.strptime(value,'%Y:%m:%d %H:%M:%S') 
+          else
+            raise MiniExiftool::Error.new "Value #@timestamps not allowed for option timestamps."
+          end
+        rescue ArgumentError
+          value = false
+        end
       when /^\d+\.\d+$/
         value = value.to_f
       when /^0+[1-9]+$/

data/test/test_special_dates.rb

@@ -0,0 +1,52 @@
+require 'date'
+require 'fileutils'
+require 'mini_exiftool'
+require 'tempfile'
+require 'test/unit'
+begin
+  require 'turn'
+rescue LoadError
+end
+
+class TestSpecialDates < Test::Unit::TestCase
+
+  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
+    @mini_exiftool = MiniExiftool.new @temp_filename
+    @mini_exiftool_datetime = MiniExiftool.new @temp_filename,
+      :timestamps => DateTime
+  end
+
+  # Catching bug [#16328] (1st part)
+  # Thanks to unknown
+  def test_datetime
+    datetime_original = @mini_exiftool.datetime_original 
+    if datetime_original
+      assert_kind_of Time, datetime_original
+    else
+      assert_equal false, datetime_original
+    end
+    assert_kind_of DateTime, @mini_exiftool_datetime.datetime_original
+    assert_raise MiniExiftool::Error do
+      @mini_exiftool.timestamps = String
+      @mini_exiftool.reload
+    end
+    @mini_exiftool.timestamps = DateTime
+    @mini_exiftool.reload
+    assert_equal @mini_exiftool_datetime.datetime_original,
+      @mini_exiftool.datetime_original
+  end
+
+  # Catching bug [#16328] (2nd part)
+  # Thanks to Cecil Coupe
+  def test_invalid_date
+    assert_equal false, @mini_exiftool.modify_date
+  end
+
+end
+

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
-specification_version: 1
 name: mini_exiftool
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2008-01-03 00:00:00 +01:00
-summary: A library for nice OO access to the Exiftool command-line application written by Phil Harvey.
-require_paths: 
-- lib
-email: miniexiftool@googlemail.com
-homepage: http://miniexiftool.rubyforge.org/
-rubyforge_project: miniexiftool
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jan Friedrich
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-01 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: miniexiftool@googlemail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- Tutorial
 files: 
 - lib/mini_exiftool.rb
 - test/test_write.rb
@@ -37,6 +31,7 @@ files:
 - test/test_save.rb
 - test/test_composite.rb
 - test/test_read_numerical.rb
+- test/test_special_dates.rb
 - examples/external_photo.rb
 - examples/print_portraits.rb
 - examples/shift_time.rb
@@ -47,8 +42,38 @@ files:
 - test/data/test.jpg
 - test/data/Canon.jpg
 - test/data/INFORMATION
+- test/data/test_special_dates.jpg
 - README
 - Tutorial
+has_rdoc: true
+homepage: http://miniexiftool.rubyforge.org/
+post_install_message: 
+rdoc_options: 
+- --title
+- MiniExiftool API documentation
+- --main
+- README
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: miniexiftool
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A library for nice OO access to the Exiftool command-line application written by Phil Harvey.
 test_files: 
 - test/test_write.rb
 - test/test_read.rb
@@ -57,19 +82,4 @@ test_files:
 - test/test_save.rb
 - test/test_composite.rb
 - test/test_read_numerical.rb
-rdoc_options: 
-- --title
-- MiniExiftool API documentation
-- --main
-- README
-extra_rdoc_files: 
-- README
-- Tutorial
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-
+- test/test_special_dates.rb