ruby-exiv2 0.1 → 0.2

data/lib/Makefile

@@ -0,0 +1,143 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /opt/local/lib/ruby/1.8/i686-darwin8.7.1
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/opt/local
+exec_prefix = $(DESTDIR)/opt/local
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+vendordir = $(prefix)/lib/ruby/vendor_ruby
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/opt/local/share/man
+libdir = $(DESTDIR)/opt/local/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+vendorlibdir = $(vendordir)/$(ruby_version)
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common 
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_EXIF_HPP -O -pipe -I/opt/local/include -Wall -I/usr/local/include/exiv2 -I/usr/include/exiv2 
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L/opt/local/lib -lstdc++   
+LDSHARED = g++ -g  -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-darwin8.7.1
+sitearch = i686-darwin8.7.1
+vendorarch = i686-darwin8.7.1
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = $(libdir)
+LIBPATH =  -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lexiv2  -lpthread -ldl -lobjc  
+SRCS = exif.cpp exiv2.cpp image.cpp
+OBJS = exif.o exiv2.o image.o
+TARGET = exiv2
+DLLIB = $(TARGET).bundle
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/lib/exif.cpp

@@ -1,6 +1,77 @@
 #include "exiv2.hpp"
 
-VALUE exiv2_exif_get(VALUE self, VALUE key) {
+
+static VALUE unmarshall_value(const Exiv2::Value& value) {
+	if(value.count() <= 0) {
+		rb_warn("Empty value (no entries)");
+		return Qnil;
+	}
+	
+	Exiv2::TypeId type_id = value.typeId();
+	switch(type_id) {
+		case Exiv2::invalidTypeId: 
+		{
+			rb_warn("Trying to demarshall invalid type id");
+			return Qnil;
+		}
+		
+		case Exiv2::unsignedByte:
+		case Exiv2::unsignedShort:
+		case Exiv2::unsignedLong:
+		case Exiv2::signedShort:
+		case Exiv2::signedLong: 
+		{
+			return INT2NUM(value.toLong());
+		}
+		
+		case Exiv2::asciiString:
+		case Exiv2::string: 
+		case Exiv2::undefined:
+		{
+			VALUE str = rb_str_buf_new(value.size() - 1);
+			value.copy((Exiv2::byte *)STR(str), Exiv2::littleEndian);
+			LEN(str) = value.size() - 1;
+			return str;
+		}
+		
+		case Exiv2::unsignedRational:
+		case Exiv2::signedRational: 
+		{
+			return rb_str_new2(value.toString().c_str());
+			Exiv2::Rational r = value.toRational();
+			ID rational_id = rb_intern("Rational");
+			if(0 && rb_const_defined(rb_cObject, rational_id)) {
+				VALUE rational = rb_const_get(rb_cObject, rational_id);
+				return rb_funcall(rational, rb_intern("new!"), 2, INT2NUM(r.first), INT2NUM(r.second));
+			}
+			return INT2NUM(r.first/r.second);
+		}
+		
+		case Exiv2::invalid6:
+		case Exiv2::date:
+		case Exiv2::time:
+		case Exiv2::comment:
+		case Exiv2::directory:
+		case Exiv2::lastTypeId:
+		{
+			VALUE str = rb_str_buf_new(value.size() - 1);
+			value.copy((Exiv2::byte *)STR(str), Exiv2::littleEndian);
+			LEN(str) = value.size() - 1;
+			char msg[200];
+			snprintf(msg, sizeof(msg), " !!! %d", type_id);
+			rb_funcall(str, rb_intern("<<"), 1, rb_str_new2(msg));
+			return str;
+		}
+	}
+	return Qfalse;
+}
+
+/*
+ * Access exif tag by name
+ *
+ * <code>Exiv2::Image.new("a.jpg").exif["Exif.Image.Model"] => "FinePixS2Pro"</code>
+ */
+static VALUE exiv2_exif_get(VALUE self, VALUE key) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -18,12 +89,17 @@ VALUE exiv2_exif_get(VALUE self, VALUE key) {
 		return Qnil;
     }
 	
-	std::string v = pos->toString();
-	return rb_str_new(v.c_str(), v.length());
+	return unmarshall_value(pos->value());
+	//std::string v = pos->toString();
+	//return rb_str_new(v.c_str(), v.length());
 	__NIL_END
 }
 
-VALUE exiv2_exif_set(VALUE self, VALUE key, VALUE value) {
+/*
+ *  @exif["Exif.Photo.PixelXDimension"] = 3024
+ * [] — is a universal accessor
+ */
+static VALUE exiv2_exif_set(VALUE self, VALUE key, VALUE value) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -38,7 +114,10 @@ VALUE exiv2_exif_set(VALUE self, VALUE key, VALUE value) {
 	__NIL_END
 }
 
-VALUE exiv2_exif_each(int argc, VALUE *argv, VALUE self) {
+/*
+ * Iterates through all exif tags in image
+ */
+static VALUE exiv2_exif_each(int argc, VALUE *argv, VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -54,7 +133,8 @@ VALUE exiv2_exif_each(int argc, VALUE *argv, VALUE self) {
 	Exiv2::ExifData::const_iterator end = exifData.end();
 	for(Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
 		VALUE key = rb_str_new(i->key().c_str(), i->key().length());
-		VALUE val = rb_str_new(i->toString().c_str(), i->toString().length());
+		VALUE val = unmarshall_value(i->value());
+		//VALUE val = rb_str_new(i->toString().c_str(), i->toString().length());
 		if(prefix != Qnil && INT2FIX(0) != rb_funcall(key, rb_intern("index"), 1, prefix)) {
 			continue;
 		}
@@ -64,7 +144,10 @@ VALUE exiv2_exif_each(int argc, VALUE *argv, VALUE self) {
 	__END
 }
 
-VALUE exiv2_exif_delete(VALUE self, VALUE key) {
+/*
+ * Delete exif value by it's name
+ */
+static VALUE exiv2_exif_delete(VALUE self, VALUE key) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -77,7 +160,7 @@ VALUE exiv2_exif_delete(VALUE self, VALUE key) {
 	}
 	
     Exiv2::ExifKey exifKey(STR(strkey));
-    Exiv2::ExifData::const_iterator pos = exifData.findKey(exifKey);
+    Exiv2::ExifData::iterator pos = exifData.findKey(exifKey);
     if (pos == exifData.end()) {
 		return Qnil;
     }
@@ -88,7 +171,10 @@ VALUE exiv2_exif_delete(VALUE self, VALUE key) {
 	__NIL_END
 }
 
-VALUE exiv2_exif_clear(VALUE self) {
+/*
+ * Clear all exif data in image
+ */
+static VALUE exiv2_exif_clear(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -103,8 +189,10 @@ VALUE exiv2_exif_clear(VALUE self) {
 	__END
 }
 
-
-VALUE exiv2_exif_count(VALUE self) {
+/*
+ * Count of exif tags in image
+ */
+static VALUE exiv2_exif_count(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -115,7 +203,10 @@ VALUE exiv2_exif_count(VALUE self) {
 	__END
 }
 
-VALUE exiv2_exif_empty(VALUE self) {
+/*
+ * Predicate method. Is exif empty?
+ */
+static VALUE exiv2_exif_empty(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -124,4 +215,17 @@ VALUE exiv2_exif_empty(VALUE self) {
 	
 	return exifData.empty() ? Qtrue : Qfalse;
 	__NIL_END
+}
+
+
+
+void Init_exif() {
+	cExif = rb_define_class_under(mExiv2, "Exif", rb_cObject);
+	rb_define_method(cExif, "each", VALUEFUNC(exiv2_exif_each), -1);
+	rb_define_method(cExif, "[]", VALUEFUNC(exiv2_exif_get), 1);
+	rb_define_method(cExif, "[]=", VALUEFUNC(exiv2_exif_set), 2);
+	rb_define_method(cExif, "delete", VALUEFUNC(exiv2_exif_delete), 1);
+	rb_define_method(cExif, "clear", VALUEFUNC(exiv2_exif_clear), 0);
+	rb_define_method(cExif, "count", VALUEFUNC(exiv2_exif_count), 0);
+	rb_define_method(cExif, "empty?", VALUEFUNC(exiv2_exif_empty), 0);
 }

data/lib/exiv2.cpp

@@ -29,7 +29,7 @@
 #include "exiv2.hpp"
 
 
-VALUE mExiv2, cImage, cExif, cIptc, cThumbnail;
+VALUE mExiv2, cImage, cExif, cIptc, cThumbnail, eError;
 
 #ifdef __cplusplus
 extern "C"
@@ -39,35 +39,15 @@ extern "C"
 void Init_exiv2() {
 	mExiv2 = rb_define_module("Exiv2");
 	
-	cImage = rb_define_class_under(mExiv2, "Image", rb_cObject);
-	rb_define_alloc_func(cImage, exiv2_image_s_allocate);
-	rb_define_method(cImage, "initialize", VALUEFUNC(exiv2_image_initialize), 1);
-	rb_define_method(cImage, "exif", VALUEFUNC(exiv2_image_exif), 0);
-/*
-	rb_define_method(cImage, "thumbnail", VALUEFUNC(exiv2_image_thumbnail), 0);
-	rb_define_method(cImage, "thumbnail=", VALUEFUNC(exiv2_image_thumbnail_set), 0);
-*/
-	rb_define_method(cImage, "save", VALUEFUNC(exiv2_image_save), 0);
-	rb_define_method(cImage, "clear", VALUEFUNC(exiv2_image_clear), 0);
-	rb_define_method(cImage, "comment", VALUEFUNC(exiv2_image_get_comment), 0);
-	rb_define_method(cImage, "comment=", VALUEFUNC(exiv2_image_set_comment), 1);
+	eError = rb_define_class_under(mExiv2, "Error", rb_eStandardError);
 	
-	cExif = rb_define_class_under(mExiv2, "Exif", rb_cObject);
-	rb_define_method(cExif, "each", VALUEFUNC(exiv2_exif_each), -1);
-	rb_define_method(cExif, "[]", VALUEFUNC(exiv2_exif_get), 1);
-	rb_define_method(cExif, "[]=", VALUEFUNC(exiv2_exif_set), 2);
-	rb_define_method(cExif, "delete", VALUEFUNC(exiv2_exif_delete), 1);
-	rb_define_method(cExif, "clear", VALUEFUNC(exiv2_exif_clear), 0);
-	rb_define_method(cExif, "size", VALUEFUNC(exiv2_exif_size), 0);
-	rb_define_method(cExif, "empty?", VALUEFUNC(exiv2_exif_empty), 0);
-
-/*	
-	cThumbnail = rb_define_class_under(mExiv2, "Thumbnail", rb_cObject);
-	rb_define_method(cThumbnail, "extension", VALUEFUNC(exiv2_thumb_ext), 0);
-	rb_define_method(cThumbnail, "format", VALUEFUNC(exiv2_thumb_format), 0);
-	rb_define_method(cThumbnail, "clear", VALUEFUNC(exiv2_thumb_clear), 0);
-	rb_define_method(cThumbnail, "to_s", VALUEFUNC(exiv2_thumb_read), 0);
-	rb_define_method(cThumbnail, "read", VALUEFUNC(exiv2_thumb_read), 0);
-	rb_define_method(cThumbnail, "write", VALUEFUNC(exiv2_thumb_write), 1);
-*/
+	Init_image();
+	Init_exif();
+	//cThumbnail = rb_define_class_under(mExiv2, "Thumbnail", rb_cObject);
+	//rb_define_method(cThumbnail, "extension", VALUEFUNC(exiv2_thumb_ext), 0);
+	//rb_define_method(cThumbnail, "format", VALUEFUNC(exiv2_thumb_format), 0);
+	//rb_define_method(cThumbnail, "clear", VALUEFUNC(exiv2_thumb_clear), 0);
+	//rb_define_method(cThumbnail, "to_s", VALUEFUNC(exiv2_thumb_read), 0);
+	//rb_define_method(cThumbnail, "read", VALUEFUNC(exiv2_thumb_read), 0);
+	//rb_define_method(cThumbnail, "write", VALUEFUNC(exiv2_thumb_write), 1);
 }

data/lib/exiv2.hpp

@@ -77,7 +77,7 @@
 #define RUN(x) if(!x) { return Qnil; }
 
 #define __BEGIN try {
-#define __END } catch(Exiv2::AnyError& e) { rb_raise(rb_eStandardError, "Error occured in exiv2 library: %s", e.what().c_str());}
+#define __END } catch(Exiv2::AnyError& e) { rb_raise(eError, "Error occured in exiv2 library: %s", e.what().c_str());}
 #define __NIL_END } catch(Exiv2::AnyError& e) { return Qnil; }
 #define __VOID_END } catch(Exiv2::AnyError& e) {}
 
@@ -85,7 +85,7 @@
 extern "C" {
 #endif
 	void Init_exiv2(void);
-	extern VALUE mExiv2, cImage, cExif, cIptc;
+	extern VALUE mExiv2, cImage, cExif, cIptc, eError;
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
@@ -98,21 +98,8 @@ struct rbImage {
 };
 
 
-VALUE exiv2_image_s_allocate(VALUE klass);
-VALUE exiv2_image_initialize(VALUE self, VALUE file);
-VALUE exiv2_image_save(VALUE self);
-VALUE exiv2_image_clear(VALUE self);
-VALUE exiv2_image_exif(VALUE self);
-VALUE exiv2_image_get_comment(VALUE self);
-VALUE exiv2_image_set_comment(VALUE self, VALUE comment);
-
-VALUE exiv2_exif_get(VALUE self, VALUE key);
-VALUE exiv2_exif_set(VALUE self, VALUE key, VALUE value);
-VALUE exiv2_exif_each(int argc, VALUE *argv, VALUE self);
-VALUE exiv2_exif_delete(VALUE self, VALUE key);
-VALUE exiv2_exif_size(VALUE self);
-VALUE exiv2_exif_empty(VALUE self);
-VALUE exiv2_exif_clear(VALUE self);
+void Init_image();
+void Init_exif();
 
 
 #endif /* EXIV2_HPP_ */

data/lib/extconf.rb

@@ -6,8 +6,8 @@ CONFIG['LDSHARED'] = "g++ -g  -dynamic -bundle -undefined suppress -flat_namespa
 
 
 
-$CPPFLAGS << " -Wall -I/usr/local/include/exiv2 "
-$LDFLAGS << " -lstdc++ -L/usr/local/lib "
+$CPPFLAGS << " -Wall -I/usr/local/include/exiv2 -I/usr/include/exiv2 "
+$LDFLAGS << " -lstdc++ "
 have_header "exif.hpp"
 have_library "exiv2", "_ZN5Exiv29MetadatumD0Ev"
 create_makefile 'exiv2'

data/lib/image.cpp

@@ -13,7 +13,7 @@ static void image_leave(rbImage* image) {
 	
 }
 
-VALUE exiv2_image_s_allocate(VALUE klass) {
+static VALUE exiv2_image_s_allocate(VALUE klass) {
 	__BEGIN
 	rbImage* image = new rbImage();
 	image->dirty = false;
@@ -21,7 +21,11 @@ VALUE exiv2_image_s_allocate(VALUE klass) {
 	__END
 }
 
-VALUE exiv2_image_initialize(VALUE self, VALUE file) {
+/*
+ * img = Exiv2::Image.new("IMGP3025.jpg")
+ * => #<Exiv2::Image:0x844bc>
+ */
+static VALUE exiv2_image_initialize(VALUE self, VALUE file) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -30,7 +34,7 @@ VALUE exiv2_image_initialize(VALUE self, VALUE file) {
 	try {
 		if(rb_respond_to(file, rb_intern("read"))) {
 			VALUE file_content = rb_funcall(file, rb_intern("read"), 0);
-			rb_iv_set(self, "file_content", file_content);
+			rb_iv_set(self, "@file_content", file_content);
 			image->image = Exiv2::ImageFactory::open(CBSTR(file_content), LEN(file_content));
 		} else if(TYPE(file) == T_STRING) {
 			image->image = Exiv2::ImageFactory::open(CSTR(file));
@@ -52,7 +56,10 @@ static void image_real_save(rbImage* image) {
 	}
 }
 
-VALUE exiv2_image_save(VALUE self) {
+/*
+ * Save image with changed data
+ */
+static VALUE exiv2_image_save(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -61,8 +68,10 @@ VALUE exiv2_image_save(VALUE self) {
 	__END
 }
 
-
-VALUE exiv2_image_clear(VALUE self) {
+/*
+ * Clear all metadata in image. Not only exif
+ */
+static VALUE exiv2_image_clear(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -72,8 +81,10 @@ VALUE exiv2_image_clear(VALUE self) {
 	__END
 }
 
-
-VALUE exiv2_image_get_comment(VALUE self) {
+/*
+ * Get comment of image
+ */
+static VALUE exiv2_image_get_comment(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -82,7 +93,10 @@ VALUE exiv2_image_get_comment(VALUE self) {
 	__END
 }
 
-VALUE exiv2_image_set_comment(VALUE self, VALUE comment) {
+/*
+ * Set comment in image
+ */
+static VALUE exiv2_image_set_comment(VALUE self, VALUE comment) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -105,8 +119,10 @@ VALUE exiv2_image_set_comment(VALUE self, VALUE comment) {
 	__END
 }
 
-
-VALUE exiv2_image_exif(VALUE self) {
+/*
+ * Access to exif data of image
+ */
+static VALUE exiv2_image_exif(VALUE self) {
 	__BEGIN
 	rbImage* image;
 	Data_Get_Struct(self, rbImage, image);
@@ -116,3 +132,17 @@ VALUE exiv2_image_exif(VALUE self) {
 	__END
 }
 
+void Init_image() {
+	cImage = rb_define_class_under(mExiv2, "Image", rb_cObject);
+	rb_define_alloc_func(cImage, exiv2_image_s_allocate);
+	rb_define_method(cImage, "initialize", VALUEFUNC(exiv2_image_initialize), 1);
+	rb_define_method(cImage, "exif", VALUEFUNC(exiv2_image_exif), 0);
+
+	//rb_define_method(cImage, "thumbnail", VALUEFUNC(exiv2_image_thumbnail), 0);
+	//rb_define_method(cImage, "thumbnail=", VALUEFUNC(exiv2_image_thumbnail_set), 0);
+
+	rb_define_method(cImage, "save", VALUEFUNC(exiv2_image_save), 0);
+	rb_define_method(cImage, "clear", VALUEFUNC(exiv2_image_clear), 0);
+	rb_define_method(cImage, "comment", VALUEFUNC(exiv2_image_get_comment), 0);
+	rb_define_method(cImage, "comment=", VALUEFUNC(exiv2_image_set_comment), 1);
+}

data/test/image.rb

@@ -2,9 +2,10 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/exiv2'
 require 'tempfile'
 
+
 class ImageTest < Test::Unit::TestCase
   
-  def test_file(filename)
+  def open_test_file(filename)
     test_file_name = File.dirname(__FILE__) + "/data/file_test"
     open(test_file_name, "w+") do |f|
       open(File.dirname(__FILE__) + "/data/#{filename}") do |real|
@@ -19,8 +20,15 @@ class ImageTest < Test::Unit::TestCase
   end
   
   def test_open
-    test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
-      assert @img = Exiv2::Image.new(f)
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+      assert @img = Exiv2::Image.new(f), "Image should be opened from IO::File"
+      assert_equal "FinePixS2Pro", @img.exif["Exif.Image.Model"]
+      assert_equal nil, @img.exif["zeze"]
+      assert_equal "3024", @img.exif["Exif.Photo.PixelXDimension"]
+    end
+    
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+      assert @img = Exiv2::Image.new(f.path), "Image should be opened from filename"
       assert_equal "FinePixS2Pro", @img.exif["Exif.Image.Model"]
       assert_equal nil, @img.exif["zeze"]
       assert_equal "3024", @img.exif["Exif.Photo.PixelXDimension"]
@@ -28,8 +36,9 @@ class ImageTest < Test::Unit::TestCase
   end
   
   def test_write
-    test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
       assert @img = Exiv2::Image.new(f)
+      assert_equal "FinePixS2Pro", @img.exif["Exif.Image.Model"]
       assert_equal "*istDs", @img.exif["Exif.Image.Model"] = "*istDs"
       assert @img.save
 
@@ -39,7 +48,7 @@ class ImageTest < Test::Unit::TestCase
   end
 
   def test_comment
-    test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
       assert @img = Exiv2::Image.new(f)
       assert_equal "My funny comment", @img.comment = "My funny comment"
       assert @img.save
@@ -48,13 +57,32 @@ class ImageTest < Test::Unit::TestCase
       assert_equal "My funny comment", @img.comment
     end
   end
+  
+  def test_typehinting
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+      assert @img = Exiv2::Image.new(f)
+      assert @exif = @img.exif
+      assert_equal 1, @exif["Exif.Image.Orientation"]
+      assert_equal "Digital Camera FinePixS2Pro Ver1.00", @exif["Exif.Image.Software"]
+      assert_equal 72, @exif["Exif.Image.XResolution"]
+      assert_equal String, @exif["Exif.Image.XResolution"].class
+      puts @exif["Exif.Image.XResolution"].class
+
+      require 'rational'
+
+      assert_equal 72, @exif["Exif.Image.XResolution"]
+      assert_equal Numeric, @exif["Exif.Image.XResolution"].class
+      puts @exif["Exif.Image.XResolution"].class
+    end
+  end
 
   def test_each
-    test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |f|
       assert @img = Exiv2::Image.new(f)
       i = 0
       @img.exif.each do |key, value|
         i = i + 1
+        #puts "#{key} => #{value.inspect}"
         assert key
         assert value
       end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-exiv2
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-09-20 00:00:00 +04:00
-summary: Exiv2 library ruby driver
+  version: "0.2"
+date: 2006-10-30 00:00:00 +03:00
+summary: Exiv2 (exif image tags handling) library driver
 require_paths: 
 - lib
 email: max@maxidoors.ru
-homepage: http://rubyforge.org/project/ruby-exiv2/
+homepage: http://maxidoors.ru/
 rubyforge_project: ruby-exiv2
 description: 
 autorequire: intersys
@@ -36,13 +36,14 @@ files:
 - lib/exiv2.hpp
 - lib/extconf.rb
 - lib/image.cpp
+- lib/Makefile
 - README
 test_files: []
 
 rdoc_options: 
 - --main=README
 - --line-numbers
-- --webcvs=svn+ssh://max_lapshin@rubyforge.org/var/svn/ruby-exiv2
+- --webcvs=http://svn.maxidoors.ru/ruby-exiv2
 - --charset=utf-8
 - --promiscuous
 extra_rdoc_files: 
@@ -53,5 +54,13 @@ extensions:
 - lib/extconf.rb
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: