exiv2 0.0.3 → 0.0.4

data/README.rdoc

@@ -17,6 +17,10 @@ Requires that the exiv2 C++ library is installed.
       puts "#{key} = #{value}\n"
     end
     image.exif_data.each { ... }
+    image.xmp_data.each { ... }
+
+    iptc_data_hash  = image.iptc_data.to_hash
+    xmp_data_hash   = image.xmp_data.to_hash
 
 == Why?
 

data/ext/exiv2/exiv2.cpp

@@ -12,7 +12,7 @@ static std::string to_std_string(VALUE string) {
   return std::string(RSTRING(string)->ptr, RSTRING(string)->len);
 }
 
-// Shared method for implementing each on IptcData and ExifData.
+// Shared method for implementing each on XmpData, IptcData and ExifData.
 template <class T>
 static VALUE metadata_each(VALUE self) {
   T* data;
@@ -39,6 +39,7 @@ extern "C" {
   static void image_free(Exiv2::Image* image);
   static VALUE image_read_metadata(VALUE self);
   static VALUE image_iptc_data(VALUE self);
+  static VALUE image_xmp_data(VALUE self);
   static VALUE image_exif_data(VALUE self);
 
   static VALUE image_factory_class;
@@ -50,6 +51,8 @@ extern "C" {
   static VALUE iptc_data_class;
   static VALUE iptc_data_each(VALUE self);
 
+  static VALUE xmp_data_class;
+  static VALUE xmp_data_each(VALUE self);
 
   void Init_exiv2() {
     VALUE enumerable_module = rb_const_get(rb_cObject, rb_intern("Enumerable"));
@@ -61,6 +64,7 @@ extern "C" {
     image_class = rb_define_class_under(exiv2_module, "Image", rb_cObject);
     rb_define_method(image_class, "read_metadata", (Method)image_read_metadata, 0);
     rb_define_method(image_class, "iptc_data", (Method)image_iptc_data, 0);
+    rb_define_method(image_class, "xmp_data", (Method)image_xmp_data, 0);
     rb_define_method(image_class, "exif_data", (Method)image_exif_data, 0);
 
     image_factory_class = rb_define_class_under(exiv2_module, "ImageFactory", rb_cObject);
@@ -73,6 +77,10 @@ extern "C" {
     iptc_data_class = rb_define_class_under(exiv2_module, "IptcData", rb_cObject);
     rb_include_module(iptc_data_class, enumerable_module);
     rb_define_method(iptc_data_class, "each", (Method)iptc_data_each, 0);
+    
+    xmp_data_class = rb_define_class_under(exiv2_module, "XmpData", rb_cObject);
+    rb_include_module(xmp_data_class, enumerable_module);
+    rb_define_method(xmp_data_class, "each", (Method)xmp_data_each, 0);
   }
 
   
@@ -117,6 +125,15 @@ extern "C" {
   }
 
 
+  static VALUE image_xmp_data(VALUE self) {
+    Exiv2::Image* image;
+    Data_Get_Struct(self, Exiv2::Image, image);
+
+    VALUE xmp_data = Data_Wrap_Struct(xmp_data_class, 0, 0, &image->xmpData());
+    rb_iv_set(xmp_data, "@image", self);  // Make sure we don't GC the image until there are no references to the XMP data left.
+
+    return xmp_data;
+  }
   // Exiv2::ImageFactory methods
 
   static VALUE image_factory_open(VALUE klass, VALUE path) {
@@ -146,5 +163,10 @@ extern "C" {
   static VALUE iptc_data_each(VALUE self) {
     return metadata_each<Exiv2::IptcData>(self);
   }
+ 
+  // Exiv2::XmpData methods
   
+  static VALUE xmp_data_each(VALUE self) {
+    return metadata_each<Exiv2::XmpData>(self);
+  } 
 }

data/lib/exiv2/version.rb

@@ -1,3 +1,3 @@
 module Exiv2
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/exiv2/xmp_data.rb

@@ -0,0 +1,22 @@
+class Exiv2::XmpData
+  def to_hash
+    result = {}
+
+    self.each do |key, value|
+      if result[key]
+        if result[key].is_a? Array
+          result[key] << value
+        else
+          result[key] = [result[key], value]
+        end
+      else
+        result[key] = value
+      end
+    end
+    result
+  end
+
+  def inspect
+    "#<Exiv2::XmpData: #{self.to_hash.inspect}>"
+  end
+end

data/lib/exiv2.rb

@@ -1,2 +1,3 @@
 require 'exiv2/exiv2'
 require 'exiv2/iptc_data'
+require 'exiv2/xmp_data'

data/spec/exiv2_spec.rb

@@ -1,6 +1,7 @@
 require 'exiv2'
 
 describe Exiv2 do
+
   it "should read IPTC data" do
     image = Exiv2::ImageFactory.open("spec/files/test.jpg")
     image.read_metadata
@@ -36,4 +37,30 @@ describe Exiv2 do
       Exiv2::ImageFactory.open("tmp/no-such-file.jpg")
     }.should raise_error(Exiv2::BasicError)
   end
+  
+  it "should read XMP data" do
+    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
+    image.read_metadata
+    xmp_data = image.xmp_data
+    xmp_data.should be_a(Exiv2::XmpData)
+    xmp_data.inspect.should == '#<Exiv2::XmpData: {"Xmp.dc.description"=>"lang=\"x-default\" This is a description", "Xmp.dc.title"=>"lang=\"x-default\" Pickled"}>'
+    xmp_data.to_a.should == [
+      ["Xmp.dc.title", "lang=\"x-default\" Pickled"],
+      ["Xmp.dc.description", "lang=\"x-default\" This is a description"]
+    ]
+  end
+
+  it "should convert xmp data into a hash" do
+    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
+    image.read_metadata
+    iptc_hash = image.xmp_data.to_hash
+    iptc_hash.should be_a(Hash)
+    iptc_hash.should == {
+      "Xmp.dc.title" => "lang=\"x-default\" Pickled",
+      "Xmp.dc.description" => "lang=\"x-default\" This is a description"
+    }
+  end
+
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exiv2
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +11:00
+date: 2011-05-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - lib/exiv2.rb
 - lib/exiv2/iptc_data.rb
 - lib/exiv2/version.rb
+- lib/exiv2/xmp_data.rb
 - spec/exiv2_spec.rb
 - spec/files/test.jpg
 has_rdoc: true
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: exiv2
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple wrapper around Exiv2