exifr 1.1.3 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e8d2d002f8e0ff77575cdc359ba0133af33174c1
+  data.tar.gz: 4ea1a55bbdc7480a638e1b5f43cad3be37c019c3
+SHA512:
+  metadata.gz: 9a777bb39ad994fe6cdb54598498e8299c620a4e7c0d912945ee9940ba66a3febe11c10b39c28118fc1267a61c888a392fd1e22d929d8de220d734e3df20964a
+  data.tar.gz: 9507b789bb62957afe07ec16e1c972e29fa70fce55d026e6b1fefab07fd6ba285e0b87815cbb1d91692a8255942f11f29e1fe06839b10d18fe589e2a5a19f982

data/CHANGELOG

@@ -1,3 +1,8 @@
+EXIF Reader 1.2.0
+* enhancement; "log warnings when EXIF data is malformed"
+* enhancement; "allow alternative Time adapter"
+* enhancement; "[GH#33] add reader for orientation type"; thanks Damir Svrtan
+
 EXIF Reader 1.1.3
 * bug fix; "[GH#27] some error when :shutter_speed_value is too big"; thanks to zamia
 

data/README.rdoc

@@ -20,6 +20,28 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
   EXIFR::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
   EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
 
+== Logging warnings
+When EXIF information is malformed, a warning is logged to STDERR with
+the standard Ruby logger.  Log to some other location by supplying an
+alternative implementation:
+
+  EXIFR.logger = SyslogLogger.new
+
+== Time zone support
+EXIF does not support time zones so this code does not support time
+zones.  All time stamps are created in the local time zone with:
+
+  Time.local(..)
+
+It is possible to change this behavior by supplying an alternative
+implementation.  For those who prefer UTC:
+
+  EXIFR::TIFF.mktime_proc = proc{|*args| Time.utc(*args)}
+
+Or when the application depends on ActiveSupport for time zone handling:
+
+  EXIFR::TIFF.mktime_proc = proc{|*args| Time.zone.local(*args)}
+
 == XMP data access
 If you need to access XMP data you can use the xmp gem.  More info and
 examples at https://github.com/amberbit/xmp
@@ -28,4 +50,4 @@ examples at https://github.com/amberbit/xmp
 R.W. van 't Veer
 
 == Copyright
-Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer

data/Rakefile

@@ -1,39 +1,36 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006-2013 - R.W. van 't Veer
 
-require 'rake/rdoctask'
 require 'rake/testtask'
 
 task :default => :test
 
-desc 'Generate site'
-task :site => :rdoc do
-  system 'rsync -av --delete doc/ remvee@rubyforge.org:/var/www/gforge-projects/exifr'
-end
-
-Rake::RDocTask.new do |rd|
-  rd.title = 'EXIF Reader for Ruby API Documentation'
-  rd.main = "README.rdoc"
-  rd.rdoc_dir = "doc/api"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-end
-
-
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'tests'
   t.test_files = FileList['tests/*_test.rb']
 end
 
 begin
-  require 'rcov/rcovtask'
+  begin
+    require 'rdoc/task'
+  rescue LoadError
+    require 'rake/rdoctask'
+  end
 
-  Rcov::RcovTask.new do |t|
-    t.libs << 'lib' << 'tests'
-    t.test_files = FileList['tests/*_test.rb']
+  desc 'Generate site'
+  task :site => :rdoc do
+    system 'rsync -av --delete doc/ remvee@rubyforge.org:/var/www/gforge-projects/exifr'
+  end
+
+  Rake::RDocTask.new do |rd|
+    rd.title = 'EXIF Reader for Ruby API Documentation'
+    rd.main = "README.rdoc"
+    rd.rdoc_dir = "doc/api"
+    rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   end
 
-  desc 'Remove all artifacts left by testing and packaging'
-  task :clean => [:clobber_rdoc, :clobber_rcov]
-rescue LoadError
   desc 'Remove all artifacts left by testing and packaging'
   task :clean => [:clobber_rdoc]
+
+rescue StandardError
+  nil
 end

data/bin/exifr

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'exifr'
 include EXIFR
 

data/lib/exifr.rb

@@ -1,9 +1,14 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
+
+require 'logger'
 
 module EXIFR
   class MalformedImage < StandardError; end
   class MalformedJPEG < MalformedImage; end
   class MalformedTIFF < MalformedImage; end
+
+  class << self; attr_accessor :logger; end
+  self.logger = Logger.new(STDERR)
 end
 
 require 'exifr/jpeg'

data/lib/exifr/jpeg.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
 
 require 'exifr'
 require 'stringio'

data/lib/exifr/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
 
 require 'exifr'
 require 'rational'
@@ -238,10 +238,21 @@ module EXIFR
     })
     IFD_TAGS = [:image, :exif, :gps] # :nodoc:
 
+    class << self
+      # Callable to create a +Time+ object.  Defaults to <tt>proc{|*a|Time.local(*a)}</tt>.
+      attr_accessor :mktime_proc
+    end
+    self.mktime_proc = proc { |*args| Time.local(*args) }
+
     time_proc = proc do |value|
       value.map do |value|
         if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-          Time.mktime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i) rescue nil
+          begin
+            mktime_proc.call($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i)
+          rescue => ex
+            EXIFR.logger.warn("Bad date/time value #{value.inspect}: #{ex}")
+            nil
+          end
         else
           value
         end
@@ -259,6 +270,11 @@ module EXIFR
         @value
       end
 
+      # Symbolic value.
+      def to_sym
+        @type
+      end
+
       # Debugging output.
       def inspect
         "\#<EXIFR::TIFF::Orientation:#{@type}(#{@value})>"
@@ -300,9 +316,18 @@ module EXIFR
       const_set("#{type}Orientation", ORIENTATIONS[index] = Orientation.new(index, type))
     end
 
+    degrees_proc = proc do |v|
+      begin
+        Degrees.new(v)
+      rescue => ex
+        EXIFR.logger.warn("malformed GPS degrees: #{ex}")
+        nil
+      end
+    end
+
     class Degrees < Array
       def initialize(arr)
-        raise MalformedTIFF, "expected [degrees, minutes, seconds]" unless arr.length == 3
+        raise "expected [degrees, minutes, seconds]" unless arr.length == 3
         super
       end
 
@@ -326,10 +351,10 @@ module EXIFR
                       :date_time_digitized => time_proc,
                       :date_time => time_proc,
                       :orientation => proc { |v| v.map{|v| ORIENTATIONS[v]} },
-                      :gps_latitude => proc { |v| Degrees.new(v) },
-                      :gps_longitude => proc { |v| Degrees.new(v) },
-                      :gps_dest_latitude => proc { |v| Degrees.new(v) },
-                      :gps_dest_longitude => proc { |v| Degrees.new(v) },
+                      :gps_latitude => degrees_proc,
+                      :gps_longitude => degrees_proc,
+                      :gps_dest_latitude => degrees_proc,
+                      :gps_dest_longitude => degrees_proc,
                       :shutter_speed_value => proc { |v| v.map { |v| v.abs < 100 ? rational(1, (2 ** v).to_i) : nil } },
                       :aperture_value => proc { |v| v.map { |v| round(1.4142 ** v, 1) } }
                     })
@@ -337,7 +362,7 @@ module EXIFR
     # Names for all recognized TIFF fields.
     TAGS = ([TAG_MAPPING.keys, TAG_MAPPING.values.map{|v|v.values}].flatten.uniq - IFD_TAGS).map{|v|v.to_s}
 
-    # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
+    # +file+ is a filename or an +IO+ object.  Hint: use +StringIO+ when working with slurped data like blobs.
     def initialize(file)
       Data.open(file) do |data|
         @ifds = [IFD.new(data)]
@@ -440,7 +465,8 @@ module EXIFR
         end
 
         @offset_next = @data.readlong(pos)
-      rescue
+      rescue => ex
+        EXIFR.logger.warn("Badly formed IFD: #{ex}")
         @offset_next = 0
       end
 

data/tests/jpeg_test.rb

@@ -1,27 +1,23 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
 
 require 'test_helper'
 
-class JPEGTest < Test::Unit::TestCase
+class JPEGTest < TestCase
   def test_initialize
     all_test_jpegs.each do |fname|
-      assert_nothing_raised do
-        JPEG.new(fname)
-      end
-      assert_nothing_raised do
-        open(fname) { |rd| JPEG.new(rd) }
-      end
-      assert_nothing_raised do
-        JPEG.new(StringIO.new(File.read(fname)))
-      end
+      assert JPEG.new(fname)
+      open(fname) { |rd| assert JPEG.new(rd) }
+      assert JPEG.new(StringIO.new(File.read(fname)))
     end
   end
 
   def test_raises_malformed_jpeg
-    assert_raise MalformedJPEG do
+    begin
       JPEG.new(StringIO.new("djibberish"))
+    rescue MalformedJPEG => ex
+      assert ex
     end
   end
 
@@ -64,8 +60,8 @@ class JPEGTest < Test::Unit::TestCase
   def test_exif
     assert ! JPEG.new(f('image.jpg')).exif?
     assert JPEG.new(f('exif.jpg')).exif?
-    assert_not_nil JPEG.new(f('exif.jpg')).exif.date_time
-    assert_not_nil JPEG.new(f('exif.jpg')).exif.f_number
+    assert JPEG.new(f('exif.jpg')).exif.date_time
+    assert JPEG.new(f('exif.jpg')).exif.f_number
   end
 
   def test_to_hash
@@ -87,16 +83,21 @@ class JPEGTest < Test::Unit::TestCase
     assert j.methods.include?('date_time')
     assert j.respond_to?(:date_time)
     assert j.respond_to?('date_time')
-    assert_not_nil j.date_time
+    assert j.date_time
     assert_kind_of Time, j.date_time
 
-    assert_not_nil j.f_number
+    assert j.f_number
     assert_kind_of Rational, j.f_number
   end
 
   def test_no_method_error
-    assert_nothing_raised { JPEG.new(f('image.jpg')).f_number }
-    assert_raise(NoMethodError) { JPEG.new(f('image.jpg')).foo }
+    JPEG.new(f('image.jpg')).f_number
+
+    begin
+      JPEG.new(f('image.jpg')).foo
+    rescue NoMethodError => ex
+      assert ex
+    end
   end
 
   def test_multiple_app1
@@ -108,14 +109,11 @@ class JPEGTest < Test::Unit::TestCase
     all_test_jpegs.each do |fname|
       jpeg = JPEG.new(fname)
       unless jpeg.thumbnail.nil?
-        assert_nothing_raised 'thumbnail not a JPEG' do
-          JPEG.new(StringIO.new(jpeg.thumbnail))
-        end
+        assert JPEG.new(StringIO.new(jpeg.thumbnail))
         count += 1
       end
     end
 
     assert count > 0, 'no thumbnails found'
   end
-
 end

data/tests/test_helper.rb

@@ -1,21 +1,38 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
 
-require 'test/unit'
 require 'stringio'
 require 'pp'
 
+TestCase = begin
+             tc = begin
+                    gem 'minitest' rescue nil
+                    require 'minitest/autorun'
+                    case
+                    when defined?(Minitest::Test) ; Minitest::Test
+                    when defined?(Minitest::Unit::TestCase) ; Minitest::Unit::TestCase
+                    end
+                  rescue LoadError
+                    # nop
+                  end
+             unless tc
+               require "test/unit"
+               tc = Test::Unit::TestCase
+             end
+             tc
+           end
+
 $:.unshift("#{File.dirname(__FILE__)}/../lib")
 require 'exifr'
 include EXIFR
 
+EXIFR.logger = Logger.new(StringIO.new)
 
 def all_test_jpegs
   Dir[f('*.jpg')]
 end
 
-
 def all_test_exifs
   Dir[f('*.exif')]
 end

data/tests/tiff_test.rb

@@ -1,31 +1,27 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 - R.W. van 't Veer
 
 require 'test_helper'
 
-class TIFFTest < Test::Unit::TestCase
+class TIFFTest < TestCase
   def setup
     @t = TIFF.new(f('nikon_d1x.tif'))
   end
 
   def test_initialize
     all_test_tiffs.each do |fname|
-      assert_nothing_raised do
-        TIFF.new(fname)
-      end
-      assert_nothing_raised do
-        open(fname) { |rd| TIFF.new(rd) }
-      end
-      assert_nothing_raised do
-        TIFF.new(StringIO.new(File.read(fname)))
-      end
+      assert TIFF.new(fname)
+      open(fname) { |rd| assert TIFF.new(rd) }
+      assert TIFF.new(StringIO.new(File.read(fname)))
     end
   end
   
   def test_raises_malformed_tiff
-    assert_raise MalformedTIFF do
+    begin
       TIFF.new(StringIO.new("djibberish"))
+    rescue MalformedTIFF => ex
+      assert ex
     end
   end
 
@@ -65,6 +61,14 @@ class TIFFTest < Test::Unit::TestCase
     assert_nil TIFF.new(f('weird_date.exif')).date_time
   end
 
+  def test_time_with_zone
+    old_proc = TIFF.mktime_proc
+    TIFF.mktime_proc = proc { |*args| "TIME-WITH-ZONE" }
+    assert_equal "TIME-WITH-ZONE", TIFF.new(f('nikon_d1x.tif')).date_time
+  ensure
+    TIFF.mktime_proc = old_proc
+  end
+
   def test_orientation
     tested = 0 # count tests because not all exif samples have an orientation field
     all_test_exifs.each do |fname|
@@ -80,6 +84,16 @@ class TIFFTest < Test::Unit::TestCase
           TIFF::RightBottomOrientation,
           TIFF::LeftBottomOrientation
         ].any? { |c| orientation == c }, 'not an orientation'
+        assert [
+          :TopLeft,
+          :TopRight,
+          :BottomRight,
+          :BottomLeft,
+          :LeftTop,
+          :RightTop,
+          :RightBottom,
+          :LeftBottom
+        ].any? { |c| orientation.to_sym == c }, 'not an orientation symbol'
         assert orientation.respond_to?(:to_i)
         assert orientation.respond_to?(:transform_rmagick)
         tested += 1
@@ -110,18 +124,16 @@ class TIFFTest < Test::Unit::TestCase
     assert @t.methods.include?('f_number')
     assert TIFF.instance_methods.include?('f_number')
 
-    assert_not_nil @t.f_number
+    assert @t.f_number
     assert_kind_of Rational, @t.f_number
-    assert_not_nil @t[0].f_number
+    assert @t[0].f_number
     assert_kind_of Rational, @t[0].f_number
   end
 
   def test_avoid_dispatch_to_nonexistent_ifds
-    assert_nothing_raised do
-      all_test_tiffs.each do |fname|
-        t = TIFF.new(fname)
-        TIFF::TAGS.each { |tag| t.send(tag) }
-      end
+    all_test_tiffs.each do |fname|
+      assert t = TIFF.new(fname)
+      assert TIFF::TAGS.map { |tag| t.send(tag) }
     end
   end
 
@@ -135,9 +147,7 @@ class TIFFTest < Test::Unit::TestCase
   end
 
   def test_old_style
-    assert_nothing_raised do
-      assert_not_nil @t[:f_number]
-    end
+    assert @t[:f_number]
   end
 
   def test_yaml_dump_and_load
@@ -155,10 +165,8 @@ class TIFFTest < Test::Unit::TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       unless t.jpeg_thumbnails.empty?
-        assert_nothing_raised do
-          t.jpeg_thumbnails.each do |n|
-            JPEG.new(StringIO.new(n))
-          end
+        t.jpeg_thumbnails.each do |n|
+          assert JPEG.new(StringIO.new(n))
         end
         count += 1
       end
@@ -176,9 +184,7 @@ class TIFFTest < Test::Unit::TestCase
   end
 
   def test_handle_out_of_range_offset
-    assert_nothing_raised do
-      assert 'NIKON', TIFF.new(f('out-of-range.exif')).make
-    end
+    assert_equal 'NIKON', TIFF.new(f('out-of-range.exif')).make
   end
   
   def test_negative_exposure_bias_value

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - R.W. van 't Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: EXIF Reader is a module to read EXIF from JPEG and TIFF images.
 email: remco@remvee.net
 executables:
 - exifr
@@ -20,62 +19,62 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 files:
+- CHANGELOG
+- README.rdoc
 - Rakefile
 - bin/exifr
 - lib/exifr.rb
 - lib/exifr/jpeg.rb
 - lib/exifr/tiff.rb
 - tests/data/1x1.jpg
-- tests/data/apple-aperture-1.5.exif
-- tests/data/canon-g3.exif
 - tests/data/Canon_PowerShot_A85.exif
 - tests/data/Casio-EX-S20.exif
+- tests/data/FUJIFILM-FinePix_S3000.exif
+- tests/data/Panasonic-DMC-LC33.exif
+- tests/data/Trust-DC3500_MINI.exif
+- tests/data/apple-aperture-1.5.exif
+- tests/data/bad-shutter_speed_value.exif
+- tests/data/canon-g3.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
-- tests/data/FUJIFILM-FinePix_S3000.exif
 - tests/data/gps.exif
 - tests/data/image.jpg
 - tests/data/multiple-app1.jpg
 - tests/data/negative-exposure-bias-value.exif
 - tests/data/nikon_d1x.tif
 - tests/data/out-of-range.exif
-- tests/data/Panasonic-DMC-LC33.exif
 - tests/data/plain.tif
-- tests/data/Trust-DC3500_MINI.exif
 - tests/data/user-comment.exif
 - tests/data/weird_date.exif
-- tests/data/bad-shutter_speed_value.exif
 - tests/jpeg_test.rb
 - tests/test_helper.rb
 - tests/tiff_test.rb
-- README.rdoc
-- CHANGELOG
 homepage: http://github.com/remvee/exifr/
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - EXIF Reader for Ruby API Documentation
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: EXIF Reader is a module to read EXIF from JPEG images.
+specification_version: 4
+summary: Read EXIF from JPEG and TIFF images
 test_files: []