ruby-exiv2 1.0 → 1.1

data/Rakefile

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

data/ext/exif.cpp

@@ -51,9 +51,15 @@ static bool marshall_value(Exiv2::ExifData &data, const char* key, VALUE value)
 			data[key] = Exiv2::Rational(NUM2INT(value), 1);
 			return true;
 		}
+		case Exiv2::date: {
+			int year = NUM2INT(rb_funcall(value, rb_intern("year"), 0));
+			int month = NUM2INT(rb_funcall(value, rb_intern("month"), 0));
+			int day = NUM2INT(rb_funcall(value, rb_intern("day"), 0));
+			data[key] = Exiv2::DateValue(year, month, day);
+			return true;
+		}
 		
 		case Exiv2::invalid6:
-		case Exiv2::date:
 		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:

data/ext/iptc.cpp

@@ -52,8 +52,16 @@ static bool marshall_value(Exiv2::IptcData &data, const char* key, VALUE value)
 			return true;
 		}
 		
-		case Exiv2::invalid6:
 		case Exiv2::date:
+		{
+			int year = NUM2INT(rb_funcall(value, rb_intern("year"), 0));
+			int month = NUM2INT(rb_funcall(value, rb_intern("month"), 0));
+			int day = NUM2INT(rb_funcall(value, rb_intern("day"), 0));
+			data[key] = Exiv2::DateValue(year, month, day);
+			return true;
+		}
+		
+		case Exiv2::invalid6:
 		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:

data/ext/marshall.cpp

@@ -91,9 +91,15 @@ VALUE unmarshall_value(const Exiv2::Value& value) {
 			}
 			return INT2NUM(r.first/r.second);
 		}
+		case Exiv2::date:
+		{
+			Exiv2::DateValue *date_value = dynamic_cast<Exiv2::DateValue *>(const_cast<Exiv2::Value *>(&value));
+			if(!date_value) return Qnil;
+			Exiv2::DateValue::Date date = date_value->getDate();
+			return rb_funcall(rb_cTime, rb_intern("utc"), 3, INT2FIX(date.year), INT2FIX(date.month), INT2FIX(date.day));
+		}
 		
 		case Exiv2::invalid6:
-		case Exiv2::date:
 		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:

data/test/image.rb

@@ -198,6 +198,13 @@ class ImageTest < Test::Unit::TestCase
       
       assert @img = Exiv2::Image.new(filename)
       assert_equal "Moscow", @img["Iptc.Application2.City"]
+      
+      assert_equal Time.utc(2004, 7, 13), @img["Iptc.Application2.DateCreated"]
+      assert_equal Time.utc(2006, 3, 5), @img["Iptc.Application2.DateCreated"] = Time.utc(2006, 3, 5)
+      assert @img.save
+      
+      assert @img = Exiv2::Image.new(filename)
+      assert_equal Time.utc(2006, 3, 5), @img["Iptc.Application2.DateCreated"]
     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.0"
-date: 2007-04-06 00:00:00 +04:00
+  version: "1.1"
+date: 2007-04-10 00:00:00 +04:00
 summary: Exiv2 (exif image tags handling) library driver
 require_paths: 
 - lib