rdf-turtle 3.0.6 → 3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/VERSION +1 -1
- data/lib/rdf/turtle/freebase_reader.rb +1 -1
- data/lib/rdf/turtle/reader.rb +7 -7
- data/lib/rdf/turtle/streaming_writer.rb +4 -4
- data/lib/rdf/turtle/writer.rb +7 -7
- metadata +29 -35
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 23a25ff951065479aaa42feb25d8646ed7e87270556e759ea10d219e24b4ac72
|
4
|
+
data.tar.gz: ee4be6acf9c89792f5df29e018a3ab22c667477de4e95178517a4002da68707b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 34c956ae30fbbe235344fc2ada8ed41539e912022b6ec0699afde1108d98d6b83a8c3008bc131535e0f96ef9b9f481079aa58dc5f8b384b250b20b4b33b72d90
|
7
|
+
data.tar.gz: 405cfd25f8899631bac219096670d36969602329c7f3ea4905f0a36a47835ee6ac8aac65c163c6b8d4cc4ce284d2e162cb00ff1e7db193c8bf072c00c84c77dd
|
data/README.md
CHANGED
@@ -85,8 +85,8 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
|
|
85
85
|
|
86
86
|
## Dependencies
|
87
87
|
|
88
|
-
* [Ruby](https://ruby-lang.org/) (>= 2.
|
89
|
-
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.
|
88
|
+
* [Ruby](https://ruby-lang.org/) (>= 2.4)
|
89
|
+
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
|
90
90
|
* [EBNF][] (~> 1.1)
|
91
91
|
|
92
92
|
## Installation
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.0
|
1
|
+
3.1.0
|
@@ -55,7 +55,7 @@ module RDF::Turtle
|
|
55
55
|
##
|
56
56
|
# Read a PNAME of the form `prefix:suffix`.
|
57
57
|
# @return [RDF::URI]
|
58
|
-
def read_pname(options
|
58
|
+
def read_pname(**options)
|
59
59
|
if pname_str = match(/^(\w+:\S+)/)
|
60
60
|
ns, suffix = pname_str.split(':', 2)
|
61
61
|
if suffix[-1,1] == "."
|
data/lib/rdf/turtle/reader.rb
CHANGED
@@ -48,14 +48,14 @@ module RDF::Turtle
|
|
48
48
|
# Redirect for Freebase Reader
|
49
49
|
#
|
50
50
|
# @private
|
51
|
-
def self.new(input = nil, options
|
51
|
+
def self.new(input = nil, **options, &block)
|
52
52
|
klass = if options[:freebase]
|
53
53
|
FreebaseReader
|
54
54
|
else
|
55
55
|
self
|
56
56
|
end
|
57
57
|
reader = klass.allocate
|
58
|
-
reader.send(:initialize, input, options, &block)
|
58
|
+
reader.send(:initialize, input, **options, &block)
|
59
59
|
reader
|
60
60
|
end
|
61
61
|
|
@@ -82,7 +82,7 @@ module RDF::Turtle
|
|
82
82
|
# @option options [Boolean] :freebase (false)
|
83
83
|
# Use optimized Freebase reader
|
84
84
|
# @return [RDF::Turtle::Reader]
|
85
|
-
def initialize(input = nil, options
|
85
|
+
def initialize(input = nil, **options, &block)
|
86
86
|
super do
|
87
87
|
@options = {
|
88
88
|
anon_base: "b0",
|
@@ -98,7 +98,7 @@ module RDF::Turtle
|
|
98
98
|
log_debug("canonicalize") {canonicalize?.inspect}
|
99
99
|
log_debug("intern") {intern?.inspect}
|
100
100
|
|
101
|
-
@lexer = EBNF::LL1::Lexer.new(input, self.class.patterns,
|
101
|
+
@lexer = EBNF::LL1::Lexer.new(input, self.class.patterns, **@options)
|
102
102
|
|
103
103
|
if block_given?
|
104
104
|
case block.arity
|
@@ -184,14 +184,14 @@ module RDF::Turtle
|
|
184
184
|
end
|
185
185
|
|
186
186
|
# Create a literal
|
187
|
-
def literal(value, options
|
187
|
+
def literal(value, **options)
|
188
188
|
log_debug("literal") do
|
189
189
|
"value: #{value.inspect}, " +
|
190
190
|
"options: #{options.inspect}, " +
|
191
191
|
"validate: #{validate?.inspect}, " +
|
192
192
|
"c14n?: #{canonicalize?.inspect}"
|
193
193
|
end
|
194
|
-
RDF::Literal.new(value,
|
194
|
+
RDF::Literal.new(value, validate: validate?, canonicalize: canonicalize?, **options)
|
195
195
|
rescue ArgumentError => e
|
196
196
|
error("Argument Error #{e.message}", production: :literal, token: @lexer.first)
|
197
197
|
end
|
@@ -587,7 +587,7 @@ module RDF::Turtle
|
|
587
587
|
# @option options [Symbol] :production (nil)
|
588
588
|
# @option options [String] :token (nil)
|
589
589
|
# @option options [Integer] :lineno (nil)
|
590
|
-
def initialize(message, options
|
590
|
+
def initialize(message, **options)
|
591
591
|
@production = options[:production]
|
592
592
|
@token = options[:token]
|
593
593
|
@lineno = options[:lineno] || (@token.lineno if @token.respond_to?(:lineno))
|
@@ -28,15 +28,15 @@ module RDF::Turtle
|
|
28
28
|
if statement.subject != @streaming_subject
|
29
29
|
@output.puts ' .' if @streaming_subject
|
30
30
|
@streaming_subject, @streaming_predicate = statement.subject, statement.predicate
|
31
|
-
@output.write "#{format_term(statement.subject, options)} "
|
32
|
-
@output.write "#{format_term(statement.predicate, options)} "
|
31
|
+
@output.write "#{format_term(statement.subject, **options)} "
|
32
|
+
@output.write "#{format_term(statement.predicate, **options)} "
|
33
33
|
elsif statement.predicate != @streaming_predicate
|
34
34
|
@streaming_predicate = statement.predicate
|
35
|
-
@output.write ";\n#{indent(1)}#{format_term(statement.predicate, options)} "
|
35
|
+
@output.write ";\n#{indent(1)}#{format_term(statement.predicate, **options)} "
|
36
36
|
else
|
37
37
|
@output.write ",\n#{indent(2)}"
|
38
38
|
end
|
39
|
-
@output.write("#{format_term(statement.object, options)}")
|
39
|
+
@output.write("#{format_term(statement.object, **options)}")
|
40
40
|
end
|
41
41
|
|
42
42
|
##
|
data/lib/rdf/turtle/writer.rb
CHANGED
@@ -123,7 +123,7 @@ module RDF::Turtle
|
|
123
123
|
# @yieldreturn [void]
|
124
124
|
# @yield [writer]
|
125
125
|
# @yieldparam [RDF::Writer] writer
|
126
|
-
def initialize(output = $stdout, options
|
126
|
+
def initialize(output = $stdout, **options, &block)
|
127
127
|
@graph = RDF::Graph.new
|
128
128
|
@uri_to_pname = {}
|
129
129
|
@uri_to_prefix = {}
|
@@ -272,7 +272,7 @@ module RDF::Turtle
|
|
272
272
|
# @param [RDF::Literal, String, #to_s] literal
|
273
273
|
# @param [Hash{Symbol => Object}] options
|
274
274
|
# @return [String]
|
275
|
-
def format_literal(literal, options
|
275
|
+
def format_literal(literal, **options)
|
276
276
|
case literal
|
277
277
|
when RDF::Literal
|
278
278
|
case @options[:literal_shorthand] && literal.valid? ? literal.datatype : false
|
@@ -297,7 +297,7 @@ module RDF::Turtle
|
|
297
297
|
# @param [RDF::URI] uri
|
298
298
|
# @param [Hash{Symbol => Object}] options
|
299
299
|
# @return [String]
|
300
|
-
def format_uri(uri, options
|
300
|
+
def format_uri(uri, **options)
|
301
301
|
md = uri.relativize(base_uri)
|
302
302
|
log_debug("relativize") {"#{uri.to_ntriples} => #{md.inspect}"} if md != uri.to_s
|
303
303
|
md != uri.to_s ? "<#{md}>" : (get_pname(uri) || "<#{uri}>")
|
@@ -309,7 +309,7 @@ module RDF::Turtle
|
|
309
309
|
# @param [RDF::Node] node
|
310
310
|
# @param [Hash{Symbol => Object}] options
|
311
311
|
# @return [String]
|
312
|
-
def format_node(node, options
|
312
|
+
def format_node(node, **options)
|
313
313
|
options[:unique_bnodes] ? node.to_unique_base : node.to_base
|
314
314
|
end
|
315
315
|
|
@@ -349,7 +349,7 @@ module RDF::Turtle
|
|
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.
|
@@ -546,7 +546,7 @@ module RDF::Turtle
|
|
546
546
|
l = if resource == RDF.nil
|
547
547
|
"()"
|
548
548
|
else
|
549
|
-
format_term(resource, options)
|
549
|
+
format_term(resource, **options)
|
550
550
|
end
|
551
551
|
@output.write(l)
|
552
552
|
end
|
@@ -595,7 +595,7 @@ module RDF::Turtle
|
|
595
595
|
# @return [Integer] the number of properties serialized
|
596
596
|
def predicateObjectList(subject, from_bpl = false)
|
597
597
|
properties = {}
|
598
|
-
@graph.query(subject: subject) do |st|
|
598
|
+
@graph.query({subject: subject}) do |st|
|
599
599
|
(properties[st.predicate.to_s] ||= []) << st.object
|
600
600
|
end
|
601
601
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rdf-turtle
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0
|
4
|
+
version: 3.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gregg Kellogg
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-12-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rdf
|
@@ -16,146 +16,140 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '3.
|
19
|
+
version: '3.1'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '3.
|
26
|
+
version: '3.1'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: ebnf
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '1.
|
33
|
+
version: '1.2'
|
34
34
|
type: :runtime
|
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: '1.
|
40
|
+
version: '1.2'
|
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.
|
47
|
+
version: '3.9'
|
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.
|
54
|
+
version: '3.9'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: rspec-its
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '1.
|
61
|
+
version: '1.3'
|
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: '1.
|
68
|
+
version: '1.3'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rdf-isomorphic
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '3.
|
75
|
+
version: '3.1'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '3.
|
82
|
+
version: '3.1'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: json-ld
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '3.
|
89
|
+
version: '3.1'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '3.
|
96
|
+
version: '3.1'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name: rdf-
|
98
|
+
name: rdf-spec
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '3.
|
103
|
+
version: '3.1'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '3.
|
110
|
+
version: '3.1'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
112
|
+
name: rdf-vocab
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- - "
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '2.1'
|
118
|
-
- - "<"
|
115
|
+
- - "~>"
|
119
116
|
- !ruby/object:Gem::Version
|
120
|
-
version: '
|
117
|
+
version: '3.1'
|
121
118
|
type: :development
|
122
119
|
prerelease: false
|
123
120
|
version_requirements: !ruby/object:Gem::Requirement
|
124
121
|
requirements:
|
125
|
-
- - "
|
126
|
-
- !ruby/object:Gem::Version
|
127
|
-
version: '2.1'
|
128
|
-
- - "<"
|
122
|
+
- - "~>"
|
129
123
|
- !ruby/object:Gem::Version
|
130
|
-
version: '
|
124
|
+
version: '3.1'
|
131
125
|
- !ruby/object:Gem::Dependency
|
132
126
|
name: rake
|
133
127
|
requirement: !ruby/object:Gem::Requirement
|
134
128
|
requirements:
|
135
129
|
- - "~>"
|
136
130
|
- !ruby/object:Gem::Version
|
137
|
-
version: '
|
131
|
+
version: '13.0'
|
138
132
|
type: :development
|
139
133
|
prerelease: false
|
140
134
|
version_requirements: !ruby/object:Gem::Requirement
|
141
135
|
requirements:
|
142
136
|
- - "~>"
|
143
137
|
- !ruby/object:Gem::Version
|
144
|
-
version: '
|
138
|
+
version: '13.0'
|
145
139
|
- !ruby/object:Gem::Dependency
|
146
140
|
name: yard
|
147
141
|
requirement: !ruby/object:Gem::Requirement
|
148
142
|
requirements:
|
149
143
|
- - "~>"
|
150
144
|
- !ruby/object:Gem::Version
|
151
|
-
version: 0.9.
|
145
|
+
version: 0.9.20
|
152
146
|
type: :development
|
153
147
|
prerelease: false
|
154
148
|
version_requirements: !ruby/object:Gem::Requirement
|
155
149
|
requirements:
|
156
150
|
- - "~>"
|
157
151
|
- !ruby/object:Gem::Version
|
158
|
-
version: 0.9.
|
152
|
+
version: 0.9.20
|
159
153
|
description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
|
160
154
|
email: public-rdf-ruby@w3.org
|
161
155
|
executables: []
|
@@ -187,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
187
181
|
requirements:
|
188
182
|
- - ">="
|
189
183
|
- !ruby/object:Gem::Version
|
190
|
-
version: 2.
|
184
|
+
version: '2.4'
|
191
185
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
192
186
|
requirements:
|
193
187
|
- - ">="
|
194
188
|
- !ruby/object:Gem::Version
|
195
189
|
version: '0'
|
196
190
|
requirements: []
|
197
|
-
rubygems_version: 3.0.
|
191
|
+
rubygems_version: 3.0.6
|
198
192
|
signing_key:
|
199
193
|
specification_version: 4
|
200
194
|
summary: Turtle reader/writer for Ruby.
|