ruby-exiv2 0.3 → 0.4

data/lib/Makefile

@@ -4,7 +4,7 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin8.7.1
+topdir = /opt/local/lib/ruby/1.8/powerpc-darwin8.8.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 prefix = $(DESTDIR)/opt/local
@@ -36,8 +36,10 @@ LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
+RUBY_EXTCONF_H = 
 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 
+INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/powerpc-darwin8.8.0 -I.
+CPPFLAGS =  -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 = cc -dynamic -bundle -undefined suppress -flat_namespace
@@ -46,9 +48,9 @@ EXEEXT =
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin8.7.1
-sitearch = i686-darwin8.7.1
-vendorarch = i686-darwin8.7.1
+arch = powerpc-darwin8.8.0
+sitearch = powerpc-darwin8.8.0
+vendorarch = powerpc-darwin8.8.0
 ruby_version = 1.8
 ruby = /opt/local/bin/ruby
 RUBY = $(ruby)
@@ -74,11 +76,12 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lexiv2  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
 SRCS = exif.cpp exiv2.cpp image.cpp
 OBJS = exif.o exiv2.o image.o
 TARGET = exiv2
 DLLIB = $(TARGET).bundle
+EXTSTATIC = 
 STATIC_LIB = 
 
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
@@ -96,7 +99,7 @@ clean:
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
 distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
 realclean:	distclean
@@ -120,19 +123,19 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(DLLIB): $(OBJS)
 	@-$(RM) $@

data/lib/exif.cpp

@@ -102,8 +102,14 @@ static VALUE exiv2_exif_get(VALUE self, VALUE key) {
  * then I will just set apropreciated hash entry to this casted value
  */
 static bool marshall_value(Exiv2::ExifData &exifData, const char* key, VALUE value) {
-	Exiv2::ExifKey exif_key(key);
-	Exiv2::TypeId type_id = Exiv2::ExifTags::tagType(exif_key.tag(), exif_key.ifdId());
+	Exiv2::TypeId type_id;
+	try {
+		Exiv2::ExifKey exif_key(key);
+		type_id = Exiv2::ExifTags::tagType(exif_key.tag(), exif_key.ifdId());
+	}
+	catch(Exiv2::Error& e) {
+		rb_raise(eError, "Cannot set tag %s because it doesn't exists. Look at http://www.exiv2.org/tags.html for list of supported tags", key);
+	}
 	switch(type_id) {
 		case Exiv2::invalidTypeId:
 		{
@@ -167,17 +173,12 @@ static VALUE exiv2_exif_set(VALUE self, VALUE key, VALUE value) {
 	Data_Get_Struct(self, rbImage, image);
 
 	VALUE strkey = rb_funcall(key, rb_intern("to_s"), 0);
-	bool marshalled = false;
-	{
-		Exiv2::ExifData &exifData = image->image->exifData();
+	Exiv2::ExifData &exifData = image->image->exifData();
 
-		marshalled = marshall_value(exifData, STR(strkey), value);
-	}
-	
-	if(!marshalled) {
+	if(!marshall_value(exifData, STR(strkey), value)) {
 		THROW("Couldn't write %s", STR(strkey));
 	}
-
+	
 	image->dirty = true;
 	return value;
 	__NIL_END
@@ -287,6 +288,36 @@ static VALUE exiv2_exif_empty(VALUE self) {
 }
 
 
+/*
+static void tag_leave(Exiv2::TagInfo* info) {
+	
+}
+
+static VALUE create_exiv2_tag(VALUE exif, Exiv2::TagInfo* info) {
+	VALUE tag_info = Data_Wrap_Struct(cTag, 0, tag_leave, info);
+	rb_iv_set(tag_info, "@exif", exif);
+	return tag_info;
+}
+static VALUE exiv2_exif_tags_each(VALUE self) {
+    for (int i=0; Exiv2::ifdTagInfo[i].tag_ != 0xffff; ++i) {
+		rb_yield(create_exiv2_tag(self, Exiv2::ifdTagInfo + i));
+    }
+    for (int i=0; Exiv2::exifTagInfo[i].tag_ != 0xffff; ++i) {
+		rb_yield(create_exiv2_tag(self, Exiv2::exifTagInfo + i));
+    }
+    for (int i=0; Exiv2::iopTagInfo[i].tag_ != 0xffff; ++i) {
+		rb_yield(create_exiv2_tag(self, Exiv2::iopTagInfo + i));
+    }
+    for (int i=0; Exiv2::gpsTagInfo[i].tag_ != 0xffff; ++i) {
+		rb_yield(create_exiv2_tag(self, Exiv2::gpsTagInfo + i));
+    }
+	return self;
+}
+
+static VALUE exiv2_iptc_tags_each(VALUE self) {
+	
+}
+*/
 
 void Init_exif() {
 	cExif = rb_define_class_under(mExiv2, "Exif", rb_cObject);
@@ -297,4 +328,8 @@ void Init_exif() {
 	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);
+//	rb_define_singleton_method(cExif, "exif_tags_each", VALUEFUNC(exiv2_exif_tags_each), 0);
+//	rb_define_singleton_method(cExif, "iptc_tags_each", VALUEFUNC(exiv2_iptc_tags_each), 0);
+	
+	cTag = rb_define_class_under(mExiv2, "Tag", rb_cObject);
 }

data/lib/exiv2.cpp

@@ -29,7 +29,7 @@
 #include "exiv2.hpp"
 
 
-VALUE mExiv2, cImage, cExif, cIptc, cThumbnail, eError;
+VALUE mExiv2, cImage, cExif, cTag, cIptc, cThumbnail, eError;
 
 void rb_exiv2_throw(const char *file, long unsigned int line, const char *fmt, ...) {
 	char* message;

data/lib/exiv2.hpp

@@ -43,6 +43,7 @@
 #include <cstring>
 #include <cassert>
 
+#include <stdarg.h>
 
 
 #include "ruby.h"
@@ -88,7 +89,7 @@ void rb_exiv2_throw(const char* file, long unsigned int line, const char *fmt, .
 extern "C" {
 #endif
 	void Init_exiv2(void);
-	extern VALUE mExiv2, cImage, cExif, cIptc, eError;
+	extern VALUE mExiv2, cImage, cExif, cTag, cIptc, eError;
 
 #if defined(__cplusplus)
 }  /* extern "C" { */

data/lib/image.cpp

@@ -132,14 +132,53 @@ static VALUE exiv2_image_exif(VALUE self) {
 	__END
 }
 
+
+/*
+ * Dump thumbnail to file.
+ * @img.thumbnail("my_image")
+ */
+static VALUE exiv2_image_thumbnail(VALUE self, VALUE file_name) {
+	__BEGIN
+	Check_Type(file_name, T_STRING);
+	
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	Exiv2::ExifData &exifData = image->image->exifData();
+	exifData.writeThumbnail(STR(file_name));
+	if(rb_block_given_p()) {
+		rb_yield(file_name);
+	}
+	return self;
+	__END
+}
+
+/*
+ * Set image thumbnail to contents of passed file
+ * @img.thumbnail = "my_image.jpg"
+ */
+static VALUE exiv2_image_thumbnail_set(VALUE self, VALUE file_name) {
+	__BEGIN
+	Check_Type(file_name, T_STRING);
+	
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	Exiv2::ExifData &exifData = image->image->exifData();
+	exifData.setJpegThumbnail(STR(file_name));
+	return 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, "thumbnail", VALUEFUNC(exiv2_image_thumbnail), 1);
+	rb_define_method(cImage, "thumbnail=", VALUEFUNC(exiv2_image_thumbnail_set), 1);
 
 	rb_define_method(cImage, "save", VALUEFUNC(exiv2_image_save), 0);
 	rb_define_method(cImage, "clear", VALUEFUNC(exiv2_image_clear), 0);

data/test/image.rb

@@ -27,6 +27,9 @@ class ImageTest < Test::Unit::TestCase
         assert @img = Exiv2::Image.new(image_file), "Image should be opened from IO::File"
         assert_equal "FinePixS2Pro", @img.exif["Exif.Image.Model"]
         assert_equal nil, @img.exif["zeze"]
+        assert_raise(Exiv2::Error, "Setting of invalid tag should raise an exception") do
+          @img.exif["zeze"] = "lala"
+        end
         assert_equal 3024, @img.exif["Exif.Photo.PixelXDimension"]
       end
     end
@@ -125,4 +128,11 @@ class ImageTest < Test::Unit::TestCase
       assert_equal 16, i
     end
   end
+  
+  def __test_thumbnail
+    open_test_file "exiv2-fujifilm-finepix-s2pro.jpg" do |filename|
+      assert @img = Exiv2::Image.new(filename)
+      
+    end
+  end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-exiv2
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2006-11-07 00:00:00 +03:00
+  version: "0.4"
+date: 2006-11-09 00:00:00 +03:00
 summary: Exiv2 (exif image tags handling) library driver
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Max Lapshin
 files: