libxml-ruby 0.8.3-x86-mswin32-60 → 0.9.0-x86-mswin32-60

data/lib/libxml/node.rb

@@ -1,9 +1,20 @@
-# $Id: libxml.rb 374 2008-07-11 04:51:41Z cfis $ 
-# Please see the LICENSE file for copyright and distribution information 
-
 module LibXML
   module XML
     class Node
+      # Register the prefix (i.e., name) of the default namespace to
+      # make xpath searches easier
+      def register_default_namespace(prefix)
+        ns = self.namespace.find do |ns|
+          ns.prefix.nil?
+        end
+
+        if ns
+          NS.new(self, ns.href, prefix)
+        else
+          raise(ArgumentError, "No default namespace was found")
+        end
+      end
+
       # Determines whether this node has attributes
       def attributes?
         attributes.length > 0
@@ -105,49 +116,49 @@ module LibXML
       def node_type_name
         case node_type
           # Most common choices first
-          when ATTRIBUTE_NODE:
+          when ATTRIBUTE_NODE
             'attribute'
-          when DOCUMENT_NODE:
+          when DOCUMENT_NODE
             'document_xml'
-          when ELEMENT_NODE:
+          when ELEMENT_NODE
             'element'
-          when TEXT_NODE:
+          when TEXT_NODE
             'text'
           
           # Now the rest  
-          when ATTRIBUTE_DECL:
+          when ATTRIBUTE_DECL
             'attribute_decl'
-          when CDATA_SECTION_NODE:
+          when CDATA_SECTION_NODE
             'cdata'
-          when COMMENT_NODE:
+          when COMMENT_NODE
             'comment'
-          when DOCB_DOCUMENT_NODE:
+          when DOCB_DOCUMENT_NODE
             'document_docbook'
-          when DOCUMENT_FRAG_NODE:
+          when DOCUMENT_FRAG_NODE
             'fragment'
-          when DOCUMENT_TYPE_NODE:
+          when DOCUMENT_TYPE_NODE
             'doctype'
-          when DTD_NODE:
+          when DTD_NODE
             'dtd'
-          when ELEMENT_DECL:
+          when ELEMENT_DECL
             'elem_decl'
-          when ENTITY_DECL:
+          when ENTITY_DECL
             'entity_decl'
-          when ENTITY_NODE:
+          when ENTITY_NODE
             'entity'
-          when ENTITY_REF_NODE:
+          when ENTITY_REF_NODE
             'entity_ref'
-          when HTML_DOCUMENT_NODE:
+          when HTML_DOCUMENT_NODE
             'document_html'
-          when NAMESPACE_DECL:
+          when NAMESPACE_DECL
             'namespace'
-          when NOTATION_NODE:
+          when NOTATION_NODE
             'notation'
-          when PI_NODE:
+          when PI_NODE
             'pi'
-          when XINCLUDE_START:
+          when XINCLUDE_START
             'xinclude_start'
-          when XINCLUDE_END:
+          when XINCLUDE_END
             'xinclude_end'
           else
             raise(UnknownType, "Unknown node type: %n", node.node_type);
@@ -261,4 +272,4 @@ module LibXML
       alias :each_child :each
     end
   end
-end
+end

data/lib/libxml/parser.rb

@@ -1,42 +1,321 @@
 module LibXML
   module XML
     class Parser
-      class << self
-        attr_reader :error_handler
-      
-        # Register the attached block as the handler for parser errors.
-        #
-        # Parser.register_error_handler {|msg| <do stuff>}
-        # Parser.register_error_handler(lambda {|msg| <do stuff>})
-        # Parser.register_error_handler(nil)
-        #
-        # A message describing parse errors is passed to the block.
-        # Libxml passes error messages to the handler in parts, one per call.
-        # A typical error results in six calls to this proc, with arguments:
-        # 
-        #   "Entity: line 1: ", 
-        #   "parser ", 
-        #   "error : ", 
-        #   "Opening and ending tag mismatch: foo line 1 and foz\n",
-        #   "<foo><bar/></foz>\n",
-        #   "                 ^\n"
-        # 
-        # Note that the error handler is shared by all threads.
-        def register_error_handler(value = nil, &block)
-          # Value may be nil or a proc.
-          tmp = self.error_handler
-          @error_handler = block_given? ? block : value
-          tmp
-        end
+      def self.filename(value)
+        warn("Parser.filename is deprecated.  Use Parser.file instead")
+        self.file(value)
+      end
+
+      def self.file(value)
+        parser = Parser.new
+        parser.input.file = value
+        parser
+      end
+
+      def self.string(value)
+        parser = Parser.new
+        parser.input.string = value
+        parser
+      end
+
+      def self.document(value)
+        parser = Parser.new
+        parser.input.document = value
+        parser
+      end
 
-        def xml_error_func_handler(msg)
-          if not self.error_handler
-            $stderr.puts(msg)
-          else
-            self.error_handler.call(msg)
-          end
+      def self.io(value)
+        parser = Parser.new
+        parser.input.io = value
+        parser
+      end
+
+      def self.register_error_handler(proc)
+        warn('Parser.register_error_handler is deprecated.  Use Error.set_handler instead')
+        if proc.nil?
+          Error.reset_handler
+        else
+          Error.set_handler(&proc)
         end
       end
+
+      def filename
+        warn("Parser#filename is deprecated.  Use Parser#file instead")
+        self.file
+      end
+
+      def filename=(value)
+        warn("Parser#filename is deprecated.  Use Parser#file instead")
+        self.file = value
+      end
+
+      def file
+        input.file
+      end
+
+      def file=(value)
+        input.file = value
+      end
+
+      def string
+        input.string
+      end
+
+      def string=(value)
+        input.string = value
+      end
+
+      def document
+        input.document
+      end
+
+      def document=(value)
+        input.document = value
+      end
+
+      def io
+        input.io
+      end
+
+      def io=(value)
+        input.io = value
+      end
+
+      # :enddoc:
+
+      # Bunch of deprecated methods that have moved to the XML module
+      VERSION = XML::VERSION
+      VERNUM = XML::VERNUM
+
+      def self.enabled_automata?
+        warn("XML::Parser.enabled_automata? has been deprecated.  Use XML.enabled_automata? instead")
+        XML.enabled_automata?
+      end
+
+      def self.enabled_c14n?
+        warn("XML::Parser.enabled_c14n? has been deprecated.  Use XML.enabled_c14n? instead")
+        XML.enabled_c14n?
+      end
+
+      def self.enabled_catalog?
+        warn("XML::Parser.enabled_catalog? has been deprecated.  Use XML.enabled_catalog? instead")
+        XML.enabled_catalog?
+      end
+
+      def self.enabled_debug?
+        warn("XML::Parser.enabled_debug? has been deprecated.  Use XML.enabled_debug? instead")
+        XML.enabled_debug?
+      end
+
+      def self.enabled_docbook?
+        warn("XML::Parser.enabled_docbook? has been deprecated.  Use XML.enabled_docbook? instead")
+        XML.enabled_docbook?
+      end
+
+      def self.enabled_ftp?
+        warn("XML::Parser.enabled_ftp? has been deprecated.  Use XML.enabled_ftp? instead")
+        XML.enabled_ftp?
+      end
+
+      def self.enabled_http?
+        warn("XML::Parser.enabled_http? has been deprecated.  Use XML.enabled_http? instead")
+        XML.enabled_http?
+      end
+
+      def self.enabled_html?
+        warn("XML::Parser.enabled_html? has been deprecated.  Use XML.enabled_html? instead")
+        XML.enabled_html?
+      end
+
+      def self.enabled_iconv?
+        warn("XML::Parser.enabled_iconv? has been deprecated.  Use XML.enabled_iconv? instead")
+        XML.enabled_iconv?
+      end
+
+      def self.enabled_memory_debug?
+        warn("XML::Parser.enabled_memory_debug_location? has been deprecated.  Use XML.enabled_memory_debug_location? instead")
+        XML.enabled_memory_debug_location?
+      end
+
+      def self.enabled_regexp?
+        warn("XML::Parser.enabled_regexp? has been deprecated.  Use XML.enabled_regexp? instead")
+        XML.enabled_regexp?
+      end
+
+      def self.enabled_schemas?
+        warn("XML::Parser.enabled_schemas? has been deprecated.  Use XML.enabled_schemas? instead")
+        XML.enabled_schemas?
+      end
+
+      def self.enabled_thread?
+        warn("XML::Parser.enabled_thread? has been deprecated.  Use XML.enabled_thread? instead")
+        XML.enabled_thread?
+      end
+
+      def self.enabled_unicode?
+        warn("XML::Parser.enabled_unicode? has been deprecated.  Use XML.enabled_unicode? instead")
+        XML.enabled_unicode?
+      end
+
+      def self.enabled_xinclude?
+        warn("XML::Parser.enabled_xinclude? has been deprecated.  Use XML.enabled_xinclude? instead")
+        XML.enabled_xinclude?
+      end
+
+      def self.enabled_xpath?
+        warn("XML::Parser.enabled_xpath? has been deprecated.  Use XML.enabled_xpath? instead")
+        XML.enabled_xpath?
+      end
+
+      def self.enabled_xpointer?
+        warn("XML::Parser.enabled_xpointer? has been deprecated.  Use XML.enabled_xpointer? instead")
+        XML.enabled_xpointer?
+      end
+
+      def self.enabled_zlib?
+        warn("XML::Parser.enabled_zlib? has been deprecated.  Use XML.enabled_zlib? instead")
+        XML.enabled_zlib?
+      end
+
+      def self.catalog_dump
+        warn("XML::Parser.catalog_dump has been deprecated.  Use XML.catalog_dump instead")
+        XML.catalog_dump
+      end
+
+      def self.catalog_remove
+        warn("XML::Parser.catalog_remove has been deprecated.  Use XML.catalog_remove instead")
+        XML.catalog_remove
+      end
+
+      def self.check_lib_versions
+        warn("XML::Parser.check_lib_versions has been deprecated.  Use XML.check_lib_versions instead")
+        XML.check_lib_versions
+      end
+
+      def self.debug_entities
+        warn("XML::Parser.debug_entities has been deprecated.  Use XML.debug_entities instead")
+        XML.debug_entities
+      end
+
+      def self.debug_entities=(value)
+        warn("XML::Parser.debug_entities_set has been deprecated.  Use XML.debug_entities= value instead")
+        XML.debug_entities= value
+      end
+
+      def self.default_compression
+        warn("XML::Parser.default_compression has been deprecated.  Use XML.default_compression instead")
+        XML.default_compression
+      end
+
+      def self.default_compression=(value)
+        warn("XML::Parser.default_compression= value has been deprecated.  Use XML.default_compression= value instead")
+        XML.default_compression= value
+      end
+
+      def self.default_keep_blanks
+        warn("XML::Parser.default_keep_blanks has been deprecated.  Use XML.default_keep_blanks instead")
+        XML.default_keep_blanks
+      end
+
+      def self.default_keep_blanks=(value)
+        warn("XML::Parser.default_keep_blanks= value has been deprecated.  Use XML.default_keep_blanks= value instead")
+        XML.default_keep_blanks= value
+      end
+
+      def self.default_load_external_dtd
+        warn("XML::Parser.default_load_external_dtd has been deprecated.  Use XML.default_load_external_dtd instead")
+        XML.default_load_external_dtd
+      end
+
+      def self.default_load_external_dtd=(value)
+        warn("XML::Parser.default_load_external_dtd= value has been deprecated.  Use XML.default_load_external_dtd= value instead")
+        XML.default_load_external_dtd= value
+      end
+
+      def self.default_line_numbers
+        warn("XML::Parser.default_line_numbers has been deprecated.  Use XML.default_line_numbers instead")
+        XML.default_line_numbers
+      end
+
+      def self.default_line_numbers=(value)
+        warn("XML::Parser.default_line_numbers= value has been deprecated.  Use XML.default_line_numbers= value instead")
+        XML.default_line_numbers= value
+      end
+
+      def self.default_pedantic_parser
+        warn("XML::Parser.default_pedantic_parser has been deprecated.  Use XML.default_pedantic_parser instead")
+        XML.default_pedantic_parser
+      end
+
+      def self.default_pedantic_parser=(value)
+        warn("XML::Parser.default_pedantic_parser= value has been deprecated.  Use XML.default_pedantic_parser= value instead")
+        XML.default_pedantic_parser= value
+      end
+
+      def self.default_substitute_entities
+        warn("XML::Parser.default_substitute_entities has been deprecated.  Use XML.default_substitute_entities instead")
+        XML.default_substitute_entities
+      end
+
+      def self.default_substitute_entities=(value)
+        warn("XML::Parser.default_substitute_entities= value has been deprecated.  Use XML.default_substitute_entities= value instead")
+        XML.default_substitute_entities= value
+      end
+
+      def self.default_tree_indent_string
+        warn("XML::Parser.default_tree_indent_string has been deprecated.  Use XML.default_tree_indent_string instead")
+        XML.default_tree_indent_string
+      end
+
+      def self.default_tree_indent_string=(value)
+        warn("XML::Parser.default_tree_indent_string= value has been deprecated.  Use XML.default_tree_indent_string= value instead")
+        XML.default_tree_indent_string= value
+      end
+
+      def self.default_validity_checking
+        warn("XML::Parser.default_validity_checking has been deprecated.  Use XML.default_validity_checking instead")
+        XML.default_validity_checking
+      end
+
+      def self.default_validity_checking=(value)
+        warn("XML::Parser.default_validity_checking= value has been deprecated.  Use XML.default_validity_checking= value instead")
+        XML.default_validity_checking= value
+      end
+
+      def self.default_warnings
+        warn("XML::Parser.default_warnings has been deprecated.  Use XML.default_warnings instead")
+        XML.default_warnings
+      end
+
+      def self.default_warnings=(value)
+        warn("XML::Parser.default_warnings= value has been deprecated.  Use XML.default_warnings= value instead")
+        XML.default_warnings= value
+      end
+
+      def self.features
+        warn("XML::Parser.features has been deprecated.  Use XML.features instead")
+        XML.features
+      end
+
+      def self.indent_tree_output
+        warn("XML::Parser.indent_tree_output has been deprecated.  Use XML.indent_tree_output instead")
+        XML.indent_tree_output
+      end
+
+      def self.indent_tree_output=(value)
+        warn("XML::Parser.indent_tree_output= value has been deprecated.  Use XML.indent_tree_output= value instead")
+        XML.indent_tree_output= value
+      end
+
+      def self.memory_dump
+        warn("XML::Parser.memory_dump has been deprecated.  Use XML.memory_dump instead")
+        XML.memory_dump
+      end
+
+      def self.memory_used
+        warn("XML::Parser.memory_used has been deprecated.  Use XML.memory_used instead")
+        XML.memory_used
+      end
     end
   end
 end