exifr 0.10.7 → 0.10.8

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 0.10.8
+* feature request; "[#23694] The object interface of JPEG is different from the TIFF one."
+
 EXIF Reader 0.10.7
 * bug fix; "[#22403] Wrong file size reported"
 

data/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, 2008 - R.W. van 't Veer
+Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
 
 require 'rake/rdoctask'
 require 'rake/testtask'

data/lib/exifr.rb

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

data/lib/jpeg.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
 
 require 'stringio'
 
@@ -21,7 +21,7 @@ module EXIFR
     # EXIF data if available
     attr_reader :exif
 
-    # +file+ is a filename or an IO object.
+    # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
     def initialize(file)
       if file.kind_of? String
         File.open(file, 'rb') { |io| examine(io) }
@@ -40,6 +40,13 @@ module EXIFR
       @exif && @exif.jpeg_thumbnails && @exif.jpeg_thumbnails.first
     end
 
+    # Get a hash presentation of the image.
+    def to_hash
+      h = {:width => width, :height => height, :bits => bits, :comment => comment}
+      h.merge!(exif) if exif?
+      h
+    end
+
     # 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)

data/lib/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2007, 2008, 2009 - R.W. van 't Veer
 
 require 'rational'
 
@@ -302,21 +302,9 @@ 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.
+    # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
     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
+      data = Data.new(file)
 
       @ifds = [IFD.new(data)]
       while ifd = @ifds.last.next
@@ -464,8 +452,9 @@ module EXIFR
 
       def initialize(data, pos)
         @tag, count, @offset = data.readshort(pos), data.readlong(pos + 4), data.readlong(pos + 8)
+        @type = data.readshort(pos + 2)
 
-        case data.readshort(pos + 2)
+        case @type
         when 1, 6 # byte, signed byte
           # TODO handle signed bytes
           len, pack = count, proc { |d| d }
@@ -477,6 +466,14 @@ module EXIFR
         when 4, 9 # long, signed long
           # TODO handle signed
           len, pack = count * 4, proc { |d| d.unpack(data.long + '*') }
+        when 7 # undefined
+          # UserComment 
+          if @tag == 0x9286
+            len, pack = count, proc { |d| d.strip }
+            len -= 8 # reduce to account for first 8 bytes
+            start = len > 4 ? @offset + 8 : (pos + 8) # UserComment first 8-bytes is char code
+            @value = [pack[data[start..(start + len - 1)]]].flatten
+          end
         when 5, 10
           len, pack = count * 8, proc do |d|
             r = []
@@ -493,11 +490,58 @@ module EXIFR
           end
         end
 
-        if len && pack
+        if len && pack && @type != 7
           start = len > 4 ? @offset : (pos + 8)
           @value = [pack[data[start..(start + len - 1)]]].flatten
         end
       end
     end
+
+    class Data #:nodoc:
+      attr_reader :short, :long
+
+      def initialize(file)
+        @file = file.respond_to?(:read) ? file : File.open(file, 'rb')
+        @buffer = ''
+        @pos = 0
+
+        case self[0..1]
+        when 'II'; @short, @long = 'v', 'V'
+        when 'MM'; @short, @long = 'n', 'N'
+        else; raise 'no II or MM marker found'
+        end
+      end
+
+      def [](pos)
+        unless pos.respond_to?(:begin) && pos.respond_to?(:end)
+          pos = pos..pos
+        end
+
+        if pos.begin < @pos || pos.end >= @pos + @buffer.size
+          read_for(pos)
+        end
+
+        @buffer[(pos.begin - @pos)..(pos.end - @pos)]
+      end
+
+      def readshort(pos)
+        self[pos..(pos + 1)].unpack(@short)[0]
+      end
+
+      def readlong(pos)
+        self[pos..(pos + 3)].unpack(@long)[0]
+      end
+
+      def size
+        @file.seek(0, IO::SEEK_END)
+        @file.pos
+      end
+
+    private
+      def read_for(pos)
+        @file.seek(@pos = pos.begin)
+        @buffer = @file.read([pos.end - pos.begin, 4096].max)
+      end
+    end
   end
 end

data/tests/jpeg_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
@@ -44,6 +44,18 @@ class JPEGTest < Test::Unit::TestCase
     assert_not_nil JPEG.new(f('exif.jpg')).exif.f_number
   end
 
+  def test_to_hash
+    h = JPEG.new(f('image.jpg')).to_hash
+    assert_equal 100, h[:width]
+    assert_equal 75, h[:height]
+    assert_equal "Here's a comment!", h[:comment]
+
+    h = JPEG.new(f('exif.jpg')).to_hash
+    assert_equal 100, h[:width]
+    assert_equal 75, h[:height]
+    assert_kind_of Time, h[:date_time]
+  end
+
   def test_exif_dispatch
     j = JPEG.new(f('exif.jpg'))
 

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
 
 require 'test/unit'
 require 'stringio'

data/tests/tiff_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
 
 require File.join(File.dirname(__FILE__), 'test_helper')
 
@@ -91,7 +91,7 @@ class TIFFTest < Test::Unit::TestCase
     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|
+    (all_test_exifs - [f('gps.exif'), f('user-comment.exif')]).each do |fname|
       assert_nil TIFF.new(fname).gps_version_id
     end
   end
@@ -162,4 +162,8 @@ class TIFFTest < Test::Unit::TestCase
     TIFF.new(f('endless-loop.exif'))
     assert true
   end
+    
+  def test_user_comment
+    assert_equal "Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-15 00:00:00 +02:00
+date: 2009-10-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,8 @@ files:
 - CHANGELOG
 has_rdoc: true
 homepage: http://github.com/remvee/exifr/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -74,9 +76,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 test_files: []