exifr 0.10.6 → 0.10.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+EXIF Reader 0.10.7
+* bug fix; "[#22403] Wrong file size reported"
+
+EXIF Reader 0.10.6.1
+* moved to GitHub
+
 EXIF Reader 0.10.6
 * bug fix (thanks to Forian Munz for reporting it); endless loop when reading a malformed EXIF/TIFF
 

data/{README → README.rdoc}

@@ -21,4 +21,4 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
 R.W. van 't Veer
 
 == Copyright
-Copyright (c) 2006, 2007 - R.W. van 't Veer
+Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer

data/Rakefile

@@ -1,7 +1,6 @@
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
 require 'rake/testtask'
 
 task :default => :test
@@ -11,47 +10,17 @@ task :site => :rdoc do
   system 'rsync -av --delete doc/ remvee@rubyforge.org:/var/www/gforge-projects/exifr'
 end
 
-desc "Tag current trunk.  Use VERSION to provide a version spec."
-task :tag do
-  version = ENV['VERSION'] or raise 'provide VERSION'
-  base = 'svn+ssh://remvee@rubyforge.org/var/svn/exifr'
-  trunk, tag = base + "/trunk", base + "/tags/#{version}"
-  system *(%w(svn copy -m) << "tagged release #{version}" << trunk << tag)
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = 'exifr'
-  s.version = '0.10.6'
-  s.author = "R.W. van 't Veer"
-  s.email = 'remco@remvee.net'
-  s.homepage = 'http://exifr.rubyforge.org/'
-  s.summary = 'EXIF Reader is a module to read EXIF from JPEG images.'
-  
-  s.autorequire = 'exifr'
-  s.files = FileList['Rakefile', '{bin,lib,tests}/**/*'].exclude('rdoc').to_a
-  
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README', 'CHANGELOG']
-  
-  s.bindir = 'bin'
-  s.executables = ['exifr']
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
 Rake::RDocTask.new do |rd|
   rd.title = 'EXIF Reader for Ruby API Documentation'
-  rd.main = "README"
+  rd.main = "README.rdoc"
   rd.rdoc_dir = "doc/api"
-  rd.rdoc_files.include("README", "lib/**/*.rb")
+  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']
+  t.test_files = FileList['tests/*_test.rb']
 end
 
 begin
@@ -59,12 +28,12 @@ begin
 
   Rcov::RcovTask.new do |t|
     t.libs << 'lib' << 'tests'
-    t.test_files = FileList['tests/test*.rb'].exclude('test_helper.rb')
+    t.test_files = FileList['tests/*_test.rb']
   end
 
   desc 'Remove all artifacts left by testing and packaging'
-  task :clean => [:clobber_package, :clobber_rdoc, :clobber_rcov]
+  task :clean => [:clobber_rdoc, :clobber_rcov]
 rescue LoadError
   desc 'Remove all artifacts left by testing and packaging'
-  task :clean => [:clobber_package, :clobber_rdoc]
+  task :clean => [:clobber_rdoc]
 end

data/lib/exifr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require 'jpeg'
-require 'tiff'
+require 'tiff'

data/lib/jpeg.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require 'stringio'
 
@@ -34,20 +34,35 @@ module EXIFR
     def exif?
       !exif.nil?
     end
-    
+
     # Return thumbnail data when available.
     def thumbnail
       @exif && @exif.jpeg_thumbnails && @exif.jpeg_thumbnails.first
     end
 
-    # Dispatch to EXIF.  When no EXIF data is available but the +method+ does exist
-    # for EXIF data +nil+ will be returned.
+    # Dispatch to EXIF.  When no EXIF data is available but the
+    # +method+ does exist for EXIF data +nil+ will be returned.
     def method_missing(method, *args)
       super unless args.empty?
-      super unless TIFF::TAGS.include?(method)
+      super unless TIFF::TAGS.include?(method.to_s)
       @exif.send method if @exif
     end
-    
+
+    def respond_to?(method) # :nodoc:
+      super || TIFF::TAGS.include?(method.to_s)
+    end
+
+    def methods # :nodoc:
+      super + TIFF::TAGS
+    end
+
+    class << self
+      alias instance_methods_without_jpeg_extras instance_methods
+      def instance_methods(include_super = true) # :nodoc:
+        instance_methods_without_jpeg_extras(include_super) + TIFF::TAGS
+      end
+    end
+
   private
     def examine(io)
       class << io
@@ -78,10 +93,10 @@ module EXIFR
       end
 
       @comment = @comment.first if @comment && @comment.size == 1
-      
+
       if app1 = app1s.find { |d| d[0..5] == "Exif\0\0" }
         @exif = TIFF.new(StringIO.new(app1[6..-1]))
       end
     end
   end
-end
+end

data/lib/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007 - R.W. van 't Veer
+# Copyright (c) 2007, 2008 - R.W. van 't Veer
 
 require 'rational'
 
@@ -36,10 +36,10 @@ module EXIFR
   #   EXIFR::TIFF.new('DSC_0218.TIF').orientation     # => EXIFR::TIFF::Orientation
   class TIFF
     include Enumerable
-    
+
     # JPEG thumbnails
     attr_reader :jpeg_thumbnails
-    
+
     TAG_MAPPING = {} # :nodoc:
     TAG_MAPPING.merge!({
       :image => {
@@ -140,7 +140,7 @@ module EXIFR
         0x8769 => :exif,
         0x8825 => :gps,
       },
-      
+
       :exif => {
         0x829a => :exposure_time,
         0x829d => :f_number,
@@ -199,7 +199,7 @@ module EXIFR
         0xa40c => :subject_distance_range,
         0xa420 => :image_unique_id
       },
-      
+
       :gps => {
         0x0000 => :gps_version_id,
         0x0001 => :gps_latitude_ref,
@@ -235,7 +235,7 @@ module EXIFR
       },
     })
     IFD_TAGS = [:image, :exif, :gps] # :nodoc:
-    
+
     time_proc = proc 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
@@ -243,18 +243,18 @@ module EXIFR
         value
       end
     end
-    
+
     # The orientation of the image with respect to the rows and columns.
     class Orientation
       def initialize(value, type) # :nodoc:
         @value, @type = value, type
       end
-      
+
       # Field value.
       def to_i
         @value
       end
-      
+
       # Rotate and/or flip for proper viewing.
       def transform_rmagick(img)
         case @type
@@ -269,12 +269,12 @@ module EXIFR
           img
         end
       end
-      
+
       def ==(other) # :nodoc:
         Orientation === other && to_i == other.to_i
       end
     end
-    
+
     ORIENTATIONS = [] # :nodoc:
     [
       nil,
@@ -290,7 +290,7 @@ module EXIFR
       next unless type
       const_set("#{type}Orientation", ORIENTATIONS[index] = Orientation.new(index, type))
     end
-    
+
     ADAPTERS = Hash.new { proc { |v| v } } # :nodoc:
     ADAPTERS.merge!({
       :date_time_original => time_proc,
@@ -298,29 +298,32 @@ module EXIFR
       :date_time => time_proc,
       :orientation => proc { |v| ORIENTATIONS[v] }
     })
-    
+
     # Names for all recognized TIFF fields.
-    TAGS = [TAG_MAPPING.keys, TAG_MAPPING.values.map{|a|a.values}].flatten.uniq - IFD_TAGS
-    
+    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.
     def initialize(file)
       data = file.respond_to?(:read) ? file.read : File.open(file, 'rb') { |io| io.read }
-      
+
       class << data
         attr_accessor :short, :long
         def readshort(pos); self[pos..(pos + 1)].unpack(@short)[0]; end
         def readlong(pos); self[pos..(pos + 3)].unpack(@long)[0]; end
       end
-      
+
       case data[0..1]
       when 'II'; data.short, data.long = 'v', 'V'
       when 'MM'; data.short, data.long = 'n', 'N'
       else; raise 'no II or MM marker found'
       end
-      
+
       @ifds = [IFD.new(data)]
-      while ifd = @ifds.last.next; @ifds << ifd; end
-      
+      while ifd = @ifds.last.next
+        break if @ifds.find{|i| i.offset == ifd.offset}
+        @ifds << ifd
+      end
+
       @jpeg_thumbnails = @ifds.map do |ifd|
         if ifd.jpeg_interchange_format && ifd.jpeg_interchange_format_length
           start, length = ifd.jpeg_interchange_format, ifd.jpeg_interchange_format_length
@@ -328,54 +331,71 @@ module EXIFR
         end
       end.compact
     end
-    
+
     # Number of images.
     def size
       @ifds.size
     end
-    
+
     # Yield for each image.
     def each
       @ifds.each { |ifd| yield ifd }
     end
-    
+
     # Get +index+ image.
     def [](index)
       index.is_a?(Symbol) ? to_hash[index] : @ifds[index]
     end
-    
+
     # Dispatch to first image.
     def method_missing(method, *args)
       super unless args.empty?
-      
+
       if @ifds.first.respond_to?(method)
         @ifds.first.send(method)
-      elsif TAGS.include?(method)
+      elsif TAGS.include?(method.to_s)
         @ifds.first.to_hash[method]
       else
         super
       end
     end
-    
+
+    def respond_to?(method) # :nodoc:
+      super ||
+        (@ifds && @ifds.first && @ifds.first.respond_to?(method)) ||
+        TAGS.include?(method.to_s)
+    end
+
+    def methods # :nodoc:
+      (super + TAGS + IFD.instance_methods(false)).uniq
+    end
+
+    class << self
+      alias instance_methods_without_tiff_extras instance_methods
+      def instance_methods(include_super = true) # :nodoc:
+        (instance_methods_without_tiff_extras(include_super) + TAGS + IFD.instance_methods(false)).uniq
+      end
+    end
+
     # Convenience method to access image width.
     def width; @ifds.first.width; end
 
     # Convenience method to access image height.
     def height; @ifds.first.height; end
-    
+
     # Get a hash presentation of the (first) image.
     def to_hash; @ifds.first.to_hash; end
-    
+
     def inspect # :nodoc:
       @ifds.inspect
     end
-    
+
     class IFD # :nodoc:
-      attr_reader :type, :fields
+      attr_reader :type, :fields, :offset
 
       def initialize(data, offset = nil, type = :image)
         @data, @offset, @type, @fields = data, offset, type, {}
-        
+
         pos = offset || @data.readlong(4)
         num = @data.readshort(pos)
         pos += 2
@@ -387,15 +407,15 @@ module EXIFR
 
         @offset_next = @data.readlong(pos)
       end
-      
+
       def method_missing(method, *args)
-        super unless args.empty? && TAGS.include?(method)
+        super unless args.empty? && TAGS.include?(method.to_s)
         to_hash[method]
       end
-      
+
       def width; image_width; end
       def height; image_length; end
-      
+
       def to_hash
         @hash ||= begin
           result = @fields.dup
@@ -414,22 +434,22 @@ module EXIFR
       end
 
       def next?
-        @offset_next != 0 && @offset_next < @data.size && (@offset || 0) < @offset_next
+        @offset_next != 0 && @offset_next < @data.size
       end
-      
+
       def next
         IFD.new(@data, @offset_next) if next?
       end
-    
+
       def to_yaml_properties
         ['@fields']
       end
-      
+
     private
       def add_field(field)
         return unless tag = TAG_MAPPING[@type][field.tag]
         return if @fields[tag]
-        
+
         if IFD_TAGS.include? tag
           @fields[tag] = IFD.new(@data, field.offset, tag)
         else
@@ -444,7 +464,7 @@ module EXIFR
 
       def initialize(data, pos)
         @tag, count, @offset = data.readshort(pos), data.readlong(pos + 4), data.readlong(pos + 8)
-        
+
         case data.readshort(pos + 2)
         when 1, 6 # byte, signed byte
           # TODO handle signed bytes
@@ -467,7 +487,7 @@ module EXIFR
               if f[1] == 0 # allow NaN and Infinity
                 f[0].to_f.quo(f[1])
               else
-                Rational.reduce(*f)
+                Rational.respond_to?(:reduce) ? Rational.reduce(*f) : f[0].quo(f[1])
               end
             end
           end
@@ -480,4 +500,4 @@ module EXIFR
       end
     end
   end
-end
+end

data/tests/{test_jpeg.rb → jpeg_test.rb}

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class TestJPEG < Test::Unit::TestCase
+class JPEGTest < Test::Unit::TestCase
   def test_initialize
     all_test_jpegs.each do |fname|
       assert_nothing_raised do
@@ -18,7 +18,7 @@ class TestJPEG < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_size
     j = JPEG.new(f('image.jpg'))
     assert_equal j.width, 100
@@ -32,35 +32,41 @@ class TestJPEG < Test::Unit::TestCase
     assert_equal j.width, 1
     assert_equal j.height, 1
   end
-  
+
   def test_comment
     assert_equal JPEG.new(f('image.jpg')).comment, "Here's a comment!"
   end
-  
+
   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
   end
-  
+
   def test_exif_dispatch
     j = JPEG.new(f('exif.jpg'))
+
+    assert JPEG.instance_methods.include?('date_time')
+    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_kind_of Time, j.date_time
+
     assert_not_nil 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 }
   end
-  
+
   def test_multiple_app1
     assert JPEG.new(f('multiple-app1.jpg')).exif?
   end
-  
+
   def test_thumbnail
     count = 0
     all_test_jpegs.each do |fname|
@@ -72,7 +78,7 @@ class TestJPEG < Test::Unit::TestCase
         count += 1
       end
     end
-    
+
     assert count > 0, 'no thumbnails found'
   end
-end
+end

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require 'test/unit'
 require 'stringio'
@@ -36,4 +36,4 @@ class Hash
   def to_s
     keys.map{|k| k.to_s}.sort.map{|k| "#{k.inspect} => #{self[k].inspect}" }.join(', ')
   end
-end
+end

data/tests/{test_tiff.rb → tiff_test.rb}

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class TestTIFF < Test::Unit::TestCase
-  def setup    
+class TIFFTest < Test::Unit::TestCase
+  def setup
     @t = TIFF.new(f('nikon_d1x.tif'))
   end
-  
+
   def test_initialize
     all_test_tiffs.each do |fname|
       assert_nothing_raised do
@@ -22,11 +22,11 @@ class TestTIFF < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_multiple_images
     assert_equal 2, @t.size
   end
-  
+
   def test_size
     assert_equal 269, @t.image_width
     assert_equal 269, @t.image_length
@@ -36,29 +36,29 @@ class TestTIFF < Test::Unit::TestCase
     assert_equal 160, @t[1].image_length
     assert_equal 120, @t[1].width
     assert_equal 160, @t[1].height
-    
+
     @t = TIFF.new(f('plain.tif'))
     assert_equal 23, @t.image_width
     assert_equal 24, @t.image_length
     assert_equal 23, @t.width
     assert_equal 24, @t.height
   end
-  
+
   def test_enumerable
     assert_equal @t[1], @t.find { |i| i.f_number.nil? }
   end
-  
+
   def test_misc_fields
     assert_equal 'Canon PowerShot G3', TIFF.new(f('canon-g3.exif')).model
   end
-  
+
   def test_dates
     (all_test_tiffs - [f('weird_date.exif'), f('plain.tif'), f('endless-loop.exif')]).each do |fname|
       assert_kind_of Time, TIFF.new(fname).date_time
     end
     assert_nil TIFF.new(f('weird_date.exif')).date_time
   end
-  
+
   def test_orientation
     tested = 0 # count tests because not all exif samples have an orientation field
     all_test_exifs.each do |fname|
@@ -81,7 +81,7 @@ class TestTIFF < Test::Unit::TestCase
     end
     assert tested > 0
   end
-  
+
   def test_gps
     t = TIFF.new(f('gps.exif'))
     assert_equal "\2\2\0\0", t.gps_version_id
@@ -90,19 +90,24 @@ class TestTIFF < Test::Unit::TestCase
     assert_equal [5355537.quo(100000), 0.quo(1), 0.quo(1)], t.gps_latitude
     assert_equal [678886.quo(100000), 0.quo(1), 0.quo(1)], t.gps_longitude
     assert_equal 'WGS84', t.gps_map_datum
-    
+
     (all_test_exifs - [f('gps.exif')]).each do |fname|
       assert_nil TIFF.new(fname).gps_version_id
     end
   end
-  
+
   def test_ifd_dispatch
+    assert @t.respond_to?(:f_number)
+    assert @t.respond_to?('f_number')
+    assert @t.methods.include?('f_number')
+    assert TIFF.instance_methods.include?('f_number')
+
     assert_not_nil @t.f_number
     assert_kind_of Rational, @t.f_number
     assert_not_nil @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|
@@ -111,32 +116,32 @@ class TestTIFF < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_to_hash
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       TIFF::TAGS.each do |key|
-        assert_literally_equal t.send(key), t.to_hash[key], "#{key} not equal"
+        assert_literally_equal t.send(key), t.to_hash[key.to_sym], "#{key} not equal"
       end
     end
   end
-  
+
   def test_old_style
     assert_nothing_raised do
       assert_not_nil @t[:f_number]
     end
   end
-  
+
   def test_yaml_dump_and_load
     require 'yaml'
-    
+
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       y = YAML.dump(t)
       assert_literally_equal t.to_hash, YAML.load(y).to_hash
     end
   end
-  
+
   def test_jpeg_thumbnails
     count = 0
     all_test_tiffs.each do |fname|
@@ -152,9 +157,9 @@ class TestTIFF < Test::Unit::TestCase
     end
     assert count > 0, 'no thumbnails found'
   end
-  
+
   def test_should_not_loop_endlessly
     TIFF.new(f('endless-loop.exif'))
     assert true
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - R.W. van 't Veer
-autorequire: exifr
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 +01:00
+date: 2008-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -20,7 +20,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 - CHANGELOG
 files: 
 - Rakefile
@@ -28,10 +28,6 @@ files:
 - lib/exifr.rb
 - lib/jpeg.rb
 - lib/tiff.rb
-- tests/data
-- tests/test_helper.rb
-- tests/test_jpeg.rb
-- tests/test_tiff.rb
 - tests/data/1x1.jpg
 - tests/data/apple-aperture-1.5.exif
 - tests/data/canon-g3.exif
@@ -48,13 +44,19 @@ files:
 - tests/data/plain.tif
 - tests/data/Trust-DC3500_MINI.exif
 - tests/data/weird_date.exif
-- README
+- tests/test_helper.rb
+- tests/jpeg_test.rb
+- tests/tiff_test.rb
+- README.rdoc
 - CHANGELOG
 has_rdoc: true
-homepage: http://exifr.rubyforge.org/
+homepage: http://github.com/remvee/exifr/
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --title
+- EXIF Reader for Ruby API Documentation
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: EXIF Reader is a module to read EXIF from JPEG images.