Skip to content

Commit 172ae02

Browse files
committed
Don't use self-closing tags until Haml fixes problem with haml_tag. (reverted from commit 9f43ed9)
1 parent fb0cd2a commit 172ae02

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

lib/rdf/rdfxml/writer/haml_templates.rb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class Writer
3838
- if expanded_type.start_with?('_:')
3939
- haml_tag(get_qname(RDF.type), "rdf:nodeID" => expanded_type[2..-1])
4040
-else
41-
- # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
42-
- haml_tag(get_qname(RDF.type), "", "rdf:resource" => expanded_type)
41+
- haml_tag(get_qname(RDF.type), "rdf:resource" => expanded_type)
4342
- predicates.each do |p|
4443
= yield(p)
4544
),
@@ -60,11 +59,9 @@ class Writer
6059
- haml_tag(property, :"<", "xml:lang" => object.language, "rdf:datatype" => (object.datatype unless object.plain?)) do
6160
= object.value.to_s.encode(xml: :text)
6261
- elsif object.node?
63-
- # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
64-
- haml_tag(property, "", "rdf:nodeID" => object.id)
62+
- haml_tag(property, :"/", "rdf:nodeID" => object.id)
6563
- else
66-
- # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
67-
- haml_tag(property, "", "rdf:resource" => relativize(object))
64+
- haml_tag(property, :"/", "rdf:resource" => relativize(object))
6865
),
6966

7067
# Outpust for a list
@@ -78,11 +75,9 @@ class Writer
7875
- if recurse && res = yield(object)
7976
= res
8077
- elsif object.node?
81-
- # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
82-
- haml_tag(get_qname(RDF.Description), "", "rdf:nodeID" => (object.id if ref_count(object) > 1))
78+
- haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))
8379
- else
84-
- # FIXME: closing tag forces close tag, as :/ is not honored in 5.0.1
85-
- haml_tag(get_qname(RDF.Description), "", "rdf:about" => relativize(object))
80+
- haml_tag(get_qname(RDF.Description), :"/", "rdf:about" => relativize(object))
8681
),
8782
}
8883
HAML_TEMPLATES = {base: BASE_HAML}

spec/writer_spec.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,7 @@ class FOO < RDF::Vocabulary("http://foo/"); end
690690
describe m.comment do
691691
m.entries.each do |t|
692692
next unless t.positive_test? && t.evaluate?
693-
# Literal serialization adds namespace definitions
694-
695693
specify "#{t.name}" do
696-
pending if t.name == 'xml-canon-test001'
697694
unless defined?(::Nokogiri)
698695
pending("XML-C14XL") if t.name == "xml-canon-test001"
699696
end

0 commit comments

Comments
 (0)