Skip to content

Commit 00429ae

Browse files
gkellogggkellogg
committed
* Favor absolute URIs for term properties, but allow pnames transitionally.
* Update local vocabularies to use absolute URIs in property values and keys. * Change `Term#properties` to use an empty hash with a default_proc which does the magical lookup from attributes. For #424.
1 parent b0e40d5 commit 00429ae

8 files changed

Lines changed: 831 additions & 1094 deletions

File tree

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ group :test do
3131
gem "rake"
3232
gem "equivalent-xml"
3333
gem 'fasterer'
34-
gem 'simplecov', require: false, platforms: :mri
35-
gem 'coveralls', '~> 0.8', require: false, platforms: :mri
34+
gem 'simplecov', '~> 0.16', platforms: :mri
35+
gem 'coveralls', '~> 0.8', platforms: :mri
3636
end

‎lib/rdf/vocab/owl.rb‎

Lines changed: 366 additions & 388 deletions
Large diffs are not rendered by default.

‎lib/rdf/vocab/rdfs.rb‎

Lines changed: 72 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ module RDF
66
# @!parse
77
# # Vocabulary for <http://www.w3.org/2000/01/rdf-schema#>
88
# #
9-
# # The RDF Schema vocabulary (RDFS)
10-
# # @see http://www.w3.org/2000/01/rdf-schema-more
119
# class RDFS < RDF::StrictVocabulary
1210
# # The class of classes.
1311
# # @return [RDF::Vocabulary::Term]
@@ -74,112 +72,111 @@ module RDF
7472

7573
# Ontology definition
7674
ontology :"http://www.w3.org/2000/01/rdf-schema#",
77-
"dc11:title": "The RDF Schema vocabulary (RDFS)".freeze,
78-
"rdfs:seeAlso": "http://www.w3.org/2000/01/rdf-schema-more".freeze,
79-
type: "owl:Ontology".freeze
75+
"http://purl.org/dc/elements/1.1/title": "The RDF Schema vocabulary (RDFS)".freeze,
76+
"http://www.w3.org/2000/01/rdf-schema#seeAlso": "http://www.w3.org/2000/01/rdf-schema-more".freeze,
77+
type: "http://www.w3.org/2002/07/owl#Ontology".freeze
8078

8179
# Class definitions
8280
term :Class,
83-
comment: %(The class of classes.).freeze,
84-
isDefinedBy: "rdfs:".freeze,
81+
comment: "The class of classes.".freeze,
82+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
8583
label: "Class".freeze,
86-
subClassOf: "rdfs:Resource".freeze,
87-
type: "rdfs:Class".freeze
84+
subClassOf: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
85+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
8886
term :Container,
89-
comment: %(The class of RDF containers.).freeze,
90-
isDefinedBy: "rdfs:".freeze,
87+
comment: "The class of RDF containers.".freeze,
88+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
9189
label: "Container".freeze,
92-
subClassOf: "rdfs:Resource".freeze,
93-
type: "rdfs:Class".freeze
90+
subClassOf: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
91+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
9492
term :ContainerMembershipProperty,
95-
comment: %(The class of container membership properties, rdf:_1, rdf:_2, ...,
96-
all of which are sub-properties of 'member'.).freeze,
97-
isDefinedBy: "rdfs:".freeze,
93+
comment: "The class of container membership properties, rdf:_1, rdf:_2, ...,\n all of which are sub-properties of 'member'.".freeze,
94+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
9895
label: "ContainerMembershipProperty".freeze,
99-
subClassOf: "rdf:Property".freeze,
100-
type: "rdfs:Class".freeze
96+
subClassOf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze,
97+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
10198
term :Datatype,
102-
comment: %(The class of RDF datatypes.).freeze,
103-
isDefinedBy: "rdfs:".freeze,
99+
comment: "The class of RDF datatypes.".freeze,
100+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
104101
label: "Datatype".freeze,
105-
subClassOf: "rdfs:Class".freeze,
106-
type: "rdfs:Class".freeze
102+
subClassOf: "http://www.w3.org/2000/01/rdf-schema#Class".freeze,
103+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
107104
term :Literal,
108-
comment: %(The class of literal values, eg. textual strings and integers.).freeze,
109-
isDefinedBy: "rdfs:".freeze,
105+
comment: "The class of literal values, eg. textual strings and integers.".freeze,
106+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
110107
label: "Literal".freeze,
111-
subClassOf: "rdfs:Resource".freeze,
112-
type: "rdfs:Class".freeze
108+
subClassOf: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
109+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
113110
term :Resource,
114-
comment: %(The class resource, everything.).freeze,
115-
isDefinedBy: "rdfs:".freeze,
111+
comment: "The class resource, everything.".freeze,
112+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
116113
label: "Resource".freeze,
117-
type: "rdfs:Class".freeze
114+
type: "http://www.w3.org/2000/01/rdf-schema#Class".freeze
118115

119116
# Property definitions
120117
property :comment,
121-
comment: %(A description of the subject resource.).freeze,
122-
domain: "rdfs:Resource".freeze,
123-
isDefinedBy: "rdfs:".freeze,
118+
comment: "A description of the subject resource.".freeze,
119+
domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
120+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
124121
label: "comment".freeze,
125-
range: "rdfs:Literal".freeze,
126-
type: "rdf:Property".freeze
122+
range: "http://www.w3.org/2000/01/rdf-schema#Literal".freeze,
123+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
127124
property :domain,
128-
comment: %(A domain of the subject property.).freeze,
129-
domain: "rdf:Property".freeze,
130-
isDefinedBy: "rdfs:".freeze,
125+
comment: "A domain of the subject property.".freeze,
126+
domain: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze,
127+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
131128
label: "domain".freeze,
132-
range: "rdfs:Class".freeze,
133-
type: "rdf:Property".freeze
129+
range: "http://www.w3.org/2000/01/rdf-schema#Class".freeze,
130+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
134131
property :isDefinedBy,
135-
comment: %(The defininition of the subject resource.).freeze,
136-
domain: "rdfs:Resource".freeze,
137-
isDefinedBy: "rdfs:".freeze,
132+
comment: "The defininition of the subject resource.".freeze,
133+
domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
134+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
138135
label: "isDefinedBy".freeze,
139-
range: "rdfs:Resource".freeze,
140-
subPropertyOf: "rdfs:seeAlso".freeze,
141-
type: "rdf:Property".freeze
136+
range: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
137+
subPropertyOf: "http://www.w3.org/2000/01/rdf-schema#seeAlso".freeze,
138+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
142139
property :label,
143-
comment: %(A human-readable name for the subject.).freeze,
144-
domain: "rdfs:Resource".freeze,
145-
isDefinedBy: "rdfs:".freeze,
140+
comment: "A human-readable name for the subject.".freeze,
141+
domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
142+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
146143
label: "label".freeze,
147-
range: "rdfs:Literal".freeze,
148-
type: "rdf:Property".freeze
144+
range: "http://www.w3.org/2000/01/rdf-schema#Literal".freeze,
145+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
149146
property :member,
150-
comment: %(A member of the subject resource.).freeze,
151-
domain: "rdfs:Resource".freeze,
152-
isDefinedBy: "rdfs:".freeze,
147+
comment: "A member of the subject resource.".freeze,
148+
domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
149+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
153150
label: "member".freeze,
154-
range: "rdfs:Resource".freeze,
155-
type: "rdf:Property".freeze
151+
range: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
152+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
156153
property :range,
157-
comment: %(A range of the subject property.).freeze,
158-
domain: "rdf:Property".freeze,
159-
isDefinedBy: "rdfs:".freeze,
154+
comment: "A range of the subject property.".freeze,
155+
domain: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze,
156+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
160157
label: "range".freeze,
161-
range: "rdfs:Class".freeze,
162-
type: "rdf:Property".freeze
158+
range: "http://www.w3.org/2000/01/rdf-schema#Class".freeze,
159+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
163160
property :seeAlso,
164-
comment: %(Further information about the subject resource.).freeze,
165-
domain: "rdfs:Resource".freeze,
166-
isDefinedBy: "rdfs:".freeze,
161+
comment: "Further information about the subject resource.".freeze,
162+
domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
163+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
167164
label: "seeAlso".freeze,
168-
range: "rdfs:Resource".freeze,
169-
type: "rdf:Property".freeze
165+
range: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze,
166+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
170167
property :subClassOf,
171-
comment: %(The subject is a subclass of a class.).freeze,
172-
domain: "rdfs:Class".freeze,
173-
isDefinedBy: "rdfs:".freeze,
168+
comment: "The subject is a subclass of a class.".freeze,
169+
domain: "http://www.w3.org/2000/01/rdf-schema#Class".freeze,
170+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
174171
label: "subClassOf".freeze,
175-
range: "rdfs:Class".freeze,
176-
type: "rdf:Property".freeze
172+
range: "http://www.w3.org/2000/01/rdf-schema#Class".freeze,
173+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
177174
property :subPropertyOf,
178-
comment: %(The subject is a subproperty of a property.).freeze,
179-
domain: "rdf:Property".freeze,
180-
isDefinedBy: "rdfs:".freeze,
175+
comment: "The subject is a subproperty of a property.".freeze,
176+
domain: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze,
177+
isDefinedBy: "http://www.w3.org/2000/01/rdf-schema#".freeze,
181178
label: "subPropertyOf".freeze,
182-
range: "rdf:Property".freeze,
183-
type: "rdf:Property".freeze
179+
range: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze,
180+
type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze
184181
end
185182
end

0 commit comments

Comments
 (0)