gmt 0.0.11 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/ext/gmt/gmt.c +81 -77
  3. data/lib/gmt.rb +2 -4
  4. metadata +13 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 88539f5f8f1bc7eaa33cad667f4f34bc05af82b5
4
- data.tar.gz: 9f731cf9dbfb6e09895f2ebc030ad9d599fa25fd
3
+ metadata.gz: 9e6a7a0a7dc937c57dc6c075f4c506b7c70ff314
4
+ data.tar.gz: d3e77c6aee7b31a6dcd2d4a4e07b012eb99a86ee
5
5
  SHA512:
6
- metadata.gz: 93f48be603b22f30cfd554e3ae78d8e037cd39a0505774a9756c2b048ba53274f587fa165647b7992c2eee1053603237f1818327cbf760428f637e38af322311
7
- data.tar.gz: ee9b7af7e6e67a5334da37b78c7d69a1166f85dab656981a188040cf0be2e636cd5f3217914df9f91859158465e4fbc91bf9de8fb4a097499367468d9d87b299
6
+ metadata.gz: c7472840160e4d774aab02115d3c7a76781224db5b48001c35fc564e1d09073c7533a4f2b5b06cf25b4883bd7a93eb4930a9d11fb997fa75956908b52cf8d7af
7
+ data.tar.gz: 96d94b7badc20cfc8ff20f4cfde1e3eab56071aaf6ecc5fbcd50a295bedbd29caf6a07ab0716a18016613eec63f36e8c4f48deae61abb9ca295f6c0953c24342
data/ext/gmt/gmt.c CHANGED
@@ -221,6 +221,8 @@ GMT_FUN(psconvert)
221
221
 
222
222
  #undef GMT_FUN
223
223
 
224
+ #define RB_DPM(name) rb_define_private_method(cGMT, #name "_c", gmt_ ## name, -1)
225
+
224
226
  void Init_gmt(void)
225
227
  {
226
228
  VALUE cGMT = rb_const_get(rb_cObject, rb_intern("GMT"));
@@ -231,111 +233,113 @@ void Init_gmt(void)
231
233
 
232
234
  /* Filtering of 1-D and 2-D Data */
233
235
 
234
- rb_define_private_method(cGMT, "blockmean_c", gmt_blockmean, -1);
235
- rb_define_private_method(cGMT, "blockmedian_c", gmt_blockmedian, -1);
236
- rb_define_private_method(cGMT, "blockmode_c", gmt_blockmode, -1);
237
- rb_define_private_method(cGMT, "filter1d_c", gmt_filter1d, -1);
238
- rb_define_private_method(cGMT, "grdfilter_c", gmt_grdfilter, -1);
236
+ RB_DPM(blockmean);
237
+ RB_DPM(blockmedian);
238
+ RB_DPM(blockmode);
239
+ RB_DPM(filter1d);
240
+ RB_DPM(grdfilter);
239
241
 
240
242
  /* Plotting of 1-D and 2-D Data */
241
243
 
242
- rb_define_private_method(cGMT, "gmtlogo_c", gmt_gmtlogo, -1);
243
- rb_define_private_method(cGMT, "grdcontour_c", gmt_grdcontour, -1);
244
- rb_define_private_method(cGMT, "grdimage_c", gmt_grdimage, -1);
245
- rb_define_private_method(cGMT, "grdvector_c", gmt_grdvector, -1);
246
- rb_define_private_method(cGMT, "grdview_c", gmt_grdview, -1);
247
- rb_define_private_method(cGMT, "psbasemap_c", gmt_psbasemap, -1);
248
- rb_define_private_method(cGMT, "psclip_c", gmt_psclip, -1);
249
- rb_define_private_method(cGMT, "pscoast_c", gmt_pscoast, -1);
250
- rb_define_private_method(cGMT, "pscontour_c", gmt_pscontour, -1);
251
- rb_define_private_method(cGMT, "pshistogram_c", gmt_pshistogram, -1);
252
- rb_define_private_method(cGMT, "psimage_c", gmt_psimage, -1);
253
- rb_define_private_method(cGMT, "pslegend_c", gmt_pslegend, -1);
254
- rb_define_private_method(cGMT, "psmask_c", gmt_psmask, -1);
255
- rb_define_private_method(cGMT, "psrose_c", gmt_psrose, -1);
256
- rb_define_private_method(cGMT, "psscale_c", gmt_psscale, -1);
257
- rb_define_private_method(cGMT, "pstext_c", gmt_pstext, -1);
258
- rb_define_private_method(cGMT, "pswiggle_c", gmt_pswiggle, -1);
259
- rb_define_private_method(cGMT, "psxy_c", gmt_psxy, -1);
260
- rb_define_private_method(cGMT, "psxyz_c", gmt_psxyz, -1);
244
+ RB_DPM(gmtlogo);
245
+ RB_DPM(grdcontour);
246
+ RB_DPM(grdimage);
247
+ RB_DPM(grdvector);
248
+ RB_DPM(grdview);
249
+ RB_DPM(psbasemap);
250
+ RB_DPM(psclip);
251
+ RB_DPM(pscoast);
252
+ RB_DPM(pscontour);
253
+ RB_DPM(pshistogram);
254
+ RB_DPM(psimage);
255
+ RB_DPM(pslegend);
256
+ RB_DPM(psmask);
257
+ RB_DPM(psrose);
258
+ RB_DPM(psscale);
259
+ RB_DPM(pstext);
260
+ RB_DPM(pswiggle);
261
+ RB_DPM(psxy);
262
+ RB_DPM(psxyz);
261
263
 
262
264
  /* Gridding of Data Tables */
263
265
 
264
- rb_define_private_method(cGMT, "greenspline_c", gmt_greenspline, -1);
265
- rb_define_private_method(cGMT, "nearneighbor_c", gmt_nearneighbor, -1);
266
- rb_define_private_method(cGMT, "sphinterpolate_c", gmt_sphinterpolate, -1);
267
- rb_define_private_method(cGMT, "surface_c", gmt_surface, -1);
268
- rb_define_private_method(cGMT, "triangulate_c", gmt_triangulate, -1);
266
+ RB_DPM(greenspline);
267
+ RB_DPM(nearneighbor);
268
+ RB_DPM(sphinterpolate);
269
+ RB_DPM(surface);
270
+ RB_DPM(triangulate);
269
271
 
270
272
  /* Sampling of 1-D and 2-D Data */
271
273
 
272
- rb_define_private_method(cGMT, "gmtsimplify_c", gmt_gmtsimplify, -1);
273
- rb_define_private_method(cGMT, "grdsample_c", gmt_grdsample, -1);
274
- rb_define_private_method(cGMT, "grdtrack_c", gmt_grdtrack, -1);
275
- rb_define_private_method(cGMT, "sample1d_c", gmt_sample1d, -1);
274
+ RB_DPM(gmtsimplify);
275
+ RB_DPM(grdsample);
276
+ RB_DPM(grdtrack);
277
+ RB_DPM(sample1d);
276
278
 
277
279
  /* Projection and Map-transformation */
278
280
 
279
- rb_define_private_method(cGMT, "grdproject_c", gmt_grdproject, -1);
280
- rb_define_private_method(cGMT, "mapproject_c", gmt_mapproject, -1);
281
- rb_define_private_method(cGMT, "project_c", gmt_project, -1);
281
+ RB_DPM(grdproject);
282
+ RB_DPM(mapproject);
283
+ RB_DPM(project);
282
284
 
283
285
  /* Retrieve Information */
284
286
 
285
- rb_define_private_method(cGMT, "gmtdefaults_c", gmt_gmtdefaults, -1);
286
- rb_define_private_method(cGMT, "gmtget_c", gmt_gmtget, -1);
287
- rb_define_private_method(cGMT, "gmtinfo_c", gmt_gmtinfo, -1);
288
- rb_define_private_method(cGMT, "gmtset_c", gmt_gmtset, -1);
289
- rb_define_private_method(cGMT, "grdinfo_c", gmt_grdinfo, -1);
287
+ RB_DPM(gmtdefaults);
288
+ RB_DPM(gmtget);
289
+ RB_DPM(gmtinfo);
290
+ RB_DPM(gmtset);
291
+ RB_DPM(grdinfo);
290
292
 
291
293
  /* Mathematical Operations on Tables or Grids */
292
294
 
293
- rb_define_private_method(cGMT, "gmtmath_c", gmt_gmtmath, -1);
294
- rb_define_private_method(cGMT, "makecpt_c", gmt_makecpt, -1);
295
- rb_define_private_method(cGMT, "spectrum1d_c", gmt_spectrum1d, -1);
296
- rb_define_private_method(cGMT, "sph2grd_c", gmt_sph2grd, -1);
297
- rb_define_private_method(cGMT, "sphdistance_c", gmt_sphdistance, -1);
298
- rb_define_private_method(cGMT, "sphtriangulate_c", gmt_sphtriangulate, -1);
295
+ RB_DPM(gmtmath);
296
+ RB_DPM(makecpt);
297
+ RB_DPM(spectrum1d);
298
+ RB_DPM(sph2grd);
299
+ RB_DPM(sphdistance);
300
+ RB_DPM(sphtriangulate);
299
301
 
300
302
  /* Convert or Extract Subsets of Data */
301
303
 
302
- rb_define_private_method(cGMT, "gmtconnect_c", gmt_gmtconnect, -1);
303
- rb_define_private_method(cGMT, "gmtconvert_c", gmt_gmtconvert, -1);
304
- rb_define_private_method(cGMT, "gmtselect_c", gmt_gmtselect, -1);
305
- rb_define_private_method(cGMT, "gmtspatial_c", gmt_gmtspatial, -1);
306
- rb_define_private_method(cGMT, "gmtvector_c", gmt_gmtvector, -1);
307
- rb_define_private_method(cGMT, "grd2rgb_c", gmt_grd2rgb, -1);
308
- rb_define_private_method(cGMT, "grd2xyz_c", gmt_grd2xyz, -1);
309
- rb_define_private_method(cGMT, "grdblend_c", gmt_grdblend, -1);
310
- rb_define_private_method(cGMT, "grdconvert_c", gmt_grdconvert, -1);
311
- rb_define_private_method(cGMT, "grdcut_c", gmt_grdcut, -1);
312
- rb_define_private_method(cGMT, "grdpaste_c", gmt_grdpaste, -1);
313
- rb_define_private_method(cGMT, "splitxyz_c", gmt_splitxyz, -1);
314
- rb_define_private_method(cGMT, "xyz2grd_c", gmt_xyz2grd, -1);
304
+ RB_DPM(gmtconnect);
305
+ RB_DPM(gmtconvert);
306
+ RB_DPM(gmtselect);
307
+ RB_DPM(gmtspatial);
308
+ RB_DPM(gmtvector);
309
+ RB_DPM(grd2rgb);
310
+ RB_DPM(grd2xyz);
311
+ RB_DPM(grdblend);
312
+ RB_DPM(grdconvert);
313
+ RB_DPM(grdcut);
314
+ RB_DPM(grdpaste);
315
+ RB_DPM(splitxyz);
316
+ RB_DPM(xyz2grd);
315
317
 
316
318
  /* Determine Trends in 1-D and 2-D Data */
317
319
 
318
- rb_define_private_method(cGMT, "fitcircle_c", gmt_fitcircle, -1);
319
- rb_define_private_method(cGMT, "gmtregress_c", gmt_gmtregress, -1);
320
- rb_define_private_method(cGMT, "trend1d_c", gmt_trend1d, -1);
321
- rb_define_private_method(cGMT, "trend2d_c", gmt_trend2d, -1);
320
+ RB_DPM(fitcircle);
321
+ RB_DPM(gmtregress);
322
+ RB_DPM(trend1d);
323
+ RB_DPM(trend2d);
322
324
 
323
325
  /* Other Operations on 2-D Grids */
324
326
 
325
- rb_define_private_method(cGMT, "grd2cpt_c", gmt_grd2cpt, -1);
326
- rb_define_private_method(cGMT, "grdclip_c", gmt_grdclip, -1);
327
- rb_define_private_method(cGMT, "grdedit_c", gmt_grdedit, -1);
328
- rb_define_private_method(cGMT, "grdfft_c", gmt_grdfft, -1);
329
- rb_define_private_method(cGMT, "grdgradient_c", gmt_grdgradient, -1);
330
- rb_define_private_method(cGMT, "grdhisteq_c", gmt_grdhisteq, -1);
331
- rb_define_private_method(cGMT, "grdlandmask_c", gmt_grdlandmask, -1);
332
- rb_define_private_method(cGMT, "grdmask_c", gmt_grdmask, -1);
333
- rb_define_private_method(cGMT, "grdmath_c", gmt_grdmath, -1);
334
- rb_define_private_method(cGMT, "grdvolume_c", gmt_grdvolume, -1);
327
+ RB_DPM(grd2cpt);
328
+ RB_DPM(grdclip);
329
+ RB_DPM(grdedit);
330
+ RB_DPM(grdfft);
331
+ RB_DPM(grdgradient);
332
+ RB_DPM(grdhisteq);
333
+ RB_DPM(grdlandmask);
334
+ RB_DPM(grdmask);
335
+ RB_DPM(grdmath);
336
+ RB_DPM(grdvolume);
335
337
 
336
338
  /* Miscellaneous Tools */
337
339
 
338
- rb_define_private_method(cGMT, "gmt2kml_c", gmt_gmt2kml, -1);
339
- rb_define_private_method(cGMT, "kml2gmt_c", gmt_kml2gmt, -1);
340
- rb_define_private_method(cGMT, "psconvert_c", gmt_psconvert, -1);
340
+ RB_DPM(gmt2kml);
341
+ RB_DPM(kml2gmt);
342
+ RB_DPM(psconvert);
341
343
  }
344
+
345
+ #undef RB_DPM
data/lib/gmt.rb CHANGED
@@ -127,7 +127,7 @@ class GMT
127
127
  public
128
128
 
129
129
  # @yield [gmt] yields the {GMT} session to the block
130
- def session(&block)
130
+ def session
131
131
  yield GMT.new
132
132
  end
133
133
 
@@ -188,8 +188,7 @@ class GMT
188
188
  # convert the options hash to an array of pairs
189
189
 
190
190
  def options_as_pairs(options)
191
- options.inject(Array.new) do |result, pair|
192
- key, values = pair
191
+ options.each_with_object(Array.new) do |(key, values), result|
193
192
  if values.respond_to? :each then
194
193
  values.each do |value|
195
194
  result << [key, string_unless_nil(value)]
@@ -197,7 +196,6 @@ class GMT
197
196
  else
198
197
  result << [key, string_unless_nil(values)]
199
198
  end
200
- result
201
199
  end
202
200
  end
203
201
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gmt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - J.J. Green
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-06 00:00:00.000000000 Z
11
+ date: 2017-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -30,45 +30,45 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '11'
33
+ version: '12.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '11'
40
+ version: '12.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '3.4'
47
+ version: '3.6'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '3.4'
54
+ version: '3.6'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: yard
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0.8'
61
+ version: '0.9'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '0.8'
68
+ version: '0.9'
69
69
  description: |
70
70
  A Ruby extension for the Generic Mapping Tools (GMT5)
71
- cartographic toolset (work-in-progress).
71
+ cartographic toolset.
72
72
  email: j.j.green@gmx.co.uk
73
73
  executables: []
74
74
  extensions:
@@ -100,10 +100,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  - !ruby/object:Gem::Version
101
101
  version: '0'
102
102
  requirements:
103
- - GMT5 development libraries
104
- - ghostscript (for tests)
103
+ - GMT5 development libraries (compile)
104
+ - GMT5 installation (test)
105
+ - ghostscript (test)
105
106
  rubyforge_project:
106
- rubygems_version: 2.2.2
107
+ rubygems_version: 2.5.1
107
108
  signing_key:
108
109
  specification_version: 4
109
110
  summary: Generic Mapping Tools (GMT)