exifr 0.10.3 → 0.10.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 0.10.4
+* Thumbnail extraction; [#15317] Please add thumbnail extraction
+
 EXIF Reader 0.10.3
 * YAML friendly; can now safely (de)serialize
 

data/Rakefile

@@ -6,9 +6,22 @@ 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
+
+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.3'
+  s.version = '0.10.4'
   s.author = "R.W. van 't Veer"
   s.email = 'remco@remvee.net'
   s.homepage = 'http://exifr.rubyforge.org/'

data/lib/jpeg.rb

@@ -34,6 +34,11 @@ 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.

data/lib/tiff.rb

@@ -37,6 +37,9 @@ module EXIFR
   class TIFF
     include Enumerable
     
+    # JPEG thumbnails
+    attr_reader :jpeg_thumbnails
+    
     TAG_MAPPING = {} # :nodoc:
     TAG_MAPPING.merge!({
       :image => {
@@ -317,6 +320,13 @@ module EXIFR
       
       @ifds = [IFD.new(data)]
       while ifd = @ifds.last.next; @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
+          data[start..(start + length)]
+        end
+      end.compact
     end
     
     # Number of images.
@@ -413,6 +423,7 @@ module EXIFR
     private
       def add_field(field)
         return unless tag = TAG_MAPPING[@type][field.tag]
+        
         if IFD_TAGS.include? tag
           @fields[tag] = IFD.new(@data, field.offset, tag)
         else

data/tests/test_helper.rb

@@ -21,9 +21,19 @@ def all_test_exifs
 end
 
 def all_test_tiffs
-  Dir[f('*.tif')]
+  Dir[f('*.tif')] + all_test_exifs
 end
 
 def f(fname)
   "#{File.dirname(__FILE__)}/data/#{fname}"
 end
+
+def assert_literally_equal(expected, actual, *args)
+  assert_equal expected.to_s, actual.to_s, *args
+end
+
+class Hash
+  def to_s
+    keys.map{|k| k.to_s}.sort.map{|k| "#{k.inspect} => #{self[k].inspect}" }.join(', ')
+  end
+end

data/tests/test_jpeg.rb

@@ -60,4 +60,19 @@ class TestJPEG < Test::Unit::TestCase
   def test_multiple_app1
     assert JPEG.new(f('multiple-app1.jpg')).exif?
   end
+  
+  def test_thumbnail
+    count = 0
+    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
+        count += 1
+      end
+    end
+    
+    assert count > 0, 'no thumbnails found'
+  end
 end

data/tests/test_tiff.rb

@@ -116,7 +116,7 @@ class TestTIFF < Test::Unit::TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       TIFF::TAGS.each do |key|
-        assert_equal t.send(key), t.to_hash[key]
+        assert_literally_equal t.send(key), t.to_hash[key], "#{key} not equal"
       end
     end
   end
@@ -133,7 +133,23 @@ class TestTIFF < Test::Unit::TestCase
     all_test_tiffs.each do |fname|
       t = TIFF.new(fname)
       y = YAML.dump(t)
-      assert_equal t.to_hash, YAML.load(y).to_hash
+      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|
+      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
+        end
+        count += 1
+      end
+    end
+    assert count > 0, 'no thumbnails found'
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
-date: 2007-10-23 00:00:00 +02:00
+  version: 0.10.4
+date: 2007-11-04 00:00:00 +01:00
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 require_paths: 
 - lib