rdf-n3 3.1.0 → 3.1.1
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.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/rdf/n3/extensions.rb +0 -17
- data/lib/rdf/n3/patches/array_hacks.rb +1 -1
- data/lib/rdf/n3/reader.rb +2 -2
- data/lib/rdf/n3/reasoner.rb +1 -1
- data/lib/rdf/n3/writer.rb +9 -9
- metadata +24 -24
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ec61e722e941b81e66326c2c01be01294d795e79de7d2c19170621cf8e847abd
|
4
|
+
data.tar.gz: 939c44022792bd224fbdda4bd424e5a314007fa063bb37ecd0e4d9d970a05bda
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f9aa6b2c0dfa8932709f9b3d6f39be96252e2ee9002bf1d328fe2adb8145bd79755cb7f7933b1263a0a3e255d4b814ae224c81a465ddf887524294aa34dde90
|
7
|
+
data.tar.gz: 164f2b19c87a60c328176cee7ff0a358ea04c4f073f169c3f4175d916d9fa910a0d2c4fc01793fc985e1cae6292fefd9eebfe7a3edfd6b90bbb57fcafa724d82
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.1
|
data/lib/rdf/n3/extensions.rb
CHANGED
@@ -59,21 +59,4 @@ module RDF
|
|
59
59
|
to_sxp_bin.to_sxp
|
60
60
|
end
|
61
61
|
end
|
62
|
-
|
63
|
-
class Query::Variable
|
64
|
-
|
65
|
-
# Transform Statement into an SXP
|
66
|
-
# @return [Array]
|
67
|
-
def to_sxp_bin
|
68
|
-
[:var, name, (value.to_sxp_bin if value)].compact
|
69
|
-
end
|
70
|
-
|
71
|
-
##
|
72
|
-
# Returns an S-Expression (SXP) representation
|
73
|
-
#
|
74
|
-
# @return [String]
|
75
|
-
def to_sxp
|
76
|
-
to_sxp_bin.to_sxp
|
77
|
-
end
|
78
|
-
end
|
79
62
|
end
|
@@ -18,7 +18,7 @@ class Array
|
|
18
18
|
# * <tt>:words_connector</tt> - The sign or word used to join the elements in arrays with two or more elements (default: ", ")
|
19
19
|
# * <tt>:two_words_connector</tt> - The sign or word used to join the elements in arrays with two elements (default: " and ")
|
20
20
|
# * <tt>:last_word_connector</tt> - The sign or word used to join the last element in arrays with three or more elements (default: ", and ")
|
21
|
-
def to_sentence(options
|
21
|
+
def to_sentence(**options)
|
22
22
|
default_words_connector = ", "
|
23
23
|
default_two_words_connector = " and "
|
24
24
|
default_last_word_connector = ", and "
|
data/lib/rdf/n3/reader.rb
CHANGED
@@ -50,7 +50,7 @@ module RDF::N3
|
|
50
50
|
# @yieldparam [RDF::Reader] reader
|
51
51
|
# @yieldreturn [void] ignored
|
52
52
|
# @raise [Error]:: Raises RDF::ReaderError if validating and an error is found
|
53
|
-
def initialize(input = $stdin, options
|
53
|
+
def initialize(input = $stdin, **options, &block)
|
54
54
|
super do
|
55
55
|
input.rewind if input.respond_to?(:rewind)
|
56
56
|
@input = input.respond_to?(:read) ? input : StringIO.new(input.to_s)
|
@@ -704,7 +704,7 @@ module RDF::N3
|
|
704
704
|
value = value.join(append) if append
|
705
705
|
value.validate! if validate? && value.respond_to?(:validate)
|
706
706
|
value.canonicalize! if canonicalize?
|
707
|
-
value = RDF::URI.intern(value
|
707
|
+
value = RDF::URI.intern(value) if intern?
|
708
708
|
|
709
709
|
# Variable substitution for in-scope variables. Variables are in scope if they are defined in anthing other than the current formula
|
710
710
|
var = find_var(@formulae.last, value)
|
data/lib/rdf/n3/reasoner.rb
CHANGED
@@ -66,7 +66,7 @@ module RDF::N3
|
|
66
66
|
else RDF::Repository.new
|
67
67
|
end
|
68
68
|
|
69
|
-
log_debug("reasoner: expression", options) {SXP::Generator.string(formula.to_sxp_bin)}
|
69
|
+
log_debug("reasoner: expression", **options) {SXP::Generator.string(formula.to_sxp_bin)}
|
70
70
|
|
71
71
|
if block_given?
|
72
72
|
case block.arity
|
data/lib/rdf/n3/writer.rb
CHANGED
@@ -103,7 +103,7 @@ module RDF::N3
|
|
103
103
|
# @yieldreturn [void]
|
104
104
|
# @yield [writer]
|
105
105
|
# @yieldparam [RDF::Writer] writer
|
106
|
-
def initialize(output = $stdout, options
|
106
|
+
def initialize(output = $stdout, **options, &block)
|
107
107
|
@repo = RDF::Repository.new
|
108
108
|
@uri_to_pname = {}
|
109
109
|
@uri_to_prefix = {}
|
@@ -259,7 +259,7 @@ module RDF::N3
|
|
259
259
|
# @param [RDF::Literal, String, #to_s] literal
|
260
260
|
# @param [Hash{Symbol => Object}] options
|
261
261
|
# @return [String]
|
262
|
-
def format_literal(literal, options
|
262
|
+
def format_literal(literal, **options)
|
263
263
|
literal = literal.dup.canonicalize! if @options[:canonicalize]
|
264
264
|
case literal
|
265
265
|
when RDF::Literal
|
@@ -285,7 +285,7 @@ module RDF::N3
|
|
285
285
|
# @param [RDF::URI] uri
|
286
286
|
# @param [Hash{Symbol => Object}] options
|
287
287
|
# @return [String]
|
288
|
-
def format_uri(uri, options
|
288
|
+
def format_uri(uri, **options)
|
289
289
|
md = uri.relativize(base_uri)
|
290
290
|
log_debug("relativize") {"#{uri.to_sxp} => #{md.inspect}"} if md != uri.to_s
|
291
291
|
md != uri.to_s ? "<#{md}>" : (get_pname(uri) || "<#{uri}>")
|
@@ -297,7 +297,7 @@ module RDF::N3
|
|
297
297
|
# @param [RDF::Node] node
|
298
298
|
# @param [Hash{Symbol => Object}] options
|
299
299
|
# @return [String]
|
300
|
-
def format_node(node, options
|
300
|
+
def format_node(node, **options)
|
301
301
|
options[:unique_bnodes] ? node.to_unique_base : node.to_base
|
302
302
|
end
|
303
303
|
|
@@ -349,7 +349,7 @@ module RDF::N3
|
|
349
349
|
|
350
350
|
# Add distinguished classes
|
351
351
|
top_classes.each do |class_uri|
|
352
|
-
graph.query(predicate: RDF.type, object: class_uri).
|
352
|
+
graph.query({predicate: RDF.type, object: class_uri}).
|
353
353
|
map {|st| st.subject}.
|
354
354
|
sort.
|
355
355
|
uniq.
|
@@ -504,7 +504,7 @@ module RDF::N3
|
|
504
504
|
elsif resource == RDF.nil
|
505
505
|
"()"
|
506
506
|
else
|
507
|
-
format_term(resource, options)
|
507
|
+
format_term(resource, **options)
|
508
508
|
end
|
509
509
|
@output.write(l)
|
510
510
|
end
|
@@ -566,7 +566,7 @@ module RDF::N3
|
|
566
566
|
(properties[st.predicate.to_s] ||= []) << st.object
|
567
567
|
end
|
568
568
|
else
|
569
|
-
@graph.query(subject: subject) do |st|
|
569
|
+
@graph.query({subject: subject}) do |st|
|
570
570
|
(properties[st.predicate.to_s] ||= []) << st.object
|
571
571
|
end
|
572
572
|
end
|
@@ -704,8 +704,8 @@ module RDF::N3
|
|
704
704
|
select {|st| st.subject.equal?(resource) || st.object.equal?(resource)}.
|
705
705
|
map(&:graph_name)
|
706
706
|
else
|
707
|
-
graph_names = @repo.query(subject: resource).map(&:graph_name)
|
708
|
-
graph_names += @repo.query(object: resource).map(&:graph_name)
|
707
|
+
graph_names = @repo.query({subject: resource}).map(&:graph_name)
|
708
|
+
graph_names += @repo.query({object: resource}).map(&:graph_name)
|
709
709
|
end
|
710
710
|
graph_names.uniq.length <= 1
|
711
711
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rdf-n3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gregg
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2019-
|
12
|
+
date: 2019-12-13 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rdf
|
@@ -17,98 +17,98 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - "~>"
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version: '3.
|
20
|
+
version: '3.1'
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
25
|
- - "~>"
|
26
26
|
- !ruby/object:Gem::Version
|
27
|
-
version: '3.
|
27
|
+
version: '3.1'
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: sparql
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
31
31
|
requirements:
|
32
32
|
- - "~>"
|
33
33
|
- !ruby/object:Gem::Version
|
34
|
-
version: '3.
|
34
|
+
version: '3.1'
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
38
38
|
requirements:
|
39
39
|
- - "~>"
|
40
40
|
- !ruby/object:Gem::Version
|
41
|
-
version: '3.
|
41
|
+
version: '3.1'
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: sxp
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
45
45
|
requirements:
|
46
46
|
- - "~>"
|
47
47
|
- !ruby/object:Gem::Version
|
48
|
-
version: '1.
|
48
|
+
version: '1.1'
|
49
49
|
type: :runtime
|
50
50
|
prerelease: false
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
52
52
|
requirements:
|
53
53
|
- - "~>"
|
54
54
|
- !ruby/object:Gem::Version
|
55
|
-
version: '1.
|
55
|
+
version: '1.1'
|
56
56
|
- !ruby/object:Gem::Dependency
|
57
57
|
name: json-ld
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
59
59
|
requirements:
|
60
60
|
- - "~>"
|
61
61
|
- !ruby/object:Gem::Version
|
62
|
-
version: '3.
|
62
|
+
version: '3.1'
|
63
63
|
type: :development
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
66
|
requirements:
|
67
67
|
- - "~>"
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version: '3.
|
69
|
+
version: '3.1'
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: rspec
|
72
72
|
requirement: !ruby/object:Gem::Requirement
|
73
73
|
requirements:
|
74
74
|
- - "~>"
|
75
75
|
- !ruby/object:Gem::Version
|
76
|
-
version: '3.
|
76
|
+
version: '3.9'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
79
|
version_requirements: !ruby/object:Gem::Requirement
|
80
80
|
requirements:
|
81
81
|
- - "~>"
|
82
82
|
- !ruby/object:Gem::Version
|
83
|
-
version: '3.
|
83
|
+
version: '3.9'
|
84
84
|
- !ruby/object:Gem::Dependency
|
85
85
|
name: rspec-its
|
86
86
|
requirement: !ruby/object:Gem::Requirement
|
87
87
|
requirements:
|
88
88
|
- - "~>"
|
89
89
|
- !ruby/object:Gem::Version
|
90
|
-
version: '1.
|
90
|
+
version: '1.3'
|
91
91
|
type: :development
|
92
92
|
prerelease: false
|
93
93
|
version_requirements: !ruby/object:Gem::Requirement
|
94
94
|
requirements:
|
95
95
|
- - "~>"
|
96
96
|
- !ruby/object:Gem::Version
|
97
|
-
version: '1.
|
97
|
+
version: '1.3'
|
98
98
|
- !ruby/object:Gem::Dependency
|
99
99
|
name: rdf-spec
|
100
100
|
requirement: !ruby/object:Gem::Requirement
|
101
101
|
requirements:
|
102
102
|
- - "~>"
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: '3.
|
104
|
+
version: '3.1'
|
105
105
|
type: :development
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - "~>"
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: '3.
|
111
|
+
version: '3.1'
|
112
112
|
- !ruby/object:Gem::Dependency
|
113
113
|
name: rdf-isomorphic
|
114
114
|
requirement: !ruby/object:Gem::Requirement
|
@@ -129,42 +129,42 @@ dependencies:
|
|
129
129
|
requirements:
|
130
130
|
- - "~>"
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version: '3.
|
132
|
+
version: '3.1'
|
133
133
|
type: :development
|
134
134
|
prerelease: false
|
135
135
|
version_requirements: !ruby/object:Gem::Requirement
|
136
136
|
requirements:
|
137
137
|
- - "~>"
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: '3.
|
139
|
+
version: '3.1'
|
140
140
|
- !ruby/object:Gem::Dependency
|
141
141
|
name: rdf-vocab
|
142
142
|
requirement: !ruby/object:Gem::Requirement
|
143
143
|
requirements:
|
144
144
|
- - "~>"
|
145
145
|
- !ruby/object:Gem::Version
|
146
|
-
version: '3.
|
146
|
+
version: '3.1'
|
147
147
|
type: :development
|
148
148
|
prerelease: false
|
149
149
|
version_requirements: !ruby/object:Gem::Requirement
|
150
150
|
requirements:
|
151
151
|
- - "~>"
|
152
152
|
- !ruby/object:Gem::Version
|
153
|
-
version: '3.
|
153
|
+
version: '3.1'
|
154
154
|
- !ruby/object:Gem::Dependency
|
155
155
|
name: yard
|
156
156
|
requirement: !ruby/object:Gem::Requirement
|
157
157
|
requirements:
|
158
158
|
- - "~>"
|
159
159
|
- !ruby/object:Gem::Version
|
160
|
-
version: 0.9.
|
160
|
+
version: 0.9.20
|
161
161
|
type: :development
|
162
162
|
prerelease: false
|
163
163
|
version_requirements: !ruby/object:Gem::Requirement
|
164
164
|
requirements:
|
165
165
|
- - "~>"
|
166
166
|
- !ruby/object:Gem::Version
|
167
|
-
version: 0.9.
|
167
|
+
version: 0.9.20
|
168
168
|
description: RDF::N3 is an Notation-3 reader/writer and reasoner for the RDF.rb library
|
169
169
|
suite.
|
170
170
|
email: public-rdf-ruby@w3.org
|
@@ -247,14 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
247
247
|
requirements:
|
248
248
|
- - ">="
|
249
249
|
- !ruby/object:Gem::Version
|
250
|
-
version: 2.
|
250
|
+
version: '2.4'
|
251
251
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
252
252
|
requirements:
|
253
253
|
- - ">="
|
254
254
|
- !ruby/object:Gem::Version
|
255
255
|
version: '0'
|
256
256
|
requirements: []
|
257
|
-
rubygems_version: 3.0.
|
257
|
+
rubygems_version: 3.0.6
|
258
258
|
signing_key:
|
259
259
|
specification_version: 4
|
260
260
|
summary: Notation3 reader/writer and reasoner for RDF.rb.
|