gmt 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84cd995c50a9a918aadf655f83b8be85f297f391f456cd4fe1833db79367bfb0
-  data.tar.gz: 7f88fb3453566749affca18d1ec2afe0242e5ff2b50edfd34795572213a798da
+  metadata.gz: add57f0a400ff02baf95838b30287a290923d1a56e0ed528f0687649eb173a7d
+  data.tar.gz: d8e40fad79ec4dffe5973038fc963da69cbc8e9538ac6c0440971277fe47e010
 SHA512:
-  metadata.gz: c4d22fae62200c0976471c93f5b9dadbfafe7368b14e6ef5b344d0f77267d74c28e6db459e20b4740991792ed3545267870767e9048a33802736844253b0d0ec
-  data.tar.gz: 2f59eea2cead5e5383ebf5ffcb828a4d1e6c3f5913b44682dfcd6c52a118f24d3f111da1af9ebf9eff5c7b36f5ed74f25ce7e11e4c1adf945a4e3a6487c466a2
+  metadata.gz: f820a71b95aee0f2e3ef4306c771ba3e3449f4be109f505c84dadbe396ea955a2914dbcba1bc5bf055f2f6e9985d76ec882e951e1460123babde15e2b4850a90
+  data.tar.gz: 59fe46c4f7dd9aa045857a9129c948440d56e8209bbbe20848bf6f5f47c7b0ba79c8466155af3a6fd4e9b371046a03941c6663285e60d73b899e1f95f7989fcd

data/lib/gmt.rb

@@ -145,7 +145,7 @@ class GMT
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_ps(method)
       define_method(method) do |*args, **opts|
-        args, opts = nilargify(args, opts)
+        args, opts = arg_opt_normalise(args, opts)
         coerce_postscript_options!(opts)
         coerce_append_option!(opts)
         self.send(api_function(method), *args, options_as_pairs(opts))
@@ -160,7 +160,7 @@ class GMT
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_other(method)
       define_method(method) do |*args, **opts|
-        args, opts = nilargify(args, opts)
+        args, opts = arg_opt_normalise(args, opts)
         coerce_append_option!(opts)
         self.send(api_function(method), *args, options_as_pairs(opts))
       end
@@ -185,13 +185,22 @@ class GMT
     [method.to_s, 'c'].join('_').to_sym
   end
 
-  # convert symbol arguments to nil-valued options, so
-  # nilargify(['a', :b], {c: 'd'}) -> [['a'], {b: nil, c: 'd'}]
-
-  def nilargify(args, opts)
+  # convert symbol arguments to nil-valued options, and
+  # call :to_s on the remaining arguments, so
+  #
+  #   arg_opt_normalise(['a', :b, Pathname('/c')], {d: 'e'})
+  #
+  # becomes
+  #
+  #   [['a', '/c'], {b: nil, d: 'e'}]
+  #
+  # returns the normalised arguments and options, does not
+  # modify the inputs
+
+  def arg_opt_normalise(args, opts)
     syms, strs = args.partition { |x| x.is_a? Symbol }
     syms.each { |sym| opts[sym] = nil }
-    [strs, opts]
+    [strs.map(&:to_s), opts]
   end
 
   # for GMT modules which produce PostScript, convert the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler