ruby-exiv2 1.1 → 1.2

data/README

@@ -2,15 +2,15 @@ Library for handling exif image tags.
 
 Basic usage:
 
-> gem install ruby-exiv2
-> irb -r rubygems
-irb(main):001:0> require 'exiv2'
-=> true
-irb(main):002:0> @img = Exiv2::Image.new("a.jpg")
-=> #<Exiv2::Image:0x4c524c>
-irb(main):003:0> @exif = @img.exif
-=> #<Exiv2::Exif:0x4bc160>
-irb(main):004:0> @img.exif["Exif.Photo.PixelXDimension"]
-=> 1024
+	> gem install ruby-exiv2
+	> irb -r rubygems
+	
+	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.1"
+PKG_VERSION = "1.2"
 PKG_AUTHOR = "Max Lapshin"
 PKG_EMAIL = "max@maxidoors.ru"
 PKG_HOMEPAGE = "http://maxidoors.ru/"
@@ -63,9 +63,10 @@ task :stats  do
   ).to_s
 end
 
+`rm -f ruby-exiv2.cpp`
 desc "Generate file with C++ with all methods for proper rdoc"
 file "ruby-exiv2.cpp" do
-  `cat lib/*.cpp > ruby-exiv2.cpp`
+  `cat ext/*.cpp > ruby-exiv2.cpp`
 end
 
 
@@ -90,6 +91,7 @@ desc "Remove packaging products (doc and pkg) - they are not source-managed"
 task :clobber do
 	`rm -rf ./doc`
 	`rm -rf ./pkg`
+	`rm -f ruby-exiv2`
 end
 
 desc "Publish the new docs"

data/ext/exif.cpp

@@ -58,9 +58,15 @@ static bool marshall_value(Exiv2::ExifData &data, const char* key, VALUE value)
 			data[key] = Exiv2::DateValue(year, month, day);
 			return true;
 		}
+		case Exiv2::time: {
+			int hour = NUM2INT(rb_funcall(value, rb_intern("hour"), 0));
+			int minute = NUM2INT(rb_funcall(value, rb_intern("min"), 0));
+			int second = NUM2INT(rb_funcall(value, rb_intern("sec"), 0));
+			data[key] = Exiv2::TimeValue(hour, minute, second);
+			return true;
+		}
 		
 		case Exiv2::invalid6:
-		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:
 		case Exiv2::lastTypeId:
@@ -248,6 +254,9 @@ static int iterate_tag_collection(const Exiv2::TagInfo* collection, bool to_yiel
 	return i;
 }
 
+/*
+ * Iterates through all available exif tags, that can be set in the image
+ */
 static VALUE exiv2_tags_each(VALUE self) {
 	__BEGIN
 	iterate_tag_collection(Exiv2::ExifTags::ifdTagList());
@@ -259,7 +268,9 @@ static VALUE exiv2_tags_each(VALUE self) {
 }
 
 
-
+/*
+ * Count of all available exif tags
+ */
 static VALUE exiv2_tags_count(VALUE self) {
 	__BEGIN
 	return INT2NUM(
@@ -272,6 +283,9 @@ static VALUE exiv2_tags_count(VALUE self) {
 }
 #endif /* HAVE_IFDTAGLIST */
 
+/*
+ * Name of exif tag
+ */
 static VALUE exiv2_tag_name(VALUE self) {
 	__BEGIN
 	Exiv2::TagInfo* tag;
@@ -281,6 +295,9 @@ static VALUE exiv2_tag_name(VALUE self) {
 	__END
 }
 
+/*
+ * title of exif tag
+ */
 static VALUE exiv2_tag_title(VALUE self) {
 	__BEGIN
 	Exiv2::TagInfo* tag;
@@ -290,6 +307,9 @@ static VALUE exiv2_tag_title(VALUE self) {
 	__END
 }
 
+/*
+ * description of exif tag
+ */
 static VALUE exiv2_tag_desc(VALUE self) {
 	__BEGIN
 	Exiv2::TagInfo* tag;
@@ -299,6 +319,9 @@ static VALUE exiv2_tag_desc(VALUE self) {
 	__END
 }
 
+/*
+ * section of exif tag
+ */
 static VALUE exiv2_tag_section(VALUE self) {
 	__BEGIN
 	Exiv2::TagInfo* tag;
@@ -308,6 +331,9 @@ static VALUE exiv2_tag_section(VALUE self) {
 	__END
 }
 
+/*
+ * IFD of exif tag
+ */
 static VALUE exiv2_tag_ifd(VALUE self) {
 	__BEGIN
 	Exiv2::TagInfo* tag;

data/ext/exiv2.cpp

@@ -49,7 +49,16 @@ void rb_exiv2_throw(const char *file, long unsigned int line, const char *fmt, .
 extern "C"
 #endif
 
+/*
+ * Document-module: Exiv2
+ *
+ * Namespace for all exiv stuff
+ */
 
+/*
+ * Document-class: Exiv2::Error
+ * error, thrown if anything goes wrong inside in exiv2
+ */
 
 void Init_exiv2_bin() {
 	mExiv2 = rb_define_module("Exiv2");

data/ext/image.cpp

@@ -13,6 +13,14 @@ static void image_leave(rbImage* image) {
 	
 }
 
+/*
+ * Document-class: Exiv2::Image
+ * Image is used to access to all exif data of image
+ *
+ *   @image = Exiv2::Image.new("my.jpg")
+ *   puts @image["Iptc.Application2.DateCreated"]
+ *   puts @image["Exif.Image.Software"]
+ */
 static VALUE exiv2_image_s_allocate(VALUE klass) {
 	__BEGIN
 	rbImage* image = new rbImage();
@@ -22,8 +30,7 @@ static VALUE exiv2_image_s_allocate(VALUE klass) {
 }
 
 /*
- * img = Exiv2::Image.new("IMGP3025.jpg")
- * => #<Exiv2::Image:0x844bc>
+ *   img = Exiv2::Image.new("IMGP3025.jpg")
  */
 static VALUE exiv2_image_initialize(VALUE self, VALUE file) {
 	__BEGIN
@@ -51,8 +58,9 @@ static VALUE exiv2_image_initialize(VALUE self, VALUE file) {
 /*
  *
  * Load Exiv2::Image from memory string
- * content = File.open("a.jpg").read
- * img = Exiv2::Image.load_string(content)
+ *
+ *   content = File.open("a.jpg").read
+ *   img = Exiv2::Image.load_string(content)
  */
 static VALUE exiv2_image_load_string(VALUE self, VALUE string) {
 	__BEGIN

data/ext/iptc.cpp

@@ -60,9 +60,15 @@ static bool marshall_value(Exiv2::IptcData &data, const char* key, VALUE value)
 			data[key] = Exiv2::DateValue(year, month, day);
 			return true;
 		}
+		case Exiv2::time: {
+			int hour = NUM2INT(rb_funcall(value, rb_intern("hour"), 0));
+			int minute = NUM2INT(rb_funcall(value, rb_intern("min"), 0));
+			int second = NUM2INT(rb_funcall(value, rb_intern("sec"), 0));
+			data[key] = Exiv2::TimeValue(hour, minute, second);
+			return true;
+		}
 		
 		case Exiv2::invalid6:
-		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:
 		case Exiv2::lastTypeId:

data/ext/marshall.cpp

@@ -98,9 +98,14 @@ VALUE unmarshall_value(const Exiv2::Value& value) {
 			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::time: {
+			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));
+		}
 		
 		case Exiv2::invalid6:
-		case Exiv2::time:
 		case Exiv2::comment:
 		case Exiv2::directory:
 		case Exiv2::lastTypeId:

data/lib/exiv2.rb

@@ -5,17 +5,28 @@ rescue LoadError
 end
 
 module Exiv2
+  #
   class Image
     
+    # method [] is used to read exif or iptc data
     def [](key)
       return exif[key] if key[0...4] == "Exif"
       return iptc[key] if key[0...4] == "Iptc"
     end
     
+    # method []= is used to set exif or iptc data
     def []=(key, value)
       return exif[key] = value if key[0...4] == "Exif"
       return iptc[key] = value if key[0...4] == "Iptc"
       raise Exiv2::Error, "Unknown key for writing: #{key.inspect}"
     end
+    
+    # clues together Iptc.Application2.DateCreated and Iptc.Application2.TimeCreated if possible
+    def created_at
+      date = iptc["Iptc.Application2.DateCreated"]
+      time = iptc["Iptc.Application2.TimeCreated"]
+      return date unless time
+      Time.utc(date.year, date.month, date.day, time.hour, time.min, time.sec)
+    end
   end
 end

data/test/image.rb

@@ -205,6 +205,13 @@ class ImageTest < Test::Unit::TestCase
       
       assert @img = Exiv2::Image.new(filename)
       assert_equal Time.utc(2006, 3, 5), @img["Iptc.Application2.DateCreated"]
+      assert_equal nil, @img["Iptc.Application2.TimeCreated"]
+      assert @img["Iptc.Application2.TimeCreated"] = Time.utc(1970, 1, 1, 15, 43, 23)
+      assert @img.save
+      assert @img = Exiv2::Image.new(filename)
+      assert_equal Time.utc(1970, 1, 1, 15, 43, 23), @img["Iptc.Application2.TimeCreated"]
+      
+      assert_equal Time.utc(2006, 3, 5, 15, 43, 23), @img.created_at
     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.1"
-date: 2007-04-10 00:00:00 +04:00
+  version: "1.2"
+date: 2007-04-12 00:00:00 +04:00
 summary: Exiv2 (exif image tags handling) library driver
 require_paths: 
 - lib