exifr 0.9.5.1 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 0.9.6
+* bug fix; "[#8458] Conversion from string to Time fails", weird dates will now reflect nil
+
 EXIF Reader 0.9.5.1
 * make tinderbox happy by hiding rcov task
 

data/Rakefile

@@ -6,7 +6,7 @@ task :default => :test
 
 spec = Gem::Specification.new do |s|
   s.name = 'exifr'
-  s.version = '0.9.5.1'
+  s.version = '0.9.6'
   s.author = "R.W. van 't Veer"
   s.email = 'remco@remvee.net'
   s.homepage = 'http://exifr.rubyforge.org/'

data/lib/exif.rb

@@ -180,7 +180,7 @@ module EXIFR
 
     time_proc = proc do |value|
       if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-        Time.mktime($1, $2, $3, $4, $5, $6)
+        Time.mktime($1, $2, $3, $4, $5, $6) rescue nil
       else
         value
       end

data/tests/test_exif.rb

@@ -4,9 +4,8 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class TestEXIF < Test::Unit::TestCase
   def test_initialize
-    [['canon-g3.exif', 'Canon PowerShot G3']].each do |fname,model|
-      data = open(f(fname)) { |rd| rd.read }
-      assert_equal EXIF.new(data).model, model
+    [[f('canon-g3.exif'), 'Canon PowerShot G3']].each do |fname,model|
+      assert_equal EXIF.new(File.read(fname)).model, model
     end
     
     assert_raise RuntimeError, 'no II or MM marker found' do
@@ -15,16 +14,15 @@ class TestEXIF < Test::Unit::TestCase
   end
   
   def test_dates
-    all_test_exifs.each do |fname|
-      data = open(fname) { |rd| rd.read }
-      assert_kind_of Time, EXIF.new(data).date_time
+    (all_test_exifs - [f('weird_date.exif')]).each do |fname|
+      assert_kind_of Time, EXIF.new(File.read(fname)).date_time
     end
+    assert_nil EXIF.new(File.read(f('weird_date.exif'))).date_time
   end
   
   def test_orientation
     all_test_exifs.each do |fname|
-      data = open(fname) { |rd| rd.read }
-      orientation = EXIF.new(data).orientation
+      orientation = EXIF.new(File.read(fname)).orientation
       assert_kind_of Module, orientation
       assert orientation.respond_to?(:to_i)
       assert orientation.respond_to?(:transform_rmagick)
@@ -35,8 +33,7 @@ class TestEXIF < Test::Unit::TestCase
     assert_not_nil JPEG.new(f('exif.jpg')).exif.thumbnail
     
     all_test_exifs.each do |fname|
-      data = open(fname) { |rd| rd.read }
-      thumbnail = EXIF.new(data).thumbnail
+      thumbnail = EXIF.new(File.read(fname)).thumbnail
       assert_nothing_raised do
         JPEG.new(StringIO.new(thumbnail))
       end
@@ -48,8 +45,7 @@ class TestEXIF < Test::Unit::TestCase
   end
   
   def test_gps
-    data = open(f('gps.exif')){|rd|rd.read}
-    exif = EXIF.new(data)
+    exif = EXIF.new(File.read(f('gps.exif')))
     assert exif.include?(:gps_version_id)
     assert_equal "\2\2\0\0", exif.gps_version_id
     assert_equal 'N', exif.gps_latitude_ref
@@ -59,8 +55,7 @@ class TestEXIF < Test::Unit::TestCase
     assert_equal 'WGS84', exif.gps_map_datum
     
     (all_test_exifs - [f('gps.exif')]).each do |fname|
-      data = open(fname) { |rd| rd.read }
-      assert EXIF.new(data).keys.map{|k|k.to_s}.grep(/gps/).empty?
+      assert EXIF.new(File.read(fname)).keys.map{|k|k.to_s}.grep(/gps/).empty?
     end
   end
 end

data/tests/test_jpeg.rb

@@ -12,7 +12,7 @@ class TestJPEG < Test::Unit::TestCase
         open(fname) { |rd| JPEG.new(rd) }
       end
       assert_nothing_raised do
-        open(fname) { |rd| JPEG.new(StringIO.new(rd.read)) }
+        JPEG.new(StringIO.new(File.read(fname)))
       end
     end
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.1
-date: 2007-01-31 00:00:00 +01:00
+  version: 0.9.6
+date: 2007-02-07 00:00:00 +01:00
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 require_paths: 
 - lib
@@ -50,6 +50,7 @@ files:
 - tests/data/multiple-app1.jpg
 - tests/data/Panasonic-DMC-LC33.exif
 - tests/data/Trust-DC3500_MINI.exif
+- tests/data/weird_date.exif
 - README
 - CHANGELOG
 test_files: []