exiv2 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7000b7708b6281fe8686a00aaff68027dbfa95023a51cfbbd651188b8b48740b
-  data.tar.gz: 3a6c7cbbfa1b6d6a5ca44b31f93819c79687570081951aa1ee0bb9a69766d83e
+  metadata.gz: c62790694ad3a6cf96e9f52341343bedefc97acbc262c3e454c0582cfd53fbab
+  data.tar.gz: 8cc6d290fc681e9a597a5b920ecdd23521cb2bec04616c26d02efabe9716ed98
 SHA512:
-  metadata.gz: 9267361af64e277e724f18256108f01997daa8b873cac39984e37a5e12267551ea4da29353424b6fd1afaba9a0f6afbaf63fc17143e93d75e84bfcbbb5526302
-  data.tar.gz: 59d8a2cfebab35d5760f832420eab1cc89cbbd67dda0017512de843b4aa89bc89c176440de8df95bbc9c60d9e0bcdb36589c6995944381ed24733d5e905e3d11
+  metadata.gz: fc9cb80689cbff412812924041daca2c69c191689dd602f0700688a563a86191ca48d4b9fc09f6c1ac9933cd9ac463df6417bd9c4b0a4cda78f787e4435fa627
+  data.tar.gz: 76d9e02c5524da3741c7a46a43fc26d28558947110527e01e5191607a675123abcaa4bfe6f131a6df6a2987b4c84e8d313b35551cc27fca6892b444eeb3d7ef4

data/README.md

@@ -17,31 +17,6 @@ Requires that the exiv2 C++ library is installed.
 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:
 
 ```
@@ -93,17 +68,17 @@ are welcome.
 
 ## Compatibility
 
-Tested on 2.4.x, 2.5.x and 2.6.x with Exiv2 0.27.1
+Tested on 2.6.x, 2.7.x, 3.0.x, 3.1.x and 3.2.x with Exiv2 0.27.1 and 0.28.0.
 
 ## 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
+- 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.
+- 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.
+- Send me a pull request. Bonus points for topic branches.
 
 ## Status
 

data/ext/exiv2/exiv2.cpp

@@ -1,7 +1,20 @@
-#include "exiv2/image.hpp"
-#include "exiv2/error.hpp"
+#include "exiv2/exiv2.hpp"
 #include "ruby.h"
 
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 27
+#define ExivImagePtr Exiv2::Image::AutoPtr
+#define ExivValuePtr Exiv2::Value::AutoPtr
+#else
+#define ExivImagePtr Exiv2::Image::UniquePtr
+#define ExivValuePtr Exiv2::Value::UniquePtr
+#endif
+
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 27
+#define ExivError Exiv2::BasicError<char>
+#else
+#define ExivError Exiv2::Error
+#endif
+
 // Create a Ruby string from a C++ std::string.
 static VALUE to_ruby_string(const std::string& string) {
   VALUE str = rb_str_new(string.data(), string.length());
@@ -75,6 +88,7 @@ extern "C" void Init_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_undef_alloc_func(image_class);
   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);
@@ -85,18 +99,21 @@ extern "C" void Init_exiv2() {
   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_undef_alloc_func(exif_data_class);
   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_undef_alloc_func(iptc_data_class);
   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_undef_alloc_func(xmp_data_class);
   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);
@@ -117,7 +134,7 @@ static VALUE image_read_metadata(VALUE self) {
   try {
     image->readMetadata();
   }
-  catch (Exiv2::BasicError<char> error) {
+  catch (ExivError error) {
     rb_raise(basic_error_class, "%s", error.what());
   }
 
@@ -131,7 +148,7 @@ static VALUE image_write_metadata(VALUE self) {
   try {
     image->writeMetadata();
   }
-  catch (Exiv2::BasicError<char> error) {
+  catch (ExivError error) {
     rb_raise(basic_error_class, "%s", error.what());
   }
 
@@ -174,10 +191,10 @@ 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.
+    ExivImagePtr image_ptr = Exiv2::ImageFactory::open(to_std_string(path));
+    image = image_ptr.release(); // Release the pointer, so we can keep the image around.
   }
-  catch (Exiv2::BasicError<char> error) {
+  catch (ExivError error) {
     rb_raise(basic_error_class, "%s", error.what());
   }
 
@@ -203,7 +220,7 @@ static VALUE exif_data_add(VALUE self, VALUE key, VALUE value) {
   Exiv2::TypeId typeId = exifKey.defaultTypeId();
 #endif
   
-  Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
+  ExivValuePtr v = Exiv2::Value::create(typeId);
   v->read(to_std_string(value));
   
   data->add(exifKey, v.get());
@@ -236,7 +253,7 @@ static VALUE iptc_data_add(VALUE self, VALUE key, VALUE value) {
   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);
+  ExivValuePtr v = Exiv2::Value::create(typeId);
   v->read(to_std_string(value));
   
   if(data->add(iptcKey, v.get())) {
@@ -270,7 +287,7 @@ static VALUE xmp_data_add(VALUE self, VALUE key, VALUE value) {
   Exiv2::XmpKey xmpKey = Exiv2::XmpKey(to_std_string(key));
   Exiv2::TypeId typeId = Exiv2::XmpProperties::propertyType(xmpKey);
   
-  Exiv2::Value::AutoPtr v = Exiv2::Value::create(typeId);
+  ExivValuePtr v = Exiv2::Value::create(typeId);
   v->read(to_std_string(value));
   
   if(data->add(xmpKey, v.get())) {

data/ext/exiv2/extconf.rb

@@ -1,12 +1,29 @@
 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']
+$CXXFLAGS += " -std=c++11"
+RbConfig::CONFIG['PKG_CONFIG'] = 'pkg-config'
 
 if dir_config("exiv2") == [nil, nil]
   pkg_config("exiv2")
 end
 have_library("exiv2")
+
+# Some extensions are optional in versions <= 0.27 and also don't exist in
+# versions >= 0.28.
+# Check if they're enabled in the existing exiv2 headers
+# configuration and include the relevant libraries.
+if have_macro("EXV_USE_SSH", "exiv2/exv_conf.h")
+  if dir_config("libssh") == [nil, nil]
+    pkg_config("libssh")
+  end
+  have_library("libssh")
+end
+
+if have_macro("EXV_USE_CURL", "exiv2/exv_conf.h")
+  if dir_config("libcurl") == [nil, nil]
+    pkg_config("libcurl")
+  end
+  have_library("libcurl")
+end
+
 create_makefile("exiv2/exiv2")

data/lib/exiv2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exiv2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Pete Yandell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -61,9 +61,9 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/envato/exiv2/issues
   changelog_uri: https://github.com/envato/exiv2/releases
-  documentation_uri: https://www.rubydoc.info/gems/exiv2/0.1.0
+  documentation_uri: https://www.rubydoc.info/gems/exiv2/0.1.2
   homepage_uri: https://github.com/envato/exiv2
-  source_code_uri: https://github.com/envato/exiv2/tree/v0.1.0
+  source_code_uri: https://github.com/envato/exiv2/tree/v0.1.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A simple wrapper around Exiv2