nokogiri 1.3.3 → 1.4.0

data/lib/nokogiri/ffi/structs/xml_entity.rb

@@ -0,0 +1,32 @@
+module Nokogiri
+  # :stopdoc:
+  module LibXML
+    class XmlEntity < FFI::Struct
+      include CommonNode
+
+      layout(
+        :_private,      :long,
+        :type,          :int,
+        :name,          :string,
+        :children,      :pointer,
+        :last,          :pointer,
+        :parent,        :pointer,
+        :next,          :pointer,
+        :prev,          :pointer,
+        :doc,           :pointer,
+
+        :orig,          :string,
+        :content,       :string,
+        :length,        :int,
+        :etype,         :int,
+        :external_id,   :string,
+        :system_id,     :string,
+        :nexte,         :pointer,
+        :uri,           :string,
+        :owner,         :int,
+        :checked,       :int
+      )
+    end
+  end
+  # :startdoc:
+end

data/lib/nokogiri/ffi/structs/xml_enumeration.rb

@@ -0,0 +1,12 @@
+module Nokogiri
+  # :stopdoc:
+  module LibXML
+    class XmlEnumeration < FFI::Struct
+      layout(
+        :next, :pointer,
+        :name, :string
+      )
+    end
+  end
+  # :startdoc:
+end

data/lib/nokogiri/ffi/structs/xml_parser_context.rb

@@ -0,0 +1,19 @@
+module Nokogiri
+  # :stopdoc:
+  module LibXML
+    class XmlParserContext < FFI::Struct
+      layout(
+        :sax,               :pointer,
+        :userData,          :pointer,
+        :myDoc,             :pointer,
+        :wellFormed,        :int,
+        :replaceEntities,   :int,
+        :version,           :string,
+        :encoding,          :string,
+        :standalone,        :int,
+        :html,              :int
+      )
+    end
+  end
+  # :startdoc:
+end

data/lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb

@@ -1,7 +1,7 @@
 module Nokogiri
-  module LibXML # :nodoc:
-
-    class XmlSaxPushParserContext < FFI::ManagedStruct # :nodoc:
+  # :stopdoc:
+  module LibXML
+    class XmlSaxPushParserContext < FFI::ManagedStruct
 
       layout :dummy, :int, 0 # to avoid @layout warnings
 
@@ -11,4 +11,5 @@ module Nokogiri
     end
 
   end
+  # :startdoc:
 end

data/lib/nokogiri/ffi/structs/xml_syntax_error.rb

@@ -5,7 +5,7 @@ module Nokogiri
       layout(
         :domain,  :int,
         :code,    :int,
-        :message, :string,
+        :message, :pointer,
         :level,   :int,
         :file,    :string,
         :line,    :int,

data/lib/nokogiri/ffi/xml/attribute_decl.rb

@@ -0,0 +1,27 @@
+module Nokogiri
+  module XML
+    # :stopdoc:
+    class AttributeDecl < Nokogiri::XML::Node
+      def enumeration
+        list = []
+        return list if cstruct[:tree].null?
+        head = LibXML::XmlEnumeration.new cstruct[:tree]
+        loop do
+          list << head[:name]
+          break if head[:next].null?
+          head = LibXML::XmlEnumeration.new head[:next]
+        end
+        list
+      end
+
+      def attribute_type
+        cstruct[:atype]
+      end
+
+      def default
+        cstruct[:default_value]
+      end
+    end
+    # :startdoc:
+  end
+end

data/lib/nokogiri/ffi/xml/comment.rb

@@ -1,7 +1,7 @@
 module Nokogiri
   module XML
-    class Comment < Node
-      
+    class Comment < CharacterData
+
       def self.new(document, content, *rest) # :nodoc:
         node_ptr = LibXML.xmlNewDocComment(document.cstruct, content)
         node_cstruct = LibXML::XmlNode.new(node_ptr)

data/lib/nokogiri/ffi/xml/document.rb

@@ -1,14 +1,15 @@
+# :stopdoc:
 module Nokogiri
   module XML
     class Document < Node
 
-      attr_accessor :cstruct # :nodoc:
+      attr_accessor :cstruct
 
-      def url # :nodoc:
+      def url
         cstruct[:URL]
       end
 
-      def root=(new_root) # :nodoc:
+      def root= new_root
         old_root = nil
         if new_root.cstruct[:doc] != cstruct[:doc]
           old_root_ptr = LibXML.xmlDocGetRootElement(cstruct)
@@ -23,34 +24,38 @@ module Nokogiri
         new_root
       end
 
-      def root # :nodoc:
+      def root
         ptr = LibXML.xmlDocGetRootElement(cstruct)
         ptr.null? ? nil : Node.wrap(LibXML::XmlNode.new(ptr))
       end
 
-      def encoding=(encoding) # :nodoc:
+      def encoding= encoding
         # TODO: if :encoding is already set, then it's probably getting leaked.
         cstruct[:encoding] = LibXML.xmlStrdup(encoding)
       end
 
-      def encoding # :nodoc:
+      def encoding
         ptr = cstruct[:encoding]
         ptr.null? ? nil : ptr.read_string
       end
 
-      def self.read_io(io, url, encoding, options) # :nodoc:
+      def version
+        cstruct[:version]
+      end
+
+      def self.read_io io, url, encoding, options
         wrap_with_error_handling do
           LibXML.xmlReadIO(IoCallbacks.reader(io), nil, nil, url, encoding, options)
         end
       end
 
-      def self.read_memory(string, url, encoding, options) # :nodoc:
+      def self.read_memory(string, url, encoding, options)
         wrap_with_error_handling do
           LibXML.xmlReadMemory(string, string.length, url, encoding, options)
         end
       end
 
-      def dup(deep = 1) # :nodoc:
+      def dup deep = 1
         dup_ptr = LibXML.xmlCopyDoc(cstruct, deep)
         return nil if dup_ptr.null?
 
@@ -61,15 +66,19 @@ module Nokogiri
         self.class.wrap(dup_ptr)
       end
 
+      def remove_namespaces!
+        self.class.recursively_remove_namespaces_from_node(root)
+      end
+
       class << self
-        def new(*args) # :nodoc:
+        def new(*args)
           version = args.first || "1.0"
           doc = wrap(LibXML.xmlNewDoc(version))
           doc.send :initialize, *args
           doc
         end
 
-        def wrap(doc_struct) # :nodoc: #
+        def wrap doc_struct
           if doc_struct.is_a?(FFI::Pointer)
             # cast native pointers up into a doc cstruct
             return nil if doc_struct.null?
@@ -88,7 +97,7 @@ module Nokogiri
       private
 
       class << self
-        def wrap_with_error_handling(&block) # :nodoc:
+        def wrap_with_error_handling(&block)
           error_list = []
           LibXML.xmlInitParser()
           LibXML.xmlResetLastError()
@@ -111,8 +120,16 @@ module Nokogiri
           document.errors = error_list
           return document
         end
+
+        def recursively_remove_namespaces_from_node(node)
+          node.cstruct[:ns] = nil
+          node.children.each do |child|
+            recursively_remove_namespaces_from_node(child)
+          end
+        end
       end
 
     end
   end
 end
+# :startdoc:

data/lib/nokogiri/ffi/xml/document_fragment.rb

@@ -9,11 +9,6 @@ module Nokogiri
 
         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
-          node.cstruct[:ns] = node.document.children.first.cstruct[:ns] 
-        end
-
         node.send :initialize, document, *rest
         yield node if block_given?
 

data/lib/nokogiri/ffi/xml/dtd.rb

@@ -1,7 +1,7 @@
+# :stopdoc:
 module Nokogiri
   module XML
     class DTD < Node
-      # :stopdoc:
       def validate document
         error_list = []
         ctxt = LibXML.xmlNewValidCtxt
@@ -16,6 +16,14 @@ module Nokogiri
         error_list
       end
 
+      def system_id
+        cstruct[:system_id]
+      end
+
+      def external_id
+        cstruct[:external_id]
+      end
+
       def elements
         internal_attributes :elements
       end
@@ -24,6 +32,10 @@ module Nokogiri
         internal_attributes :entities
       end
 
+      def attributes
+        internal_attributes :attributes
+      end
+
       def notations
         attr_ptr = cstruct[:notations]
         return nil if attr_ptr.null?
@@ -51,8 +63,7 @@ module Nokogiri
         LibXML.xmlHashScan(attr_ptr, proc, nil)
         ahash
       end
-
-      # :startdoc:
     end
   end
 end
+# :startdoc:

data/lib/nokogiri/ffi/xml/element_content.rb

@@ -0,0 +1,43 @@
+# :stopdoc:
+module Nokogiri
+  module XML
+    class ElementContent
+      attr_accessor :cstruct
+
+      def self.wrap pointer, document
+        return nil if pointer.null?
+
+        c = ElementContent.allocate
+        c.cstruct = LibXML::XmlElementContent.new pointer
+        c.instance_variable_set :@document, document
+        c
+      end
+
+      def type
+        cstruct[:type]
+      end
+
+      def prefix
+        cstruct[:prefix]
+      end
+
+      def occur
+        cstruct[:ocur]
+      end
+
+      def name
+        cstruct[:name]
+      end
+
+      private
+      def c1
+        self.class.wrap cstruct[:c1], document
+      end
+
+      def c2
+        self.class.wrap cstruct[:c2], document
+      end
+    end
+  end
+end
+# :startdoc:

data/lib/nokogiri/ffi/xml/element_decl.rb

@@ -0,0 +1,19 @@
+# :stopdoc:
+module Nokogiri
+  module XML
+    class ElementDecl < Nokogiri::XML::Node
+      def element_type
+        cstruct[:etype]
+      end
+
+      def prefix
+        cstruct[:prefix]
+      end
+
+      def content
+        ElementContent.wrap cstruct[:content], document
+      end
+    end
+  end
+end
+# :startdoc:

data/lib/nokogiri/ffi/xml/entity_decl.rb

@@ -0,0 +1,27 @@
+# :stopdoc:
+module Nokogiri
+  module XML
+    class EntityDecl < Nokogiri::XML::Node
+      def content
+        cstruct[:content]
+      end
+
+      def entity_type
+        cstruct[:etype]
+      end
+
+      def external_id
+        cstruct[:external_id]
+      end
+
+      def system_id
+        cstruct[:system_id]
+      end
+
+      def original_content
+        cstruct[:orig]
+      end
+    end
+  end
+end
+# :startdoc:

data/lib/nokogiri/ffi/xml/node.rb

@@ -18,13 +18,41 @@ module Nokogiri
       end
 
       def internal_subset
-        return nil if cstruct[:doc].null?
         doc = cstruct.document
         dtd = LibXML.xmlGetIntSubset(doc)
         return nil if dtd.null?
         Node.wrap(dtd)
       end
 
+      def external_subset
+        doc = cstruct.document
+        return nil if doc[:extSubset].null?
+
+        Node.wrap(doc[:extSubset])
+      end
+
+      def create_internal_subset name, external_id, system_id
+        raise("Document already has an internal subset") if internal_subset
+
+        doc = cstruct.document
+        dtd_ptr = LibXML.xmlCreateIntSubset doc, name, external_id, system_id
+
+        return nil if dtd_ptr.null?
+
+        Node.wrap dtd_ptr
+      end
+
+      def create_external_subset name, external_id, system_id
+        raise("Document already has an external subset") if external_subset
+
+        doc = cstruct.document
+        dtd_ptr = LibXML.xmlNewDtd doc, name, external_id, system_id
+
+        return nil if dtd_ptr.null?
+
+        Node.wrap dtd_ptr
+      end
+
       def dup(deep = 1)
         dup_ptr = LibXML.xmlDocCopyNode(cstruct, cstruct.document, deep)
         return nil if dup_ptr.null?
@@ -61,7 +89,7 @@ module Nokogiri
 
         set = NodeSet.new child.document
         set_ptr = LibXML.xmlXPathNodeSetCreate(child.cstruct)
-        
+
         set.cstruct = LibXML::XmlNodeSet.new(set_ptr)
         return set unless child
 
@@ -109,7 +137,7 @@ module Nokogiri
       end
 
       def attribute(name)
-        raise "Node#attribute not implemented yet"
+        attribute_nodes.find { |x| x.name == name }
       end
 
       def attribute_with_ns(name, namespace)
@@ -266,11 +294,13 @@ module Nokogiri
                   when ELEMENT_NODE then [XML::Element]
                   when TEXT_NODE then [XML::Text]
                   when ENTITY_REF_NODE then [XML::EntityReference]
+                  when ATTRIBUTE_DECL then [XML::AttributeDecl, LibXML::XmlAttribute]
+                  when ELEMENT_DECL then [XML::ElementDecl, LibXML::XmlElement]
                   when COMMENT_NODE then [XML::Comment]
                   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]
@@ -316,6 +346,7 @@ module Nokogiri
 
       def self.reparent_node_with(node, other, &block)
         raise(ArgumentError, "node must be a Nokogiri::XML::Node") unless node.is_a?(Nokogiri::XML::Node)
+        raise(ArgumentError, "cannot reparent a document node") if node.node_type == DOCUMENT_NODE || node.node_type == HTML_DOCUMENT_NODE
 
         # If a document fragment is added, we need to reparent all of it's
         # children
@@ -326,6 +357,11 @@ module Nokogiri
           return node
         end
 
+        if node.type == TEXT_NODE
+          node.cstruct.keep_reference_from_document!
+          node.cstruct = LibXML::XmlNode.new(LibXML.xmlDocCopyNode(node.cstruct, other.cstruct.document, 1))
+        end
+
         if node.cstruct[:doc] == other.cstruct[:doc]
           LibXML.xmlUnlinkNode(node.cstruct)
           if node.type == TEXT_NODE && other.type == TEXT_NODE && Nokogiri.is_2_6_16?
@@ -358,8 +394,10 @@ module Nokogiri
       end
 
       def self.relink_namespace(reparented_struct)
+        return if reparented_struct[:parent].null?
+
         # Make sure that our reparented node has the correct namespaces
-        if reparented_struct[:doc] != reparented_struct[:parent]
+        if reparented_struct[:ns].null? && reparented_struct[:doc] != reparented_struct[:parent]
           LibXML.xmlSetNs(reparented_struct, LibXML::XmlNode.new(reparented_struct[:parent])[:ns])
         end
 
@@ -402,3 +440,5 @@ module Nokogiri
     end
   end
 end
+class Nokogiri::XML::Element < Nokogiri::XML::Node; end
+class Nokogiri::XML::CharacterData < Nokogiri::XML::Node; end