ruby-exiv2 1.3 → 1.5

data/lib/exiv2/metadata/each.cpp

@@ -0,0 +1,26 @@
+static VALUE exiv2_metadata_each(int argc, VALUE *argv, VALUE self) {
+	__BEGIN
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	VALUE prefix;
+	rb_scan_args(argc, argv, "01", &prefix);
+	
+	Exiv2::<%= kind %>Data &data = image->image-><%= kind.downcase %>Data();
+	if(data.empty()) {
+		return Qnil;
+	}
+	
+	Exiv2::<%= kind %>Data::const_iterator end = data.end();
+	for(Exiv2::<%= kind %>Data::const_iterator i = data.begin(); i != end; ++i) {
+		VALUE key = rb_str_new(i->key().c_str(), i->key().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;
+		}
+		rb_yield(rb_ary_new3(2, key, val));
+	}
+	return self;
+	__END
+}

data/lib/exiv2/metadata/get.cpp

@@ -0,0 +1,21 @@
+static VALUE exiv2_metadata_get(VALUE rb_key) {
+	__BEGIN
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	VALUE strkey = rb_funcall(rb_key, rb_intern("to_s"), 0);
+	Exiv2::<%= kind %>Data &data = image->image-><%= kind.downcase %>Data();
+
+	if(data.empty()) {
+		return Qnil;
+	}
+
+  Exiv2::<%= kind %>Key key(STR(strkey));
+  Exiv2::<%= kind %>Data::const_iterator pos = data.findKey(key);
+  if (pos == data.end()) {
+		return Qnil;
+  }
+
+	return unmarshall_value(pos->value());
+	__NIL_END
+}

data/lib/exiv2/metadata/is_empty.cpp

@@ -0,0 +1,10 @@
+static VALUE exiv2_metadata_is_empty() {
+	__BEGIN
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	Exiv2::<%= kind %>Data &data = image->image-><%= kind.downcase %>Data();
+	
+	return data.empty() ? Qtrue : Qfalse;
+	__NIL_END
+}

data/lib/exiv2/metadata/marshall.cpp

@@ -0,0 +1,85 @@
+static bool marshall_value(Exiv2::<%= kind %>Data &data, const char* key, VALUE value) {
+	Exiv2::TypeId type_id;
+	try {
+		<% if kind == "Exif" %>
+		Exiv2::ExifKey data_key(key);
+		type_id = Exiv2::ExifTags::tagType(data_key.tag(), data_key.ifdId());
+		<% elsif kind == "Iptc" %>
+		Exiv2::IptcKey iptcKey(key);
+		type_id = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());
+		<% end %>
+	}
+	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:
+		{
+			rb_warn("Trying to marshall invalid type id");
+			return Qnil;
+		}
+
+		case Exiv2::unsignedByte:
+		case Exiv2::unsignedShort:
+		case Exiv2::unsignedLong:
+		case Exiv2::signedShort:
+		case Exiv2::signedLong: 
+		{
+			data[key] = NUM2INT(value);
+			return true;
+		}
+
+		case Exiv2::asciiString:
+		case Exiv2::string: 
+		case Exiv2::undefined:
+		{
+			data[key] = std::string(STR(value));
+			return true;
+		}
+
+		case Exiv2::unsignedRational:
+		case Exiv2::signedRational: 
+		{
+			if(rb_respond_to(value, rb_intern("numerator"))) {
+				int numerator = NUM2INT(rb_funcall(value, rb_intern("numerator"), 0));
+				int denominator = NUM2INT(rb_funcall(value, rb_intern("denominator"), 0));
+				<% if kind == "Exif" %>
+				data[key] = Exiv2::Rational(numerator, denominator);
+				<% else %>
+				data[key] = numerator / denominator;
+				<% end %>
+				return true;
+			}
+			<% if kind == "Exif" %>
+			data[key] = Exiv2::Rational(NUM2INT(value), 1);
+			<% else %>
+			data[key] = int(NUM2INT(value));
+			<% end %>
+			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::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::comment:
+		case Exiv2::directory:
+		case Exiv2::lastTypeId:
+		{
+			data[key] = std::string(STR(value));
+			return true;
+		}
+	}
+	return false;
+}
+

data/lib/exiv2/metadata/set.cpp

@@ -0,0 +1,16 @@
+static VALUE exiv2_metadata_set(VALUE key, VALUE value) {
+	__BEGIN
+	rbImage* image;
+	Data_Get_Struct(self, rbImage, image);
+
+	VALUE strkey = rb_funcall(key, rb_intern("to_s"), 0);
+
+	if(!marshall_value(image->image-><%= kind.downcase %>Data(), STR(strkey), value)) {
+		THROW("Couldn't write %s", STR(strkey));
+	}
+	
+	image->dirty = true;
+	return value;
+	__NIL_END
+	
+}

data/{ext/marshall.cpp → lib/exiv2/metadata/unmarshall.cpp}

@@ -105,7 +105,6 @@ VALUE unmarshall_value(const Exiv2::Value& value) {
 			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:
 		case Exiv2::comment:
 		case Exiv2::directory:
 		case Exiv2::lastTypeId:

data/lib/exiv2/tag.rb

@@ -0,0 +1,110 @@
+module Exiv2
+  class Tag
+    inline do |builder|
+      Exiv2.prepare_builder(builder)
+      builder.prefix <<-EOF
+      VALUE cTag;
+      static void tag_leave(Exiv2::TagInfo* info) {
+
+      }
+      
+      static VALUE create_exiv2_tag(Exiv2::TagInfo* info) {
+      	return Data_Wrap_Struct(cTag, 0, tag_leave, info);
+      }
+      
+      static int iterate_tag_collection(const Exiv2::TagInfo* collection, bool to_yield = true) {
+      	Exiv2::TagInfo* _collection = const_cast<Exiv2::TagInfo *>(collection);
+      	int i;
+          for (i=0; _collection[i].tag_ != 0xffff; ++i) {
+      		if(to_yield) {
+      			rb_yield(create_exiv2_tag(_collection + i));
+      		}
+          }
+      	return i;
+      }
+      EOF
+      
+      builder.add_to_init "cTag = c;"
+      
+      builder.c_singleton <<-EOF
+      static VALUE each() {
+      	__BEGIN
+      	iterate_tag_collection(Exiv2::ExifTags::ifdTagList());
+      	iterate_tag_collection(Exiv2::ExifTags::exifTagList());
+      	iterate_tag_collection(Exiv2::ExifTags::iopTagList());
+      	iterate_tag_collection(Exiv2::ExifTags::gpsTagList());
+      	return self;
+      	__END
+      }
+      EOF
+      
+      builder.c_singleton <<-EOF
+      static VALUE count() {
+      	__BEGIN
+      	return INT2NUM(
+      	iterate_tag_collection(Exiv2::ExifTags::ifdTagList(), false) +
+      	iterate_tag_collection(Exiv2::ExifTags::exifTagList(), false) +
+      	iterate_tag_collection(Exiv2::ExifTags::iopTagList(), false) +
+      	iterate_tag_collection(Exiv2::ExifTags::gpsTagList(), false)
+      	);
+      	__END
+      }
+      EOF
+      
+      builder.c <<-EOF
+      static VALUE name() {
+      	__BEGIN
+      	Exiv2::TagInfo* tag;
+      	Data_Get_Struct(self, Exiv2::TagInfo, tag);
+
+      	return tag->name_ ? rb_str_new2(tag->name_) : Qnil;
+      	__END
+      }
+      EOF
+      
+      builder.c <<-EOF
+      static VALUE title() {
+      	__BEGIN
+      	Exiv2::TagInfo* tag;
+      	Data_Get_Struct(self, Exiv2::TagInfo, tag);
+
+      	return tag->title_ ? rb_str_new2(tag->title_) : Qnil;
+      	__END
+      }
+      EOF
+      
+      builder.c <<-EOF
+      static VALUE desc() {
+      	__BEGIN
+      	Exiv2::TagInfo* tag;
+      	Data_Get_Struct(self, Exiv2::TagInfo, tag);
+
+      	return tag->desc_ ? rb_str_new2(tag->desc_) : Qnil;
+      	__END
+      }
+      EOF
+      
+      builder.c <<-EOF
+      static VALUE section() {
+      	__BEGIN
+      	Exiv2::TagInfo* tag;
+      	Data_Get_Struct(self, Exiv2::TagInfo, tag);
+
+      	return rb_str_new2(Exiv2::ExifTags::sectionName(tag->sectionId_));
+      	__END
+      }
+      EOF
+      
+      builder.c <<-EOF
+      static VALUE ifd() {
+      	__BEGIN
+      	Exiv2::TagInfo* tag;
+      	Data_Get_Struct(self, Exiv2::TagInfo, tag);
+
+      	return rb_str_new2(Exiv2::ExifTags::ifdName(tag->ifdId_));
+      	__END
+      }
+      EOF
+    end
+  end
+end

data/lib/exiv2/throw.cpp

@@ -0,0 +1,12 @@
+void rb_exiv2_throw(const char *file, long unsigned int line, const char *fmt, ...) {
+	char* message;
+	va_list ap;
+	va_start(ap, fmt);
+	vasprintf(&message, fmt, ap);
+	va_end(ap);
+	
+	char error_message[strlen(message) + 80];
+	snprintf(error_message, sizeof(error_message), "%s. File: %s, line: %lu", message, file, line);
+	free(message);
+	rb_raise(eError, error_message);
+}

data/test/{image.rb → test_image.rb}

@@ -126,7 +126,7 @@ class ImageTest < Test::Unit::TestCase
         assert key
         assert value
       end
-      assert_equal 74, i
+      assert_equal 77, i
 
       i = 0
       @img.exif.each "Exif.Fujifilm" do |key, value|
@@ -170,7 +170,7 @@ class ImageTest < Test::Unit::TestCase
   
   def test_tag_access
     return unless Exiv2::Tag.respond_to?(:count)
-    assert_equal 147, Exiv2::Tag.count
+    assert_equal 201, Exiv2::Tag.count
     exif_tag = nil
     Exiv2::Tag.each do |tag|
       exif_tag = tag
@@ -232,4 +232,16 @@ class ImageTest < Test::Unit::TestCase
       assert_equal 160, @img.Exif.Photo.PixelXDimension
     end
   end
+  
+  def test_string_io
+    open_test_file "smiley1.jpg" do |filename|
+      File.open(filename, "r") {|f| @content = StringIO.new(f.read, "r+") }
+      assert @img = Exiv2::Image.new(@content)
+      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

@@ -1,67 +1,77 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: ruby-exiv2
 version: !ruby/object:Gem::Version 
-  version: "1.3"
-date: 2007-04-24 00:00:00 +04:00
-summary: Exiv2 (exif image tags handling) library driver
-require_paths: 
-- lib
-email: max@maxidoors.ru
-homepage: http://maxidoors.ru/
-rubyforge_project: ruby-exiv2
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "1.5"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Max Lapshin
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-12-02 00:00:00 +03:00
+default_executable: 
+dependencies: []
+
+description: 
+email: max@maxidoors.ru
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - README
 - Rakefile
-- setup.rb
 - init.rb
 - test/data
-- 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
-- ext/image.cpp
-- ext/iptc.cpp
-- ext/marshall.cpp
-- ext/extconf.rb
-- ext/exiv2.hpp
+- test/test_image.rb
+- lib/exiv2/exif.rb
+- lib/exiv2/image.rb
+- lib/exiv2/iptc.rb
+- lib/exiv2/tag.rb
 - lib/exiv2.rb
-test_files: 
-- test/image.rb
-rdoc_options: 
-- --main=README
-- --line-numbers
-- --webcvs=http://svn.maxidoors.ru/ruby-exiv2
-- --charset=utf-8
-- --promiscuous
-extra_rdoc_files: 
-- README
-executables: []
+- lib/exiv2/metadata/clear.cpp
+- lib/exiv2/metadata/count.cpp
+- lib/exiv2/metadata/delete.cpp
+- lib/exiv2/metadata/each.cpp
+- lib/exiv2/metadata/get.cpp
+- lib/exiv2/metadata/is_empty.cpp
+- lib/exiv2/metadata/marshall.cpp
+- lib/exiv2/metadata/set.cpp
+- lib/exiv2/metadata/unmarshall.cpp
+- lib/exiv2/throw.cpp
+- lib/exiv2.hpp
+has_rdoc: true
+homepage: http://github.com/maxlapshin/exiv2
+post_install_message: 
+rdoc_options: []
 
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-exiv2
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Exiv2 (exif image tags handling) library driver
+test_files: 
+- test/test_image.rb