nokogiri 1.3.3 → 1.4.0

data/ext/nokogiri/html_sax_parser.c

@@ -1,57 +0,0 @@
-#include <html_sax_parser.h>
-
-/*
- * call-seq:
- *  native_parse_file(data, encoding)
- *
- * Parse +data+ with +encoding+
- */
-static VALUE native_parse_file(VALUE self, VALUE data, VALUE encoding)
-{
-  xmlSAXHandlerPtr handler;
-  htmlDocPtr hdoc ;
-  Data_Get_Struct(self, xmlSAXHandler, handler);
-  hdoc = htmlSAXParseFile( StringValuePtr(data),
-                           (const char *)StringValuePtr(encoding),
-                           (htmlSAXHandlerPtr)handler,
-                           (void *)self );
-  xmlFreeDoc(hdoc);
-  return data;
-}
-
-/*
- * call-seq:
- *  native_parse_memory(data, encoding)
- *
- * Parse +data+ with +encoding+
- */
-static VALUE native_parse_memory(VALUE self, VALUE data, VALUE encoding)
-{
-  xmlSAXHandlerPtr handler;
-  htmlDocPtr hdoc ;
-  Data_Get_Struct(self, xmlSAXHandler, handler);
-  hdoc = htmlSAXParseDoc(  (xmlChar *)StringValuePtr(data),
-                           (const char *)StringValuePtr(encoding),
-                           (htmlSAXHandlerPtr)handler,
-                           (void *)self );
-  xmlFreeDoc(hdoc);
-  return data;
-}
-
-VALUE cNokogiriHtmlSaxParser ;
-void init_html_sax_parser()
-{
-  VALUE nokogiri  = rb_define_module("Nokogiri");
-  VALUE html      = rb_define_module_under(nokogiri, "HTML");
-  VALUE sax       = rb_define_module_under(html, "SAX");
-  /*
-   * Nokogiri::HTML::SAX::Parser is used for parsing HTML with SAX
-   * callbacks.
-   */
-  VALUE klass     = rb_define_class_under(sax, "Parser", cNokogiriXmlSaxParser);
-
-  cNokogiriHtmlSaxParser = klass;
-
-  rb_define_private_method(klass, "native_parse_memory", native_parse_memory, 2);
-  rb_define_private_method(klass, "native_parse_file", native_parse_file, 2);
-}

data/ext/nokogiri/html_sax_parser.h

@@ -1,11 +0,0 @@
-#ifndef NOKOGIRI_HTML_SAX_PARSER
-#define NOKOGIRI_HTML_SAX_PARSER
-
-#include <nokogiri.h>
-
-void init_html_sax_parser();
-
-extern VALUE cNokogiriHtmlSaxParser ;
-#endif
-
-

data/lib/action-nokogiri.rb

@@ -1,38 +0,0 @@
-require 'nokogiri'
-
-#
-#  to use this in your Rails view or controller tests, simply:
-#
-#  require 'action-nokogiri'
-#
-#  class KittehControllerTest < ActionController::TestCase
-#  def test_i_can_does_test_with_nokogiri
-#    get(:index, {:wants => "cheezburgers"})
-#    assert @response.html.at("h2.lolcats")
-#  end
-#
-module ActionController
-  module TestResponseBehavior # :nodoc:
-
-    ###
-    # Get your response as a Nokogiri::XML::Document using the
-    # Nokogiri.HTML parser
-    def html(flavor=nil)
-      warn "@response.html is deprecated and will be removed in nokogiri 1.4.0"
-      if flavor == :hpricot
-        @_nokogiri_html_hpricot ||= Nokogiri::Hpricot(body)
-      else
-        @_nokogiri_html_vanilla ||= Nokogiri::HTML(body)
-      end
-    end
-
-    ###
-    # Get your response as a Nokogiri::XML::Document using the
-    # Nokogiri.XML parser
-    def xml
-      warn "@response.html is deprecated and will be removed in nokogiri 1.4.0"
-      @_nokogiri_xml ||= Nokogiri::XML(body)
-    end
-
-  end
-end

data/lib/nokogiri/decorators.rb

@@ -1,2 +0,0 @@
-require 'nokogiri/decorators/hpricot'
-require 'nokogiri/decorators/slop'

data/lib/nokogiri/decorators/hpricot.rb

@@ -1,3 +0,0 @@
-require 'nokogiri/decorators/hpricot/node'
-require 'nokogiri/decorators/hpricot/node_set'
-require 'nokogiri/decorators/hpricot/xpath_visitor'

data/lib/nokogiri/decorators/hpricot/node.rb

@@ -1,56 +0,0 @@
-module Nokogiri
-  module Decorators
-    module Hpricot
-      module Node # :nodoc:
-        def search *paths
-          ns = paths.last.is_a?(Hash) ? paths.pop : {}
-          converted = paths.map { |path|
-            convert_to_xpath(path)
-          }.flatten.uniq
-
-          super(*converted + [ns])
-        end
-        def /(path); search(path) end
-
-        def xpath *args
-          return super if args.length > 0
-          path
-        end
-
-        def raw_attributes; self end
-
-        def get_element_by_id element_id
-          search("//*[@id='#{element_id}']").first
-        end
-
-        def get_elements_by_tag_name tag
-          search("//#{tag}")
-        end
-
-        def convert_to_xpath(rule)
-          rule = rule.to_s
-          case rule
-          when %r{^//}
-            [".#{Hpricot::XPathVisitor.xpath_namespace_helper(rule)}"]
-          when %r{^/}
-            [Hpricot::XPathVisitor.xpath_namespace_helper(rule)]
-          when %r{^.//}
-            [Hpricot::XPathVisitor.xpath_namespace_helper(rule)]
-          else
-            visitor = CSS::XPathVisitor.new
-            visitor.extend(Hpricot::XPathVisitor)
-            CSS.xpath_for(rule, :prefix => ".//", :visitor => visitor)
-          end
-        end
-
-        def target
-          name
-        end
-
-        def to_original_html
-          to_html
-        end
-      end
-    end
-  end
-end

data/lib/nokogiri/decorators/hpricot/node_set.rb

@@ -1,54 +0,0 @@
-module Nokogiri
-  module Decorators
-    module Hpricot
-      module NodeSet
-
-        # Select nodes matching the supplied rule.
-        # Note that positional rules (like <tt>:nth()</tt>) aren't currently supported.
-        #
-        # example:
-        #   node_set.filter('.ohmy')          # selects nodes from the set with class "ohmy"
-        #   node_set.filter('a#link2')        # selects nodes from the set with child node <a id='link2'>
-        #   node_set.filter('a[@id="link2"]') # selects nodes from the set with child node <a id='link2'>
-        def filter(rule)
-          filter_transformer( lambda {|j| j}, rule ) # identity transformer
-        end
-
-        # The complement to filter, select nodes <em>not</em> matching the supplied rule.
-        # Note that positional rules (like <tt>:nth()</tt>) aren't currently supported.
-        #
-        # See filter for examples.
-        #
-        # Also note that you can pass a XML::Node object instead of a
-        # rule to remove that object from the node set (if it is
-        # present):
-        #    node_set.not(node_to_exclude) # selects all nodes EXCEPT node_to_exclude
-        #
-        def not(rule)
-          filter_transformer( lambda {|j| !j}, rule ) # negation transformer
-        end
-
-      private
-        def filter_transformer(transformer, rule) # :nodoc:
-          sub_set = XML::NodeSet.new(document)
-          document.decorate(sub_set)
-
-          if rule.is_a?(XML::Node)
-            each { |node| sub_set << node if transformer.call(node == rule) }
-            return sub_set
-          end
-
-          ctx = CSS.parse(rule.to_s)
-          visitor = CSS::XPathVisitor.new
-          visitor.extend(Hpricot::XPathVisitor)
-          each do |node|
-            if transformer.call(node.at(".//self::" + visitor.accept(ctx.first)))
-              sub_set << node
-            end
-          end
-          sub_set
-        end
-      end
-    end
-  end
-end

data/lib/nokogiri/decorators/hpricot/xpath_visitor.rb

@@ -1,30 +0,0 @@
-module Nokogiri
-  module Decorators
-    module Hpricot
-      ####
-      # This mixin does custom adjustments to deal with _whyML
-      module XPathVisitor
-        ###
-        # Visit attribute condition nodes with +node+
-        def visit_attribute_condition node
-          unless (node.value.first.type == :FUNCTION) or (node.value.first.value.first =~ /^@/)
-            node.value.first.value[0] = "child::" +
-              node.value.first.value[0]
-          end
-          super(node).gsub(/child::text\(\)/, 'normalize-space(child::text())')
-        end
-
-        #  take a path like '//t:sam' and convert to xpath "*[name()='t:sam']"
-        def self.xpath_namespace_helper rule
-          rule.split(/\//).collect do |tag|
-            if match = tag.match(/^(\w+:\w+)(.*)/)
-              "*[name()='#{match[1]}']#{match[2]}"
-            else
-              tag
-            end
-          end.join("/")
-        end
-      end
-    end
-  end
-end

data/lib/nokogiri/ffi/html/sax/parser.rb

@@ -1,21 +0,0 @@
-module Nokogiri
-  module HTML
-    module SAX
-      class Parser < XML::SAX::Parser
-        
-        def native_parse_file(data, encoding) # :nodoc:
-          docptr = LibXML.htmlSAXParseFile(data, encoding, cstruct, nil)
-          LibXML.xmlFreeDoc docptr
-          data
-        end
-
-        def native_parse_memory(data, encoding) # :nodoc:
-          docptr = LibXML.htmlSAXParseDoc(data, encoding, cstruct, nil)
-          LibXML.xmlFreeDoc docptr
-          data
-        end
-
-      end
-    end
-  end
-end

data/lib/nokogiri/hpricot.rb

@@ -1,92 +0,0 @@
-require 'nokogiri'
-
-module Nokogiri
-  module Hpricot
-    # STag compatibility proxy
-    STag = String
-    # Elem compatibility proxy
-    Elem = XML::Node
-    # NamedCharacters compatibility proxy
-    NamedCharacters = Nokogiri::HTML::NamedCharacters
-    class << self
-      # parse proxy
-      def parse(*args)
-        warn <<-eomsg
-Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
-when Nokogiri 1.4.0 is released.  Please switch to Nokogiri(), or be prepared
-to install the compatibility layer.
-#{caller.first}
-eomsg
-        doc = Nokogiri.parse(*args)
-        add_decorators(doc)
-      end
-
-      # XML proxy
-      def XML(string)
-        warn <<-eomsg
-Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
-when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::XML(), or be
-prepared to install the compatibility layer.
-#{caller.first}
-eomsg
-        doc = Nokogiri::XML::Document.parse(string)
-        add_decorators(doc)
-      end
-
-      # HTML proxy
-      def HTML(string)
-        warn <<-eomsg
-Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
-when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::HTML(), or be
-prepared to install the compatibility layer.
-#{caller.first}
-eomsg
-        doc = Nokogiri::HTML::Document.parse(string)
-        add_decorators(doc)
-      end
-
-      # make proxy
-      def make string
-        warn <<-eomsg
-Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
-when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::HTML.make(), or be
-prepared to install the compatibility layer.
-#{caller.first}
-eomsg
-        doc = XML::Document.new
-        ns = XML::NodeSet.new(doc)
-        ns << XML::Text.new(string, doc)
-        ns
-      end
-
-      # Add compatibility decorators
-      def add_decorators(doc)
-        doc.decorators(XML::Node) << Decorators::Hpricot::Node
-        doc.decorators(XML::NodeSet) << Decorators::Hpricot::NodeSet
-        doc.decorate!
-        doc
-      end
-    end
-  end
-
-  class << self
-    ###
-    # Parse a document and apply the Hpricot decorators for Hpricot
-    # compatibility mode.
-    def Hpricot(*args, &block)
-        warn <<-eomsg
-Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
-when Nokogiri 1.4.0 is released.  Please switch to Nokogiri(), or be
-prepared to install the compatibility layer.
-#{caller.first}
-eomsg
-      if block_given?
-        builder = Nokogiri::HTML::Builder.new(&block)
-        Nokogiri::Hpricot.add_decorators(builder.doc)
-      else
-        doc = Nokogiri.parse(*args)
-        Nokogiri::Hpricot.add_decorators(doc)
-      end
-    end
-  end
-end

data/lib/nokogiri/xml/entity_declaration.rb

@@ -1,11 +0,0 @@
-module Nokogiri
-  module XML
-    class EntityDeclaration < Nokogiri::XML::Node
-      ###
-      # return attributes.  Always returns +nil+
-      def attributes
-        nil
-      end
-    end
-  end
-end

data/lib/nokogiri/xml/sax/legacy_handlers.rb

@@ -1,65 +0,0 @@
-module Nokogiri
-  module XML
-    module SAX
-      # :stopdoc:
-      module LegacyHandlers
-        def start_element_namespace name,
-                                    attrs   = [],
-                                    prefix  = nil,
-                                    uri     = nil,
-                                    ns      = []
-
-          ##
-          # Deal with legacy interface
-          if @document.respond_to? :start_element_ns
-            unless @warned
-              warn <<-eowarn
-Nokogiri::XML::SAX::Document#start_element_ns and end_element_ns are deprecated,
-please change to start_element_namespace.  start_element_ns will be removed by
-version 1.4.0 or by August 1st, whichever comes first.
-              eowarn
-              @warned = true
-            end
-            attr_hash = {}
-            attrs.each do |attr|
-              attr_hash[attr.localname] = attr.value
-            end
-            ns_hash = Hash[*ns.flatten]
-            @document.start_element_ns name, attr_hash, prefix, uri, ns_hash
-          end
-
-          ###
-          # Deal with SAX v1 interface
-          name = [prefix, name].compact.join(':')
-          attributes = ns.map { |ns_prefix,ns_uri|
-            [['xmlns', ns_prefix].compact.join(':'), ns_uri]
-          } + attrs.map { |attr|
-            [[attr.prefix, attr.localname].compact.join(':'), attr.value]
-          }.flatten
-          @document.start_element name, attributes
-        end
-
-        def end_element_namespace name, prefix = nil, uri = nil
-          ##
-          # Deal with legacy interface
-          if @document.respond_to? :end_element_ns
-            unless @warned
-              warn <<-eowarn
-Nokogiri::XML::SAX::Document#start_element_ns and end_element_ns are deprecated,
-please change to start_element_namespace.  start_element_ns will be removed by
-version 1.4.0 or by August 1st, whichever comes first.
-              eowarn
-              @warned = true
-            end
-            @document.end_element_ns name, prefix, uri
-          end
-
-          ###
-          # Deal with SAX v1 interface
-          @document.end_element [prefix, name].compact.join(':')
-        end
-      end
-      # :startdoc:
-    end
-  end
-end