exifr 0.10.2 → 0.10.3

data/CHANGELOG

@@ -1,5 +1,8 @@
+EXIF Reader 0.10.3
+* YAML friendly; can now safely (de)serialize
+
 EXIF Reader 0.10.2
-* bug fix (thanks to Alexander Staubo for providing me witb sample data);
+* bug fix (thanks to Alexander Staubo for providing me with sample data);
   don't fail on out-of-range IFD offsets for Apple Aperture generated JPGs
 
 EXIF Reader 0.10.1

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :test
 
 spec = Gem::Specification.new do |s|
   s.name = 'exifr'
-  s.version = '0.10.2'
+  s.version = '0.10.3'
   s.author = "R.W. van 't Veer"
   s.email = 'remco@remvee.net'
   s.homepage = 'http://exifr.rubyforge.org/'

data/lib/jpeg.rb

@@ -35,7 +35,7 @@ module EXIFR
       !exif.nil?
     end
 
-    # Dispath to EXIF.  When no EXIF data is available but the +method+ does exist
+    # 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?

data/lib/tiff.rb

@@ -12,7 +12,7 @@ module EXIFR
   # == Orientation
   # The property <tt>:orientation</tt> describes the subject rotated and/or
   # mirrored in relation to the camera.  It is translated to one of the following
-  # modules:
+  # instances:
   # * TopLeftOrientation
   # * TopRightOrientation
   # * BottomRightOrientation
@@ -22,7 +22,7 @@ module EXIFR
   # * RightBottomOrientation
   # * LeftBottomOrientation
   #
-  # These modules have two methods:
+  # These instances of Orientation have two methods:
   # * <tt>to_i</tt>; return the original integer
   # * <tt>transform_rmagick(image)</tt>; transforms the given RMagick::Image
   #   to a viewable version
@@ -33,7 +33,7 @@ module EXIFR
   #   EXIFR::TIFF.new('DSC_0218.TIF').model           # => "NIKON D1X"
   #   EXIFR::TIFF.new('DSC_0218.TIF').date_time       # => Tue May 23 19:15:32 +0200 2006
   #   EXIFR::TIFF.new('DSC_0218.TIF').exposure_time   # => Rational(1, 100)
-  #   EXIFR::TIFF.new('DSC_0218.TIF').orientation     # => EXIFR::TIFF::TopLeftOrientation
+  #   EXIFR::TIFF.new('DSC_0218.TIF').orientation     # => EXIFR::TIFF::Orientation
   class TIFF
     include Enumerable
     
@@ -241,28 +241,51 @@ module EXIFR
       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
+        when :TopRight    : img.flop
+        when :BottomRight : img.rotate(180)
+        when :BottomLeft  : img.flip
+        when :LeftTop     : img.rotate(90).flop
+        when :RightTop    : img.rotate(90)
+        when :RightBottom : img.rotate(270).flop
+        when :LeftBottom  : img.rotate(270)     
+        else
+          img
+        end
+      end
+      
+      def ==(other) # :nodoc:
+        Orientation === other && to_i == other.to_i
+      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
+      :TopLeft,
+      :TopRight,
+      :BottomRight,
+      :BottomLeft,
+      :LeftTop,
+      :RightTop,
+      :RightBottom,
+      :LeftBottom,
+    ].each_with_index do |type,index|
+      next unless type
+      const_set("#{type}Orientation", ORIENTATIONS[index] = Orientation.new(index, type))
     end
     
     ADAPTERS = Hash.new { proc { |v| v } } # :nodoc:
@@ -278,21 +301,21 @@ module EXIFR
     
     # +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 }
+      data = file.respond_to?(:read) ? file.read : File.open(file, 'rb') { |io| io.read }
       
-      class << @data
+      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'
+      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)]
+      @ifds = [IFD.new(data)]
       while ifd = @ifds.last.next; @ifds << ifd; end
     end
     
@@ -384,6 +407,9 @@ module EXIFR
         IFD.new(@data, @offset_next) unless @offset_next == 0 || @offset_next >= @data.size
       end
     
+      def to_yaml_properties
+        '@fields'
+      end
     private
       def add_field(field)
         return unless tag = TAG_MAPPING[@type][field.tag]

data/tests/test_tiff.rb

@@ -64,7 +64,16 @@ class TestTIFF < Test::Unit::TestCase
     all_test_exifs.each do |fname|
       orientation = TIFF.new(fname).orientation
       if orientation
-        assert_kind_of Module, orientation
+        assert [
+          TIFF::TopLeftOrientation,
+          TIFF::TopRightOrientation,
+          TIFF::BottomRightOrientation,
+          TIFF::BottomLeftOrientation,
+          TIFF::LeftTopOrientation,
+          TIFF::RightTopOrientation,
+          TIFF::RightBottomOrientation,
+          TIFF::LeftBottomOrientation
+        ].any? { |c| orientation == c }, 'not an orientation'
         assert orientation.respond_to?(:to_i)
         assert orientation.respond_to?(:transform_rmagick)
         tested += 1
@@ -117,4 +126,14 @@ class TestTIFF < Test::Unit::TestCase
       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_equal t.to_hash, YAML.load(y).to_hash
+    end
+  end
 end

metadata

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