gmt 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88539f5f8f1bc7eaa33cad667f4f34bc05af82b5
-  data.tar.gz: 9f731cf9dbfb6e09895f2ebc030ad9d599fa25fd
+  metadata.gz: 9e6a7a0a7dc937c57dc6c075f4c506b7c70ff314
+  data.tar.gz: d3e77c6aee7b31a6dcd2d4a4e07b012eb99a86ee
 SHA512:
-  metadata.gz: 93f48be603b22f30cfd554e3ae78d8e037cd39a0505774a9756c2b048ba53274f587fa165647b7992c2eee1053603237f1818327cbf760428f637e38af322311
-  data.tar.gz: ee9b7af7e6e67a5334da37b78c7d69a1166f85dab656981a188040cf0be2e636cd5f3217914df9f91859158465e4fbc91bf9de8fb4a097499367468d9d87b299
+  metadata.gz: c7472840160e4d774aab02115d3c7a76781224db5b48001c35fc564e1d09073c7533a4f2b5b06cf25b4883bd7a93eb4930a9d11fb997fa75956908b52cf8d7af
+  data.tar.gz: 96d94b7badc20cfc8ff20f4cfde1e3eab56071aaf6ecc5fbcd50a295bedbd29caf6a07ab0716a18016613eec63f36e8c4f48deae61abb9ca295f6c0953c24342

data/ext/gmt/gmt.c

@@ -221,6 +221,8 @@ GMT_FUN(psconvert)
 
 #undef GMT_FUN
 
+#define RB_DPM(name) rb_define_private_method(cGMT, #name "_c", gmt_ ## name, -1)
+
 void Init_gmt(void)
 {
   VALUE cGMT = rb_const_get(rb_cObject, rb_intern("GMT"));
@@ -231,111 +233,113 @@ void Init_gmt(void)
 
   /* Filtering of 1-D and 2-D Data */
 
-  rb_define_private_method(cGMT, "blockmean_c", gmt_blockmean, -1);
-  rb_define_private_method(cGMT, "blockmedian_c", gmt_blockmedian, -1);
-  rb_define_private_method(cGMT, "blockmode_c", gmt_blockmode, -1);
-  rb_define_private_method(cGMT, "filter1d_c", gmt_filter1d, -1);
-  rb_define_private_method(cGMT, "grdfilter_c", gmt_grdfilter, -1);
+  RB_DPM(blockmean);
+  RB_DPM(blockmedian);
+  RB_DPM(blockmode);
+  RB_DPM(filter1d);
+  RB_DPM(grdfilter);
 
   /* Plotting of 1-D and 2-D Data */
 
-  rb_define_private_method(cGMT, "gmtlogo_c", gmt_gmtlogo, -1);
-  rb_define_private_method(cGMT, "grdcontour_c", gmt_grdcontour, -1);
-  rb_define_private_method(cGMT, "grdimage_c", gmt_grdimage, -1);
-  rb_define_private_method(cGMT, "grdvector_c", gmt_grdvector, -1);
-  rb_define_private_method(cGMT, "grdview_c", gmt_grdview, -1);
-  rb_define_private_method(cGMT, "psbasemap_c", gmt_psbasemap, -1);
-  rb_define_private_method(cGMT, "psclip_c", gmt_psclip, -1);
-  rb_define_private_method(cGMT, "pscoast_c", gmt_pscoast, -1);
-  rb_define_private_method(cGMT, "pscontour_c", gmt_pscontour, -1);
-  rb_define_private_method(cGMT, "pshistogram_c", gmt_pshistogram, -1);
-  rb_define_private_method(cGMT, "psimage_c", gmt_psimage, -1);
-  rb_define_private_method(cGMT, "pslegend_c", gmt_pslegend, -1);
-  rb_define_private_method(cGMT, "psmask_c", gmt_psmask, -1);
-  rb_define_private_method(cGMT, "psrose_c", gmt_psrose, -1);
-  rb_define_private_method(cGMT, "psscale_c", gmt_psscale, -1);
-  rb_define_private_method(cGMT, "pstext_c", gmt_pstext, -1);
-  rb_define_private_method(cGMT, "pswiggle_c", gmt_pswiggle, -1);
-  rb_define_private_method(cGMT, "psxy_c", gmt_psxy, -1);
-  rb_define_private_method(cGMT, "psxyz_c", gmt_psxyz, -1);
+  RB_DPM(gmtlogo);
+  RB_DPM(grdcontour);
+  RB_DPM(grdimage);
+  RB_DPM(grdvector);
+  RB_DPM(grdview);
+  RB_DPM(psbasemap);
+  RB_DPM(psclip);
+  RB_DPM(pscoast);
+  RB_DPM(pscontour);
+  RB_DPM(pshistogram);
+  RB_DPM(psimage);
+  RB_DPM(pslegend);
+  RB_DPM(psmask);
+  RB_DPM(psrose);
+  RB_DPM(psscale);
+  RB_DPM(pstext);
+  RB_DPM(pswiggle);
+  RB_DPM(psxy);
+  RB_DPM(psxyz);
 
   /* Gridding of Data Tables */
 
-  rb_define_private_method(cGMT, "greenspline_c", gmt_greenspline, -1);
-  rb_define_private_method(cGMT, "nearneighbor_c", gmt_nearneighbor, -1);
-  rb_define_private_method(cGMT, "sphinterpolate_c", gmt_sphinterpolate, -1);
-  rb_define_private_method(cGMT, "surface_c", gmt_surface, -1);
-  rb_define_private_method(cGMT, "triangulate_c", gmt_triangulate, -1);
+  RB_DPM(greenspline);
+  RB_DPM(nearneighbor);
+  RB_DPM(sphinterpolate);
+  RB_DPM(surface);
+  RB_DPM(triangulate);
 
   /* Sampling of 1-D and 2-D Data */
 
-  rb_define_private_method(cGMT, "gmtsimplify_c", gmt_gmtsimplify, -1);
-  rb_define_private_method(cGMT, "grdsample_c", gmt_grdsample, -1);
-  rb_define_private_method(cGMT, "grdtrack_c", gmt_grdtrack, -1);
-  rb_define_private_method(cGMT, "sample1d_c", gmt_sample1d, -1);
+  RB_DPM(gmtsimplify);
+  RB_DPM(grdsample);
+  RB_DPM(grdtrack);
+  RB_DPM(sample1d);
 
   /* Projection and Map-transformation */
 
-  rb_define_private_method(cGMT, "grdproject_c", gmt_grdproject, -1);
-  rb_define_private_method(cGMT, "mapproject_c", gmt_mapproject, -1);
-  rb_define_private_method(cGMT, "project_c", gmt_project, -1);
+  RB_DPM(grdproject);
+  RB_DPM(mapproject);
+  RB_DPM(project);
 
   /* Retrieve Information */
 
-  rb_define_private_method(cGMT, "gmtdefaults_c", gmt_gmtdefaults, -1);
-  rb_define_private_method(cGMT, "gmtget_c", gmt_gmtget, -1);
-  rb_define_private_method(cGMT, "gmtinfo_c", gmt_gmtinfo, -1);
-  rb_define_private_method(cGMT, "gmtset_c", gmt_gmtset, -1);
-  rb_define_private_method(cGMT, "grdinfo_c", gmt_grdinfo, -1);
+  RB_DPM(gmtdefaults);
+  RB_DPM(gmtget);
+  RB_DPM(gmtinfo);
+  RB_DPM(gmtset);
+  RB_DPM(grdinfo);
 
   /* Mathematical Operations on Tables or Grids */
 
-  rb_define_private_method(cGMT, "gmtmath_c", gmt_gmtmath, -1);
-  rb_define_private_method(cGMT, "makecpt_c", gmt_makecpt, -1);
-  rb_define_private_method(cGMT, "spectrum1d_c", gmt_spectrum1d, -1);
-  rb_define_private_method(cGMT, "sph2grd_c", gmt_sph2grd, -1);
-  rb_define_private_method(cGMT, "sphdistance_c", gmt_sphdistance, -1);
-  rb_define_private_method(cGMT, "sphtriangulate_c", gmt_sphtriangulate, -1);
+  RB_DPM(gmtmath);
+  RB_DPM(makecpt);
+  RB_DPM(spectrum1d);
+  RB_DPM(sph2grd);
+  RB_DPM(sphdistance);
+  RB_DPM(sphtriangulate);
 
   /* Convert or Extract Subsets of Data */
 
-  rb_define_private_method(cGMT, "gmtconnect_c", gmt_gmtconnect, -1);
-  rb_define_private_method(cGMT, "gmtconvert_c", gmt_gmtconvert, -1);
-  rb_define_private_method(cGMT, "gmtselect_c", gmt_gmtselect, -1);
-  rb_define_private_method(cGMT, "gmtspatial_c", gmt_gmtspatial, -1);
-  rb_define_private_method(cGMT, "gmtvector_c", gmt_gmtvector, -1);
-  rb_define_private_method(cGMT, "grd2rgb_c", gmt_grd2rgb, -1);
-  rb_define_private_method(cGMT, "grd2xyz_c", gmt_grd2xyz, -1);
-  rb_define_private_method(cGMT, "grdblend_c", gmt_grdblend, -1);
-  rb_define_private_method(cGMT, "grdconvert_c", gmt_grdconvert, -1);
-  rb_define_private_method(cGMT, "grdcut_c", gmt_grdcut, -1);
-  rb_define_private_method(cGMT, "grdpaste_c", gmt_grdpaste, -1);
-  rb_define_private_method(cGMT, "splitxyz_c", gmt_splitxyz, -1);
-  rb_define_private_method(cGMT, "xyz2grd_c", gmt_xyz2grd, -1);
+  RB_DPM(gmtconnect);
+  RB_DPM(gmtconvert);
+  RB_DPM(gmtselect);
+  RB_DPM(gmtspatial);
+  RB_DPM(gmtvector);
+  RB_DPM(grd2rgb);
+  RB_DPM(grd2xyz);
+  RB_DPM(grdblend);
+  RB_DPM(grdconvert);
+  RB_DPM(grdcut);
+  RB_DPM(grdpaste);
+  RB_DPM(splitxyz);
+  RB_DPM(xyz2grd);
 
   /* Determine Trends in 1-D and 2-D Data */
 
-  rb_define_private_method(cGMT, "fitcircle_c", gmt_fitcircle, -1);
-  rb_define_private_method(cGMT, "gmtregress_c", gmt_gmtregress, -1);
-  rb_define_private_method(cGMT, "trend1d_c", gmt_trend1d, -1);
-  rb_define_private_method(cGMT, "trend2d_c", gmt_trend2d, -1);
+  RB_DPM(fitcircle);
+  RB_DPM(gmtregress);
+  RB_DPM(trend1d);
+  RB_DPM(trend2d);
 
   /* Other Operations on 2-D Grids */
 
-  rb_define_private_method(cGMT, "grd2cpt_c", gmt_grd2cpt, -1);
-  rb_define_private_method(cGMT, "grdclip_c", gmt_grdclip, -1);
-  rb_define_private_method(cGMT, "grdedit_c", gmt_grdedit, -1);
-  rb_define_private_method(cGMT, "grdfft_c", gmt_grdfft, -1);
-  rb_define_private_method(cGMT, "grdgradient_c", gmt_grdgradient, -1);
-  rb_define_private_method(cGMT, "grdhisteq_c", gmt_grdhisteq, -1);
-  rb_define_private_method(cGMT, "grdlandmask_c", gmt_grdlandmask, -1);
-  rb_define_private_method(cGMT, "grdmask_c", gmt_grdmask, -1);
-  rb_define_private_method(cGMT, "grdmath_c", gmt_grdmath, -1);
-  rb_define_private_method(cGMT, "grdvolume_c", gmt_grdvolume, -1);
+  RB_DPM(grd2cpt);
+  RB_DPM(grdclip);
+  RB_DPM(grdedit);
+  RB_DPM(grdfft);
+  RB_DPM(grdgradient);
+  RB_DPM(grdhisteq);
+  RB_DPM(grdlandmask);
+  RB_DPM(grdmask);
+  RB_DPM(grdmath);
+  RB_DPM(grdvolume);
 
   /* Miscellaneous Tools */
 
-  rb_define_private_method(cGMT, "gmt2kml_c", gmt_gmt2kml, -1);
-  rb_define_private_method(cGMT, "kml2gmt_c", gmt_kml2gmt, -1);
-  rb_define_private_method(cGMT, "psconvert_c", gmt_psconvert, -1);
+  RB_DPM(gmt2kml);
+  RB_DPM(kml2gmt);
+  RB_DPM(psconvert);
 }
+
+#undef RB_DPM

data/lib/gmt.rb

@@ -127,7 +127,7 @@ class GMT
     public
 
     # @yield [gmt] yields the {GMT} session to the block
-    def session(&block)
+    def session
       yield GMT.new
     end
 
@@ -188,8 +188,7 @@ class GMT
   # convert the options hash to an array of pairs
 
   def options_as_pairs(options)
-    options.inject(Array.new) do |result, pair|
-      key, values = pair
+    options.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)]
@@ -197,7 +196,6 @@ class GMT
       else
         result << [key, string_unless_nil(values)]
       end
-      result
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,45 +30,45 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: |
   A Ruby extension for the Generic Mapping Tools (GMT5)
-  cartographic toolset (work-in-progress).
+  cartographic toolset.
 email: j.j.green@gmx.co.uk
 executables: []
 extensions:
@@ -100,10 +100,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- GMT5 development libraries
-- ghostscript (for tests)
+- GMT5 development libraries (compile)
+- GMT5 installation (test)
+- ghostscript (test)
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generic Mapping Tools (GMT)