gmt 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa6455137a875453333acb344af988d06610a9c
-  data.tar.gz: b06416fe648fda0fa83d1d8d8a2b38c2fb3e41a9
+  metadata.gz: 83004af94b065d8ed5dcc96880f9f92eb24d9587
+  data.tar.gz: c3c3b8a34eecbe5d65fdd434a9d79ed4fe3a2ebf
 SHA512:
-  metadata.gz: 95eba465b3606499f9200fbcd41e5d5426282a5a9436eea512e5b71a4f7abdc23806fc9c12e647283aad032394d27379bbbee01ddfc672212af57c7ce7fa73a2
-  data.tar.gz: 4f4149ed3eb0b7e80c149d140cbdbb568e8edebde42e837a85512e178bae1858a205d7c7f72b423c0030711bab0dca650a50f28d29ab8fe5262df4be8abe2ad6
+  metadata.gz: 203784ecd104c0412a2c327c10457c1508754574e9a5dfb6224cf708ef8f438e4460b1a2118e76f49d0f63cb5378949aacfab5074e9800e5070357f9818fe1f1
+  data.tar.gz: db221c721995a317e2dc78eb0e18247dc58c78006769715ded65aaea10ca96e24a5a7c1ecfffb86133983d3df027686f4997a007d4134515207e068af3375663

data/ext/gmt/option.c

@@ -2,8 +2,8 @@
   option.c
 
   GMT expects arguments to be in a linked-list format and provides
-  some library support for creating these.  We here convert a hash
-  to this linked-list format.
+  some library support for creating these.  We here convert a Ruby
+  array-of-pairs to this linked-list format.
 */
 
 #include "option.h"
@@ -42,14 +42,18 @@ extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
   for (size_t i = 0 ; i < RARRAY_LEN(opts) ; i++)
     {
       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))
 	{
 	case T_STRING:
@@ -63,6 +67,7 @@ extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
 	default:
 	  rb_raise(rb_eArgError, "option argument should be string or nil");
 	}
+
       gmt_opts = append_option(session, option_name, option_arg, gmt_opts);
     }
 
@@ -79,9 +84,12 @@ extern gmt_option_t* append_inputs_to_gmt_options(VALUE files,
   for (size_t i = 0 ; i < RARRAY_LEN(files) ; i++)
     {
       VALUE file = RARRAY_PTR(files)[i];
+
       if (TYPE(file) != T_STRING)
 	rb_raise(rb_eArgError, "each input should be a string");
+
       const char *option_arg = StringValueCStr(file);
+
       gmt_opts = append_option(session, '<', option_arg, gmt_opts);
     }
 

data/lib/gmt.rb

@@ -99,11 +99,10 @@ 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),
-                  array_options(options))
+        coerce_string_arguments!(args)
+        coerce_postscript_options!(options)
+        coerce_append_option!(options)
+        self.send(api_function(method), *args, options_as_pairs(options))
       end
     end
 
@@ -115,10 +114,9 @@ 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),
-                  array_options(options))
+        coerce_string_arguments!(args)
+        coerce_append_option!(options)
+        self.send(api_function(method), *args, options_as_pairs(options))
       end
     end
 
@@ -132,62 +130,66 @@ class GMT
     [method.to_s, 'c'].join('_').to_sym
   end
 
-  # convert non-option arguments to strings
+  # convert arguments to strings
 
-  def string_arguments(args)
-    args.map(&:to_s)
+  def coerce_string_arguments!(arguments)
+    arguments.map!(&:to_s)
+  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
+  # or appending to the PostScript output file
+
+  def coerce_postscript_options!(options)
+    file = options.delete(:file)
+    position = options.delete(:position)
+    if file && position then
+      file_options =
+        case position
+        when :first, 'first'
+          { :K => nil, :> => file }
+        when :middle, 'middle'
+          { :O => nil, :K => nil, :>> => file }
+        when :last, 'last'
+          { :O => nil, :>> => file }
+        else
+          raise ArgumentError, 'position should be :first, :middle or :last'
+        end
+      options.merge!(file_options)
+    end
   end
 
   # handle the :>> option
 
-  def fix_append_option!(options)
+  def coerce_append_option!(options)
     if file = options.delete(:>>) then
       options[:>] = '>' + file
     end
   end
 
+  # convert non-nil argument to string
+
+  def string_unless_nil(argument)
+    argument.to_s unless argument.nil?
+  end
+
   # convert the options hash to an array of pairs
 
-  def array_options(options)
+  def options_as_pairs(options)
     options.inject(Array.new) do |result, pair|
       key, values = pair
       if values.respond_to? :each then
         values.each do |value|
-          result << [key, value]
+          result << [key, string_unless_nil(value)]
         end
       else
-        result << [key, values]
+        result << [key, string_unless_nil(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
-  # or appending to the PostScript output file
-
-  def postscript_options(options)
-    file = options.delete(:file)
-    position = options.delete(:position)
-    if file && position then
-      file_options =
-        case position
-        when :first
-          { :K => nil, :> => file }
-        when :middle
-          { :O => nil, :K => nil, :>> => file }
-        when :last
-          { :O => nil, :>> => file }
-        else
-          raise ArguemntError, 'position should be :first, :middle or :last'
-        end
-      options.merge(file_options)
-    else
-      options
-    end
-  end
-
   public
 
   # @!group Filtering of 1-D and 2-D Data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,10 +67,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 description: |
-  A Ruby extension for the Generic Mapping Tools (GMT)
+  A Ruby extension for the Generic Mapping Tools (GMT5)
   cartographic toolset (work-in-progress).
-
-  Requires the GMT5 development libraries.
 email: j.j.green@gmx.co.uk
 executables: []
 extensions:
@@ -102,7 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ghostscript (gs) for the test-suite
+- GMT5 development libraries
+- ghostscript (for tests)
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: