exiv2 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 700d9adb55ce3e0eb64fa2f2f8749c607e22ebd896e82b92142c4a901f8c2f99
+  data.tar.gz: f74dc692a5e857177623ff7d62c88bd7f3dfb6e7e717fd47c9a05dbc6b921f2b
+SHA512:
+  metadata.gz: '025834b98bb969965ce0a4a0b87df41f5bb4c193cf16297753f4bfc8ca45ab94c6048f81e6429e53f1dcb90e73bfdada4a39da8b1a816c594bf1767ae8ca7b82'
+  data.tar.gz: 7b3f1468e28087b2f7b369a6b7b660656f31aef57b93ac048ad1f8333256f61c629a30d95834f2f50001b9720ebf2075110ab3b9b275923a5a9fa5be0fe5013f

data/.gitignore

@@ -11,3 +11,4 @@ mkmf.log
 pkg
 tmp
 bin
+/vendor

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.4
+  - 2.5
+  - 2.6
+before_script:
+  - sudo apt-get install libexiv2-dev
+script:
+  - bundle exec rake spec

data/Gemfile.lock

@@ -1,23 +1,28 @@
 PATH
   remote: .
   specs:
-    exiv2 (0.0.8)
+    exiv2 (0.0.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rake (0.8.7)
-    rake-compiler (0.7.5)
+    diff-lcs (1.2.5)
+    rake (10.4.2)
+    rake-compiler (0.9.5)
       rake
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
 
 PLATFORMS
   ruby
@@ -26,3 +31,6 @@ DEPENDENCIES
   exiv2!
   rake-compiler
   rspec
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -0,0 +1,116 @@
+# Exiv2
+
+[![Build Status](https://travis-ci.org/envato/exiv2.svg)](https://travis-ci.org/envato/exiv2)
+
+A simple wrapper around the C++ Exiv2 libary for reading and writing image metadata.
+
+See http://www.exiv2.org/
+
+Requires that the exiv2 C++ library is installed.
+
+## Usage
+
+```
+gem install exiv2
+```
+
+if you get errors with header could not be found below:
+
+```
+exiv2.cpp:1:10: fatal error: 'exiv2/image.hpp' file not found
+#include "exiv2/image.hpp"
+```
+
+please explicitly declare the header path
+
+```
+gem install exiv2 -- --with-exiv2-include="${EXIV2_PREFIX}/include" --with-exiv2-lib="${EXIV2_PREFIX}/lib"
+```
+
+on OSX with Homebrew's exiv2, the `EXIV2_PREFIX` can be set:
+
+```
+export EXIV2_PREFIX=$(brew --prefix exiv2)
+```
+
+If you get this error while trying to install as part of a bundle install, you can set these paths using:
+```
+bundle config build.exiv2 --with-exiv2-include="${EXIV2_PREFIX}/include" --with-exiv2-lib="${EXIV2_PREFIX}/lib"
+```
+
+
+If you are on new version of Command Line Tool (that is newer than 6.2, and bump into following error:
+
+```
+/Library/Developer/CommandLineTools/usr/bin/../include/c++/v1/iterator:341:10: fatal error: '__debug' file not found
+#include <__debug>
+```
+
+You can follow the quick hack by touching a new file `/Library/Developer/CommandLineTools/usr/include/c++/v1/__debug` with content:
+
+```
+#ifndef _LIBCPP_ASSERT
+#define _LIBCPP_ASSERT(...) ((void)0)
+#endif
+```
+
+Once everything is successfully installed, you can give it a go:
+
+```ruby
+require 'exiv2'
+image = Exiv2::ImageFactory.open("image.jpg")
+image.read_metadata
+image.iptc_data.each do |key, value|
+  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
+
+image.exif_data.delete("Exif.Image.Software")
+image.iptc_data.delete_all("Iptc.Application2.Keywords")
+
+image.iptc_data["Iptc.Application2.Caption"] = "A New Caption"
+image.iptc_data.add("Iptc.Application2.Keywords", "fishy")
+
+image.write_metadata
+```
+
+## Why?
+
+None of the existing Ruby libraries for reading and writing image metadata did quite what
+we wanted, so we figured it wouldn't be too hard to wrap enough of Exiv2 to
+meet our needs.
+
+The intention is to just mirror the Exiv2 API in Ruby, so the path to extending
+this to support more of Exiv2's functionality should be straightforward. Patches
+are welcome.
+
+## Compatibility
+
+Tested on 2.4.x, 2.5.x and 2.6.x with Exiv2 0.27.1
+
+## Developing
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Status
+
+In early development. Very little of Exiv2's API is supported, and it hasn't
+been heavily tested.
+
+## Contributors
+
+Pete Yandell, Mark Turnley, Lucas Parry, Norbert Wojtwoicz, Jan Graichen, John Barton
+
+## Copyright
+
+Copyright (c) 2014 Envato & Pete Yandell. See LICENSE for details.

data/ext/exiv2/exiv2.cpp

@@ -1,4 +1,5 @@
 #include "exiv2/image.hpp"
+#include "exiv2/error.hpp"
 #include "ruby.h"
 
 // Create a Ruby string from a C++ std::string.
@@ -34,261 +35,258 @@ static VALUE metadata_each(VALUE self) {
   return Qnil;
 }
 
+typedef VALUE (*Method)(...);
 
-extern "C" {
-  typedef VALUE (*Method)(...);
-
-  static VALUE exiv2_module;
-
-  static VALUE basic_error_class;
-
-  static VALUE image_class;
-  static void image_free(Exiv2::Image* image);
-  static VALUE image_read_metadata(VALUE self);
-  static VALUE image_write_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;
-  static VALUE image_factory_open(VALUE klass, VALUE path);
-
-  static VALUE exif_data_class;
-  static VALUE exif_data_each(VALUE self);
-  static VALUE exif_data_add(VALUE self, VALUE key, VALUE value);
-  static VALUE exif_data_delete(VALUE self, VALUE key);
-
-  static VALUE iptc_data_class;
-  static VALUE iptc_data_each(VALUE self);
-  static VALUE iptc_data_add(VALUE self, VALUE key, VALUE value);
-  static VALUE iptc_data_delete(VALUE self, VALUE key);
-
-  static VALUE xmp_data_class;
-  static VALUE xmp_data_each(VALUE self);
-  static VALUE xmp_data_add(VALUE self, VALUE key, VALUE value);
-  static VALUE xmp_data_delete(VALUE self, VALUE key);
-
-  void Init_exiv2() {
-    VALUE enumerable_module = rb_const_get(rb_cObject, rb_intern("Enumerable"));
-
-    exiv2_module = rb_define_module("Exiv2");
-
-    basic_error_class = rb_define_class_under(exiv2_module, "BasicError", rb_eRuntimeError);
-
-    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, "write_metadata", (Method)image_write_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);
-    rb_define_singleton_method(image_factory_class, "open", (Method)image_factory_open, 1);
-
-    exif_data_class = rb_define_class_under(exiv2_module, "ExifData", rb_cObject);
-    rb_include_module(exif_data_class, enumerable_module);
-    rb_define_method(exif_data_class, "each", (Method)exif_data_each, 0);
-    rb_define_method(exif_data_class, "add", (Method)exif_data_add, 2);
-    rb_define_method(exif_data_class, "delete", (Method)exif_data_delete, 1);
-
-    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);
-    rb_define_method(iptc_data_class, "add", (Method)iptc_data_add, 2);
-    rb_define_method(iptc_data_class, "delete", (Method)iptc_data_delete, 1);
-    
-    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);
-    rb_define_method(xmp_data_class, "add", (Method)xmp_data_add, 2);
-    rb_define_method(xmp_data_class, "delete", (Method)xmp_data_delete, 1);
-  }
+static VALUE exiv2_module;
 
+static VALUE basic_error_class;
+
+static VALUE image_class;
+static void image_free(Exiv2::Image* image);
+static VALUE image_read_metadata(VALUE self);
+static VALUE image_write_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;
+static VALUE image_factory_open(VALUE klass, VALUE path);
+
+static VALUE exif_data_class;
+static VALUE exif_data_each(VALUE self);
+static VALUE exif_data_add(VALUE self, VALUE key, VALUE value);
+static VALUE exif_data_delete(VALUE self, VALUE key);
+
+static VALUE iptc_data_class;
+static VALUE iptc_data_each(VALUE self);
+static VALUE iptc_data_add(VALUE self, VALUE key, VALUE value);
+static VALUE iptc_data_delete(VALUE self, VALUE key);
+
+static VALUE xmp_data_class;
+static VALUE xmp_data_each(VALUE self);
+static VALUE xmp_data_add(VALUE self, VALUE key, VALUE value);
+static VALUE xmp_data_delete(VALUE self, VALUE key);
+
+extern "C" void Init_exiv2() {
+  VALUE enumerable_module = rb_const_get(rb_cObject, rb_intern("Enumerable"));
+
+  exiv2_module = rb_define_module("Exiv2");
+
+  basic_error_class = rb_define_class_under(exiv2_module, "BasicError", rb_eRuntimeError);
+
+  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, "write_metadata", (Method)image_write_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);
+  rb_define_singleton_method(image_factory_class, "open", (Method)image_factory_open, 1);
+
+  exif_data_class = rb_define_class_under(exiv2_module, "ExifData", rb_cObject);
+  rb_include_module(exif_data_class, enumerable_module);
+  rb_define_method(exif_data_class, "each", (Method)exif_data_each, 0);
+  rb_define_method(exif_data_class, "add", (Method)exif_data_add, 2);
+  rb_define_method(exif_data_class, "delete", (Method)exif_data_delete, 1);
+
+  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);
+  rb_define_method(iptc_data_class, "add", (Method)iptc_data_add, 2);
+  rb_define_method(iptc_data_class, "delete", (Method)iptc_data_delete, 1);
   
-  // Exiv2::Image Methods
-  
-  static void image_free(Exiv2::Image* image) {
-    delete image;
-  }
-  
-  static VALUE image_read_metadata(VALUE self) {
-    Exiv2::Image* image;
-    Data_Get_Struct(self, Exiv2::Image, image);
-
-    try {
-      image->readMetadata();
-    }
-    catch (Exiv2::BasicError<char> error) {
-      rb_raise(basic_error_class, "%s", error.what());
-    }
-
-    return Qnil;
+  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);
+  rb_define_method(xmp_data_class, "add", (Method)xmp_data_add, 2);
+  rb_define_method(xmp_data_class, "delete", (Method)xmp_data_delete, 1);
+}
+
+
+// Exiv2::Image Methods
+
+static void image_free(Exiv2::Image* image) {
+  delete image;
+}
+
+static VALUE image_read_metadata(VALUE self) {
+  Exiv2::Image* image;
+  Data_Get_Struct(self, Exiv2::Image, image);
+
+  try {
+    image->readMetadata();
   }
-  
-  static VALUE image_write_metadata(VALUE self) {
-    Exiv2::Image* image;
-    Data_Get_Struct(self, Exiv2::Image, image);
-
-    try {
-      image->writeMetadata();
-    }
-    catch (Exiv2::BasicError<char> error) {
-      rb_raise(basic_error_class, "%s", error.what());
-    }
-
-    return Qnil;
+  catch (Exiv2::BasicError<char> error) {
+    rb_raise(basic_error_class, "%s", error.what());
   }
 
-  static VALUE image_exif_data(VALUE self) {
-    Exiv2::Image* image;
-    Data_Get_Struct(self, Exiv2::Image, image);
+  return Qnil;
+}
 
-    VALUE exif_data = Data_Wrap_Struct(exif_data_class, 0, 0, &image->exifData());
-    rb_iv_set(exif_data, "@image", self);  // Make sure we don't GC the image until there are no references to the EXIF data left.
+static VALUE image_write_metadata(VALUE self) {
+  Exiv2::Image* image;
+  Data_Get_Struct(self, Exiv2::Image, image);
 
-    return exif_data;
+  try {
+    image->writeMetadata();
   }
+  catch (Exiv2::BasicError<char> error) {
+    rb_raise(basic_error_class, "%s", error.what());
+  }
+
+  return Qnil;
+}
 
-  static VALUE image_iptc_data(VALUE self) {
-    Exiv2::Image* image;
-    Data_Get_Struct(self, Exiv2::Image, image);
+static VALUE image_exif_data(VALUE self) {
+  Exiv2::Image* image;
+  Data_Get_Struct(self, Exiv2::Image, image);
 
-    VALUE iptc_data = Data_Wrap_Struct(iptc_data_class, 0, 0, &image->iptcData());
-    rb_iv_set(iptc_data, "@image", self);  // Make sure we don't GC the image until there are no references to the IPTC data left.
+  VALUE exif_data = Data_Wrap_Struct(exif_data_class, 0, 0, &image->exifData());
+  rb_iv_set(exif_data, "@image", self);  // Make sure we don't GC the image until there are no references to the EXIF data left.
 
-    return iptc_data;
-  }
+  return exif_data;
+}
 
+static VALUE image_iptc_data(VALUE self) {
+  Exiv2::Image* image;
+  Data_Get_Struct(self, Exiv2::Image, image);
 
-  static VALUE image_xmp_data(VALUE self) {
-    Exiv2::Image* image;
-    Data_Get_Struct(self, Exiv2::Image, image);
+  VALUE iptc_data = Data_Wrap_Struct(iptc_data_class, 0, 0, &image->iptcData());
+  rb_iv_set(iptc_data, "@image", self);  // Make sure we don't GC the image until there are no references to the IPTC data left.
 
-    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 iptc_data;
+}
 
-    return xmp_data;
+
+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) {
+  Exiv2::Image* image;
+
+  try {
+    Exiv2::Image::AutoPtr image_auto_ptr = Exiv2::ImageFactory::open(to_std_string(path));
+    image = image_auto_ptr.release(); // Release the AutoPtr, so we can keep the image around.
   }
-  // Exiv2::ImageFactory methods
-
-  static VALUE image_factory_open(VALUE klass, VALUE path) {
-    Exiv2::Image* image;
-
-    try {
-      Exiv2::Image::AutoPtr image_auto_ptr = Exiv2::ImageFactory::open(to_std_string(path));
-      image = image_auto_ptr.release(); // Release the AutoPtr, so we can keep the image around.
-    }
-    catch (Exiv2::BasicError<char> error) {
-      rb_raise(basic_error_class, "%s", error.what());
-    }
-  
-    return Data_Wrap_Struct(image_class, 0, image_free, image);
+  catch (Exiv2::BasicError<char> error) {
+    rb_raise(basic_error_class, "%s", error.what());
   }
 
+  return Data_Wrap_Struct(image_class, 0, image_free, image);
+}
 
-  // Exiv2::ExifData methods
 
-  static VALUE exif_data_each(VALUE self) {
-    return metadata_each<Exiv2::ExifData>(self);
-  }
+// Exiv2::ExifData methods
+
+static VALUE exif_data_each(VALUE self) {
+  return metadata_each<Exiv2::ExifData>(self);
+}
+
+static VALUE exif_data_add(VALUE self, VALUE key, VALUE value) {
+  Exiv2::ExifData* data;
+  Data_Get_Struct(self, Exiv2::ExifData, data);
+  
+  Exiv2::ExifKey exifKey = Exiv2::ExifKey(to_std_string(key));
   
-  static VALUE exif_data_add(VALUE self, VALUE key, VALUE value) {
-    Exiv2::ExifData* data;
-    Data_Get_Struct(self, Exiv2::ExifData, data);
-    
-    Exiv2::ExifKey exifKey = Exiv2::ExifKey(to_std_string(key));
-    
 #if EXIV2_MAJOR_VERSION <= 0 && EXIV2_MINOR_VERSION <= 20
-    Exiv2::TypeId typeId = Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId());
+  Exiv2::TypeId typeId = Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId());
 #else
-    Exiv2::TypeId typeId = exifKey.defaultTypeId();
+  Exiv2::TypeId typeId = exifKey.defaultTypeId();
 #endif
-    
-    Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
-    v->read(to_std_string(value));
-    
-    data->add(exifKey, v.get());
-    return Qtrue;
-  }
   
-  static VALUE exif_data_delete(VALUE self, VALUE key) {
-    Exiv2::ExifData* data;
-    Data_Get_Struct(self, Exiv2::ExifData, data);
-    
-    Exiv2::ExifKey exifKey = Exiv2::ExifKey(to_std_string(key));
-    Exiv2::ExifData::iterator pos = data->findKey(exifKey);
-    if(pos == data->end()) return Qfalse;
-    data->erase(pos);
-    
-    return Qtrue;
-  }
+  Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
+  v->read(to_std_string(value));
   
+  data->add(exifKey, v.get());
+  return Qtrue;
+}
 
-  // Exiv2::IptcData methods
+static VALUE exif_data_delete(VALUE self, VALUE key) {
+  Exiv2::ExifData* data;
+  Data_Get_Struct(self, Exiv2::ExifData, data);
   
-  static VALUE iptc_data_each(VALUE self) {
-    return metadata_each<Exiv2::IptcData>(self);
-  }
+  Exiv2::ExifKey exifKey = Exiv2::ExifKey(to_std_string(key));
+  Exiv2::ExifData::iterator pos = data->findKey(exifKey);
+  if(pos == data->end()) return Qfalse;
+  data->erase(pos);
   
-  static VALUE iptc_data_add(VALUE self, VALUE key, VALUE value) {
-    Exiv2::IptcData* data;
-    Data_Get_Struct(self, Exiv2::IptcData, data);
-    
-    Exiv2::IptcKey iptcKey  = Exiv2::IptcKey(to_std_string(key));
-    Exiv2::TypeId typeId    = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());
-    
-    Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
-    v->read(to_std_string(value));
-    
-    if(data->add(iptcKey, v.get())) {
-      return Qfalse;
-    }
-    return Qtrue;
-  }
+  return Qtrue;
+}
+
+
+// Exiv2::IptcData methods
+
+static VALUE iptc_data_each(VALUE self) {
+  return metadata_each<Exiv2::IptcData>(self);
+}
+
+static VALUE iptc_data_add(VALUE self, VALUE key, VALUE value) {
+  Exiv2::IptcData* data;
+  Data_Get_Struct(self, Exiv2::IptcData, data);
+  
+  Exiv2::IptcKey iptcKey  = Exiv2::IptcKey(to_std_string(key));
+  Exiv2::TypeId typeId    = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());
   
-  static VALUE iptc_data_delete(VALUE self, VALUE key) {
-    Exiv2::IptcData* data;
-    Data_Get_Struct(self, Exiv2::IptcData, data);
-    
-    Exiv2::IptcKey iptcKey = Exiv2::IptcKey(to_std_string(key));
-    Exiv2::IptcData::iterator pos = data->findKey(iptcKey);
-    if(pos == data->end()) return Qfalse;
-    data->erase(pos);
-    
-    return Qtrue;
+  Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
+  v->read(to_std_string(value));
+  
+  if(data->add(iptcKey, v.get())) {
+    return Qfalse;
   }
+  return Qtrue;
+}
+
+static VALUE iptc_data_delete(VALUE self, VALUE key) {
+  Exiv2::IptcData* data;
+  Data_Get_Struct(self, Exiv2::IptcData, data);
+  
+  Exiv2::IptcKey iptcKey = Exiv2::IptcKey(to_std_string(key));
+  Exiv2::IptcData::iterator pos = data->findKey(iptcKey);
+  if(pos == data->end()) return Qfalse;
+  data->erase(pos);
+  
+  return Qtrue;
+}
  
-  // Exiv2::XmpData methods
+// Exiv2::XmpData methods
+
+static VALUE xmp_data_each(VALUE self) {
+  return metadata_each<Exiv2::XmpData>(self);
+}
+
+static VALUE xmp_data_add(VALUE self, VALUE key, VALUE value) {
+  Exiv2::XmpData* data;
+  Data_Get_Struct(self, Exiv2::XmpData, data);
   
-  static VALUE xmp_data_each(VALUE self) {
-    return metadata_each<Exiv2::XmpData>(self);
-  }
+  Exiv2::XmpKey xmpKey = Exiv2::XmpKey(to_std_string(key));
+  Exiv2::TypeId typeId = Exiv2::XmpProperties::propertyType(xmpKey);
   
-  static VALUE xmp_data_add(VALUE self, VALUE key, VALUE value) {
-    Exiv2::XmpData* data;
-    Data_Get_Struct(self, Exiv2::XmpData, data);
-    
-    Exiv2::XmpKey xmpKey = Exiv2::XmpKey(to_std_string(key));
-    Exiv2::TypeId typeId = Exiv2::XmpProperties::propertyType(xmpKey);
-    
-    Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
-    v->read(to_std_string(value));
-    
-    if(data->add(xmpKey, v.get())) {
-      return Qfalse;
-    }
-    return Qtrue;
-  }
+  Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
+  v->read(to_std_string(value));
   
-  static VALUE xmp_data_delete(VALUE self, VALUE key) {
-    Exiv2::XmpData* data;
-    Data_Get_Struct(self, Exiv2::XmpData, data);
-    
-    Exiv2::XmpKey xmpKey = Exiv2::XmpKey(to_std_string(key));
-    Exiv2::XmpData::iterator pos = data->findKey(xmpKey);
-    if(pos == data->end()) return Qfalse;
-    data->erase(pos);
-    
-    return Qtrue;
+  if(data->add(xmpKey, v.get())) {
+    return Qfalse;
   }
+  return Qtrue;
+}
+
+static VALUE xmp_data_delete(VALUE self, VALUE key) {
+  Exiv2::XmpData* data;
+  Data_Get_Struct(self, Exiv2::XmpData, data);
+  
+  Exiv2::XmpKey xmpKey = Exiv2::XmpKey(to_std_string(key));
+  Exiv2::XmpData::iterator pos = data->findKey(xmpKey);
+  if(pos == data->end()) return Qfalse;
+  data->erase(pos);
+  
+  return Qtrue;
 }

data/ext/exiv2/extconf.rb

@@ -1,4 +1,10 @@
 require 'mkmf'
+
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+RbConfig::MAKEFILE_CONFIG['CCFLAGS'] = ENV['CCFLAGS'] if ENV['CCFLAGS']
+RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['CXX'] if ENV['CXX']
+RbConfig::MAKEFILE_CONFIG['CXXFLAGS'] = ENV['CXXFLAGS'] if ENV['CXXFLAGS']
+
 dir_config("exiv2")
 have_library("exiv2")
 create_makefile("exiv2/exiv2")

data/lib/exiv2/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Exiv2
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/exiv2_spec.rb

@@ -8,13 +8,13 @@ describe Exiv2 do
   it "should handle a Pathname being passed to open" do
     image = Exiv2::ImageFactory.open(Pathname.new("spec/files/test.jpg").to_s)
     image.read_metadata
-    image.iptc_data.to_hash.should_not be_empty
+    expect(image.iptc_data.to_hash).not_to be_empty
   end
 
   it "should raise an error when trying to open a non-existant file" do
     expect {
       Exiv2::ImageFactory.open("tmp/no-such-file.jpg")
-    }.should raise_error(Exiv2::BasicError)
+    }.to raise_error(Exiv2::BasicError)
   end
 
   it "should write metadata" do
@@ -27,7 +27,7 @@ describe Exiv2 do
     
     image2 = Exiv2::ImageFactory.open("spec/files/test_tmp.jpg")
     image2.read_metadata
-    image2.iptc_data["Iptc.Application2.Caption"].should == "A New Caption"
+    expect(image2.iptc_data["Iptc.Application2.Caption"]).to eq("A New Caption")
     FileUtils.rm("spec/files/test_tmp.jpg")
   end
 
@@ -36,9 +36,9 @@ describe Exiv2 do
     image.read_metadata
     description = image.exif_data["Exif.Image.ImageDescription"]
     if description.respond_to? :encoding # Only in Ruby 1.9+
-      description.encoding.should == Encoding::UTF_8
+      expect(description.encoding).to eq(Encoding::UTF_8)
     end
-    description.should == 'UTF-8 description. ☃ł㌎'
+    expect(description).to eq('UTF-8 description. ☃ł㌎')
   end
 
   it 'reads UTF-8 data in each' do
@@ -46,8 +46,8 @@ describe Exiv2 do
       image = Exiv2::ImageFactory.open(Pathname.new("spec/files/photo_with_utf8_description.jpg").to_s)
       image.read_metadata
       image.exif_data.each do |key,value|
-        key.encoding.should   == Encoding::UTF_8
-        value.encoding.should == Encoding::UTF_8
+        expect(key.encoding).to   eq(Encoding::UTF_8)
+        expect(value.encoding).to eq(Encoding::UTF_8)
       end
     end
   end
@@ -64,52 +64,52 @@ describe Exiv2 do
     end
 
     it "should read IPTC data" do
-      @iptc_data.should be_a(Exiv2::IptcData)
-      @iptc_data.inspect.should == '#<Exiv2::IptcData: {"Iptc.Application2.Caption"=>"Rhubarb rhubarb rhubard", "Iptc.Application2.Keywords"=>["fish", "custard"]}>'
-      @iptc_data.to_a.should == [
+      expect(@iptc_data).to be_a(Exiv2::IptcData)
+      expect(@iptc_data.inspect).to eq('#<Exiv2::IptcData: {"Iptc.Application2.Caption"=>"Rhubarb rhubarb rhubard", "Iptc.Application2.Keywords"=>["fish", "custard"]}>')
+      expect(@iptc_data.to_a).to eq([
         ["Iptc.Application2.Caption", "Rhubarb rhubarb rhubard"],
         ["Iptc.Application2.Keywords", "fish"],
         ["Iptc.Application2.Keywords", "custard"]
-      ]
+      ])
     end
 
     it "should convert iptc data into a hash" do
       iptc_hash = @iptc_data.to_hash
-      iptc_hash.should be_a(Hash)
-      iptc_hash.should == {
+      expect(iptc_hash).to be_a(Hash)
+      expect(iptc_hash).to eq({
         "Iptc.Application2.Caption"  => "Rhubarb rhubarb rhubard",
         "Iptc.Application2.Keywords" => ["fish", "custard"]
-      }
+      })
     end
     
     it "should write IPTC data" do
       @iptc_data.add("Iptc.Application2.Keywords", "fishy")
-      @iptc_data.to_a.should == [
+      expect(@iptc_data.to_a).to eq([
         ["Iptc.Application2.Caption", "Rhubarb rhubarb rhubard"],
         ["Iptc.Application2.Keywords", "fish"],
         ["Iptc.Application2.Keywords", "custard"],
         ["Iptc.Application2.Keywords", "fishy"]
-      ]
+      ])
     end
     
     it "should set IPTC data" do
       @iptc_data["Iptc.Application2.Caption"] = "A New Caption"
-      @iptc_data.to_hash["Iptc.Application2.Caption"].should == "A New Caption"
+      expect(@iptc_data.to_hash["Iptc.Application2.Caption"]).to eq("A New Caption")
     end
     
     it "should set multiply IPTC data values" do
       @iptc_data["Iptc.Application2.Keywords"] = ["abc", "cde"]
-      @iptc_data.to_hash["Iptc.Application2.Keywords"].should == ["abc", "cde"]
+      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq(["abc", "cde"])
     end
     
     it "should delete one value of IPTC data" do
       @iptc_data.delete("Iptc.Application2.Keywords")
-      @iptc_data.to_hash["Iptc.Application2.Keywords"].should == "custard"
+      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq("custard")
     end
     
     it "should delete all values of IPTC data" do
       @iptc_data.delete_all("Iptc.Application2.Keywords")
-      @iptc_data.to_hash["Iptc.Application2.Keywords"].should == nil
+      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq(nil)
     end
   end
 
@@ -119,47 +119,47 @@ describe Exiv2 do
     end
 
     it "should read XMP data" do
-      @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 == [
+      expect(@xmp_data).to be_a(Exiv2::XmpData)
+      expect(@xmp_data.inspect).to eq('#<Exiv2::XmpData: {"Xmp.dc.description"=>"lang=\"x-default\" This is a description", "Xmp.dc.title"=>"lang=\"x-default\" Pickled"}>')
+      expect(@xmp_data.to_a).to eq([
         ["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
       xmp_hash = @xmp_data.to_hash
-      xmp_hash.should be_a(Hash)
-      xmp_hash.should == {
+      expect(xmp_hash).to be_a(Hash)
+      expect(xmp_hash).to eq({
         "Xmp.dc.title"       => "lang=\"x-default\" Pickled",
         "Xmp.dc.description" => "lang=\"x-default\" This is a description"
-      }
+      })
     end
 
     it "should write XMP data" do
       @xmp_data["Xmp.dc.title"] = "lang=\"x-default\" Changed!"
-      @xmp_data.to_hash["Xmp.dc.title"].should == "lang=\"x-default\" Changed!"
+      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" Changed!")
     end
     
     it "should set XMP data" do
       @xmp_data["Xmp.dc.title"] = "A New Title"
-      @xmp_data.to_hash["Xmp.dc.title"].should == "lang=\"x-default\" A New Title"
+      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" A New Title")
     end
     
     it "should set multiply XMP data values" do
       @xmp_data["Xmp.dc.title"] = ["abc", "cde"]
-      @xmp_data.to_hash["Xmp.dc.title"].should == ["lang=\"x-default\" abc", "lang=\"x-default\" cde"]
+      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq(["lang=\"x-default\" abc", "lang=\"x-default\" cde"])
     end
     
     it "should delete one value of XMP data" do
       @xmp_data["Xmp.dc.title"] = ["abc", "cde"]
       @xmp_data.delete("Xmp.dc.title")
-      @xmp_data.to_hash["Xmp.dc.title"].should == "lang=\"x-default\" cde"
+      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" cde")
     end
     
     it "should delete all values of XMP data" do
       @xmp_data.delete_all("Xmp.dc.title")
-      @xmp_data.to_hash["Xmp.dc.title"].should == nil
+      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq(nil)
     end
   end
 
@@ -169,59 +169,59 @@ describe Exiv2 do
     end
 
     it "should read Exif data" do
-      @exif_data.should be_a(Exiv2::ExifData)
-      @exif_data.inspect.should == '#<Exiv2::ExifData: {"Exif.Image.ExifTag"=>"52", "Exif.Image.Software"=>"plasq skitch", "Exif.Photo.ExifVersion"=>"48 50 49 48", "Exif.Photo.PixelXDimension"=>"32", "Exif.Photo.PixelYDimension"=>"32"}>'
-      @exif_data.to_a.should == [
+      expect(@exif_data).to be_a(Exiv2::ExifData)
+      expect(@exif_data.inspect).to eq('#<Exiv2::ExifData: {"Exif.Image.ExifTag"=>"52", "Exif.Image.Software"=>"plasq skitch", "Exif.Photo.ExifVersion"=>"48 50 49 48", "Exif.Photo.PixelXDimension"=>"32", "Exif.Photo.PixelYDimension"=>"32"}>')
+      expect(@exif_data.to_a).to eq([
         ["Exif.Image.Software",         "plasq skitch"],
         ["Exif.Image.ExifTag",          "52"],
         ["Exif.Photo.ExifVersion",      "48 50 49 48"],
         ["Exif.Photo.PixelXDimension",  "32"],
         ["Exif.Photo.PixelYDimension",  "32"]
-      ]
+      ])
     end
 
     it "should convert xmp data into a hash" do
       exif_hash = @exif_data.to_hash
-      exif_hash.should be_a(Hash)
-      exif_hash.should == {
+      expect(exif_hash).to be_a(Hash)
+      expect(exif_hash).to eq({
         "Exif.Photo.PixelXDimension" => "32",
         "Exif.Photo.ExifVersion"     => "48 50 49 48",
         "Exif.Image.Software"        => "plasq skitch",
         "Exif.Photo.PixelYDimension" => "32",
         "Exif.Image.ExifTag"         => "52"
-      }
+      })
     end
 
     it "should write Exif data" do
       @exif_data.add("Exif.Image.Software", "ruby-exiv2")
-      @exif_data.to_hash.should == {
+      expect(@exif_data.to_hash).to eq({
         "Exif.Photo.PixelXDimension" => "32",
         "Exif.Photo.ExifVersion"     => "48 50 49 48",
         "Exif.Image.Software"        => ["plasq skitch", "ruby-exiv2"],
         "Exif.Photo.PixelYDimension" => "32",
         "Exif.Image.ExifTag"         => "52"
-      }
+      })
     end
     
     it "should set Exif data" do
       @exif_data["Exif.Image.Software"] = "ruby-exiv2"
-      @exif_data.to_hash["Exif.Image.Software"].should == "ruby-exiv2"
+      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq("ruby-exiv2")
     end
     
     it "should set multiply Exif data values" do
       @exif_data["Exif.Image.Software"] = ["ruby-exiv2", "plasq skitch"]
-      @exif_data.to_hash["Exif.Image.Software"].should == ["ruby-exiv2", "plasq skitch"]
+      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq(["ruby-exiv2", "plasq skitch"])
     end
     
     it "should delete one value of Exif data" do
       @exif_data["Exif.Image.Software"] = ["ruby-exiv2", "plasq skitch"]
       @exif_data.delete("Exif.Image.Software")
-      @exif_data.to_hash["Exif.Image.Software"].should == "plasq skitch"
+      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq("plasq skitch")
     end
     
     it "should delete all values of Exif data" do
       @exif_data.delete_all("Exif.Image.Software")
-      @exif_data.to_hash["Exif.Image.Software"].should == nil
+      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq(nil)
     end
   end
 end

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: exiv2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Pete Yandell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157752580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157752580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2157751940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157751940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple wrapper around the C++ Exiv2 libary for reading image metadata
 email:
 - pete@envato.com
@@ -41,12 +46,13 @@ extensions:
 - ext/exiv2/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - exiv2.gemspec
 - ext/exiv2/exiv2.cpp
@@ -62,34 +68,27 @@ files:
 - spec/files/test.jpg
 homepage: https://github.com/envato/exiv2
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1767711018481939965
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1767711018481939965
 requirements: []
 rubyforge_project: exiv2
-rubygems_version: 1.8.10
+rubygems_version: 2.7.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple wrapper around Exiv2
 test_files:
 - spec/exiv2_spec.rb

data/README.rdoc

@@ -1,68 +0,0 @@
-= Exiv2
-
-A simple wrapper around the C++ Exiv2 libary for reading and writing image metadata.
-
-See http://www.exiv2.org/
-
-Requires that the exiv2 C++ library is installed.
-
-== Usage
-
-    gem install exiv2
-
-    require 'exiv2'
-    image = Exiv2::ImageFactory.open("image.jpg")
-    image.read_metadata
-    image.iptc_data.each do |key, value|
-      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
-    
-    image.exif_data.delete("Exif.Image.Software")
-    image.iptc_data.delete_all("Iptc.Application2.Keywords")
-    
-    image.iptc_data["Iptc.Application2.Caption"] = "A New Caption"
-    image.iptc_data.add("Iptc.Application2.Keywords", "fishy")
-    
-    image.write_metadata
-
-== Why?
-
-None of the existing Ruby libraries for reading and writing image metadata did quite what
-we wanted, so we figured it wouldn't be too hard to wrap enough of Exiv2 to
-meet our needs.
-
-The intention is to just mirror the Exiv2 API in Ruby, so the path to extending
-this to support more of Exiv2's functionality should be straightforward. Patches
-are welcome.
-
-== Compatibility
-
-Tested with Ruby 1.8.7 and 1.9.3, and Exiv2 0.20 and 0.21
-
-== Developing
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Status
-
-In early development. Very little of Exiv2's API is supported, and it hasn't
-been heavily tested.
-
-== Contributors
-
-Pete Yandell, Mark Turnley, Lucas Parry, Norbert Wojtwoicz, Jan Graichen, John Barton
-
-== Copyright
-
-Copyright (c) 2010 Envato & Pete Yandell. See LICENSE for details.