gmt 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a8003af67677af616118eca5328e10c509cb84
-  data.tar.gz: 58224d0ff46be31e78016d23a4173afd334b996e
+  metadata.gz: 7fa6455137a875453333acb344af988d06610a9c
+  data.tar.gz: b06416fe648fda0fa83d1d8d8a2b38c2fb3e41a9
 SHA512:
-  metadata.gz: 47e480dfdfe0c27b70e727d39e5e362a004fc760d0b80018390baee247b7ecc08ed3683d4da48cc467d556a742f537537330e82436f7d7612780487e40c201da
-  data.tar.gz: 82e1c0d38739842d0d7ba33dd5239c7eece6b13532f55d830ef338f6b5e43d82a87dd7750eb2817ffce819f8f10fe61012083e93af397d874be9e726ff1fd877
+  metadata.gz: 95eba465b3606499f9200fbcd41e5d5426282a5a9436eea512e5b71a4f7abdc23806fc9c12e647283aad032394d27379bbbee01ddfc672212af57c7ce7fa73a2
+  data.tar.gz: 4f4149ed3eb0b7e80c149d140cbdbb568e8edebde42e837a85512e178bae1858a205d7c7f72b423c0030711bab0dca650a50f28d29ab8fe5262df4be8abe2ad6

data/ext/gmt/gmt.c

@@ -81,8 +81,7 @@ static VALUE gmt_release(VALUE self)
 static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
 {
   VALUE files, opts;
-  rb_scan_args(argc, argv, "*:", &files, &opts);
-  if (TYPE(opts) == T_NIL) opts = rb_hash_new();
+  rb_scan_args(argc, argv, "*1", &files, &opts);
 
   gmt_t *gmt;
   Data_Get_Struct(self, gmt_t, gmt);
@@ -91,7 +90,7 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
   void *session = gmt->session;
 
   gmt_option_t *gmt_opts;
-  gmt_opts = ruby_hash_to_gmt_options(opts, session);
+  gmt_opts = ruby_array_to_gmt_options(opts, session);
   gmt_opts = append_inputs_to_gmt_options(files, gmt_opts, session);
 
   int err = GMT_Call_Module(session, name, -1, gmt_opts);

data/ext/gmt/option.c

@@ -8,35 +8,13 @@
 
 #include "option.h"
 
-typedef struct {
-  void *session;
-  gmt_option_t *gmt_opts;
-} rhtgo_cb_arg_t;
-
-static void rhtgo_cb_arg_free(void *arg){ };
-
-static VALUE rhtgo_cb_arg_class;
-
-static ID append_id(void)
-{
-  static ID cached = 0;
-
-  if (! cached)
-    cached = rb_intern(">>");
-
-  return cached;
-}
-
-static ID id_of_key(VALUE key)
+static char char_of_key(VALUE key)
 {
   if (TYPE(key) != T_SYMBOL)
     rb_raise(rb_eArgError, "option keys should be symbols");
 
-  return SYM2ID(key);
-}
+  ID key_id = SYM2ID(key);
 
-static char char_of_key_id(ID key_id)
-{
   const char *key_s = rb_id2name(key_id);
 
   if (key_s == NULL || *key_s == '\0')
@@ -54,91 +32,41 @@ static gmt_option_t* append_option(void *session,
   return GMT_Append_Option(session, gmt_opt, gmt_opts);
 }
 
-static int rhtgo_cb(VALUE key, VALUE value, VALUE arg)
+extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
 {
-  rhtgo_cb_arg_t *rhtgo_cb_arg;
-
-  Data_Get_Struct(arg, rhtgo_cb_arg_t, rhtgo_cb_arg);
-
-  void *session = rhtgo_cb_arg->session;
-  gmt_option_t *gmt_opt, *gmt_opts = rhtgo_cb_arg->gmt_opts;
+  if (TYPE(opts) != T_ARRAY)
+    rb_raise(rb_eArgError, "options should be an array");
 
-  ID key_id = id_of_key(key);
+  gmt_option_t *gmt_opts = NULL;
 
-  if (key_id == append_id())
+  for (size_t i = 0 ; i < RARRAY_LEN(opts) ; i++)
     {
-      /*
-	the append key (>>) is a special case, since this needs to be converted
-	to the (option, argument) pair ('>', '>filename'), see the discussion at
-	http://gmt.soest.hawaii.edu/boards/1/topics/3665?r=3677
-      */
-
-      if (TYPE(value) != T_STRING)
-	rb_raise(rb_eArgError, "argument for >> option must be a string");
-
-      const char *filename = StringValueCStr(value);
-      size_t len = strlen(filename);
-      char option_arg[len+2];
-      snprintf(option_arg, len+2, ">%s", filename);
-
-      gmt_opts = append_option(session, '>', option_arg, gmt_opts);
-    }
-  else
-    {
-      char option_name = char_of_key_id(key_id);
-
-      switch (TYPE(value))
+      VALUE opt = RARRAY_PTR(opts)[i];
+      if (TYPE(opt) != T_ARRAY)
+	rb_raise(rb_eArgError, "each option should be a array");
+      if (RARRAY_LEN(opt) != 2)
+	rb_raise(rb_eArgError, "each option should be a pair");
+      VALUE key = RARRAY_PTR(opt)[0];
+      char option_name = char_of_key(key);
+      VALUE arg = RARRAY_PTR(opt)[1];
+      const char *option_arg;
+      switch (TYPE(arg))
 	{
-	  const char *option_arg;
-
 	case T_STRING:
-	  option_arg = StringValueCStr(value);
-	  gmt_opts = append_option(session, option_name, option_arg, gmt_opts);
+	  option_arg = StringValueCStr(arg);
 	  break;
 
 	case T_NIL:
-	  gmt_opts = append_option(session, option_name, NULL, gmt_opts);
-	  break;
-
-	case T_ARRAY:
-	  for (size_t i = 0 ; i < RARRAY_LEN(value) ; i++)
-	    {
-	      VALUE item = RARRAY_PTR(value)[i];
-	      if (TYPE(item) != T_STRING)
-		rb_raise(rb_eArgError, "option arguments should be strings");
-	      option_arg = StringValueCStr(item);
-	      gmt_opts = append_option(session, option_name, option_arg, gmt_opts);
-	    }
+	  option_arg = NULL;
 	  break;
 
 	default:
-	  rb_raise(rb_eArgError, "option arguments should be strings or arrays");
+	  rb_raise(rb_eArgError, "option argument should be string or nil");
 	}
+      gmt_opts = append_option(session, option_name, option_arg, gmt_opts);
     }
 
-  rhtgo_cb_arg->gmt_opts = gmt_opts;
-
-  return ST_CONTINUE;
-}
-
-extern gmt_option_t* ruby_hash_to_gmt_options(VALUE opts, void *session)
-{
-  gmt_option_t *gmt_opt, *gmt_opts = NULL;
-  rhtgo_cb_arg_t *rhtgo_cb_arg = ALLOC(rhtgo_cb_arg_t);
-
-  rhtgo_cb_arg->session = session;
-  rhtgo_cb_arg->gmt_opts = NULL;
-
-  VALUE arg =
-    Data_Wrap_Struct(rhtgo_cb_arg_class,
-		     NULL,
-		     rhtgo_cb_arg_free,
-		     rhtgo_cb_arg);
-
-
-  rb_hash_foreach(opts, rhtgo_cb, arg);
-
-  return rhtgo_cb_arg->gmt_opts;
+  return gmt_opts;
 }
 
 extern gmt_option_t* append_inputs_to_gmt_options(VALUE files,

data/ext/gmt/option.h

@@ -14,7 +14,7 @@
 
 typedef struct GMT_OPTION gmt_option_t;
 
-extern gmt_option_t* ruby_hash_to_gmt_options(VALUE, void*);
+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*);
 
 #endif

data/lib/gmt.rb

@@ -99,9 +99,11 @@ class GMT
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_ps(method)
       define_method(method) do |*args, options|
+        options = postscript_options(options)
+        fix_append_option!(options)
         self.send(api_function(method),
                   *string_arguments(args),
-                  postscript_options(options))
+                  array_options(options))
       end
     end
 
@@ -113,9 +115,10 @@ class GMT
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_other(method)
       define_method(method) do |*args, options|
+        fix_append_option!(options)
         self.send(api_function(method),
                   *string_arguments(args),
-                  options)
+                  array_options(options))
       end
     end
 
@@ -135,6 +138,30 @@ class GMT
     args.map(&:to_s)
   end
 
+  # handle the :>> option
+
+  def fix_append_option!(options)
+    if file = options.delete(:>>) then
+      options[:>] = '>' + file
+    end
+  end
+
+  # convert the options hash to an array of pairs
+
+  def array_options(options)
+    options.inject(Array.new) do |result, pair|
+      key, values = pair
+      if values.respond_to? :each then
+        values.each do |value|
+          result << [key, value]
+        end
+      else
+        result << [key, values]
+      end
+      result
+    end
+  end
+
   # for GMT modules which produce PostScript, convert the
   # convenience options (:position, :file) to the hash
   # equivalent of the -K, -O options, and the creation of

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- ghostscript (gs) for the test-suite
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: