exifr 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,5 +1,14 @@
+EXIF Reader 0.9.2
+* bug fix; "[#4595] EXIFR::JPEG doesn't support multiple comments", the
+  comment property of a JPEG object now contains an array instead of a string
+  when multiple COM frames are found
+* EXIF orientation modules including RMagick code to rotate to viewable state
+* access to thumbnail included in EXIF
+* simple commandline utility, "exifr", to view image properties
+* overall code improvements including documentation and tests
+
 EXIF Reader 0.9.1
-* bug fix "4321 Can't create object", division by zero when
+* bug fix; "4321 Can't create object", division by zero when
   denominator of rational value is zero
 
 EXIF Reader 0.9

data/bin/exifr

@@ -0,0 +1,33 @@
+include EXIFR
+
+def pp(fname)
+  jpeg = JPEG.new(fname)
+  ks = %w(width height comment bits)
+  ks += jpeg.exif.keys.map{|a|a.to_s}.sort{|a,b|a<=>b} if jpeg.exif?
+
+  l = []
+  ks[0..3].each do |k|
+    v = jpeg.send(k)
+    l << [k, v] if v
+  end
+  ks[4..-1].each do |k|
+    v = jpeg.exif[k.to_sym]
+    l << [k, v] if v
+  end
+  l.delete_if{|k,v|v.nil?}
+  
+  puts "#{fname}:"
+  f = "  %#{l.sort{|a,b|a[0].size <=> b[0].size}.last[0].size}s = %s\n"
+  l.each{|k,v|puts f  % [k, v]}
+end
+
+if ARGV.size == 0
+  STDERR.puts "Usage: #{$0} FILE .."
+elsif ARGV.size == 1
+  pp ARGV[0]
+else
+  ARGV.each do |fname|
+    pp fname
+    puts
+  end
+end

data/lib/exif.rb

@@ -1,9 +1,42 @@
+#!/usr/bin/env ruby
 # Copyright (c) 2006 - R.W. van 't Veer
 
-module EXIFR
+module EXIFR  
   # = EXIF decoder
+  #
+  # The EXIF class contains the EXIF properties.
+  #
+  #
+  # == Date properties
+  #
+  # The properties <tt>:date_time</tt>, <tt>:date_time_original</tt>,
+  # <tt>:date_time_digitized</tt> are stored in a EXIF tags as an ASCII
+  # string.  This class stores them as Time objects.
+  #
+  #
+  # == Orientation
+  #
+  # The property <tt>:orientation</tt> describes the subject rotated and/or
+  # mirrored in relation to the camera.  The value is stored in an EXIF tags
+  # as an integer.  This class stores this value as a module;
+  #
+  # * TopLeftOrientation
+  # * TopRightOrientation
+  # * BottomRightOrientation
+  # * BottomLeftOrientation
+  # * LeftTopOrientation
+  # * RightTopOrientation
+  # * RightBottomOrientation
+  # * LeftBottomOrientation
+  #
+  # These modules have two methods:
+  # * <tt>to_i</tt>; return the original EXIF tag integer
+  # * <tt>transform_rmagick(image)</tt>; transforms the given RMagick::Image
+  #   to a viewable version
+  #
   class EXIF < Hash
-    @@TAGS = {
+    TAGS = {} # :nodoc:
+    TAGS.merge!({
       0x0100 => :image_width,
       0x0101 => :image_length,
       0x0102 => :bits_per_sample,
@@ -31,8 +64,8 @@ module EXIFR
       0x013f => :primary_chromaticities,
       0x0156 => :transfer_range,
       0x0200 => :jpegproc,
-      0x0201 => :jpeginterchange_format,
-      0x0202 => :jpeginterchange_format_length,
+      0x0201 => :jpeg_interchange_format,
+      0x0202 => :jpeg_interchange_format_length,
       0x0211 => :ycb_cr_coefficients,
       0x0212 => :ycb_cr_sub_sampling,
       0x0213 => :ycb_cr_positioning,
@@ -102,9 +135,48 @@ module EXIFR
       0xa40b => :device_setting_descr,
       0xa40c => :subject_dist_range,
       0xa420 => :image_unique_id
-    }
-    @@EXIF_HEADERS = [0x8769, 0x8825, 0xa005]
-    @@TIME_TAGS = [:date_time, :date_time_original, :date_time_digitized]
+    })
+    EXIF_HEADERS = [0x8769, 0x8825, 0xa005] # :nodoc:
+
+    time_proc = proc do |value|
+      if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+        Time.mktime($1, $2, $3, $4, $5, $6)
+      else
+        value
+      end
+    end
+
+    ORIENTATIONS = [] # :nodoc:
+    [
+      nil,
+      [:TopLeft, 'img'],
+      [:TopRight, 'img.flop'],
+      [:BottomRight, 'img.rotate(180)'],
+      [:BottomLeft, 'img.flip'],
+      [:LeftTop, 'img.rotate(90).flop'],
+      [:RightTop, 'img.rotate(90)'],
+      [:RightBottom, 'img.rotate(270).flop'],
+      [:LeftBottom, 'img.rotate(270)'],
+    ].each_with_index do |tuple,index|
+      next unless tuple
+      name, rmagic_code = *tuple
+      
+      eval <<-EOS
+        module #{name}Orientation
+          def self.to_i; #{index}; end
+          def self.transform_rmagick(img); #{rmagic_code}; end
+        end
+        ORIENTATIONS[#{index}] = #{name}Orientation
+      EOS
+    end
+    
+    ADAPTERS = Hash.new { proc { |v| v } } # :nodoc:
+    ADAPTERS.merge!({
+      :date_time_original => time_proc,
+      :date_time_digitized => time_proc,
+      :date_time => time_proc,
+      :orientation => proc { |v| ORIENTATIONS[v] }
+    })
 
     # +data+ the content of the JPEG APP1 frame without the EXIF marker
     def initialize(data)
@@ -113,7 +185,13 @@ module EXIFR
       freeze
     end
 
-    # convience
+    # 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
+
+    # convience; <tt>self[method]</tt>
     def method_missing(method, *args)
       self[method]
     end
@@ -121,26 +199,15 @@ module EXIFR
   private
     def traverse(tiff)
       tiff.fields.each do |f|
-        tag, value = @@TAGS[f.tag], f.value
+        tag = TAGS[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?(f.tag)
+        if EXIF_HEADERS.include?(f.tag)
           traverse(TiffHeader.new(@data, f.offset))
         elsif tag
-          if @@TIME_TAGS.include? tag
-            self[tag] = value2time(value)
-          else
-            self[tag] = value
-          end
+          self[tag] = value
         end
       end
     end
-
-    def value2time(value)
-      if value.sub(/\000.*$/, '') =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-        Time.mktime($1, $2, $3, $4, $5, $6)
-      else
-        value
-      end
-    end
   end
 end

data/lib/jpeg.rb

@@ -15,17 +15,18 @@ module EXIFR
     attr_reader :width
     # number of bits per ???
     attr_reader :bits
-    # image comment
+    # comment; a string if one comment found, an array if more,
+    # otherwise <tt>nil</tt>
     attr_reader :comment
-    # hash of exif data if available
+    # EXIF data if available
     attr_reader :exif
 
     # +file+ is a filename or an IO object
     def initialize(file)
-      if file.kind_of? IO
-        examine(file)
-      else
+      if file.kind_of? String
         File.open(file, 'rb') { |io| examine(io) }
+      else
+        examine(file.dup)
       end
     end
 
@@ -47,21 +48,24 @@ module EXIFR
           c = readchar while c == 0xFF
           c
         end
-      end
+      end unless io.respond_to? :readsof
 
+      app1 = nil
       while marker = io.next
         case marker
           when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF # SOF markers
             length, @bits, @height, @width, components = io.readsof
             raise 'malformed JPEG' unless length == 8 + components * 3
           when 0xD9, 0xDA:  break # EOI, SOS
-          when 0xFE:        @comment = io.readframe # COM
+          when 0xFE:        (@comment ||= []) << io.readframe # COM
           when 0xE1:        app1 = io.readframe # APP1, contains EXIF tag
           else              io.readframe # ignore frame
         end
       end
 
-      if app1 && EXIF
+      @comment = @comment.first if @comment && @comment.size == 1
+      
+      if app1 && app1[0..5] == "Exif\0\0"
         @exif = EXIF.new(app1[6..-1]) # rescue nil
       end
     end

data/lib/tiff_header.rb

@@ -8,16 +8,18 @@ module EXIFR
       @data = data
       @fields = []
 
-      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
+      unless @data.respond_to? :readshort
+        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'
+        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
       end
 
       readIfds(offset || @data.readlong(4))
@@ -49,7 +51,7 @@ module EXIFR
         # TODO handle signed bytes
         len, pack = count, proc { |d| d }
       when 2 # ascii
-        len, pack = count, proc { |d| d.sub(/\000.*$/, '').strip }
+        len, pack = count, proc { |d| d.sub(/\0.*$/, '').strip }
       when 3, 8 # short, signed short
         # TODO handle signed
         len, pack = count * 2, proc { |d| d.unpack(data.short + '*') }
@@ -62,13 +64,13 @@ module EXIFR
           d.unpack(data.long + '*').each_with_index do |v,i|
             i % 2 == 0 ? r << [v] : r.last << v
           end
-	  r.map do |f|
-	    if f[1] == 0 # allow NaN and Infinity
-	      f[0].to_f.quo(f[1])
-	    else
-	      Rational.reduce(*f)
-	    end
-	  end
+          r.map do |f|
+            if f[1] == 0 # allow NaN and Infinity
+              f[0].to_f.quo(f[1])
+            else
+              Rational.reduce(*f)
+            end
+          end
         end
       end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2006-05-03 00:00:00 +02:00
+  version: 0.9.2
+date: 2006-05-30 00:00:00 +02:00
 summary: EXIF Reader is a module to read EXIF from JPEG images.
 require_paths: 
 - lib
@@ -28,9 +28,10 @@ cert_chain:
 authors: 
 - R.W. van 't Veer
 files: 
+- bin/exifr
+- lib/exif.rb
 - lib/exifr.rb
 - lib/jpeg.rb
-- lib/exif.rb
 - lib/tiff_header.rb
 - README
 - CHANGELOG
@@ -41,8 +42,8 @@ rdoc_options: []
 extra_rdoc_files: 
 - README
 - CHANGELOG
-executables: []
-
+executables: 
+- exifr
 extensions: []
 
 requirements: []