xmp_toolkit_ruby 0.0.2 → 0.1.0

data/ext/xmp_toolkit_ruby/xmp_toolkit.hpp

@@ -2,11 +2,11 @@
 #define XMP_TOOLKIT_HPP
 
 #include <cstdio>
-#include <vector>
-#include <string>
 #include <cstring>
+#include <string>
+#include <vector>
 
-//#define ENABLE_XMP_CPP_INTERFACE 1
+// #define ENABLE_XMP_CPP_INTERFACE 1
 
 // Must be defined to instantiate template classes
 #define TXMP_STRING_TYPE std::string
@@ -20,50 +20,39 @@
 // Provide access to the API
 #include "XMP.hpp"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 #include <ruby.h>
 
 using namespace std;
 
-//#define ENABLE_XMP_CPP_INTERFACE 1;
+// #define ENABLE_XMP_CPP_INTERFACE 1;
 
 // Must be defined to instantiate template classes
 #define TXMP_STRING_TYPE std::string
 // Must be defined to give access to XMPFiles
 #define XMP_INCLUDE_XMPFILES 1
 
-#include "XMP.incl_cpp"
 #include "XMP.hpp"
+#include "XMP.incl_cpp"
 
 // TXMPMeta‐style error callback
-bool xmp_meta_error_callback(
-    void *             clientContext,
-    XMP_ErrorSeverity  severity,
-    XMP_Int32          cause,
-    XMP_StringPtr      message
-);
+bool xmp_meta_error_callback(void *clientContext, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message);
 
 // TXMPFiles‐style error callback
-bool xmp_file_error_callback(
-    void *             clientContext,
-    XMP_StringPtr      filePath,
-    XMP_ErrorSeverity  severity,
-    XMP_Int32          cause,
-    XMP_StringPtr      message
-);
+bool xmp_file_error_callback(void *clientContext, XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause,
+                             XMP_StringPtr message);
+
+void ensure_sdk_initialized();
+
+VALUE is_sdk_initialized(VALUE self);
 
 // Initialize SXMPMeta + SXMPFiles, installing callbacks.
-// Returns Qtrue or raises a Ruby exception.
-VALUE xmp_initialize(VALUE self);
+// If PLUGINS_PATH is defined, it will be used to initialize the XMP Toolkit.
+VALUE xmp_initialize(int argc, VALUE *argv, VALUE self);
 
 // Terminate SXMPFiles + SXMPMeta.
 VALUE xmp_terminate(VALUE self);
 
-// process_file(filename) → Ruby Hash or nil
-VALUE get_xmp_from_file(VALUE self, VALUE rb_filename);
-
-VALUE write_xmp_to_file(int argc, VALUE* argv, VALUE self);
-
 #endif

data/ext/xmp_toolkit_ruby/xmp_toolkit_ruby.cpp

@@ -1,44 +1,38 @@
 // xmp_init.cpp
 
 #include "xmp_toolkit.hpp"
+#include "xmp_wrapper.hpp"
+
 #include <ruby.h>
 
 // The one and only Init function.  Ruby will look for Init_xmp_toolkit_ruby
 // because we will (in extconf.rb) build this extension as “xmp_toolkit_ruby.so”.
-extern "C"
-void Init_xmp_toolkit_ruby()
-{
-
-   SXMPMeta::SetDefaultErrorCallback(
-        xmp_meta_error_callback,
-        nullptr,
-        0
-    );
-
-    SXMPFiles::SetDefaultErrorCallback(
-            xmp_file_error_callback,
-            nullptr,
-            0
-   );
-
-   VALUE mXmpToolkitRuby = rb_define_module("XmpToolkitRuby");
-   VALUE mXMPToolkit = rb_define_module_under(mXmpToolkitRuby, "XmpToolkit");
-
-   rb_define_singleton_method(mXMPToolkit,
-                              "initialize_xmp",
-                              RUBY_METHOD_FUNC(xmp_initialize),
-                              0);
-   rb_define_singleton_method(mXMPToolkit,
-                              "terminate",
-                              RUBY_METHOD_FUNC(xmp_terminate),
-                              0);
-   rb_define_singleton_method(mXMPToolkit,
-                              "read_xmp",
-                              RUBY_METHOD_FUNC(get_xmp_from_file),
-                              1);
- rb_define_singleton_method(mXMPToolkit,
-                              "write_xmp",
-                              RUBY_METHOD_FUNC(write_xmp_to_file),
-                              -1);
+extern "C" void Init_xmp_toolkit_ruby() {
+  SXMPMeta::SetDefaultErrorCallback(xmp_meta_error_callback, nullptr, 0);
+
+  SXMPFiles::SetDefaultErrorCallback(xmp_file_error_callback, nullptr, 0);
+
+  VALUE mXmpToolkitRuby = rb_define_module("XmpToolkitRuby");
+  VALUE mXMPToolkit = rb_define_module_under(mXmpToolkitRuby, "XmpToolkit");
+
+  rb_define_singleton_method(mXMPToolkit, "initialize_xmp", RUBY_METHOD_FUNC(xmp_initialize), -1);
+  rb_define_singleton_method(mXMPToolkit, "terminate", RUBY_METHOD_FUNC(xmp_terminate), 0);
+  rb_define_singleton_method(mXMPToolkit, "initialized?", RUBY_METHOD_FUNC(is_sdk_initialized), 0);
+
+  VALUE cXMPWrapper = rb_define_class_under(mXmpToolkitRuby, "XmpWrapper", rb_cObject);
 
+  rb_define_alloc_func(cXMPWrapper, xmpwrapper_allocate);
+  rb_define_method(cXMPWrapper, "open", RUBY_METHOD_FUNC(xmpwrapper_open_file), -1);
+  rb_define_method(cXMPWrapper, "file_info", RUBY_METHOD_FUNC(xmp_file_info), 0);
+  rb_define_method(cXMPWrapper, "packet_info", RUBY_METHOD_FUNC(xmp_packet_info), 0);
+  rb_define_method(cXMPWrapper, "meta", RUBY_METHOD_FUNC(xmp_meta), 0);
+  rb_define_method(cXMPWrapper, "property", RUBY_METHOD_FUNC(xmpwrapper_get_property), 2);
+  rb_define_method(cXMPWrapper, "localized_property", RUBY_METHOD_FUNC(xmpwrapper_get_localized_text), -1);
+  rb_define_method(cXMPWrapper, "update_meta", RUBY_METHOD_FUNC(xmpwrapper_set_meta), -1);
+  rb_define_method(cXMPWrapper, "update_property", RUBY_METHOD_FUNC(xmpwrapper_set_property), 3);
+  rb_define_method(cXMPWrapper, "update_localized_property", RUBY_METHOD_FUNC(xmpwrapper_update_localized_text), -1);
+  rb_define_method(cXMPWrapper, "write", RUBY_METHOD_FUNC(write_xmp),
+                   0);  // close flushes the file until then the data is not guaranteed to be written
+  rb_define_method(cXMPWrapper, "close", RUBY_METHOD_FUNC(xmpwrapper_close_file), 0);
+  rb_define_singleton_method(cXMPWrapper, "register_namespace", RUBY_METHOD_FUNC(register_namespace), 2);
 }