Skip to content

Commit ad40f93

Browse files
gkellogggkellogg
committed
Validate and lint HTML/RDFa output.
1 parent 8534131 commit ad40f93

File tree

3 files changed

+41
-39
lines changed

3 files changed

+41
-39
lines changed

‎sparql11/data-sparql11/protocol/gen_manifest.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require 'cgi'
22
require 'getoptlong'
33
require 'json/ld'
4+
require 'rdf/rdfa'
45
require 'rdf/reasoner'
56
require 'rdf/turtle'
67
require 'haml'
@@ -883,12 +884,13 @@ def usage(**options)
883884
template = File.read(File.expand_path('../template.haml', __FILE__))
884885
engine = Haml::Engine.new(template, format: :html5)
885886
html = engine.render(self, man: JSON.parse(man.to_json))
887+
validate(RDF::RDFa::Reader.new(html, base_uri: "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/protocol/manifest.ttl", validate: validate)) if validate
886888
output.write(html)
887889
when :jsonld
888-
validate(JSON::LD::Reader.new(man.to_json)) if validate
890+
validate(JSON::LD::Reader.new(man.to_json, base_uri: "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/protocol/manifest.ttl", validate: validate)) if validate
889891
output.puts man.to_json(JSON::LD::JSON_STATE)
890892
when :ttl
891-
JSON::LD::Reader.new(man.to_json) do |reader|
893+
JSON::LD::Reader.new(man.to_json, validate: validate) do |reader|
892894
ttl = RDF::Turtle::Writer.buffer(
893895
prefixes: {
894896
"": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/protocol/manifest#",
@@ -902,7 +904,7 @@ def usage(**options)
902904
}
903905
) {|writer| writer << reader}
904906

905-
validate(RDF::Turtle::Reader.new(ttl)) if validate
907+
validate(RDF::Turtle::Reader.new(ttl, base_uri: "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/protocol/manifest.ttl", validate: true)) if validate
906908

907909
# Do some result hacking
908910
ttl.sub!('<http://www.w3.org/2009/sparql/docs/tests/data-sparql11/protocol/manifest>', '<>')

‎sparql11/data-sparql11/protocol/index.html

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ <h2>
116116
<dd inlist property='mf:entry' resource='#query_get' typeof='mf:ProtocolTest'>
117117
<dl class='test-detail'>
118118
<dt>type</dt>
119-
<dd property='rdf:type'>mf:ProtocolTest</dd>
119+
<dd>mf:ProtocolTest</dd>
120120
<dt>approval</dt>
121121
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
122122
<dt>approvedBy</dt>
@@ -169,7 +169,7 @@ <h4>Response</h4>
169169
<dd inlist property='mf:entry' resource='#query_post_form' typeof='mf:ProtocolTest'>
170170
<dl class='test-detail'>
171171
<dt>type</dt>
172-
<dd property='rdf:type'>mf:ProtocolTest</dd>
172+
<dd>mf:ProtocolTest</dd>
173173
<dt>approval</dt>
174174
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
175175
<dt>approvedBy</dt>
@@ -229,7 +229,7 @@ <h4>Response</h4>
229229
<dd inlist property='mf:entry' resource='#query_post_direct' typeof='mf:ProtocolTest'>
230230
<dl class='test-detail'>
231231
<dt>type</dt>
232-
<dd property='rdf:type'>mf:ProtocolTest</dd>
232+
<dd>mf:ProtocolTest</dd>
233233
<dt>approval</dt>
234234
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
235235
<dt>approvedBy</dt>
@@ -294,7 +294,7 @@ <h4>Response</h4>
294294
<dd inlist property='mf:entry' resource='#query_dataset_default_graph' typeof='mf:ProtocolTest'>
295295
<dl class='test-detail'>
296296
<dt>type</dt>
297-
<dd property='rdf:type'>mf:ProtocolTest</dd>
297+
<dd>mf:ProtocolTest</dd>
298298
<dt>approval</dt>
299299
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
300300
<dt>approvedBy</dt>
@@ -359,7 +359,7 @@ <h4>Response</h4>
359359
<dd inlist property='mf:entry' resource='#query_dataset_default_graphs_get' typeof='mf:ProtocolTest'>
360360
<dl class='test-detail'>
361361
<dt>type</dt>
362-
<dd property='rdf:type'>mf:ProtocolTest</dd>
362+
<dd>mf:ProtocolTest</dd>
363363
<dt>approval</dt>
364364
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
365365
<dt>approvedBy</dt>
@@ -412,7 +412,7 @@ <h4>Response</h4>
412412
<dd inlist property='mf:entry' resource='#query_dataset_default_graphs_post' typeof='mf:ProtocolTest'>
413413
<dl class='test-detail'>
414414
<dt>type</dt>
415-
<dd property='rdf:type'>mf:ProtocolTest</dd>
415+
<dd>mf:ProtocolTest</dd>
416416
<dt>approval</dt>
417417
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
418418
<dt>approvedBy</dt>
@@ -477,7 +477,7 @@ <h4>Response</h4>
477477
<dd inlist property='mf:entry' resource='#query_dataset_named_graphs_post' typeof='mf:ProtocolTest'>
478478
<dl class='test-detail'>
479479
<dt>type</dt>
480-
<dd property='rdf:type'>mf:ProtocolTest</dd>
480+
<dd>mf:ProtocolTest</dd>
481481
<dt>approval</dt>
482482
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
483483
<dt>approvedBy</dt>
@@ -542,7 +542,7 @@ <h4>Response</h4>
542542
<dd inlist property='mf:entry' resource='#query_dataset_named_graphs_get' typeof='mf:ProtocolTest'>
543543
<dl class='test-detail'>
544544
<dt>type</dt>
545-
<dd property='rdf:type'>mf:ProtocolTest</dd>
545+
<dd>mf:ProtocolTest</dd>
546546
<dt>approval</dt>
547547
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
548548
<dt>approvedBy</dt>
@@ -595,7 +595,7 @@ <h4>Response</h4>
595595
<dd inlist property='mf:entry' resource='#query_dataset_full' typeof='mf:ProtocolTest'>
596596
<dl class='test-detail'>
597597
<dt>type</dt>
598-
<dd property='rdf:type'>mf:ProtocolTest</dd>
598+
<dd>mf:ProtocolTest</dd>
599599
<dt>approval</dt>
600600
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
601601
<dt>approvedBy</dt>
@@ -660,7 +660,7 @@ <h4>Response</h4>
660660
<dd inlist property='mf:entry' resource='#query_multiple_dataset' typeof='mf:ProtocolTest'>
661661
<dl class='test-detail'>
662662
<dt>type</dt>
663-
<dd property='rdf:type'>mf:ProtocolTest</dd>
663+
<dd>mf:ProtocolTest</dd>
664664
<dt>approval</dt>
665665
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
666666
<dt>approvedBy</dt>
@@ -725,7 +725,7 @@ <h4>Response</h4>
725725
<dd inlist property='mf:entry' resource='#query_content_type_select' typeof='mf:ProtocolTest'>
726726
<dl class='test-detail'>
727727
<dt>type</dt>
728-
<dd property='rdf:type'>mf:ProtocolTest</dd>
728+
<dd>mf:ProtocolTest</dd>
729729
<dt>approval</dt>
730730
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
731731
<dt>approvedBy</dt>
@@ -789,7 +789,7 @@ <h4>Response</h4>
789789
<dd inlist property='mf:entry' resource='#query_content_type_ask' typeof='mf:ProtocolTest'>
790790
<dl class='test-detail'>
791791
<dt>type</dt>
792-
<dd property='rdf:type'>mf:ProtocolTest</dd>
792+
<dd>mf:ProtocolTest</dd>
793793
<dt>approval</dt>
794794
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
795795
<dt>approvedBy</dt>
@@ -849,7 +849,7 @@ <h4>Response</h4>
849849
<dd inlist property='mf:entry' resource='#query_content_type_describe' typeof='mf:ProtocolTest'>
850850
<dl class='test-detail'>
851851
<dt>type</dt>
852-
<dd property='rdf:type'>mf:ProtocolTest</dd>
852+
<dd>mf:ProtocolTest</dd>
853853
<dt>approval</dt>
854854
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
855855
<dt>approvedBy</dt>
@@ -915,7 +915,7 @@ <h4>Response</h4>
915915
<dd inlist property='mf:entry' resource='#query_content_type_construct' typeof='mf:ProtocolTest'>
916916
<dl class='test-detail'>
917917
<dt>type</dt>
918-
<dd property='rdf:type'>mf:ProtocolTest</dd>
918+
<dd>mf:ProtocolTest</dd>
919919
<dt>approval</dt>
920920
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
921921
<dt>approvedBy</dt>
@@ -981,7 +981,7 @@ <h4>Response</h4>
981981
<dd inlist property='mf:entry' resource='#update_dataset_default_graph' typeof='mf:ProtocolTest'>
982982
<dl class='test-detail'>
983983
<dt>type</dt>
984-
<dd property='rdf:type'>mf:ProtocolTest</dd>
984+
<dd>mf:ProtocolTest</dd>
985985
<dt>approval</dt>
986986
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
987987
<dt>approvedBy</dt>
@@ -1082,7 +1082,7 @@ <h4>Response</h4>
10821082
<dd inlist property='mf:entry' resource='#update_dataset_default_graphs' typeof='mf:ProtocolTest'>
10831083
<dl class='test-detail'>
10841084
<dt>type</dt>
1085-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1085+
<dd>mf:ProtocolTest</dd>
10861086
<dt>approval</dt>
10871087
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
10881088
<dt>approvedBy</dt>
@@ -1189,7 +1189,7 @@ <h4>Response</h4>
11891189
<dd inlist property='mf:entry' resource='#update_dataset_named_graphs' typeof='mf:ProtocolTest'>
11901190
<dl class='test-detail'>
11911191
<dt>type</dt>
1192-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1192+
<dd>mf:ProtocolTest</dd>
11931193
<dt>approval</dt>
11941194
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
11951195
<dt>approvedBy</dt>
@@ -1296,7 +1296,7 @@ <h4>Response</h4>
12961296
<dd inlist property='mf:entry' resource='#update_dataset_full' typeof='mf:ProtocolTest'>
12971297
<dl class='test-detail'>
12981298
<dt>type</dt>
1299-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1299+
<dd>mf:ProtocolTest</dd>
13001300
<dt>approval</dt>
13011301
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
13021302
<dt>approvedBy</dt>
@@ -1399,7 +1399,7 @@ <h4>Response</h4>
13991399
<dd inlist property='mf:entry' resource='#update_post_form' typeof='mf:ProtocolTest'>
14001400
<dl class='test-detail'>
14011401
<dt>type</dt>
1402-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1402+
<dd>mf:ProtocolTest</dd>
14031403
<dt>approval</dt>
14041404
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
14051405
<dt>approvedBy</dt>
@@ -1450,7 +1450,7 @@ <h4>Response</h4>
14501450
<dd inlist property='mf:entry' resource='#update_post_direct' typeof='mf:ProtocolTest'>
14511451
<dl class='test-detail'>
14521452
<dt>type</dt>
1453-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1453+
<dd>mf:ProtocolTest</dd>
14541454
<dt>approval</dt>
14551455
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
14561456
<dt>approvedBy</dt>
@@ -1501,7 +1501,7 @@ <h4>Response</h4>
15011501
<dd inlist property='mf:entry' resource='#update_base_uri' typeof='mf:ProtocolTest'>
15021502
<dl class='test-detail'>
15031503
<dt>type</dt>
1504-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1504+
<dd>mf:ProtocolTest</dd>
15051505
<dt>approval</dt>
15061506
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
15071507
<dt>approvedBy</dt>
@@ -1601,7 +1601,7 @@ <h4>Response</h4>
16011601
<dd inlist property='mf:entry' resource='#bad_query_method' typeof='mf:ProtocolTest'>
16021602
<dl class='test-detail'>
16031603
<dt>type</dt>
1604-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1604+
<dd>mf:ProtocolTest</dd>
16051605
<dt>approval</dt>
16061606
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
16071607
<dt>approvedBy</dt>
@@ -1639,7 +1639,7 @@ <h4>Response</h4>
16391639
<dd inlist property='mf:entry' resource='#bad_multiple_queries' typeof='mf:ProtocolTest'>
16401640
<dl class='test-detail'>
16411641
<dt>type</dt>
1642-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1642+
<dd>mf:ProtocolTest</dd>
16431643
<dt>approval</dt>
16441644
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
16451645
<dt>approvedBy</dt>
@@ -1677,7 +1677,7 @@ <h4>Response</h4>
16771677
<dd inlist property='mf:entry' resource='#bad_query_wrong_media_type' typeof='mf:ProtocolTest'>
16781678
<dl class='test-detail'>
16791679
<dt>type</dt>
1680-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1680+
<dd>mf:ProtocolTest</dd>
16811681
<dt>approval</dt>
16821682
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
16831683
<dt>approvedBy</dt>
@@ -1727,7 +1727,7 @@ <h4>Response</h4>
17271727
<dd inlist property='mf:entry' resource='#bad_query_missing_form_type' typeof='mf:ProtocolTest'>
17281728
<dl class='test-detail'>
17291729
<dt>type</dt>
1730-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1730+
<dd>mf:ProtocolTest</dd>
17311731
<dt>approval</dt>
17321732
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
17331733
<dt>approvedBy</dt>
@@ -1770,7 +1770,7 @@ <h4>Response</h4>
17701770
<dd inlist property='mf:entry' resource='#bad_query_missing_direct_type' typeof='mf:ProtocolTest'>
17711771
<dl class='test-detail'>
17721772
<dt>type</dt>
1773-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1773+
<dd>mf:ProtocolTest</dd>
17741774
<dt>approval</dt>
17751775
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
17761776
<dt>approvedBy</dt>
@@ -1820,7 +1820,7 @@ <h4>Response</h4>
18201820
<dd inlist property='mf:entry' resource='#bad_query_non_utf8' typeof='mf:ProtocolTest'>
18211821
<dl class='test-detail'>
18221822
<dt>type</dt>
1823-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1823+
<dd>mf:ProtocolTest</dd>
18241824
<dt>approval</dt>
18251825
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
18261826
<dt>approvedBy</dt>
@@ -1871,7 +1871,7 @@ <h4>Response</h4>
18711871
<dd inlist property='mf:entry' resource='#bad_query_syntax' typeof='mf:ProtocolTest'>
18721872
<dl class='test-detail'>
18731873
<dt>type</dt>
1874-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1874+
<dd>mf:ProtocolTest</dd>
18751875
<dt>approval</dt>
18761876
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
18771877
<dt>approvedBy</dt>
@@ -1909,7 +1909,7 @@ <h4>Response</h4>
19091909
<dd inlist property='mf:entry' resource='#bad_update_get' typeof='mf:ProtocolTest'>
19101910
<dl class='test-detail'>
19111911
<dt>type</dt>
1912-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1912+
<dd>mf:ProtocolTest</dd>
19131913
<dt>approval</dt>
19141914
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
19151915
<dt>approvedBy</dt>
@@ -1947,7 +1947,7 @@ <h4>Response</h4>
19471947
<dd inlist property='mf:entry' resource='#bad_multiple_updates' typeof='mf:ProtocolTest'>
19481948
<dl class='test-detail'>
19491949
<dt>type</dt>
1950-
<dd property='rdf:type'>mf:ProtocolTest</dd>
1950+
<dd>mf:ProtocolTest</dd>
19511951
<dt>approval</dt>
19521952
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
19531953
<dt>approvedBy</dt>
@@ -1997,7 +1997,7 @@ <h4>Response</h4>
19971997
<dd inlist property='mf:entry' resource='#bad_update_wrong_media_type' typeof='mf:ProtocolTest'>
19981998
<dl class='test-detail'>
19991999
<dt>type</dt>
2000-
<dd property='rdf:type'>mf:ProtocolTest</dd>
2000+
<dd>mf:ProtocolTest</dd>
20012001
<dt>approval</dt>
20022002
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
20032003
<dt>approvedBy</dt>
@@ -2047,7 +2047,7 @@ <h4>Response</h4>
20472047
<dd inlist property='mf:entry' resource='#bad_update_missing_form_type' typeof='mf:ProtocolTest'>
20482048
<dl class='test-detail'>
20492049
<dt>type</dt>
2050-
<dd property='rdf:type'>mf:ProtocolTest</dd>
2050+
<dd>mf:ProtocolTest</dd>
20512051
<dt>approval</dt>
20522052
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
20532053
<dt>approvedBy</dt>
@@ -2090,7 +2090,7 @@ <h4>Response</h4>
20902090
<dd inlist property='mf:entry' resource='#bad_update_non_utf8' typeof='mf:ProtocolTest'>
20912091
<dl class='test-detail'>
20922092
<dt>type</dt>
2093-
<dd property='rdf:type'>mf:ProtocolTest</dd>
2093+
<dd>mf:ProtocolTest</dd>
20942094
<dt>approval</dt>
20952095
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
20962096
<dt>approvedBy</dt>
@@ -2141,7 +2141,7 @@ <h4>Response</h4>
21412141
<dd inlist property='mf:entry' resource='#bad_update_syntax' typeof='mf:ProtocolTest'>
21422142
<dl class='test-detail'>
21432143
<dt>type</dt>
2144-
<dd property='rdf:type'>mf:ProtocolTest</dd>
2144+
<dd>mf:ProtocolTest</dd>
21452145
<dt>approval</dt>
21462146
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
21472147
<dt>approvedBy</dt>
@@ -2191,7 +2191,7 @@ <h4>Response</h4>
21912191
<dd inlist property='mf:entry' resource='#bad_update_dataset_conflict' typeof='mf:ProtocolTest'>
21922192
<dl class='test-detail'>
21932193
<dt>type</dt>
2194-
<dd property='rdf:type'>mf:ProtocolTest</dd>
2194+
<dd>mf:ProtocolTest</dd>
21952195
<dt>approval</dt>
21962196
<dd property='mf:approval' resource='dawgt:Approved'>dawgt:Approved</dd>
21972197
<dt>approvedBy</dt>

‎sparql11/data-sparql11/protocol/template.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
%dd{property: "mf:entry", inlist: true, resource: test['@id'], typeof: test['@type']}
116116
%dl.test-detail
117117
%dt="type"
118-
%dd{property: 'rdf:type'}<~test['@type']
118+
%dd<~test['@type']
119119
%dt="approval"
120120
%dd{property: "mf:approval", resource: test['approval']}<~test['approval']
121121
- # Syntax Tests

0 commit comments

Comments
 (0)