sparql 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +15 -0
  2. data/README.md +1 -1
  3. data/VERSION +1 -1
  4. data/lib/sparql/algebra/extensions.rb +1 -6
  5. data/lib/sparql/algebra/operator/and.rb +1 -1
  6. data/lib/sparql/algebra/operator/not.rb +1 -1
  7. data/lib/sparql/algebra/operator/or.rb +1 -1
  8. data/lib/sparql/grammar.rb +7 -30
  9. data/lib/sparql/grammar/meta.rb +27367 -19824
  10. data/lib/sparql/grammar/parser11.rb +8 -10
  11. data/lib/sparql/grammar/terminals11.rb +6 -6
  12. data/lib/sparql/results.rb +5 -5
  13. metadata +9 -47
data/lib/sparql/grammar/parser11.rb CHANGED
@@ -168,7 +168,7 @@ module SPARQL::Grammar
168
168
  when '&&' then add_prod_datum(:ConditionalAndExpression, token.value)
169
169
  when '||' then add_prod_datum(:ConditionalOrExpression, token.value)
170
170
  when '!' then add_prod_datum(:UnaryExpression, token.value)
171
- when 'a' then add_prod_datum(:Verb, RDF.type)
171
+ when 'a' then add_prod_datum(:Verb, (a = RDF.type.dup; a.lexical = 'a'; a))
172
172
  when /true|false/ then add_prod_datum(:literal, RDF::Literal::Boolean.new(token.value.downcase))
173
173
  when /ASC|DESC/ then add_prod_datum(:OrderDirection, token.value.downcase.to_sym)
174
174
  when /DISTINCT|REDUCED/ then add_prod_datum(:DISTINCT_REDUCED, token.value.downcase.to_sym)
@@ -434,14 +434,12 @@ module SPARQL::Grammar
434
434
 
435
435
  # [59] GraphGraphPattern ::= 'GRAPH' VarOrIRIref GroupGraphPattern
436
436
  production(:GraphGraphPattern) do |input, data, callback|
437
- if data[:query]
438
- name = (data[:VarOrIRIref]).last
439
- bgp = data[:query].first
440
- if name
441
- add_prod_data(:query, SPARQL::Algebra::Expression.for(:graph, name, bgp))
442
- else
443
- add_prod_data(:query, bgp)
444
- end
437
+ name = (data[:VarOrIRIref]).last
438
+ bgp = data[:query] ? data[:query].first : SPARQL::Algebra::Operator::BGP.new
439
+ if name
440
+ add_prod_data(:query, SPARQL::Algebra::Expression.for(:graph, name, bgp))
441
+ else
442
+ add_prod_data(:query, bgp)
445
443
  end
446
444
  end
447
445
 
@@ -1281,7 +1279,7 @@ module SPARQL::Grammar
1281
1279
  #
1282
1280
  # @yieldreturn [String] added to message
1283
1281
  def debug(*args)
1284
- return unless @options[:debug] || RDF::Turtle.debug?
1282
+ return unless @options[:debug]
1285
1283
  options = args.last.is_a?(Hash) ? args.pop : {}
1286
1284
  debug_level = options.fetch(:level, 1)
1287
1285
  return unless debug_level <= DEBUG_LEVEL
data/lib/sparql/grammar/terminals11.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'rdf/ll1/lexer'
1
+ require 'ebnf/ll1/lexer'
2
2
 
3
3
  module SPARQL::Grammar
4
4
  module Terminals
@@ -91,9 +91,9 @@ module SPARQL::Grammar
91
91
  # 129
92
92
  PNAME_NS = /#{PN_PREFIX}?:/
93
93
  # 130
94
- PNAME_LN = /#{PNAME_NS}#{PN_LOCAL}/
94
+ PNAME_LN = /(?:#{PNAME_NS})(?:#{PN_LOCAL})/
95
95
  # 131
96
- BLANK_NODE_LABEL = /_:((?:[0-9]|#{PN_CHARS_U})(?:#{PN_CHARS}|\.)*)/
96
+ BLANK_NODE_LABEL = /_:(?:[0-9]|#{PN_CHARS_U})((#{PN_CHARS}|\.)*#{PN_CHARS})?/
97
97
  # 132
98
98
  VAR1 = /\?#{VARNAME}/
99
99
  # 133
@@ -128,11 +128,11 @@ module SPARQL::Grammar
128
128
  STRING_LITERAL_LONG2 = /"""((?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/m
129
129
 
130
130
  # 151
131
- WS = / |\t|\r|\n /
131
+ WS = / |\t|\r|\n/
132
132
  # 150
133
- NIL = /\(#{WS}*\)/
133
+ NIL = /\(#{WS}*\)/m
134
134
  # 152
135
- ANON = /\[#{WS}*\]/
135
+ ANON = /\[#{WS}*\]/m
136
136
 
137
137
  # String terminals, case insensitive
138
138
  STR_EXPR = %r(ABS|ADD|ALL|ASC|ASK|AS|BASE|BINDINGS|BIND
data/lib/sparql/results.rb CHANGED
@@ -136,7 +136,7 @@ module SPARQL
136
136
  format = options[:format].to_sym if options[:format]
137
137
  content_type = options[:content_type].to_s.split(';').first
138
138
  content_types = options[:content_types] || ['*/*']
139
- format ||= RDF::Query::Solutions::MIME_TYPES.invert[content_type] if content_type
139
+ format ||= SPARQL::Results::MIME_TYPES.invert[content_type] if content_type
140
140
 
141
141
  if !format && !content_type
142
142
  case solutions
@@ -144,8 +144,8 @@ module SPARQL
144
144
  content_type = first_content_type(content_types, RDF::Format.content_types.keys) || 'text/plain'
145
145
  format = RDF::Writer.for(:content_type => content_type).to_sym
146
146
  else
147
- content_type = first_content_type(content_types, RDF::Query::Solutions::MIME_TYPES.values) || 'application/sparql-results+xml'
148
- format = RDF::Query::Solutions::MIME_TYPES.invert[content_type]
147
+ content_type = first_content_type(content_types, SPARQL::Results::MIME_TYPES.values) || 'application/sparql-results+xml'
148
+ format = SPARQL::Results::MIME_TYPES.invert[content_type]
149
149
  end
150
150
  end
151
151
 
@@ -194,7 +194,7 @@ module SPARQL
194
194
  end
195
195
  end
196
196
 
197
- content_type ||= RDF::Query::Solutions::MIME_TYPES[format] if format
197
+ content_type ||= SPARQL::Results::MIME_TYPES[format] if format
198
198
 
199
199
  serialization.instance_eval do
200
200
  if RUBY_VERSION < "1.9"
@@ -257,7 +257,7 @@ module SPARQL
257
257
  def serialize_exception(exception, options = {})
258
258
  format = options[:format]
259
259
  content_type = options[:content_type]
260
- content_type ||= RDF::Query::Solutions::MIME_TYPES[format]
260
+ content_type ||= SPARQL::Results::MIME_TYPES[format]
261
261
  serialization = case content_type
262
262
  when 'text/html'
263
263
  title = exception.respond_to?(:title) ? exception.title : exception.class.to_s
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sparql
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
5
- prerelease:
4
+ version: 1.0.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Gregg Kellogg
@@ -11,12 +10,11 @@ authors:
11
10
  autorequire:
12
11
  bindir: bin
13
12
  cert_chain: []
14
- date: 2013-03-05 00:00:00.000000000 Z
13
+ date: 2013-03-20 00:00:00.000000000 Z
15
14
  dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
16
  name: rdf
18
17
  requirement: !ruby/object:Gem::Requirement
19
- none: false
20
18
  requirements:
21
19
  - - ! '>='
22
20
  - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
24
22
  type: :runtime
25
23
  prerelease: false
26
24
  version_requirements: !ruby/object:Gem::Requirement
27
- none: false
28
25
  requirements:
29
26
  - - ! '>='
30
27
  - !ruby/object:Gem::Version
@@ -32,23 +29,20 @@ dependencies:
32
29
  - !ruby/object:Gem::Dependency
33
30
  name: ebnf
34
31
  requirement: !ruby/object:Gem::Requirement
35
- none: false
36
32
  requirements:
37
33
  - - ! '>='
38
34
  - !ruby/object:Gem::Version
39
- version: 0.1.1
35
+ version: 0.2.1
40
36
  type: :runtime
41
37
  prerelease: false
42
38
  version_requirements: !ruby/object:Gem::Requirement
43
- none: false
44
39
  requirements:
45
40
  - - ! '>='
46
41
  - !ruby/object:Gem::Version
47
- version: 0.1.1
42
+ version: 0.2.1
48
43
  - !ruby/object:Gem::Dependency
49
44
  name: builder
50
45
  requirement: !ruby/object:Gem::Requirement
51
- none: false
52
46
  requirements:
53
47
  - - ! '>='
54
48
  - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
56
50
  type: :runtime
57
51
  prerelease: false
58
52
  version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
53
  requirements:
61
54
  - - ! '>='
62
55
  - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
64
57
  - !ruby/object:Gem::Dependency
65
58
  name: json
66
59
  requirement: !ruby/object:Gem::Requirement
67
- none: false
68
60
  requirements:
69
61
  - - ! '>='
70
62
  - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
72
64
  type: :runtime
73
65
  prerelease: false
74
66
  version_requirements: !ruby/object:Gem::Requirement
75
- none: false
76
67
  requirements:
77
68
  - - ! '>='
78
69
  - !ruby/object:Gem::Version
@@ -80,23 +71,20 @@ dependencies:
80
71
  - !ruby/object:Gem::Dependency
81
72
  name: sxp
82
73
  requirement: !ruby/object:Gem::Requirement
83
- none: false
84
74
  requirements:
85
75
  - - ! '>='
86
76
  - !ruby/object:Gem::Version
87
- version: '0'
77
+ version: 0.1.0
88
78
  type: :runtime
89
79
  prerelease: false
90
80
  version_requirements: !ruby/object:Gem::Requirement
91
- none: false
92
81
  requirements:
93
82
  - - ! '>='
94
83
  - !ruby/object:Gem::Version
95
- version: '0'
84
+ version: 0.1.0
96
85
  - !ruby/object:Gem::Dependency
97
86
  name: sparql-client
98
87
  requirement: !ruby/object:Gem::Requirement
99
- none: false
100
88
  requirements:
101
89
  - - ! '>='
102
90
  - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
104
92
  type: :runtime
105
93
  prerelease: false
106
94
  version_requirements: !ruby/object:Gem::Requirement
107
- none: false
108
95
  requirements:
109
96
  - - ! '>='
110
97
  - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
112
99
  - !ruby/object:Gem::Dependency
113
100
  name: rdf-xsd
114
101
  requirement: !ruby/object:Gem::Requirement
115
- none: false
116
102
  requirements:
117
103
  - - ! '>='
118
104
  - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
120
106
  type: :runtime
121
107
  prerelease: false
122
108
  version_requirements: !ruby/object:Gem::Requirement
123
- none: false
124
109
  requirements:
125
110
  - - ! '>='
126
111
  - !ruby/object:Gem::Version
@@ -128,7 +113,6 @@ dependencies:
128
113
  - !ruby/object:Gem::Dependency
129
114
  name: sinatra
130
115
  requirement: !ruby/object:Gem::Requirement
131
- none: false
132
116
  requirements:
133
117
  - - ! '>='
134
118
  - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
136
120
  type: :development
137
121
  prerelease: false
138
122
  version_requirements: !ruby/object:Gem::Requirement
139
- none: false
140
123
  requirements:
141
124
  - - ! '>='
142
125
  - !ruby/object:Gem::Version
@@ -144,7 +127,6 @@ dependencies:
144
127
  - !ruby/object:Gem::Dependency
145
128
  name: rack
146
129
  requirement: !ruby/object:Gem::Requirement
147
- none: false
148
130
  requirements:
149
131
  - - ! '>='
150
132
  - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
152
134
  type: :development
153
135
  prerelease: false
154
136
  version_requirements: !ruby/object:Gem::Requirement
155
- none: false
156
137
  requirements:
157
138
  - - ! '>='
158
139
  - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
160
141
  - !ruby/object:Gem::Dependency
161
142
  name: rack-test
162
143
  requirement: !ruby/object:Gem::Requirement
163
- none: false
164
144
  requirements:
165
145
  - - ! '>='
166
146
  - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
168
148
  type: :development
169
149
  prerelease: false
170
150
  version_requirements: !ruby/object:Gem::Requirement
171
- none: false
172
151
  requirements:
173
152
  - - ! '>='
174
153
  - !ruby/object:Gem::Version
@@ -176,7 +155,6 @@ dependencies:
176
155
  - !ruby/object:Gem::Dependency
177
156
  name: linkeddata
178
157
  requirement: !ruby/object:Gem::Requirement
179
- none: false
180
158
  requirements:
181
159
  - - ! '>='
182
160
  - !ruby/object:Gem::Version
@@ -184,7 +162,6 @@ dependencies:
184
162
  type: :development
185
163
  prerelease: false
186
164
  version_requirements: !ruby/object:Gem::Requirement
187
- none: false
188
165
  requirements:
189
166
  - - ! '>='
190
167
  - !ruby/object:Gem::Version
@@ -192,7 +169,6 @@ dependencies:
192
169
  - !ruby/object:Gem::Dependency
193
170
  name: rdf-spec
194
171
  requirement: !ruby/object:Gem::Requirement
195
- none: false
196
172
  requirements:
197
173
  - - ! '>='
198
174
  - !ruby/object:Gem::Version
@@ -200,7 +176,6 @@ dependencies:
200
176
  type: :development
201
177
  prerelease: false
202
178
  version_requirements: !ruby/object:Gem::Requirement
203
- none: false
204
179
  requirements:
205
180
  - - ! '>='
206
181
  - !ruby/object:Gem::Version
@@ -208,7 +183,6 @@ dependencies:
208
183
  - !ruby/object:Gem::Dependency
209
184
  name: open-uri-cached
210
185
  requirement: !ruby/object:Gem::Requirement
211
- none: false
212
186
  requirements:
213
187
  - - ! '>='
214
188
  - !ruby/object:Gem::Version
@@ -216,7 +190,6 @@ dependencies:
216
190
  type: :development
217
191
  prerelease: false
218
192
  version_requirements: !ruby/object:Gem::Requirement
219
- none: false
220
193
  requirements:
221
194
  - - ! '>='
222
195
  - !ruby/object:Gem::Version
@@ -224,7 +197,6 @@ dependencies:
224
197
  - !ruby/object:Gem::Dependency
225
198
  name: equivalent-xml
226
199
  requirement: !ruby/object:Gem::Requirement
227
- none: false
228
200
  requirements:
229
201
  - - ! '>='
230
202
  - !ruby/object:Gem::Version
@@ -232,7 +204,6 @@ dependencies:
232
204
  type: :development
233
205
  prerelease: false
234
206
  version_requirements: !ruby/object:Gem::Requirement
235
- none: false
236
207
  requirements:
237
208
  - - ! '>='
238
209
  - !ruby/object:Gem::Version
@@ -240,7 +211,6 @@ dependencies:
240
211
  - !ruby/object:Gem::Dependency
241
212
  name: nokogiri
242
213
  requirement: !ruby/object:Gem::Requirement
243
- none: false
244
214
  requirements:
245
215
  - - ! '>='
246
216
  - !ruby/object:Gem::Version
@@ -248,7 +218,6 @@ dependencies:
248
218
  type: :development
249
219
  prerelease: false
250
220
  version_requirements: !ruby/object:Gem::Requirement
251
- none: false
252
221
  requirements:
253
222
  - - ! '>='
254
223
  - !ruby/object:Gem::Version
@@ -256,7 +225,6 @@ dependencies:
256
225
  - !ruby/object:Gem::Dependency
257
226
  name: rspec
258
227
  requirement: !ruby/object:Gem::Requirement
259
- none: false
260
228
  requirements:
261
229
  - - ! '>='
262
230
  - !ruby/object:Gem::Version
@@ -264,7 +232,6 @@ dependencies:
264
232
  type: :development
265
233
  prerelease: false
266
234
  version_requirements: !ruby/object:Gem::Requirement
267
- none: false
268
235
  requirements:
269
236
  - - ! '>='
270
237
  - !ruby/object:Gem::Version
@@ -272,7 +239,6 @@ dependencies:
272
239
  - !ruby/object:Gem::Dependency
273
240
  name: spira
274
241
  requirement: !ruby/object:Gem::Requirement
275
- none: false
276
242
  requirements:
277
243
  - - ! '>='
278
244
  - !ruby/object:Gem::Version
@@ -280,7 +246,6 @@ dependencies:
280
246
  type: :development
281
247
  prerelease: false
282
248
  version_requirements: !ruby/object:Gem::Requirement
283
- none: false
284
249
  requirements:
285
250
  - - ! '>='
286
251
  - !ruby/object:Gem::Version
@@ -288,7 +253,6 @@ dependencies:
288
253
  - !ruby/object:Gem::Dependency
289
254
  name: yard
290
255
  requirement: !ruby/object:Gem::Requirement
291
- none: false
292
256
  requirements:
293
257
  - - ! '>='
294
258
  - !ruby/object:Gem::Version
@@ -296,7 +260,6 @@ dependencies:
296
260
  type: :development
297
261
  prerelease: false
298
262
  version_requirements: !ruby/object:Gem::Requirement
299
- none: false
300
263
  requirements:
301
264
  - - ! '>='
302
265
  - !ruby/object:Gem::Version
@@ -384,27 +347,26 @@ files:
384
347
  homepage: http://github.com/ruby-rdf/sparql
385
348
  licenses:
386
349
  - Public Domain
350
+ metadata: {}
387
351
  post_install_message:
388
352
  rdoc_options: []
389
353
  require_paths:
390
354
  - lib
391
355
  required_ruby_version: !ruby/object:Gem::Requirement
392
- none: false
393
356
  requirements:
394
357
  - - ! '>='
395
358
  - !ruby/object:Gem::Version
396
359
  version: 1.8.7
397
360
  required_rubygems_version: !ruby/object:Gem::Requirement
398
- none: false
399
361
  requirements:
400
362
  - - ! '>='
401
363
  - !ruby/object:Gem::Version
402
364
  version: '0'
403
365
  requirements: []
404
366
  rubyforge_project: sparql
405
- rubygems_version: 1.8.25
367
+ rubygems_version: 2.0.3
406
368
  signing_key:
407
- specification_version: 3
369
+ specification_version: 4
408
370
  summary: SPARQL library for Ruby.
409
371
  test_files: []
410
372
  has_rdoc: false