libxml-ruby 1.1.4 → 2.0.0

data/lib/libxml/error.rb

@@ -1,88 +1,90 @@
-module LibXML
-  module XML
-    class Error
-      # Verbose error handler
-      VERBOSE_HANDLER = lambda do |error|
-        STDERR << error.to_s << "\n"
-        STDERR.flush
-      end
-
-      # Quiet error handler
-      QUIET_HANDLER = lambda do |error|
-      end
-      
-      def ==(other)
-        eql?(other)
-      end
-      
-      def eql?(other)
-        self.code == other.code and
-        self.domain == other.domain and
-        self.message == other.message and
-        self.level == other.level and
-        self.file == other.file and
-        self.line == other.line and
-        self.str1 == other.str1 and
-        self.str2 == other.str2 and
-        self.str3 == other.str3 and
-        self.int1 == other.int1 and
-        self.int2 == other.int2 and
-        self.ctxt == other.ctxt and
-        self.node == other.node
-      end
-
-      def level_to_s
-        case self.level
-          when NONE
-            ''
-          when WARNING
-            'Warning:'
-          when ERROR
-            'Error:'
-          when FATAL
-            'Fatal error:'
-        end
-      end
-
-      def domain_to_s
-        const_map = Hash.new
-        domains = self.class.constants.grep(/XML_FROM/)
-        domains.each do |domain|
-          human_name = domain.gsub(/XML_FROM_/, '')
-          const_map[self.class.const_get(domain)] = human_name
-        end
-
-        const_map[self.domain]
-      end
-
-      def code_to_s
-        const_map = Hash.new
-        codes = self.class.constants - 
-                self.class.constants.grep(/XML_FROM/) -
-                ["XML_ERR_NONE", "XML_ERR_WARNING", "XML_ERR_ERROR", "XML_ERR_FATAL"]
-
-        
-        codes.each do |code|
-          human_name = code.gsub(/XML_ERR_/, '')
-          const_map[self.class.const_get(code)] = human_name
-        end
-
-        const_map[self.code]
-      end
-
-      def to_s
-        msg = super
-        msg = msg ? msg.strip: ''
-
-        if self.line
-          sprintf("%s %s at %s:%d.", self.level_to_s, msg,
-                                     self.file, self.line)
-        else
-          sprintf("%s %s.", self.level_to_s, msg)
-        end
-      end
-    end
-  end
-end
-
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Error
+      # Verbose error handler
+      VERBOSE_HANDLER = lambda do |error|
+        STDERR << error.to_s << "\n"
+        STDERR.flush
+      end
+
+      # Quiet error handler
+      QUIET_HANDLER = lambda do |error|
+      end
+      
+      def ==(other)
+        eql?(other)
+      end
+      
+      def eql?(other)
+        self.code == other.code and
+        self.domain == other.domain and
+        self.message == other.message and
+        self.level == other.level and
+        self.file == other.file and
+        self.line == other.line and
+        self.str1 == other.str1 and
+        self.str2 == other.str2 and
+        self.str3 == other.str3 and
+        self.int1 == other.int1 and
+        self.int2 == other.int2 and
+        self.ctxt == other.ctxt and
+        self.node == other.node
+      end
+
+      def level_to_s
+        case self.level
+          when NONE
+            ''
+          when WARNING
+            'Warning:'
+          when ERROR
+            'Error:'
+          when FATAL
+            'Fatal error:'
+        end
+      end
+
+      def domain_to_s
+        const_map = Hash.new
+        domains = self.class.constants.grep(/XML_FROM/)
+        domains.each do |domain|
+          human_name = domain.gsub(/XML_FROM_/, '')
+          const_map[self.class.const_get(domain)] = human_name
+        end
+
+        const_map[self.domain]
+      end
+
+      def code_to_s
+        const_map = Hash.new
+        codes = self.class.constants - 
+                self.class.constants.grep(/XML_FROM/) -
+                ["XML_ERR_NONE", "XML_ERR_WARNING", "XML_ERR_ERROR", "XML_ERR_FATAL"]
+
+        
+        codes.each do |code|
+          human_name = code.gsub(/XML_ERR_/, '')
+          const_map[self.class.const_get(code)] = human_name
+        end
+
+        const_map[self.code]
+      end
+
+      def to_s
+        msg = super
+        msg = msg ? msg.strip: ''
+
+        if self.line
+          sprintf("%s %s at %s:%d.", self.level_to_s, msg,
+                                     self.file, self.line)
+        else
+          sprintf("%s %s.", self.level_to_s, msg)
+        end
+      end
+    end
+  end
+end
+
 LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)

data/lib/libxml/hpricot.rb

@@ -1,76 +1,78 @@
-## Provide hpricot API for libxml.  Provided by Michael Guterl,
-## inspired by http://thebogles.com/blog/an-hpricot-style-interface-to-libxml
-#
-#class String
-#  def to_libxml_doc
-#    xp = XML::Parser.new
-#    xp.string = self
-#    xp.parse
-#  end
-#end
-#
-#module LibXML
-#  module XML
-#    class Document
-#      alias :search :find
-#    end
-#
-#    class Node
-#      # find the child node with the given xpath
-#      def at(xpath)
-#        self.find_first(xpath)
-#      end
-#
-#      # find the array of child nodes matching the given xpath
-#      def search(xpath)
-#        results = self.find(xpath).to_a
-#        if block_given?
-#          results.each do |result|
-#            yield result
-#          end
-#        end
-#        return results
-#      end
-#
-#      def /(xpath)
-#        search(xpath)
-#      end
-#
-#      # return the inner contents of this node as a string
-#      def inner_xml
-#        child.to_s
-#      end
-#
-#      # alias for inner_xml
-#      def inner_html
-#        inner_xml
-#      end
-#
-#      # return this node and its contents as an xml string
-#      def to_xml
-#        self.to_s
-#      end
-#
-#      # alias for path
-#      def xpath
-#        self.path
-#      end
-#
-#      def find_with_default_ns(xpath_expr, namespace=nil)
-#        find_base(xpath_expr, namespace || default_namespaces)
-#      end
-#
-#      def find_first_with_default_ns(xpath_expr, namespace=nil)
-#        find_first_base(xpath_expr, namespace || default_namespaces)
-#      end
-#
-##      alias_method :find_base, :find unless method_defined?(:find_base)
-##      alias_method :find, :find_with_default_ns
-##      alias_method :find_first_base, :find_first unless method_defined?(:find_first_base)
-##      alias_method :find_first, :find_first_with_default_ns
-##      alias :child? :first?
-##      alias :children? :first?
-##      alias :child :first
-#    end
-#  end
+# encoding: UTF-8
+
+## Provide hpricot API for libxml.  Provided by Michael Guterl,
+## inspired by http://thebogles.com/blog/an-hpricot-style-interface-to-libxml
+#
+#class String
+#  def to_libxml_doc
+#    xp = XML::Parser.new
+#    xp.string = self
+#    xp.parse
+#  end
+#end
+#
+#module LibXML
+#  module XML
+#    class Document
+#      alias :search :find
+#    end
+#
+#    class Node
+#      # find the child node with the given xpath
+#      def at(xpath)
+#        self.find_first(xpath)
+#      end
+#
+#      # find the array of child nodes matching the given xpath
+#      def search(xpath)
+#        results = self.find(xpath).to_a
+#        if block_given?
+#          results.each do |result|
+#            yield result
+#          end
+#        end
+#        return results
+#      end
+#
+#      def /(xpath)
+#        search(xpath)
+#      end
+#
+#      # return the inner contents of this node as a string
+#      def inner_xml
+#        child.to_s
+#      end
+#
+#      # alias for inner_xml
+#      def inner_html
+#        inner_xml
+#      end
+#
+#      # return this node and its contents as an xml string
+#      def to_xml
+#        self.to_s
+#      end
+#
+#      # alias for path
+#      def xpath
+#        self.path
+#      end
+#
+#      def find_with_default_ns(xpath_expr, namespace=nil)
+#        find_base(xpath_expr, namespace || default_namespaces)
+#      end
+#
+#      def find_first_with_default_ns(xpath_expr, namespace=nil)
+#        find_first_base(xpath_expr, namespace || default_namespaces)
+#      end
+#
+##      alias_method :find_base, :find unless method_defined?(:find_base)
+##      alias_method :find, :find_with_default_ns
+##      alias_method :find_first_base, :find_first unless method_defined?(:find_first_base)
+##      alias_method :find_first, :find_first_with_default_ns
+##      alias :child? :first?
+##      alias :children? :first?
+##      alias :child :first
+#    end
+#  end
 #end

data/lib/libxml/html_parser.rb

@@ -1,94 +1,96 @@
-module LibXML
-  module XML
-    class HTMLParser
-      # call-seq:
-      #    XML::HTMLParser.file(path) -> XML::HTMLParser
-      #    XML::HTMLParser.file(path, :encoding => XML::Encoding::UTF_8,
-      #                           :options => XML::HTMLParser::Options::NOENT) -> XML::HTMLParser
-      #
-      # Creates a new parser by parsing the specified file or uri.
-      #
-      # You may provide an optional hash table to control how the
-      # parsing is performed.  Valid options are:
-      #
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::HTMLParser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.file(path, options = {})
-        context = XML::HTMLParser::Context.file(path)
-        context.encoding = options[:encoding] if options[:encoding]
-        context.options = options[:options] if options[:options]
-        self.new(context)
-      end
-
-      # call-seq:
-      #    XML::HTMLParser.io(io) -> XML::HTMLParser
-      #    XML::HTMLParser.io(io, :encoding => XML::Encoding::UTF_8,
-      #                       :options => XML::HTMLParser::Options::NOENT
-      #                       :base_uri="http://libxml.org") -> XML::HTMLParser
-      #
-      # Creates a new reader by parsing the specified io object.
-      #
-      # Parameters:
-      #
-      #  io - io object that contains the xml to parser
-      #  base_uri - The base url for the parsed document.
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::HTMLParser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.io(io, options = {})
-        context = XML::HTMLParser::Context.io(io)
-        context.base_uri = options[:base_uri] if options[:base_uri]
-        context.encoding = options[:encoding] if options[:encoding]
-        context.options = options[:options] if options[:options]
-        self.new(context)
-      end
-
-      # call-seq:
-      #    XML::HTMLParser.string(string)
-      #    XML::HTMLParser.string(string, :encoding => XML::Encoding::UTF_8,
-      #                               :options => XML::HTMLParser::Options::NOENT
-      #                               :base_uri="http://libxml.org") -> XML::HTMLParser
-      #
-      # Creates a new parser by parsing the specified string.
-      #
-      # You may provide an optional hash table to control how the
-      # parsing is performed.  Valid options are:
-      #
-      #  base_uri - The base url for the parsed document.
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::HTMLParser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.string(string, options = {})
-        context = XML::HTMLParser::Context.string(string)
-        context.base_uri = options[:base_uri] if options[:base_uri]
-        context.encoding = options[:encoding] if options[:encoding]
-        context.options = options[:options] if options[:options]
-        self.new(context)
-      end
-
-      # :enddoc:
-
-      def file=(value)
-        warn("XML::HTMLParser#file is deprecated.  Use XML::HTMLParser.file instead")
-        @context = XML::HTMLParser::Context.file(value)
-      end
-
-      def io=(value)
-        warn("XML::HTMLParser#io is deprecated.  Use XML::HTMLParser.io instead")
-        @context = XML::HTMLParser::Context.io(value)
-      end
-
-      def string=(value)
-        warn("XML::HTMLParser#string is deprecated.  Use XML::HTMLParser.string instead")
-        @context = XML::HTMLParser::Context.string(value)
-      end
-    end
-  end
-end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class HTMLParser
+      # call-seq:
+      #    XML::HTMLParser.file(path) -> XML::HTMLParser
+      #    XML::HTMLParser.file(path, :encoding => XML::Encoding::UTF_8,
+      #                           :options => XML::HTMLParser::Options::NOENT) -> XML::HTMLParser
+      #
+      # Creates a new parser by parsing the specified file or uri.
+      #
+      # You may provide an optional hash table to control how the
+      # parsing is performed.  Valid options are:
+      #
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::HTMLParser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.file(path, options = {})
+        context = XML::HTMLParser::Context.file(path)
+        context.encoding = options[:encoding] if options[:encoding]
+        context.options = options[:options] if options[:options]
+        self.new(context)
+      end
+
+      # call-seq:
+      #    XML::HTMLParser.io(io) -> XML::HTMLParser
+      #    XML::HTMLParser.io(io, :encoding => XML::Encoding::UTF_8,
+      #                       :options => XML::HTMLParser::Options::NOENT
+      #                       :base_uri="http://libxml.org") -> XML::HTMLParser
+      #
+      # Creates a new reader by parsing the specified io object.
+      #
+      # Parameters:
+      #
+      #  io - io object that contains the xml to parser
+      #  base_uri - The base url for the parsed document.
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::HTMLParser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.io(io, options = {})
+        context = XML::HTMLParser::Context.io(io)
+        context.base_uri = options[:base_uri] if options[:base_uri]
+        context.encoding = options[:encoding] if options[:encoding]
+        context.options = options[:options] if options[:options]
+        self.new(context)
+      end
+
+      # call-seq:
+      #    XML::HTMLParser.string(string)
+      #    XML::HTMLParser.string(string, :encoding => XML::Encoding::UTF_8,
+      #                               :options => XML::HTMLParser::Options::NOENT
+      #                               :base_uri="http://libxml.org") -> XML::HTMLParser
+      #
+      # Creates a new parser by parsing the specified string.
+      #
+      # You may provide an optional hash table to control how the
+      # parsing is performed.  Valid options are:
+      #
+      #  base_uri - The base url for the parsed document.
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::HTMLParser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.string(string, options = {})
+        context = XML::HTMLParser::Context.string(string)
+        context.base_uri = options[:base_uri] if options[:base_uri]
+        context.encoding = options[:encoding] if options[:encoding]
+        context.options = options[:options] if options[:options]
+        self.new(context)
+      end
+
+      # :enddoc:
+
+      def file=(value)
+        warn("XML::HTMLParser#file is deprecated.  Use XML::HTMLParser.file instead")
+        @context = XML::HTMLParser::Context.file(value)
+      end
+
+      def io=(value)
+        warn("XML::HTMLParser#io is deprecated.  Use XML::HTMLParser.io instead")
+        @context = XML::HTMLParser::Context.io(value)
+      end
+
+      def string=(value)
+        warn("XML::HTMLParser#string is deprecated.  Use XML::HTMLParser.string instead")
+        @context = XML::HTMLParser::Context.string(value)
+      end
+    end
+  end
+end