entity decl works in jruby

mkristian · Sep 12, 2009 · 5f5dbfa · 5f5dbfa
1 parent d9b9c9e
commit 5f5dbfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -101,6 +101,7 @@ lib/nokogiri/ffi/structs/xml_buffer.rb
 lib/nokogiri/ffi/structs/xml_document.rb
 lib/nokogiri/ffi/structs/xml_dtd.rb
 lib/nokogiri/ffi/structs/xml_element.rb
+lib/nokogiri/ffi/structs/xml_entity.rb
 lib/nokogiri/ffi/structs/xml_enumeration.rb
 lib/nokogiri/ffi/structs/xml_node.rb
 lib/nokogiri/ffi/structs/xml_node_set.rb
@@ -125,6 +126,7 @@ lib/nokogiri/ffi/xml/document.rb
 lib/nokogiri/ffi/xml/document_fragment.rb
 lib/nokogiri/ffi/xml/dtd.rb
 lib/nokogiri/ffi/xml/element_decl.rb
+lib/nokogiri/ffi/xml/entity_decl.rb
 lib/nokogiri/ffi/xml/entity_reference.rb
 lib/nokogiri/ffi/xml/namespace.rb
 lib/nokogiri/ffi/xml/node.rb
@@ -160,7 +162,7 @@ lib/nokogiri/xml/document.rb
 lib/nokogiri/xml/document_fragment.rb
 lib/nokogiri/xml/dtd.rb
 lib/nokogiri/xml/element_decl.rb
-lib/nokogiri/xml/entity_declaration.rb
+lib/nokogiri/xml/entity_decl.rb
 lib/nokogiri/xml/fragment_handler.rb
 lib/nokogiri/xml/namespace.rb
 lib/nokogiri/xml/node.rb

diff --git a/lib/nokogiri/ffi/libxml.rb b/lib/nokogiri/ffi/libxml.rb
@@ -298,12 +298,14 @@ def self.pointer_offset(n)
   "structs/xml_parser_context",
   "structs/xml_attribute",
   "structs/xml_element",
+  "structs/xml_entity",
   "xml/node",
   "xml/namespace",
   "xml/dtd",
   "xml/attr",
   "xml/attribute_decl",
   "xml/element_decl",
+  "xml/entity_decl",
   "xml/document",
   "xml/document_fragment",
   "xml/schema",

diff --git a/lib/nokogiri/ffi/xml/node.rb b/lib/nokogiri/ffi/xml/node.rb
@@ -272,7 +272,7 @@ def self.wrap(node_struct, klass=nil)
                   when DOCUMENT_FRAG_NODE then [XML::DocumentFragment]
                   when PI_NODE then [XML::ProcessingInstruction]
                   when ATTRIBUTE_NODE then [XML::Attr]
-                  when ENTITY_DECL then [XML::EntityDeclaration]
+                  when ENTITY_DECL then [XML::EntityDecl, LibXML::XmlEntity]
                   when CDATA_SECTION_NODE then [XML::CDATA]
                   when DTD_NODE then [XML::DTD, LibXML::XmlDtd]
                   else [XML::Node]