rdf-tabular 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +19 -2
  3. data/VERSION +1 -1
  4. data/etc/csvw.jsonld +135 -50
  5. data/lib/rdf/tabular/csvw.rb +215 -181
  6. data/lib/rdf/tabular/format.rb +6 -4
  7. data/lib/rdf/tabular/reader.rb +3 -0
  8. metadata +138 -90
data/lib/rdf/tabular/format.rb CHANGED
@@ -52,10 +52,12 @@ module RDF::Tabular
52
52
  # @return [Hash{Symbol => Lambda(Array, Hash)}]
53
53
  def self.cli_commands
54
54
  {
55
- :"tabular-json" => {
56
- description: "Generate tabular json output, rather than RDF for Tabular data",
57
- help: "tabulary-json --input-format tabular files ...",
58
- prase: false,
55
+ "tabular-json": {
56
+ description: "Serialize using tabular JSON",
57
+ parse: false,
58
+ filter: {format: :tabular}, # Only shows output format set
59
+ option_use: {output_format: :disabled},
60
+ help: "tabular-json --input-format tabular files ...\nGenerate tabular JSON output, rather than RDF for Tabular data",
59
61
  lambda: ->(argv, opts) do
60
62
  raise ArgumentError, "Outputting Tabular JSON only allowed when input format is tabular." unless opts[:format] == :tabular
61
63
  out = opts[:output] || $stdout
data/lib/rdf/tabular/reader.rb CHANGED
@@ -28,16 +28,19 @@ module RDF::Tabular
28
28
  RDF::CLI::Option.new(
29
29
  symbol: :metadata,
30
30
  datatype: RDF::URI,
31
+ control: :url2,
31
32
  on: ["--metadata URI"],
32
33
  description: "user supplied metadata, merged on top of extracted metadata. If provided as a URL, Metadata is loade from that location.") {|arg| RDF::URI(arg)},
33
34
  RDF::CLI::Option.new(
34
35
  symbol: :minimal,
36
+ control: :checkbox,
35
37
  datatype: TrueClass,
36
38
  on: ["--minimal"],
37
39
  description: "Includes only the information gleaned from the cells of the tabular data.") {true},
38
40
  RDF::CLI::Option.new(
39
41
  symbol: :noProv,
40
42
  datatype: TrueClass,
43
+ control: :checkbox,
41
44
  on: ["--no-prov"],
42
45
  description: "do not output optional provenance information.") {true},
43
46
  ]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rdf-tabular
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gregg Kellogg
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-23 00:00:00.000000000 Z
11
+ date: 2017-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcp47
@@ -34,58 +34,82 @@ dependencies:
34
34
  name: rdf
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: '2.1'
39
+ version: '2.2'
40
+ - - "<"
41
+ - !ruby/object:Gem::Version
42
+ version: '4.0'
40
43
  type: :runtime
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
43
46
  requirements:
44
- - - "~>"
47
+ - - ">="
45
48
  - !ruby/object:Gem::Version
46
- version: '2.1'
49
+ version: '2.2'
50
+ - - "<"
51
+ - !ruby/object:Gem::Version
52
+ version: '4.0'
47
53
  - !ruby/object:Gem::Dependency
48
54
  name: rdf-vocab
49
55
  requirement: !ruby/object:Gem::Requirement
50
56
  requirements:
51
- - - "~>"
57
+ - - ">="
52
58
  - !ruby/object:Gem::Version
53
- version: '2.0'
59
+ version: '2.2'
60
+ - - "<"
61
+ - !ruby/object:Gem::Version
62
+ version: '4.0'
54
63
  type: :runtime
55
64
  prerelease: false
56
65
  version_requirements: !ruby/object:Gem::Requirement
57
66
  requirements:
58
- - - "~>"
67
+ - - ">="
59
68
  - !ruby/object:Gem::Version
60
- version: '2.0'
69
+ version: '2.2'
70
+ - - "<"
71
+ - !ruby/object:Gem::Version
72
+ version: '4.0'
61
73
  - !ruby/object:Gem::Dependency
62
74
  name: rdf-xsd
63
75
  requirement: !ruby/object:Gem::Requirement
64
76
  requirements:
65
- - - "~>"
77
+ - - ">="
78
+ - !ruby/object:Gem::Version
79
+ version: '2.2'
80
+ - - "<"
66
81
  - !ruby/object:Gem::Version
67
- version: '2.0'
82
+ version: '4.0'
68
83
  type: :runtime
69
84
  prerelease: false
70
85
  version_requirements: !ruby/object:Gem::Requirement
71
86
  requirements:
72
- - - "~>"
87
+ - - ">="
73
88
  - !ruby/object:Gem::Version
74
- version: '2.0'
89
+ version: '2.2'
90
+ - - "<"
91
+ - !ruby/object:Gem::Version
92
+ version: '4.0'
75
93
  - !ruby/object:Gem::Dependency
76
94
  name: json-ld
77
95
  requirement: !ruby/object:Gem::Requirement
78
96
  requirements:
79
- - - "~>"
97
+ - - ">="
98
+ - !ruby/object:Gem::Version
99
+ version: '2.1'
100
+ - - "<"
80
101
  - !ruby/object:Gem::Version
81
- version: '2.0'
102
+ version: '4.0'
82
103
  type: :runtime
83
104
  prerelease: false
84
105
  version_requirements: !ruby/object:Gem::Requirement
85
106
  requirements:
86
- - - "~>"
107
+ - - ">="
87
108
  - !ruby/object:Gem::Version
88
- version: '2.0'
109
+ version: '2.1'
110
+ - - "<"
111
+ - !ruby/object:Gem::Version
112
+ version: '4.0'
89
113
  - !ruby/object:Gem::Dependency
90
114
  name: addressable
91
115
  requirement: !ruby/object:Gem::Requirement
@@ -120,14 +144,14 @@ dependencies:
120
144
  requirements:
121
145
  - - "~>"
122
146
  - !ruby/object:Gem::Version
123
- version: '3.4'
147
+ version: '3.7'
124
148
  type: :development
125
149
  prerelease: false
126
150
  version_requirements: !ruby/object:Gem::Requirement
127
151
  requirements:
128
152
  - - "~>"
129
153
  - !ruby/object:Gem::Version
130
- version: '3.4'
154
+ version: '3.7'
131
155
  - !ruby/object:Gem::Dependency
132
156
  name: rspec-its
133
157
  requirement: !ruby/object:Gem::Requirement
@@ -146,86 +170,110 @@ dependencies:
146
170
  name: rdf-isomorphic
147
171
  requirement: !ruby/object:Gem::Requirement
148
172
  requirements:
149
- - - "~>"
173
+ - - ">="
174
+ - !ruby/object:Gem::Version
175
+ version: '2.2'
176
+ - - "<"
150
177
  - !ruby/object:Gem::Version
151
- version: '2.0'
178
+ version: '4.0'
152
179
  type: :development
153
180
  prerelease: false
154
181
  version_requirements: !ruby/object:Gem::Requirement
155
182
  requirements:
156
- - - "~>"
183
+ - - ">="
184
+ - !ruby/object:Gem::Version
185
+ version: '2.2'
186
+ - - "<"
157
187
  - !ruby/object:Gem::Version
158
- version: '2.0'
188
+ version: '4.0'
159
189
  - !ruby/object:Gem::Dependency
160
190
  name: rdf-spec
161
191
  requirement: !ruby/object:Gem::Requirement
162
192
  requirements:
163
- - - "~>"
193
+ - - ">="
164
194
  - !ruby/object:Gem::Version
165
- version: '2.0'
195
+ version: '2.2'
196
+ - - "<"
197
+ - !ruby/object:Gem::Version
198
+ version: '4.0'
166
199
  type: :development
167
200
  prerelease: false
168
201
  version_requirements: !ruby/object:Gem::Requirement
169
202
  requirements:
170
- - - "~>"
203
+ - - ">="
204
+ - !ruby/object:Gem::Version
205
+ version: '2.2'
206
+ - - "<"
171
207
  - !ruby/object:Gem::Version
172
- version: '2.0'
208
+ version: '4.0'
173
209
  - !ruby/object:Gem::Dependency
174
210
  name: rdf-turtle
175
211
  requirement: !ruby/object:Gem::Requirement
176
212
  requirements:
177
- - - "~>"
213
+ - - ">="
214
+ - !ruby/object:Gem::Version
215
+ version: '2.2'
216
+ - - "<"
178
217
  - !ruby/object:Gem::Version
179
- version: '2.0'
218
+ version: '4.0'
180
219
  type: :development
181
220
  prerelease: false
182
221
  version_requirements: !ruby/object:Gem::Requirement
183
222
  requirements:
184
- - - "~>"
223
+ - - ">="
224
+ - !ruby/object:Gem::Version
225
+ version: '2.2'
226
+ - - "<"
185
227
  - !ruby/object:Gem::Version
186
- version: '2.0'
228
+ version: '4.0'
187
229
  - !ruby/object:Gem::Dependency
188
230
  name: sparql
189
231
  requirement: !ruby/object:Gem::Requirement
190
232
  requirements:
191
- - - "~>"
233
+ - - ">="
192
234
  - !ruby/object:Gem::Version
193
- version: '2.0'
235
+ version: '2.2'
236
+ - - "<"
237
+ - !ruby/object:Gem::Version
238
+ version: '4.0'
194
239
  type: :development
195
240
  prerelease: false
196
241
  version_requirements: !ruby/object:Gem::Requirement
197
242
  requirements:
198
- - - "~>"
243
+ - - ">="
199
244
  - !ruby/object:Gem::Version
200
- version: '2.0'
245
+ version: '2.2'
246
+ - - "<"
247
+ - !ruby/object:Gem::Version
248
+ version: '4.0'
201
249
  - !ruby/object:Gem::Dependency
202
250
  name: webmock
203
251
  requirement: !ruby/object:Gem::Requirement
204
252
  requirements:
205
253
  - - "~>"
206
254
  - !ruby/object:Gem::Version
207
- version: '2.3'
255
+ version: '3.0'
208
256
  type: :development
209
257
  prerelease: false
210
258
  version_requirements: !ruby/object:Gem::Requirement
211
259
  requirements:
212
260
  - - "~>"
213
261
  - !ruby/object:Gem::Version
214
- version: '2.3'
262
+ version: '3.0'
215
263
  - !ruby/object:Gem::Dependency
216
264
  name: yard
217
265
  requirement: !ruby/object:Gem::Requirement
218
266
  requirements:
219
267
  - - "~>"
220
268
  - !ruby/object:Gem::Version
221
- version: '0.8'
269
+ version: '0.9'
222
270
  type: :development
223
271
  prerelease: false
224
272
  version_requirements: !ruby/object:Gem::Requirement
225
273
  requirements:
226
274
  - - "~>"
227
275
  - !ruby/object:Gem::Version
228
- version: '0.8'
276
+ version: '0.9'
229
277
  description: RDF::Tabular processes tabular data with metadata creating RDF or JSON
230
278
  output.
231
279
  email: public-rdf-ruby@w3.org
@@ -341,73 +389,73 @@ required_rubygems_version: !ruby/object:Gem::Requirement
341
389
  version: '0'
342
390
  requirements: []
343
391
  rubyforge_project:
344
- rubygems_version: 2.6.8
392
+ rubygems_version: 2.6.14
345
393
  signing_key:
346
394
  specification_version: 4
347
395
  summary: Tabular Data RDF Reader and JSON serializer.
348
396
  test_files:
349
- - spec/format_spec.rb
350
- - spec/matchers.rb
351
- - spec/metadata_spec.rb
352
- - spec/reader_spec.rb
353
397
  - spec/spec_helper.rb
354
- - spec/suite_helper.rb
398
+ - spec/metadata_spec.rb
399
+ - spec/matchers.rb
355
400
  - spec/suite_spec.rb
401
+ - spec/suite_helper.rb
402
+ - spec/reader_spec.rb
403
+ - spec/format_spec.rb
356
404
  - spec/uax35_spec.rb
357
- - spec/data/countries-minimal.json
358
- - spec/data/countries-minimal.ttl
359
- - spec/data/countries-standard.json
360
- - spec/data/countries-standard.ttl
361
- - spec/data/countries.csv
362
- - spec/data/countries.csv-minimal.json
405
+ - spec/data/roles.json
363
406
  - spec/data/countries.csv-minimal.ttl
364
- - spec/data/countries.csv-standard.json
365
- - spec/data/countries.csv-standard.ttl
366
- - spec/data/countries.html
367
- - spec/data/countries.json
368
- - spec/data/countries_embed-minimal.json
369
- - spec/data/countries_embed-minimal.ttl
370
407
  - spec/data/countries_embed-standard.json
371
- - spec/data/countries_embed-standard.ttl
372
- - spec/data/countries_embed.html
408
+ - spec/data/tree-ops-standard.json
409
+ - spec/data/countries.csv
410
+ - spec/data/countries_embed-minimal.json
411
+ - spec/data/countries-standard.json
373
412
  - spec/data/countries_html-minimal.json
413
+ - spec/data/countries.csv-minimal.json
414
+ - spec/data/senior-roles.csv
415
+ - spec/data/roles-standard.ttl
416
+ - spec/data/countries_embed-standard.ttl
417
+ - spec/data/senior-roles.json
374
418
  - spec/data/countries_html-minimal.ttl
375
- - spec/data/countries_html-standard.json
376
- - spec/data/countries_html-standard.ttl
377
- - spec/data/country-codes-and-names-minimal.json
378
- - spec/data/country-codes-and-names-minimal.ttl
379
- - spec/data/country-codes-and-names-standard.json
380
- - spec/data/country-codes-and-names-standard.ttl
381
- - spec/data/country-codes-and-names.csv
382
- - spec/data/country_slice.csv
383
419
  - spec/data/junior-roles.csv
420
+ - spec/data/countries.csv-standard.ttl
421
+ - spec/data/tree-ops-ext-standard.json
422
+ - spec/data/countries_html-standard.ttl
423
+ - spec/data/tree-ops-minimal.ttl
384
424
  - spec/data/junior-roles.json
385
425
  - spec/data/roles-minimal.json
386
- - spec/data/roles-minimal.ttl
387
- - spec/data/roles-standard.json
388
- - spec/data/roles-standard.ttl
389
- - spec/data/roles.json
390
- - spec/data/senior-roles.csv
391
- - spec/data/senior-roles.json
392
- - spec/data/test232-metadata.json
393
- - spec/data/test232.csv
426
+ - spec/data/countries_html-standard.json
427
+ - spec/data/country_slice.csv
428
+ - spec/data/countries.csv-standard.json
429
+ - spec/data/tree-ops-virtual-minimal.ttl
430
+ - spec/data/countries.json
431
+ - spec/data/tree-ops.tsv
432
+ - spec/data/tree-ops-virtual.json
433
+ - spec/data/countries-minimal.json
394
434
  - spec/data/tree-ops-atd.json
395
- - spec/data/tree-ops-ext-minimal.json
396
435
  - spec/data/tree-ops-ext-minimal.ttl
397
- - spec/data/tree-ops-ext-standard.json
436
+ - spec/data/tree-ops.csv
437
+ - spec/data/tree-ops-standard.ttl
438
+ - spec/data/tree-ops-virtual-standard.ttl
439
+ - spec/data/countries-minimal.ttl
440
+ - spec/data/tree-ops-virtual-standard.json
441
+ - spec/data/countries.html
398
442
  - spec/data/tree-ops-ext-standard.ttl
399
- - spec/data/tree-ops-ext.csv
443
+ - spec/data/country-codes-and-names-minimal.json
444
+ - spec/data/tree-ops.html
445
+ - spec/data/test232.csv
400
446
  - spec/data/tree-ops-ext.json
401
- - spec/data/tree-ops-minimal.json
402
- - spec/data/tree-ops-minimal.ttl
403
- - spec/data/tree-ops-standard.json
404
- - spec/data/tree-ops-standard.ttl
447
+ - spec/data/roles-minimal.ttl
448
+ - spec/data/countries_embed.html
449
+ - spec/data/country-codes-and-names-standard.json
450
+ - spec/data/country-codes-and-names-minimal.ttl
451
+ - spec/data/countries_embed-minimal.ttl
452
+ - spec/data/roles-standard.json
405
453
  - spec/data/tree-ops-virtual-minimal.json
406
- - spec/data/tree-ops-virtual-minimal.ttl
407
- - spec/data/tree-ops-virtual-standard.json
408
- - spec/data/tree-ops-virtual-standard.ttl
409
- - spec/data/tree-ops-virtual.json
410
- - spec/data/tree-ops.csv
454
+ - spec/data/tree-ops-minimal.json
411
455
  - spec/data/tree-ops.csv-metadata.json
412
- - spec/data/tree-ops.html
413
- - spec/data/tree-ops.tsv
456
+ - spec/data/countries-standard.ttl
457
+ - spec/data/tree-ops-ext-minimal.json
458
+ - spec/data/country-codes-and-names-standard.ttl
459
+ - spec/data/test232-metadata.json
460
+ - spec/data/tree-ops-ext.csv
461
+ - spec/data/country-codes-and-names.csv