gmt 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3d9adf57be499c296fab1aa6c6c23d1001d17709f96c0cfc62d5a3fa344a66
-  data.tar.gz: e51bafc40060577b2bc98a376dcc23b863e586697122e28335582ac0ffea522b
+  metadata.gz: 6ad7de33d11e4ab6419c28a78a14ba7ae9d5e0418485ab794060f8ca7a5a6f21
+  data.tar.gz: 11e72187266c674aad88d7597f2f50a2b714c2443820564a470bef2a180a5fdf
 SHA512:
-  metadata.gz: 29d50bccf9a8868617653da560a520e2af073e81dcd8a99e75086f4108abfd6516f4a08073cadad8d78b60687434c06032299708b5dac9c674a09c2b5fdf9ed1
-  data.tar.gz: 8f57a9db15bd3a1d5afbd899af330632e6fc72fec26c64c5ba64781ec939d42cc502a07b9d373ce02e1874e423d607dab608735d155b360130a66c81a3746ec4
+  metadata.gz: 921660bab096dd80e3908914ceca695090c83c9a7a644be6b594dc51c448c03ae1d6d33de02f5f02dc028ea32496bd672d8ac3ff980d98ee1ec7ed0170788f35
+  data.tar.gz: ffc9d3d9a51563c4e0295ccf7c621053db09fb5c302639dcabe0e516a01c09415670e8eab9f012857b0d4ecfe119a4a38a85c6962b178dc90451951a35a027a3

data/ext/gmt/gmt.c

@@ -1,7 +1,11 @@
 #include <ruby.h>
+#include <ruby/version.h>
+
 #include <gmt.h>
 #include <gmt_version.h>
 
+#include <errno.h>
+
 #include "option.h"
 
 #define API_VER(major, minor, release) (10000 * major + 100 * minor + release)
@@ -15,17 +19,25 @@ typedef struct
 
 /* helpers */
 
-static void raise_unless_class_data(gmt_t *gmt)
-{
-  if (gmt == NULL)
-    rb_raise(rb_eRuntimeError, "failed fetch of GMT class data");
-}
+static void gmt_free(void*);
 
-static void raise_if_error(int err, const char *module)
-{
-  if (err)
-    rb_raise(rb_eRuntimeError, "failed call to GMT module %s", module);
-}
+static rb_data_type_t data_type = {
+  .wrap_struct_name = "ruby-gmt-wrap",
+  .function = {
+    .dmark = NULL,
+    .dfree = gmt_free,
+    .dsize = NULL,
+#if RUBY_API_VERSION_CODE < 20700
+    .reserved = { NULL, NULL }
+#else
+    .dcompact = NULL,
+    .reserved = { NULL }
+#endif
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
 
 /* ruby object interface */
 
@@ -38,13 +50,18 @@ static void gmt_free(void *p)
       GMT_Destroy_Session(gmt->session);
       gmt->session = NULL;
     }
+
+  free(gmt);
 }
 
-static VALUE gmt_alloc(VALUE klass)
+static VALUE gmt_alloc(VALUE cls)
 {
   gmt_t *gmt;
 
-  VALUE obj = Data_Make_Struct(klass, gmt_t, NULL, gmt_free, gmt);
+  if ((gmt = malloc(sizeof(gmt_t))) == NULL)
+    rb_raise(rb_eNoMemError, "failed to alloc GMT struct");
+
+  VALUE obj = TypedData_Wrap_Struct(cls, &data_type, gmt);
 
   gmt->session = NULL;
 
@@ -55,7 +72,7 @@ static VALUE gmt_init(VALUE self)
 {
   gmt_t *gmt;
 
-  Data_Get_Struct(self, gmt_t, gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
 
   gmt->session =
     GMT_Create_Session("Session name", 2, 0, NULL);
@@ -70,7 +87,7 @@ static VALUE gmt_release(VALUE self)
 {
   gmt_t *gmt;
 
-  Data_Get_Struct(self, gmt_t, gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
 
   if (gmt->session)
     {
@@ -89,8 +106,10 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "*1", &files, &opts);
 
   gmt_t *gmt;
-  Data_Get_Struct(self, gmt_t, gmt);
-  raise_unless_class_data(gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
+
+  if (gmt == NULL)
+    rb_raise(rb_eRuntimeError, "failed fetch of GMT class data");
 
   void *session = gmt->session;
 
@@ -98,10 +117,22 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
   gmt_opts = ruby_array_to_gmt_options(opts, session);
   gmt_opts = append_inputs_to_gmt_options(files, gmt_opts, session);
 
+  errno = 0;
   int err = GMT_Call_Module(session, name, -1, gmt_opts);
+  int gmt_errno = errno;
 
   GMT_Destroy_Options(session, &gmt_opts);
-  raise_if_error(err, name);
+
+  if (err != 0)
+    {
+      VALUE gmt_syserr;
+
+      if ((gmt_errno != 0) &&
+          ((gmt_syserr = rb_syserr_new(gmt_errno, NULL)) != 0))
+        rb_exc_raise(gmt_syserr);
+      else
+        rb_raise(rb_eRuntimeError, "failed call to GMT module %s", name);
+    }
 
   return Qtrue;
 }
@@ -114,7 +145,7 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
 
   The "modern mode" modules (which have a slicker way of routing and
   combining postscript output) will probably need a different treatment,
-  possibly a more attractive on from the Ruby perspective; for now we
+  possibly a more attractive one from the Ruby perspective; for now we
   just limit ourselves to the classic mode.
 */
 
@@ -218,10 +249,6 @@ GMT_FUN(sphtriangulate)
 
 /* Convert or extract subsets of data */
 
-#if API_AT_LEAST(6, 2, 0)
-GMT_FUN(gmtbinstats)
-#endif
-
 GMT_FUN(gmtconnect)
 GMT_FUN(gmtconvert)
 GMT_FUN(gmtselect)
@@ -241,6 +268,10 @@ GMT_FUN(grd2kml)
 GMT_FUN(grd2rgb) /* https://github.com/GenericMappingTools/gmt/pull/425 */
 #endif
 
+#if API_AT_LEAST(6, 2, 0)
+GMT_FUN(gmtbinstats)
+#endif
+
 /* trends in 1-D and 2-D data */
 
 GMT_FUN(fitcircle)

data/ext/gmt/option.c

@@ -32,7 +32,7 @@ static gmt_option_t* append_option(void *session,
   return GMT_Append_Option(session, gmt_opt, gmt_opts);
 }
 
-extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
+gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
 {
   if (TYPE(opts) != T_ARRAY)
     rb_raise(rb_eArgError, "options should be an array");
@@ -74,9 +74,9 @@ extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
   return gmt_opts;
 }
 
-extern gmt_option_t* append_inputs_to_gmt_options(VALUE files,
-						  gmt_option_t* gmt_opts,
-						  void *session)
+gmt_option_t* append_inputs_to_gmt_options(VALUE files,
+                                           gmt_option_t *gmt_opts,
+                                           void *session)
 {
   if (TYPE(files) != T_ARRAY)
     rb_raise(rb_eArgError, "inputs should be an array");

data/ext/gmt/option.h

@@ -14,7 +14,7 @@
 
 typedef struct GMT_OPTION gmt_option_t;
 
-extern gmt_option_t* ruby_array_to_gmt_options(VALUE, void*);
-extern gmt_option_t* append_inputs_to_gmt_options(VALUE, gmt_option_t*, void*);
+gmt_option_t* ruby_array_to_gmt_options(VALUE, void*);
+gmt_option_t* append_inputs_to_gmt_options(VALUE, gmt_option_t*, void*);
 
 #endif

data/lib/gmt.rb

@@ -66,6 +66,18 @@
 #
 # using this format.
 #
+# One occasionally has need for multiple calls to the same option: the
+# <code>-B</code> option being the usual culprit. In this case, use a single
+# <code>:B</code> key and an array of the arguments:
+#
+#    B: [
+#      'xa%g+l%s' % [dx, x_label],
+#      'ya%g+l%s' % [dy, y_label],
+#      'nWeS'
+#     ], ...
+#
+# for example.
+#
 # == PostScript functions
 #
 # When creating complex PostScript plots one needs to make several calls to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ requirements:
 - GMT5/6 development libraries (compile)
 - GMT5/6 installation (test)
 - ghostscript (test)
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Generic Mapping Tools (GMT)