ruby-exiv2 1.2 → 1.3

data/README

@@ -10,7 +10,12 @@ Basic usage:
 	puts @img["Exif.Photo.PixelXDimension"]
 	@img["Exif.Photo.PixelXDimension"] = 2048
 	@img.save
-	
-	
 
+Version 1.3 introduces dynamic accessors:
 
+    require 'exiv2'
+    @img = Exiv2::Image.new("a.jpg")
+    puts @img.Exif.Photo.PixelXDimension
+	@img.Exif.Photo.PixelXDimension = 2048
+	@img.save
+    

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME = "ruby-exiv2"
-PKG_VERSION = "1.2"
+PKG_VERSION = "1.3"
 PKG_AUTHOR = "Max Lapshin"
 PKG_EMAIL = "max@maxidoors.ru"
 PKG_HOMEPAGE = "http://maxidoors.ru/"

data/ext/image.cpp

@@ -217,6 +217,7 @@ void Init_image() {
 	rb_define_singleton_method(cImage, "load_string", VALUEFUNC(exiv2_image_load_string), 1);
 	
 	rb_define_method(cImage, "exif", VALUEFUNC(exiv2_image_exif), 0);
+	rb_define_method(cImage, "Exif", VALUEFUNC(exiv2_image_exif), 0);
 	rb_define_method(cImage, "iptc", VALUEFUNC(exiv2_image_iptc), 0);
 
 	rb_define_method(cImage, "thumbnail", VALUEFUNC(exiv2_image_thumbnail), 1);

data/ext/marshall.cpp

@@ -102,7 +102,7 @@ VALUE unmarshall_value(const Exiv2::Value& value) {
 			Exiv2::TimeValue *time_value = dynamic_cast<Exiv2::TimeValue *>(const_cast<Exiv2::Value *>(&value));
 			if(!time_value) return Qnil;
 			Exiv2::TimeValue::Time time = time_value->getTime();
-			return rb_funcall(rb_cTime, rb_intern("utc"), 6, INT2FIX(1970), INT2FIX(1), INT2FIX(1), INT2FIX(time.hour), INT2FIX(time.minute), INT2FIX(time.second));
+			return rb_funcall(rb_cTime, rb_intern("utc"), 6, INT2FIX(1970), INT2FIX(1), INT2FIX(1), INT2FIX(time.hour+time.tzHour), INT2FIX(time.minute+time.tzMinute), INT2FIX(time.second));
 		}
 		
 		case Exiv2::invalid6:

data/lib/exiv2.rb

@@ -3,6 +3,9 @@ begin
 rescue LoadError
   require File.dirname(__FILE__)+'/../ext/exiv2_bin'
 end
+require 'enumerator'
+require 'rubygems'
+require 'active_support'
 
 module Exiv2
   #
@@ -29,4 +32,47 @@ module Exiv2
       Time.utc(date.year, date.month, date.day, time.hour, time.min, time.sec)
     end
   end
+  
+  class SubTagAccess
+    def initialize(class_name, sub_tag, parent)
+      @class_name = class_name.split("::").last
+      @sub_tag = sub_tag
+      @parent = parent
+    end
+    
+    def methods
+      @parent.select {|tag| tag.first.starts_with?("#{@class_name}.#{@sub_tag}")}.map {|tag| tag.first.gsub(/^(\w+)\.(\w+)\.(\w+)$/,'\3')}
+    end
+    
+    def method_missing(name, *args)
+      method_name = name.to_s
+      method_name = method_name[0..-2] if method_name.ends_with?("=")
+      return super(name, *args) unless methods.include?(method_name)
+      if name.to_s.ends_with?("=")
+        @parent.send :[]=, "#{@class_name}.#{@sub_tag}.#{method_name}", *args
+      else
+        @parent.send :[], "#{@class_name}.#{@sub_tag}.#{method_name}", *args
+      end
+    end
+  end
+  
+  module ExifAccess
+    include Enumerable
+    def methods
+      virtual_methods + real_methods
+    end
+    def method_missing(name, *args)
+      super(name, *args) unless virtual_methods.include?(name.to_s)
+      SubTagAccess.new(self.class.to_s, name, self)
+    end
+    private
+    def virtual_methods
+      self.map {|tag| tag.first.gsub(/^(\w+)\.(\w+)\.(\w+)$/,'\2')}.uniq
+    end
+  end
+  
+  class Exif
+    alias :real_methods :methods
+    include ExifAccess
+  end
 end

data/test/image.rb

@@ -214,4 +214,22 @@ class ImageTest < Test::Unit::TestCase
       assert_equal Time.utc(2006, 3, 5, 15, 43, 23), @img.created_at
     end
   end
+  
+  def test_time_marshall
+    open_test_file "RIA3001.jpg" do |filename|
+      assert @img = Exiv2::Image.new(filename)
+      assert_equal Time.utc(1970, 1, 1, 12, 10, 00), @img["Iptc.Application2.TimeCreated"]
+    end
+  end
+  
+  def test_dynamic_accessors
+    open_test_file "smiley1.jpg" do |filename|
+      assert @img = Exiv2::Image.new(filename)
+      assert @img.Exif
+      assert_equal ["Flash", "PixelXDimension", "PixelYDimension"], @img.Exif.Photo.methods
+      assert_equal 140, @img.Exif.Photo.PixelYDimension
+      assert @img.Exif.Photo.PixelXDimension = 160
+      assert_equal 160, @img.Exif.Photo.PixelXDimension
+    end
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-exiv2
 version: !ruby/object:Gem::Version 
-  version: "1.2"
-date: 2007-04-12 00:00:00 +04:00
+  version: "1.3"
+date: 2007-04-24 00:00:00 +04:00
 summary: Exiv2 (exif image tags handling) library driver
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - test/image.rb
 - test/data/exiv2-fujifilm-finepix-s2pro.jpg
 - test/data/gps-test.jpg
+- test/data/RIA3001.jpg
 - test/data/smiley1.jpg
 - ext/exif.cpp
 - ext/exiv2.cpp