fixes #751.

sparklemotion · Dec 5, 2012 · 173f5b7 · 173f5b7
1 parent 006dfd2
commit 173f5b7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/ext/java/nokogiri/XmlDtd.java b/ext/java/nokogiri/XmlDtd.java
@@ -129,9 +129,20 @@ public static XmlDtd newEmpty(Ruby runtime,
                                   IRubyObject name,
                                   IRubyObject external_id,
                                   IRubyObject system_id) {
-        Element placeHolder = doc.createElement("dtd_placeholder");
+
+        DocumentType placeholder = null;
+        if (doc.getDoctype() == null) {
+          String javaName = NokogiriHelpers.rubyStringToString(name);
+          String javaExternalId = NokogiriHelpers.rubyStringToString(external_id);
+          String javaSystemId = NokogiriHelpers.rubyStringToString(system_id);
+          placeholder = doc.getImplementation().createDocumentType(javaName, javaExternalId, javaSystemId);
+          doc.appendChild(placeholder);
+        } else {
+          placeholder = doc.getDoctype();
+        }
+        // FIXME: what if the document had a doc type, why are we here ?
         XmlDtd dtd = (XmlDtd) NokogiriService.XML_DTD_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::DTD"));
-        dtd.setNode(runtime, placeHolder);
+        dtd.setNode(runtime, placeholder);
         dtd.name = name;
         dtd.pubId = external_id;
         dtd.sysId = system_id;

diff --git a/test/xml/test_builder.rb b/test/xml/test_builder.rb
@@ -111,6 +111,21 @@ def test_specify_namespace
         assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
+      def test_dtd_in_builder_output
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.doc.create_internal_subset(
+                                         'html',
+                                         "-//W3C//DTD HTML 4.01 Transitional//EN",
+                                         "http://www.w3.org/TR/html4/loose.dtd"
+                                         )
+          xml.root do
+            xml.foo
+          end
+        end
+        assert_match(/<!DOCTYPE html PUBLIC "-\/\/W3C\/\/DTD HTML 4.01 Transitional\/\/EN" "http:\/\/www.w3.org\/TR\/html4\/loose.dtd">/,
+                     builder.to_xml)
+      end
+
       def test_specify_namespace_nested
         b = Nokogiri::XML::Builder.new { |xml|
           xml.root('xmlns:foo' => 'bar') do