exifr 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,10 @@
+EXIF Reader 0.9.5
+* patch calls to jpeg through to exif, i.e. jpeg., i.e. jpeg.model == jpeg.exif.model
+* fix exifr commandline utility, needs require 'exifr' now
+* improve test helper
+* reduce size of test images
+* include tests for tinderbox
+
 EXIF Reader 0.9.4
 * bug fix (thanks to Benjamin Storrier for providing me with sample date);
   multiple app1 frames will potentially overwrite EXIF tag
@@ -5,6 +12,7 @@ EXIF Reader 0.9.4
 EXIF Reader 0.9.3
 * bug fix; "[#4876] Unable to extract gpsinfo"
 * one-off bug in TiffHeader found and fixed
+* make "InteroperabilityIndex" available
 
 EXIF Reader 0.9.2
 * bug fix; "[#4595] EXIFR::JPEG doesn't support multiple comments", the

data/Rakefile

@@ -0,0 +1,49 @@
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rcov/rcovtask'
+
+task :default => :test
+
+spec = Gem::Specification.new do |s|
+  s.name = 'exifr'
+  s.version = '0.9.5'
+  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.rdoc_dir = "doc/api"
+  rd.rdoc_files.include("README", "lib/**/*.rb")
+end
+
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'tests'
+  t.test_files = FileList['tests/test*.rb']
+end
+
+Rcov::RcovTask.new do |t|
+  t.libs << 'lib' << 'tests'
+  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]

data/bin/exifr

@@ -1,3 +1,4 @@
+require 'exifr'
 include EXIFR
 
 def pp(fname)
@@ -30,4 +31,4 @@ else
     pp fname
     puts
   end
-end
+end

data/lib/exif.rb

@@ -220,16 +220,13 @@ module EXIFR
 
     # +data+ the content of the JPEG APP1 frame without the EXIF marker
     def initialize(data)
-      @data = data
-      traverse(TiffHeader.new(@data))
+      traverse(data)
+      pull_thumbnail(data)
       freeze
     end
 
-    # access to thumbnail, if included
-    def thumbnail
-      start, length = self[:jpeg_interchange_format], self[:jpeg_interchange_format_length]
-      @data[start..(start + length)] if start && length
-    end
+    # thumbnail, if included
+    attr_reader :thumbnail
 
     # convience; <tt>self[method]</tt>
     def method_missing(method, *args)
@@ -237,17 +234,22 @@ module EXIFR
     end
 
   private
-    def traverse(tiff, ifd = :exif)
-      tiff.fields.each do |f|
+    def traverse(data, offset = nil, ifd = :exif)
+      TiffHeader.new(data, offset).fields.each do |f|
         tag = TAGS[ifd][f.tag]
         value = f.value.map { |v| ADAPTERS[tag][v] } if f.value
         value = (value.kind_of?(Array) && value.size == 1) ? value.first : value
         if EXIF_HEADERS.include?(tag)
-          traverse(TiffHeader.new(@data, f.offset), tag)
+          traverse(data, f.offset, tag)
         elsif tag
           self[tag] = value
         end
       end
     end
+    
+    def pull_thumbnail(data)
+      start, length = self[:jpeg_interchange_format], self[:jpeg_interchange_format_length]
+      @thumbnail = data[start..(start + length)] if start && length
+    end
   end
 end

data/lib/jpeg.rb

@@ -35,6 +35,15 @@ module EXIFR
       !exif.nil?
     end
 
+    # patch through to exif
+    def method_missing(method, *args)
+      if args.empty?
+        exif[method] if exif?
+      else
+        super
+      end
+    end
+    
   private
     def examine(io)
       raise 'malformed JPEG' unless io.getc == 0xFF && io.getc == 0xD8 # SOI

data/tests/test_exif.rb

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+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
+    end
+    
+    assert_raise RuntimeError, 'no II or MM marker found' do
+      EXIF.new('X' * 100)
+    end
+  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
+    end
+  end
+  
+  def test_orientation
+    all_test_exifs.each do |fname|
+      data = open(fname) { |rd| rd.read }
+      orientation = EXIF.new(data).orientation
+      assert_kind_of Module, orientation
+      assert orientation.respond_to?(:to_i)
+      assert orientation.respond_to?(:transform_rmagick)
+    end
+  end
+  
+  def test_thumbnail
+    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
+      assert_nothing_raised do
+        JPEG.new(StringIO.new(thumbnail))
+      end
+    end
+  end
+  
+  def test_exif_offset
+    assert JPEG.new(f('exif.jpg')).exif.include?(:exif_version)
+  end
+  
+  def test_gps
+    data = open(f('gps.exif')){|rd|rd.read}
+    exif = EXIF.new(data)
+    assert exif.include?(:gps_version_id)
+    assert_equal "\2\2\0\0", exif.gps_version_id
+    assert_equal 'N', exif.gps_latitude_ref
+    assert_equal 'W', exif.gps_longitude_ref
+    assert_equal [5355537.quo(100000), 0.quo(1), 0.quo(1)], exif.gps_latitude
+    assert_equal [678886.quo(100000), 0.quo(1), 0.quo(1)], exif.gps_longitude
+    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?
+    end
+  end
+end

data/tests/test_helper.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'stringio'
+require 'pp'
+
+$:.unshift("#{File.dirname(__FILE__)}/../lib")
+require 'exifr'
+include EXIFR
+
+
+def all_test_images
+  Dir[f('*.jpg')]
+end
+
+def all_test_exifs
+  Dir[f('*.exif')]
+end
+
+def f(fname)
+  "#{File.dirname(__FILE__)}/data/#{fname}"
+end

data/tests/test_jpeg.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class TestJPEG < Test::Unit::TestCase
+  def test_initialize
+    all_test_images.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
+        open(fname) { |rd| JPEG.new(StringIO.new(rd.read)) }
+      end
+    end
+  end
+  
+  def test_size
+    j = JPEG.new(f('image.jpg'))
+    assert_equal j.width, 100
+    assert_equal j.height, 75
+
+    j = JPEG.new(f('exif.jpg'))
+    assert_equal j.width, 100
+    assert_equal j.height, 75
+
+    j = JPEG.new(f('1x1.jpg'))
+    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?
+  end
+  
+  def test_multiple_app1
+    assert JPEG.new(f('multiple-app1.jpg')).exif?
+  end
+  
+  def test_patch_through
+    jpeg = JPEG.new(f('exif.jpg'))
+    jpeg.exif.each do |k,v|
+      assert_equal v, jpeg.send(k)
+    end
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
-date: 2006-08-14 00:00:00 +02:00
+  version: 0.9.5
+date: 2007-01-31 00:00:00 +01:00
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 require_paths: 
 - lib
@@ -29,11 +29,27 @@ post_install_message:
 authors: 
 - R.W. van 't Veer
 files: 
+- Rakefile
 - bin/exifr
 - lib/exif.rb
 - lib/exifr.rb
 - lib/jpeg.rb
 - lib/tiff_header.rb
+- tests/data
+- tests/test_exif.rb
+- tests/test_helper.rb
+- tests/test_jpeg.rb
+- tests/data/1x1.jpg
+- tests/data/canon-g3.exif
+- tests/data/Canon_PowerShot_A85.exif
+- tests/data/Casio-EX-S20.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/Panasonic-DMC-LC33.exif
+- tests/data/Trust-DC3500_MINI.exif
 - README
 - CHANGELOG
 test_files: []