libxml-ruby 0.8.3 → 0.9.0

data/ext/libxml/version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "0.8.3"
+#define RUBY_LIBXML_VERSION  "0.9.0"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
-#define RUBY_LIBXML_VER_MIN   8
-#define RUBY_LIBXML_VER_MIC   3
+#define RUBY_LIBXML_VER_MIN   9
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/mingw/Rakefile

@@ -3,39 +3,32 @@
 # built with VC++ while here we want to build
 # with MingW.  So just roll our own...
 
-require 'rake/clean'
+require 'fileutils'
 require 'rbconfig'
 
-RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
-RUBY_BIN_DIR = Config::CONFIG["bindir"]
-RUBY_LIB_DIR = Config::CONFIG["libdir"]
-RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
-RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
-
 EXTENSION_NAME = "libxml_ruby.#{Config::CONFIG["DLEXT"]}"
+
 # MingW insists the import library is .dll.a
 EXTENSION_LIB_NAME = "libxml_ruby.dll.a"
 
-CLEAN.include('*.o')
-CLOBBER.include(EXTENSION_NAME)
-CLOBBER.include(EXTENSION_LIB_NAME)
-
-task :default => "libxml"
-
-SRC = FileList['../libxml/*.c']
-OBJ = SRC.collect do |file_name|
-  File.basename(file_name).ext('o')
-end
-
-SRC.each do |srcfile|
-  objfile = File.basename(srcfile).ext('o')
-  file objfile => srcfile do
-    command = "gcc -c -fPIC -O2 -Wall -o #{objfile} -I/usr/local/include #{srcfile} -I#{RUBY_INCLUDE_DIR}"
-    sh "sh -c '#{command}'" 
+# This is called when the Windows GEM is installed!
+task :install do
+  # Gems will pass these two environment variables:
+  # RUBYARCHDIR=#{dest_path}
+  # RUBYLIBDIR=#{dest_path}
+  
+  dest_path = ENV['RUBYLIBDIR']
+  
+  # Copy the extension
+  cp(EXTENSION_NAME, dest_path)
+  
+  # Copy the import library (used by libxslt)
+  cp(EXTENSION_LIB_NAME, dest_path)
+
+  # Copy dllss
+  Dir.glob('*.dll').each do |dll|
+    cp(dll, dest_path)
   end
 end
 
-file "libxml" => OBJ do
-  command = "gcc -shared -o #{EXTENSION_NAME} -Wl,--out-implib,#{EXTENSION_LIB_NAME} -L/usr/local/lib #{OBJ} -lxml2 #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
-  sh "sh -c '#{command}'" 
-end
+task :default => :install

data/ext/mingw/build.rake

@@ -0,0 +1,41 @@
+# We can't use Ruby's standard build procedures
+# on Windows because the Ruby executable is
+# built with VC++ while here we want to build
+# with MingW.  So just roll our own...
+
+require 'rake/clean'
+require 'rbconfig'
+
+RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
+RUBY_BIN_DIR = Config::CONFIG["bindir"]
+RUBY_LIB_DIR = Config::CONFIG["libdir"]
+RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
+RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
+
+EXTENSION_NAME = "libxml_ruby.#{Config::CONFIG["DLEXT"]}"
+# MingW insists the import library is .dll.a
+EXTENSION_LIB_NAME = "libxml_ruby.dll.a"
+
+CLEAN.include('*.o')
+CLOBBER.include(EXTENSION_NAME)
+CLOBBER.include(EXTENSION_LIB_NAME)
+
+task :default => "libxml"
+
+SRC = FileList['../libxml/*.c']
+OBJ = SRC.collect do |file_name|
+  File.basename(file_name).ext('o')
+end
+
+SRC.each do |srcfile|
+  objfile = File.basename(srcfile).ext('o')
+  file objfile => srcfile do
+    command = "gcc -c -O2 -Wall -o #{objfile} -I/usr/local/include #{srcfile} -I#{RUBY_INCLUDE_DIR}"
+    sh "sh -c '#{command}'" 
+  end
+end
+
+file "libxml" => OBJ do
+  command = "gcc -shared -o #{EXTENSION_NAME} -Wl,--out-implib,#{EXTENSION_LIB_NAME} -L/usr/local/lib #{OBJ} -lxml2 #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
+  sh "sh -c '#{command}'" 
+end

data/ext/vc/libxml_ruby.vcproj

@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.8.2-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.0-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
@@ -205,20 +205,28 @@
 				RelativePath="..\libxml\ruby_xml_dtd.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_encoding.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_error.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_html_parser.c"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_input_cbg.c"
+				RelativePath="..\libxml\ruby_xml_input.c"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node.c"
+				RelativePath="..\libxml\ruby_xml_input_cbg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node_set.c"
+				RelativePath="..\libxml\ruby_xml_node.c"
 				>
 			</File>
 			<File
@@ -273,10 +281,6 @@
 				RelativePath="..\libxml\ruby_xml_xpointer.c"
 				>
 			</File>
-			<File
-				RelativePath="..\libxml\ruby_xml_xpointer_context.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -303,20 +307,28 @@
 				RelativePath="..\libxml\ruby_xml_dtd.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_encoding.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_error.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_html_parser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_input_cbg.h"
+				RelativePath="..\libxml\ruby_xml_input.h"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node.h"
+				RelativePath="..\libxml\ruby_xml_input_cbg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node_set.h"
+				RelativePath="..\libxml\ruby_xml_node.h"
 				>
 			</File>
 			<File
@@ -371,10 +383,6 @@
 				RelativePath="..\libxml\ruby_xml_xpointer.h"
 				>
 			</File>
-			<File
-				RelativePath="..\libxml\ruby_xml_xpointer_context.h"
-				>
-			</File>
 			<File
 				RelativePath="..\libxml\version.h"
 				>

data/lib/libxml.rb

@@ -1,4 +1,4 @@
-# $Id: libxml.rb 509 2008-07-22 02:11:00Z cfis $ 
+# $Id: libxml.rb 561 2008-11-18 04:17:29Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
 # If running on Windows, then add the current directory to the PATH
@@ -12,14 +12,20 @@ end
 require 'libxml_ruby'
 
 # Load Ruby supporting code.
+require 'libxml/error'
 require 'libxml/parser'
 require 'libxml/parser_options'
+require 'libxml/parser_context'
 require 'libxml/document'
 require 'libxml/node'
-require 'libxml/node_set'
 require 'libxml/attributes'
 require 'libxml/attr'
 require 'libxml/tree'
+require 'libxml/reader'
+require 'libxml/html_parser'
+require 'libxml/sax_parser'
+require 'libxml/sax_callbacks'
+require 'libxml/xpath_object'
 
 # Deprecated
 require 'libxml/properties'

data/lib/libxml/document.rb

@@ -1,9 +1,22 @@
-# $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 Document
+      def self.file(value)
+        Parser.file(value).parse
+      end
+
+      def self.string(value)
+        Parser.string(value).parse
+      end
+
+      def self.document(value)
+        Parser.document(value).parse
+      end
+
+      def self.io(value)
+        Parser.io(value).parse
+      end
+
       # Return the nodes matching the specified xpath expression, 
       # optionally using the specified namespace.  For more 
       # information about working with namespaces, please refer
@@ -33,7 +46,6 @@ module LibXML
       #
       #  nodes = nil
       #  GC.start
-      #
       def find(xpath, nslist = nil)
         context = XPath::Context.new(self)
         context.node = self.root  

data/lib/libxml/error.rb

@@ -0,0 +1,84 @@
+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: ''
+
+       sprintf("%s %s at %s:%d.", self.level_to_s, msg,
+                                  self.file, self.line)
+      end
+    end
+  end
+end
+
+LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)

data/lib/libxml/hpricot.rb

@@ -0,0 +1,76 @@
+# 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

@@ -0,0 +1,61 @@
+module LibXML
+  module XML
+    class HTMLParser
+      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 self.io(value)
+        parser = Parser.new
+        parser.input.io = value
+        parser
+      end
+
+      def file
+        input.filename
+      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
+    end
+  end
+end