gmt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c627752c3767952e0ffcf4fa5d8974091aee1ca7
-  data.tar.gz: 744c75011fb4a4de173d3f61ff9f3f3c975c5377
+SHA256:
+  metadata.gz: 84cd995c50a9a918aadf655f83b8be85f297f391f456cd4fe1833db79367bfb0
+  data.tar.gz: 7f88fb3453566749affca18d1ec2afe0242e5ff2b50edfd34795572213a798da
 SHA512:
-  metadata.gz: 9bb70c503aea29a948bae0f133f3a1fb3259ee8521661c2b5933c0a669b35c2eadb467cc6c26bb439c4725ad7c551e91a445052ac53fa5c012ac49bdefec8584
-  data.tar.gz: 999bbe921bf36319bccbaedf237f69216465100d5a39df8561b38d91fdfd80553cc57cfcebf7b573fe872f60821185752c2bf18b6205347dac4858ad0674dc9f
+  metadata.gz: c4d22fae62200c0976471c93f5b9dadbfafe7368b14e6ef5b344d0f77267d74c28e6db459e20b4740991792ed3545267870767e9048a33802736844253b0d0ec
+  data.tar.gz: 2f59eea2cead5e5383ebf5ffcb828a4d1e6c3f5913b44682dfcd6c52a118f24d3f111da1af9ebf9eff5c7b36f5ed74f25ce7e11e4c1adf945a4e3a6487c466a2

data/lib/gmt.rb

@@ -56,7 +56,7 @@
 #
 #    gmt = GMT.new
 #    gmt.makecpt('depths.txt',
-#                :C => 'gebco', :i => 2, :Z => nil, :E => 24, :> => 'my_depths.cpt')
+#                C: 'gebco', i: 2, Z: nil, E: 24, :> => 'my_depths.cpt')
 #
 # Note that
 # - the argument(s) (the input file <code>'depths.txt'</code>) preceed(s)
@@ -67,6 +67,15 @@
 # - the output redirection is _also_ treated as hash option, with key
 #   <code>:></code> and value which is the output file.
 #
+# The options without argument can also be specifed by a symbol
+# _argument_, but recall that arguments must proceed the options hash,
+# so the above would be
+#
+#    gmt.makecpt('depths.txt',
+#                :Z, C: 'gebco', i: 2, E: 24, :> => 'my_depths.cpt')
+#
+# using this format.
+#
 # == PostScript functions
 #
 # When creating complex PostScript plots one needs to make several calls to
@@ -82,10 +91,10 @@
 # So one might write
 #
 #     gmt = GMT.new
-#     gmt.psbasemap( …, :file => 'map.ps', :position => :first)
-#     gmt.pstext(    …, :file => 'map.ps', :position => :middle)
-#     gmt.psxy(      …, :file => 'map.ps', :position => :middle)
-#     gmt.pslogo(    …, :file => 'map.ps', :position => :last)
+#     gmt.psbasemap( …, file: 'map.ps', position: :first)
+#     gmt.pstext(    …, file: 'map.ps', position: :middle)
+#     gmt.psxy(      …, file: 'map.ps', position: :middle)
+#     gmt.pslogo(    …, file: 'map.ps', position: :last)
 #
 class GMT
 
@@ -135,11 +144,11 @@ class GMT
     #   @return [Boolean] +true+ on success
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_ps(method)
-      define_method(method) do |*args, **options|
-        coerce_string_arguments!(args)
-        coerce_postscript_options!(options)
-        coerce_append_option!(options)
-        self.send(api_function(method), *args, options_as_pairs(options))
+      define_method(method) do |*args, **opts|
+        args, opts = nilargify(args, opts)
+        coerce_postscript_options!(opts)
+        coerce_append_option!(opts)
+        self.send(api_function(method), *args, options_as_pairs(opts))
       end
     end
 
@@ -150,10 +159,10 @@ class GMT
     #   @return [Boolean] +true+ on success
     #   @see http://gmt.soest.hawaii.edu/doc/latest/$1.html
     def wrapper_other(method)
-      define_method(method) do |*args, **options|
-        coerce_string_arguments!(args)
-        coerce_append_option!(options)
-        self.send(api_function(method), *args, options_as_pairs(options))
+      define_method(method) do |*args, **opts|
+        args, opts = nilargify(args, opts)
+        coerce_append_option!(opts)
+        self.send(api_function(method), *args, options_as_pairs(opts))
       end
     end
 
@@ -176,10 +185,13 @@ class GMT
     [method.to_s, 'c'].join('_').to_sym
   end
 
-  # convert arguments to strings
+  # convert symbol arguments to nil-valued options, so
+  # nilargify(['a', :b], {c: 'd'}) -> [['a'], {b: nil, c: 'd'}]
 
-  def coerce_string_arguments!(arguments)
-    arguments.map!(&:to_s)
+  def nilargify(args, opts)
+    syms, strs = args.partition { |x| x.is_a? Symbol }
+    syms.each { |sym| opts[sym] = nil }
+    [strs, opts]
   end
 
   # for GMT modules which produce PostScript, convert the
@@ -187,11 +199,11 @@ class GMT
   # 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)
+  def coerce_postscript_options!(opts)
+    file = opts.delete(:file)
+    position = opts.delete(:position)
     if file && position then
-      file_options =
+      file_opts =
         case position
         when :first, 'first'
           { :K => nil, :> => file }
@@ -202,28 +214,28 @@ class GMT
         else
           raise ArgumentError, 'position should be :first, :middle or :last'
         end
-      options.merge!(file_options)
+      opts.merge!(file_opts)
     end
   end
 
   # handle the :>> option
 
-  def coerce_append_option!(options)
-    if file = options.delete(:>>) then
-      options[:>] = '>' + file
+  def coerce_append_option!(opts)
+    if file = opts.delete(:>>) then
+      opts[:>] = '>' + file
     end
   end
 
   # convert non-nil argument to string
 
-  def string_unless_nil(argument)
-    argument.to_s unless argument.nil?
+  def string_unless_nil(arg)
+    arg.to_s unless arg.nil?
   end
 
   # convert the options hash to an array of pairs
 
-  def options_as_pairs(options)
-    options.each_with_object(Array.new) do |(key, values), result|
+  def options_as_pairs(opts)
+    opts.each_with_object(Array.new) do |(key, values), result|
       if values.respond_to? :each then
         values.each do |value|
           result << [key, string_unless_nil(value)]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: |
   A Ruby extension for the Generic Mapping Tools (GMT5)
   cartographic toolset.
@@ -118,7 +132,7 @@ requirements:
 - GMT5 installation (test)
 - ghostscript (test)
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generic Mapping Tools (GMT)