FFI - nodes may be subclassed. closes #54

lib/nokogiri/ffi/xml/attr.rb

@@ -9,7 +9,7 @@ def self.new(document, name) # :nodoc:
         node_cstruct[:doc] = document.cstruct[:doc]
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct)
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
         yield node if block_given?
         node
       end

lib/nokogiri/ffi/xml/cdata.rb

@@ -11,7 +11,7 @@ def self.new(document, content, &block) # :nodoc:
 
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct);
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
         yield node if block_given?
         node
       end

lib/nokogiri/ffi/xml/comment.rb

@@ -8,7 +8,7 @@ def self.new(document, content, &block) # :nodoc:
 
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct);
 
-        node = Node.wrap(node_ptr)
+        node = Node.wrap(node_ptr, self)
 
         yield node if block_given?
 

lib/nokogiri/ffi/xml/document_fragment.rb

@@ -10,7 +10,7 @@ def self.new(document, &block) # :nodoc:
 
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct)
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
 
         if node.document.child && node.document.child.node_type == ELEMENT_NODE
           # TODO: node_type check should be ported into master, because of e.g. DTD nodes

lib/nokogiri/ffi/xml/entity_reference.rb

@@ -10,7 +10,7 @@ def self.new(document, name, &block) # :nodoc:
 
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct);
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
 
         yield node if block_given?
 

lib/nokogiri/ffi/xml/node.rb

@@ -27,7 +27,7 @@ def internal_subset # :nodoc:
       def dup(deep = 1) # :nodoc:
         dup_ptr = LibXML.xmlDocCopyNode(cstruct, cstruct.document, deep)
         return nil if dup_ptr.null?
-        Node.wrap(dup_ptr)
+        Node.wrap(dup_ptr, self.class)
       end
 
       def unlink # :nodoc:
@@ -231,7 +231,7 @@ def self.new(name, document, &block) # :nodoc:
 
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct);
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
 
         yield node if block_given?
 
@@ -249,7 +249,7 @@ def compare(other) # :nodoc:
         LibXML.xmlXPathCmpNodes(other.cstruct, self.cstruct)
       end
 
-      def self.wrap(node_struct) # :nodoc:
+      def self.wrap(node_struct, klass=nil) # :nodoc:
         if node_struct.is_a?(FFI::Pointer)
           # cast native pointers up into a node cstruct
           return nil if node_struct.null?
@@ -280,7 +280,12 @@ def self.wrap(node_struct) # :nodoc:
                   when DTD_NODE then [XML::DTD, LibXML::XmlDtd]
                   else [XML::Node]
                   end
-        node = klasses.first.allocate
+
+        if klass
+          node = klass.allocate
+        else
+          node = klasses.first.allocate
+        end
         node.cstruct = klasses[1] ? klasses[1].new(node_struct.pointer) : node_struct
 
         node.cstruct.ruby_node = node

lib/nokogiri/ffi/xml/processing_instruction.rb

@@ -11,7 +11,7 @@ def self.new(document, name, content) # :nodoc:
         node_cstruct[:doc] = document.cstruct[:doc]
         LibXML.xmlXPathNodeSetAdd(node_cstruct.document.node_set, node_cstruct)
 
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
         yield node if block_given?
         node
       end

lib/nokogiri/ffi/xml/text.rb

@@ -6,7 +6,7 @@ def self.new(string, document) # :nodoc:
         node_ptr = LibXML.xmlNewText(string)
         node_cstruct = LibXML::XmlNode.new(node_ptr)
         node_cstruct[:doc] = document.cstruct
-        node = Node.wrap(node_cstruct)
+        node = Node.wrap(node_cstruct, self)
         yield node if block_given?
         node
       end