nokogiri 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60

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

@@ -4,16 +4,34 @@ module Nokogiri
       ###
       # Save options for serializing nodes
       class SaveOptions
-        FORMAT          = 1  # Format serialized xml
-        NO_DECLARATION  = 2  # Do not include delcarations
+        # Format serialized xml
+        FORMAT          = 1
+        # Do not include delcarations
+        NO_DECLARATION  = 2
+        # Do not include empty tags
         NO_EMPTY_TAGS   = 4
+        # Do not save XHTML
         NO_XHTML        = 8
+        # Save as XHTML
         AS_XHTML        = 16
+        # Save as XML
         AS_XML          = 32
+        # Save as HTML
         AS_HTML         = 64
 
+        # the default for XML documents
+        DEFAULT_XML  = FORMAT | AS_XML
+        # the default for HTML document
+        DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        # the default for XHTML document
+        DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
+
+        # Integer representation of the SaveOptions
         attr_reader :options
+
+        # Create a new SaveOptions object with +options+
         def initialize options = 0; @options = options; end
+
         constants.each do |constant|
           class_eval %{
             def #{constant.downcase}
@@ -26,6 +44,8 @@ module Nokogiri
             end
           }
         end
+
+        alias :to_i :options
       end
     end
   end

data/lib/nokogiri/xml/node_set.rb

@@ -13,14 +13,20 @@ module Nokogiri
       # Create a NodeSet with +document+ defaulting to +list+
       def initialize document, list = []
         @document = document
+        document.decorate(self)
         list.each { |x| self << x }
         yield self if block_given?
       end
 
       ###
       # Get the first element of the NodeSet.
-      def first
-        self[0]
+      def first n = nil
+        return self[0] unless n
+        list = []
+        0.upto(n - 1) do |i|
+          list << self[i]
+        end
+        list
       end
 
       ###
@@ -35,6 +41,13 @@ module Nokogiri
         length == 0
       end
 
+      ###
+      # Returns the index of the first node in self that is == to +node+. Returns nil if no match is found.
+      def index(node)
+        each_with_index { |member, j| return j if member == node }
+        nil
+      end
+
       ###
       # Insert +datum+ before the first Node in this NodeSet
       def before datum
@@ -56,19 +69,81 @@ module Nokogiri
       # For more information see Nokogiri::XML::Node#css and
       # Nokogiri::XML::Node#xpath
       def search *paths
-        ns = paths.last.is_a?(Hash) ? paths.pop : document.root.namespaces
+        handler = ![
+          Hash, String, Symbol
+        ].include?(paths.last.class) ? paths.pop : nil
+
+        ns = paths.last.is_a?(Hash) ? paths.pop : nil
+
         sub_set = NodeSet.new(document)
+
+        paths.each do |path|
+          sub_set += send(
+            path =~ /^(\.\/|\/)/ ? :xpath : :css,
+            *(paths + [ns, handler]).compact
+          )
+        end
+
         document.decorate(sub_set)
+        sub_set
+      end
+      alias :/ :search
+
+      ###
+      # Search this NodeSet for css +paths+
+      #
+      # For more information see Nokogiri::XML::Node#css
+      def css *paths
+        handler = ![
+          Hash, String, Symbol
+        ].include?(paths.last.class) ? paths.pop : nil
+
+        ns = paths.last.is_a?(Hash) ? paths.pop : nil
+
+        sub_set = NodeSet.new(document)
+
         each do |node|
-          node.search(*(paths + [ns])).each do |sub_node|
-            sub_set << sub_node
-          end
+          doc = node.document
+          search_ns = ns || (doc.root ? doc.root.namespaces : {})
+
+          xpaths = paths.map { |rule|
+            [
+              CSS.xpath_for(rule.to_s, :prefix => ".//", :ns => search_ns),
+              CSS.xpath_for(rule.to_s, :prefix => "self::", :ns => search_ns)
+            ].join(' | ')
+          }
+
+          sub_set += node.xpath(*(xpaths + [search_ns, handler].compact))
         end
+        document.decorate(sub_set)
+        sub_set
+      end
+
+      ###
+      # Search this NodeSet for XPath +paths+
+      #
+      # For more information see Nokogiri::XML::Node#xpath
+      def xpath *paths
+        handler = ![
+          Hash, String, Symbol
+        ].include?(paths.last.class) ? paths.pop : nil
+
+        ns = paths.last.is_a?(Hash) ? paths.pop : nil
+
+        sub_set = NodeSet.new(document)
+        each do |node|
+          sub_set += node.xpath(*(paths + [ns, handler].compact))
+        end
+        document.decorate(sub_set)
         sub_set
       end
-      alias :/ :search
-      alias :xpath :search
-      alias :css :search
+
+      ###
+      # Search this NodeSet's nodes' immediate children using CSS selector +selector+
+      def > selector
+        ns = document.root.namespaces
+        xpath CSS.xpath_for(selector, :prefix => "./", :ns => ns).first
+      end
 
       ###
       # If path is a string, search this document for +path+ returning the
@@ -77,28 +152,57 @@ module Nokogiri
         return self[path] if path.is_a?(Numeric)
         search(path, ns).first
       end
+      alias :% :at
+
+      ##
+      # Search this NodeSet for the first occurrence of XPath +paths+.
+      # Equivalent to <tt>xpath(paths).first</tt>
+      # See NodeSet#xpath for more information.
+      #
+      def at_xpath *paths
+        xpath(*paths).first
+      end
+
+      ##
+      # Search this NodeSet for the first occurrence of CSS +rules+.
+      # Equivalent to <tt>css(rules).first</tt>
+      # See NodeSet#css for more information.
+      #
+      def at_css *rules
+        css(*rules).first
+      end
+
+      ###
+      # Filter this list for nodes that match +expr+
+      def filter expr
+        find_all { |node| node.matches?(expr) }
+      end
 
       ###
       # Append the class attribute +name+ to all Node objects in the NodeSet.
       def add_class name
         each do |el|
-          next unless el.respond_to? :get_attribute
-          classes = el.get_attribute('class').to_s.split(" ")
-          el.set_attribute('class', classes.push(name).uniq.join(" "))
+          classes = el['class'].to_s.split(/\s+/)
+          el['class'] = classes.push(name).uniq.join " "
         end
         self
       end
 
       ###
       # Remove the class attribute +name+ from all Node objects in the NodeSet.
+      # If +name+ is nil, remove the class attribute from all Nodes in the
+      # NodeSet.
       def remove_class name = nil
         each do |el|
-          next unless el.respond_to? :get_attribute
           if name
-            classes = el.get_attribute('class').to_s.split(" ")
-            el.set_attribute('class', (classes - [name]).uniq.join(" "))
+            classes = el['class'].to_s.split(/\s+/)
+            if classes.empty?
+              el.delete 'class'
+            else
+              el['class'] = (classes - [name]).uniq.join " "
+            end
           else
-            el.remove_attribute("class")
+            el.delete "class"
           end
         end
         self
@@ -108,29 +212,24 @@ module Nokogiri
       # Set the attribute +key+ to +value+ or the return value of +blk+
       # on all Node objects in the NodeSet.
       def attr key, value = nil, &blk
-        if value or blk
-          each do |el|
-            el.set_attribute(key, value || blk[el])
-          end
-          return self      
-        end    
-        if key.is_a? Hash
-          key.each { |k,v| self.attr(k,v) }
-          return self
-        else
-          return self[0].get_attribute(key)
+        unless Hash === key || key && (value || blk)
+          return first.attribute(key)
         end
+
+        hash = key.is_a?(Hash) ? key : { key => value }
+
+        hash.each { |k,v| each { |el| el[k] = v || blk[el] } }
+
+        self
       end
-      alias_method :set, :attr
+      alias :set :attr
+      alias :attribute :attr
 
       ###
       # Remove the attributed named +name+ from all Node objects in the NodeSet
       def remove_attr name
-        each do |el|
-          next unless el.respond_to? :remove_attribute
-          el.remove_attribute(name)
-        end
-        self      
+        each { |el| el.delete name }
+        self
       end
 
       ###
@@ -150,39 +249,102 @@ module Nokogiri
 
       ###
       # Get the inner html of all contained Node objects
-      def inner_html
-        collect{|j| j.inner_html}.join('')
+      def inner_html *args
+        collect{|j| j.inner_html(*args) }.join('')
       end
 
       ###
       # Wrap this NodeSet with +html+ or the results of the builder in +blk+
       def wrap(html, &blk)
         each do |j|
-          new_parent = Nokogiri.make(html, &blk)
-          j.parent.add_child(new_parent)
+          new_parent = document.parse(html).first
+          j.add_next_sibling(new_parent)
           new_parent.add_child(j)
         end
         self
       end
 
+      ###
+      # Convert this NodeSet to a string.
       def to_s
         map { |x| x.to_s }.join
       end
 
+      ###
+      # Convert this NodeSet to HTML
       def to_html *args
-        map { |x| x.to_html(*args) }.join('')
+        map { |x| x.to_html(*args) }.join
       end
 
+      ###
+      # Convert this NodeSet to XHTML
       def to_xhtml *args
-        map { |x| x.to_xhtml(*args) }.join('')
+        map { |x| x.to_xhtml(*args) }.join
       end
 
+      ###
+      # Convert this NodeSet to XML
       def to_xml *args
-        map { |x| x.to_xml(*args) }.join('')
+        map { |x| x.to_xml(*args) }.join
       end
 
       alias :size :length
       alias :to_ary :to_a
+
+      ###
+      # Removes the last element from set and returns it, or +nil+ if
+      # the set is empty
+      def pop
+        return nil if length == 0
+        delete last
+      end
+
+      ###
+      # Returns the first element of the NodeSet and removes it.  Returns
+      # +nil+ if the set is empty.
+      def shift
+        return nil if length == 0
+        delete first
+      end
+
+      ###
+      # Equality -- Two NodeSets are equal if the contain the same number
+      # of elements and if each element is equal to the corresponding
+      # element in the other NodeSet
+      def == other
+        return false unless other.is_a?(Nokogiri::XML::NodeSet)
+        return false unless length == other.length
+        each_with_index do |node, i|
+          return false unless node == other[i]
+        end
+        true
+      end
+
+      ###
+      # Returns a new NodeSet containing all the children of all the nodes in
+      # the NodeSet
+      def children
+        inject(NodeSet.new(document)) { |set, node| set += node.children }
+      end
+
+      ###
+      # Returns a new NodeSet containing all the nodes in the NodeSet
+      # in reverse order
+      def reverse
+        node_set = NodeSet.new(document)
+        (length - 1).downto(0) do |x|
+          node_set.push self[x]
+        end
+        node_set
+      end
+
+      ###
+      # Return a nicely formated string representation
+      def inspect
+        "[#{map { |c| c.inspect }.join ', '}]"
+      end
+
+      alias :+ :|
     end
   end
 end

data/lib/nokogiri/xml/parse_options.rb

@@ -0,0 +1,93 @@
+module Nokogiri
+  module XML
+    ###
+    # Parse options for passing to Nokogiri.XML or Nokogiri.HTML
+    class ParseOptions
+      # Strict parsing
+      STRICT      = 0
+      # Recover from errors
+      RECOVER     = 1 << 0
+      # Substitute entities
+      NOENT       = 1 << 1
+      # Load external subsets
+      DTDLOAD     = 1 << 2
+      # Default DTD attributes
+      DTDATTR     = 1 << 3
+      # validate with the DTD
+      DTDVALID    = 1 << 4
+      # suppress error reports
+      NOERROR     = 1 << 5
+      # suppress warning reports
+      NOWARNING   = 1 << 6
+      # pedantic error reporting
+      PEDANTIC    = 1 << 7
+      # remove blank nodes
+      NOBLANKS    = 1 << 8
+      # use the SAX1 interface internally
+      SAX1        = 1 << 9
+      # Implement XInclude substitition
+      XINCLUDE    = 1 << 10
+      # Forbid network access
+      NONET       = 1 << 11
+      # Do not reuse the context dictionnary
+      NODICT      = 1 << 12
+      # remove redundant namespaces declarations
+      NSCLEAN     = 1 << 13
+      # merge CDATA as text nodes
+      NOCDATA     = 1 << 14
+      # do not generate XINCLUDE START/END nodes
+      NOXINCNODE  = 1 << 15
+      # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
+      COMPACT     = 1 << 16
+      # parse using XML-1.0 before update 5
+      OLD10       = 1 << 17
+      # do not fixup XINCLUDE xml:base uris
+      NOBASEFIX   = 1 << 18
+      # relax any hardcoded limit from the parser
+      HUGE        = 1 << 19
+
+      # the default options used for parsing XML documents
+      DEFAULT_XML  = RECOVER
+      # the default options used for parsing HTML documents
+      DEFAULT_HTML = RECOVER | NOERROR | NOWARNING | NONET
+
+      attr_accessor :options
+      def initialize options = STRICT
+        @options = options
+      end
+
+      constants.each do |constant|
+        next if constant.to_sym == :STRICT
+        class_eval %{
+          def #{constant.downcase}
+            @options |= #{constant}
+            self
+          end
+
+          def #{constant.downcase}?
+            #{constant} & @options == #{constant}
+          end
+        }
+      end
+
+      def strict
+        @options &= ~RECOVER
+        self
+      end
+
+      def strict?
+        @options & RECOVER == STRICT
+      end
+
+      alias :to_i :options
+
+      def inspect
+        options = []
+        self.class.constants.each do |k|
+          options << k.downcase if send(:"#{k.downcase}?")
+        end
+        super.sub(/>$/, " " + options.join(', ') + ">")
+      end
+    end
+  end
+end