sparql 1.0.5 → 1.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. data/README.md +7 -6
  2. data/VERSION +1 -1
  3. data/lib/sparql/algebra/expression.rb +1 -3
  4. data/lib/sparql/algebra/operator.rb +2 -0
  5. data/lib/sparql/algebra/operator/extend.rb +34 -0
  6. data/lib/sparql/grammar/meta.rb +15055 -6451
  7. data/lib/sparql/grammar/parser11.rb +167 -97
  8. data/lib/sparql/grammar/terminals11.rb +16 -60
  9. data/lib/sparql/results.rb +2 -12
  10. metadata +54 -10
  11. checksums.yaml +0 -15
data/lib/sparql/grammar/terminals11.rb CHANGED
@@ -4,60 +4,16 @@ module SPARQL::Grammar
4
4
  module Terminals
5
5
  # Definitions of token regular expressions used for lexical analysis
6
6
 
7
- if RUBY_VERSION >= '1.9'
8
- ##
9
- # Unicode regular expressions for Ruby 1.9+ with the Oniguruma engine.
10
- U_CHARS1 = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
11
- [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
12
- [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
13
- [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
14
- [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
15
- EOS
16
- U_CHARS2 = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]")
17
- IRI_RANGE = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]")
18
- else
19
- ##
20
- # UTF-8 regular expressions for Ruby 1.8.x.
21
- U_CHARS1 = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
22
- \\xC3[\\x80-\\x96]| (?# [\\u00C0-\\u00D6]|)
23
- \\xC3[\\x98-\\xB6]| (?# [\\u00D8-\\u00F6]|)
24
- \\xC3[\\xB8-\\xBF]|[\\xC4-\\xCB][\\x80-\\xBF]| (?# [\\u00F8-\\u02FF]|)
25
- \\xCD[\\xB0-\\xBD]| (?# [\\u0370-\\u037D]|)
26
- \\xCD\\xBF|[\\xCE-\\xDF][\\x80-\\xBF]| (?# [\\u037F-\\u1FFF]|)
27
- \\xE0[\\xA0-\\xBF][\\x80-\\xBF]| (?# ...)
28
- \\xE1[\\x80-\\xBF][\\x80-\\xBF]| (?# ...)
29
- \\xE2\\x80[\\x8C-\\x8D]| (?# [\\u200C-\\u200D]|)
30
- \\xE2\\x81[\\xB0-\\xBF]| (?# [\\u2070-\\u218F]|)
31
- \\xE2[\\x82-\\x85][\\x80-\\xBF]| (?# ...)
32
- \\xE2\\x86[\\x80-\\x8F]| (?# ...)
33
- \\xE2[\\xB0-\\xBE][\\x80-\\xBF]| (?# [\\u2C00-\\u2FEF]|)
34
- \\xE2\\xBF[\\x80-\\xAF]| (?# ...)
35
- \\xE3\\x80[\\x81-\\xBF]| (?# [\\u3001-\\uD7FF]|)
36
- \\xE3[\\x81-\\xBF][\\x80-\\xBF]| (?# ...)
37
- [\\xE4-\\xEC][\\x80-\\xBF][\\x80-\\xBF]| (?# ...)
38
- \\xED[\\x80-\\x9F][\\x80-\\xBF]| (?# ...)
39
- \\xEF[\\xA4-\\xB6][\\x80-\\xBF]| (?# [\\uF900-\\uFDCF]|)
40
- \\xEF\\xB7[\\x80-\\x8F]| (?# ...)
41
- \\xEF\\xB7[\\xB0-\\xBF]| (?# [\\uFDF0-\\uFFFD]|)
42
- \\xEF[\\xB8-\\xBE][\\x80-\\xBF]| (?# ...)
43
- \\xEF\\xBF[\\x80-\\xBD]| (?# ...)
44
- \\xF0[\\x90-\\xBF][\\x80-\\xBF][\\x80-\\xBF]| (?# [\\u{10000}-\\u{EFFFF}])
45
- [\\xF1-\\xF2][\\x80-\\xBF][\\x80-\\xBF][\\x80-\\xBF]|
46
- \\xF3[\\x80-\\xAF][\\x80-\\xBF][\\x80-\\xBF] (?# ...)
47
- EOS
48
- U_CHARS2 = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
49
- \\xC2\\xB7| (?# \\u00B7|)
50
- \\xCC[\\x80-\\xBF]|\\xCD[\\x80-\\xAF]| (?# [\\u0300-\\u036F]|)
51
- \\xE2\\x80\\xBF|\\xE2\\x81\\x80 (?# [\\u203F-\\u2040])
52
- EOS
53
- IRI_RANGE = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
54
- \\x21| (?# ")
55
- [\\x23-\\x3b]|\\x3d| (?# < & >)
56
- [\\x3f-\\x5b]|\\x5d|\\x5f| (?# \ ^ `)
57
- [\\x61-\\x7a]| (?# { } |)
58
- [\\x7e-\\xff]
59
- EOS
60
- end
7
+ ##
8
+ # Unicode regular expressions for Ruby 1.9+ with the Oniguruma engine.
9
+ U_CHARS1 = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
10
+ [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
11
+ [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
12
+ [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
13
+ [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
14
+ EOS
15
+ U_CHARS2 = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]")
16
+ IRI_RANGE = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]")
61
17
 
62
18
  # 26
63
19
  UCHAR = EBNF::LL1::Lexer::UCHAR
@@ -145,11 +101,11 @@ module SPARQL::Grammar
145
101
  |LANGMATCHES|LANGTAG|LANG|LCASE|LIMIT|LOAD
146
102
  |MAX|MD5|MINUS|MINUTES|MIN|MONTH|MOVE
147
103
  |NAMED|NOT|NOW|OFFSET|OPTIONAL
148
- |ORDER|PREFIX|RAND|REDUCED|REGEX|ROUND|SAMPLE|SECONDS
104
+ |ORDER|PREFIX|RAND|REDUCED|REGEX|REPLACE|ROUND|SAMPLE|SECONDS
149
105
  |SELECT|SEPARATOR|SERVICE
150
106
  |SHA1|SHA224|SHA256|SHA384|SHA512
151
- |STRDT|STRENDS|STRLANG|STRLEN|STRSTARTS|SUBSTR|STR|SUM
152
- |TIMEZONE|TO|TZ|UCASE|UNDEF|UNION|URI|USING
107
+ |STRAFTER|STRBEFORE|STRDT|STRENDS|STRLANG|STRLEN|STRSTARTS|STRUUID|SUBSTR|STR|SUM
108
+ |TIMEZONE|TO|TZ|UCASE|UNDEF|UNION|URI|USING|UUID
153
109
  |WHERE|WITH|YEAR
154
110
  |isBLANK|isIRI|isURI|isLITERAL|isNUMERIC|sameTerm
155
111
  |true
@@ -168,11 +124,11 @@ module SPARQL::Grammar
168
124
  LANGMATCHES LANGTAG LANG LCASE LIMIT LOAD
169
125
  MAX MD5 MINUS MINUTES MIN MONTH MOVE
170
126
  NAMED NOT NOW OFFSET OPTIONAL
171
- ORDER PREFIX RAND REDUCED REGEX ROUND SAMPLE SECONDS
127
+ ORDER PREFIX RAND REDUCED REGEX REPLACE ROUND SAMPLE SECONDS
172
128
  SELECT SEPARATOR SERVICE
173
129
  SHA1 SHA224 SHA256 SHA384 SHA512
174
- STRDT STRENDS STRLANG STRLEN STRSTARTS SUBSTR STR SUM
175
- TIMEZONE TO TZ UCASE UNDEF UNION URI USING
130
+ STRAFTER STRBEFORE STRDT STRENDS STRLANG STRLEN STRSTARTS STRUUID SUBSTR STR SUM
131
+ TIMEZONE TO TZ UCASE UNDEF UNION URI USING UUID
176
132
  WHERE WITH YEAR
177
133
  isBLANK isIRI isURI isLITERAL isNUMERIC sameTerm
178
134
  true
data/lib/sparql/results.rb CHANGED
@@ -197,12 +197,7 @@ module SPARQL
197
197
  content_type ||= SPARQL::Results::MIME_TYPES[format] if format
198
198
 
199
199
  serialization.instance_eval do
200
- if RUBY_VERSION < "1.9"
201
- singleton = class << self; self end
202
- singleton.send :define_method, :content_type, lambda { content_type }
203
- else
204
- define_singleton_method(:content_type) { content_type }
205
- end
200
+ define_singleton_method(:content_type) { content_type }
206
201
  end
207
202
 
208
203
  serialization
@@ -268,12 +263,7 @@ module SPARQL
268
263
  end
269
264
 
270
265
  serialization.instance_eval do
271
- if RUBY_VERSION < "1.9"
272
- singleton = class << self; self end
273
- singleton.send :define_method, :content_type, lambda { content_type }
274
- else
275
- define_singleton_method(:content_type) { content_type }
276
- end
266
+ define_singleton_method(:content_type) { content_type }
277
267
  end
278
268
 
279
269
  serialization
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sparql
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.0.6
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Gregg Kellogg
@@ -10,11 +11,12 @@ authors:
10
11
  autorequire:
11
12
  bindir: bin
12
13
  cert_chain: []
13
- date: 2013-04-12 00:00:00.000000000 Z
14
+ date: 2013-04-21 00:00:00.000000000 Z
14
15
  dependencies:
15
16
  - !ruby/object:Gem::Dependency
16
17
  name: rdf
17
18
  requirement: !ruby/object:Gem::Requirement
19
+ none: false
18
20
  requirements:
19
21
  - - ! '>='
20
22
  - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
22
24
  type: :runtime
23
25
  prerelease: false
24
26
  version_requirements: !ruby/object:Gem::Requirement
27
+ none: false
25
28
  requirements:
26
29
  - - ! '>='
27
30
  - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
29
32
  - !ruby/object:Gem::Dependency
30
33
  name: ebnf
31
34
  requirement: !ruby/object:Gem::Requirement
35
+ none: false
32
36
  requirements:
33
37
  - - ! '>='
34
38
  - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
36
40
  type: :runtime
37
41
  prerelease: false
38
42
  version_requirements: !ruby/object:Gem::Requirement
43
+ none: false
39
44
  requirements:
40
45
  - - ! '>='
41
46
  - !ruby/object:Gem::Version
@@ -43,6 +48,7 @@ dependencies:
43
48
  - !ruby/object:Gem::Dependency
44
49
  name: builder
45
50
  requirement: !ruby/object:Gem::Requirement
51
+ none: false
46
52
  requirements:
47
53
  - - ! '>='
48
54
  - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
50
56
  type: :runtime
51
57
  prerelease: false
52
58
  version_requirements: !ruby/object:Gem::Requirement
59
+ none: false
53
60
  requirements:
54
61
  - - ! '>='
55
62
  - !ruby/object:Gem::Version
@@ -57,6 +64,7 @@ dependencies:
57
64
  - !ruby/object:Gem::Dependency
58
65
  name: json
59
66
  requirement: !ruby/object:Gem::Requirement
67
+ none: false
60
68
  requirements:
61
69
  - - ! '>='
62
70
  - !ruby/object:Gem::Version
@@ -64,6 +72,7 @@ dependencies:
64
72
  type: :runtime
65
73
  prerelease: false
66
74
  version_requirements: !ruby/object:Gem::Requirement
75
+ none: false
67
76
  requirements:
68
77
  - - ! '>='
69
78
  - !ruby/object:Gem::Version
@@ -71,6 +80,7 @@ dependencies:
71
80
  - !ruby/object:Gem::Dependency
72
81
  name: sxp
73
82
  requirement: !ruby/object:Gem::Requirement
83
+ none: false
74
84
  requirements:
75
85
  - - ! '>='
76
86
  - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
78
88
  type: :runtime
79
89
  prerelease: false
80
90
  version_requirements: !ruby/object:Gem::Requirement
91
+ none: false
81
92
  requirements:
82
93
  - - ! '>='
83
94
  - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
85
96
  - !ruby/object:Gem::Dependency
86
97
  name: sparql-client
87
98
  requirement: !ruby/object:Gem::Requirement
99
+ none: false
88
100
  requirements:
89
101
  - - ! '>='
90
102
  - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
92
104
  type: :runtime
93
105
  prerelease: false
94
106
  version_requirements: !ruby/object:Gem::Requirement
107
+ none: false
95
108
  requirements:
96
109
  - - ! '>='
97
110
  - !ruby/object:Gem::Version
@@ -99,6 +112,7 @@ dependencies:
99
112
  - !ruby/object:Gem::Dependency
100
113
  name: rdf-xsd
101
114
  requirement: !ruby/object:Gem::Requirement
115
+ none: false
102
116
  requirements:
103
117
  - - ! '>='
104
118
  - !ruby/object:Gem::Version
@@ -106,6 +120,7 @@ dependencies:
106
120
  type: :runtime
107
121
  prerelease: false
108
122
  version_requirements: !ruby/object:Gem::Requirement
123
+ none: false
109
124
  requirements:
110
125
  - - ! '>='
111
126
  - !ruby/object:Gem::Version
@@ -113,6 +128,7 @@ dependencies:
113
128
  - !ruby/object:Gem::Dependency
114
129
  name: sinatra
115
130
  requirement: !ruby/object:Gem::Requirement
131
+ none: false
116
132
  requirements:
117
133
  - - ! '>='
118
134
  - !ruby/object:Gem::Version
@@ -120,6 +136,7 @@ dependencies:
120
136
  type: :development
121
137
  prerelease: false
122
138
  version_requirements: !ruby/object:Gem::Requirement
139
+ none: false
123
140
  requirements:
124
141
  - - ! '>='
125
142
  - !ruby/object:Gem::Version
@@ -127,6 +144,7 @@ dependencies:
127
144
  - !ruby/object:Gem::Dependency
128
145
  name: rack
129
146
  requirement: !ruby/object:Gem::Requirement
147
+ none: false
130
148
  requirements:
131
149
  - - ! '>='
132
150
  - !ruby/object:Gem::Version
@@ -134,6 +152,7 @@ dependencies:
134
152
  type: :development
135
153
  prerelease: false
136
154
  version_requirements: !ruby/object:Gem::Requirement
155
+ none: false
137
156
  requirements:
138
157
  - - ! '>='
139
158
  - !ruby/object:Gem::Version
@@ -141,6 +160,7 @@ dependencies:
141
160
  - !ruby/object:Gem::Dependency
142
161
  name: rack-test
143
162
  requirement: !ruby/object:Gem::Requirement
163
+ none: false
144
164
  requirements:
145
165
  - - ! '>='
146
166
  - !ruby/object:Gem::Version
@@ -148,6 +168,7 @@ dependencies:
148
168
  type: :development
149
169
  prerelease: false
150
170
  version_requirements: !ruby/object:Gem::Requirement
171
+ none: false
151
172
  requirements:
152
173
  - - ! '>='
153
174
  - !ruby/object:Gem::Version
@@ -155,6 +176,7 @@ dependencies:
155
176
  - !ruby/object:Gem::Dependency
156
177
  name: rdf-turtle
157
178
  requirement: !ruby/object:Gem::Requirement
179
+ none: false
158
180
  requirements:
159
181
  - - ! '>='
160
182
  - !ruby/object:Gem::Version
@@ -162,6 +184,7 @@ dependencies:
162
184
  type: :development
163
185
  prerelease: false
164
186
  version_requirements: !ruby/object:Gem::Requirement
187
+ none: false
165
188
  requirements:
166
189
  - - ! '>='
167
190
  - !ruby/object:Gem::Version
@@ -169,6 +192,7 @@ dependencies:
169
192
  - !ruby/object:Gem::Dependency
170
193
  name: linkeddata
171
194
  requirement: !ruby/object:Gem::Requirement
195
+ none: false
172
196
  requirements:
173
197
  - - ! '>='
174
198
  - !ruby/object:Gem::Version
@@ -176,6 +200,7 @@ dependencies:
176
200
  type: :development
177
201
  prerelease: false
178
202
  version_requirements: !ruby/object:Gem::Requirement
203
+ none: false
179
204
  requirements:
180
205
  - - ! '>='
181
206
  - !ruby/object:Gem::Version
@@ -183,6 +208,7 @@ dependencies:
183
208
  - !ruby/object:Gem::Dependency
184
209
  name: rdf-spec
185
210
  requirement: !ruby/object:Gem::Requirement
211
+ none: false
186
212
  requirements:
187
213
  - - ! '>='
188
214
  - !ruby/object:Gem::Version
@@ -190,6 +216,7 @@ dependencies:
190
216
  type: :development
191
217
  prerelease: false
192
218
  version_requirements: !ruby/object:Gem::Requirement
219
+ none: false
193
220
  requirements:
194
221
  - - ! '>='
195
222
  - !ruby/object:Gem::Version
@@ -197,6 +224,7 @@ dependencies:
197
224
  - !ruby/object:Gem::Dependency
198
225
  name: open-uri-cached
199
226
  requirement: !ruby/object:Gem::Requirement
227
+ none: false
200
228
  requirements:
201
229
  - - ! '>='
202
230
  - !ruby/object:Gem::Version
@@ -204,6 +232,7 @@ dependencies:
204
232
  type: :development
205
233
  prerelease: false
206
234
  version_requirements: !ruby/object:Gem::Requirement
235
+ none: false
207
236
  requirements:
208
237
  - - ! '>='
209
238
  - !ruby/object:Gem::Version
@@ -211,6 +240,7 @@ dependencies:
211
240
  - !ruby/object:Gem::Dependency
212
241
  name: equivalent-xml
213
242
  requirement: !ruby/object:Gem::Requirement
243
+ none: false
214
244
  requirements:
215
245
  - - ! '>='
216
246
  - !ruby/object:Gem::Version
@@ -218,6 +248,7 @@ dependencies:
218
248
  type: :development
219
249
  prerelease: false
220
250
  version_requirements: !ruby/object:Gem::Requirement
251
+ none: false
221
252
  requirements:
222
253
  - - ! '>='
223
254
  - !ruby/object:Gem::Version
@@ -225,6 +256,7 @@ dependencies:
225
256
  - !ruby/object:Gem::Dependency
226
257
  name: nokogiri
227
258
  requirement: !ruby/object:Gem::Requirement
259
+ none: false
228
260
  requirements:
229
261
  - - ! '>='
230
262
  - !ruby/object:Gem::Version
@@ -232,6 +264,7 @@ dependencies:
232
264
  type: :development
233
265
  prerelease: false
234
266
  version_requirements: !ruby/object:Gem::Requirement
267
+ none: false
235
268
  requirements:
236
269
  - - ! '>='
237
270
  - !ruby/object:Gem::Version
@@ -239,6 +272,7 @@ dependencies:
239
272
  - !ruby/object:Gem::Dependency
240
273
  name: rspec
241
274
  requirement: !ruby/object:Gem::Requirement
275
+ none: false
242
276
  requirements:
243
277
  - - ! '>='
244
278
  - !ruby/object:Gem::Version
@@ -246,6 +280,7 @@ dependencies:
246
280
  type: :development
247
281
  prerelease: false
248
282
  version_requirements: !ruby/object:Gem::Requirement
283
+ none: false
249
284
  requirements:
250
285
  - - ! '>='
251
286
  - !ruby/object:Gem::Version
@@ -253,20 +288,23 @@ dependencies:
253
288
  - !ruby/object:Gem::Dependency
254
289
  name: spira
255
290
  requirement: !ruby/object:Gem::Requirement
291
+ none: false
256
292
  requirements:
257
- - - ! '>='
293
+ - - '='
258
294
  - !ruby/object:Gem::Version
259
- version: '0'
295
+ version: 0.0.12
260
296
  type: :development
261
297
  prerelease: false
262
298
  version_requirements: !ruby/object:Gem::Requirement
299
+ none: false
263
300
  requirements:
264
- - - ! '>='
301
+ - - '='
265
302
  - !ruby/object:Gem::Version
266
- version: '0'
303
+ version: 0.0.12
267
304
  - !ruby/object:Gem::Dependency
268
305
  name: yard
269
306
  requirement: !ruby/object:Gem::Requirement
307
+ none: false
270
308
  requirements:
271
309
  - - ! '>='
272
310
  - !ruby/object:Gem::Version
@@ -274,6 +312,7 @@ dependencies:
274
312
  type: :development
275
313
  prerelease: false
276
314
  version_requirements: !ruby/object:Gem::Requirement
315
+ none: false
277
316
  requirements:
278
317
  - - ! '>='
279
318
  - !ruby/object:Gem::Version
@@ -316,6 +355,7 @@ files:
316
355
  - lib/sparql/algebra/operator/divide.rb
317
356
  - lib/sparql/algebra/operator/equal.rb
318
357
  - lib/sparql/algebra/operator/exprlist.rb
358
+ - lib/sparql/algebra/operator/extend.rb
319
359
  - lib/sparql/algebra/operator/filter.rb
320
360
  - lib/sparql/algebra/operator/graph.rb
321
361
  - lib/sparql/algebra/operator/greater_than.rb
@@ -361,26 +401,30 @@ files:
361
401
  homepage: http://github.com/ruby-rdf/sparql
362
402
  licenses:
363
403
  - Public Domain
364
- metadata: {}
365
404
  post_install_message:
366
405
  rdoc_options: []
367
406
  require_paths:
368
407
  - lib
369
408
  required_ruby_version: !ruby/object:Gem::Requirement
409
+ none: false
370
410
  requirements:
371
411
  - - ! '>='
372
412
  - !ruby/object:Gem::Version
373
- version: 1.8.7
413
+ version: 1.9.2
374
414
  required_rubygems_version: !ruby/object:Gem::Requirement
415
+ none: false
375
416
  requirements:
376
417
  - - ! '>='
377
418
  - !ruby/object:Gem::Version
378
419
  version: '0'
420
+ segments:
421
+ - 0
422
+ hash: 2959669431674437848
379
423
  requirements: []
380
424
  rubyforge_project: sparql
381
- rubygems_version: 2.0.3
425
+ rubygems_version: 1.8.25
382
426
  signing_key:
383
- specification_version: 4
427
+ specification_version: 3
384
428
  summary: SPARQL library for Ruby.
385
429
  test_files: []
386
430
  has_rdoc: false