libxml-ruby 0.5.4 → 0.6.0

data/LICENSE

@@ -1,23 +1,23 @@
-LibXML-Ruby
-
- Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
- Copyright (c) 2001 Wai-Sun "Squidster" Chia <waisun.chia@compaq.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+LibXML-Ruby
+
+ Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
+ Copyright (c) 2001 Wai-Sun "Squidster" Chia <waisun.chia@compaq.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README

@@ -1,144 +1,144 @@
-== INSTALLATION
-
-Installation is simple.  Follow the following steps:
-
-=== Rubygems
-
-  gem install libxml-ruby
-	
-=== Tarball/zip	
-
-  $ rake test
-  $ rake install
-
-If extconf yacks up an error, follow the instructions it provides.
-You will need to chdir to ext/xml and run 'ruby extconf.rb' to provide
-options, after which you can either use Rake for everything or 
-do with make (make && make install).
-
-Once installed, look at the test scripts (tests/*.rb), and run 
-'rake doc' to generate API documentation.
-You can find the latest documentation at:
-
-* http://libxml.rubyforge.org/doc
-
-== DEPENDENCIES
-
-libxml requires a few other libraries to be installed inorder to
-function properly.
-
-* libm      (math routines: very standard)
-* libz      (zlib)
-* libiconv
-* libxml2
-
-== USAGE
-
-Basic usage for reading and writing documents.
-
-=== WRITING
-
-Writing a simple document:
-
-  # require 'rubygems' # if installed via Gems
-	require 'xml/libxml'
-	
-	doc = XML::Document.new()
-	doc.root = XML::Node.new('root_node')
-	root = doc.root
-	
-	root << elem1 = XML::Node.new('elem1')
-	elem1['attr1'] = 'val1'
-	elem1['attr2'] = 'val2'
-	
-	root << elem2 = XML::Node.new('elem2')
-	elem2['attr1'] = 'val1'
-	elem2['attr2'] = 'val2'
-	
-	root << elem3 = XML::Node.new('elem3')
-	elem3 << elem4 = XML::Node.new('elem4')
-	elem3 << elem5 = XML::Node.new('elem5')
-	
-	elem5 << elem6 = XML::Node.new('elem6')
-	elem6 << 'Content for element 6'
-	
-	elem3['attr'] = 'baz'
-	
-	# Namespace hack to reduce the numer of times XML:: is typed
-	include XML
-	root << elem7 = Node.new('foo')
-	1.upto(10) do |i|
-	  elem7 << n = Node.new('bar')
-	  n << i
-	end
-	
-	format = true
-	doc.save('output.xml', format)
-
-The file output.xml contains:
-
-	<?xml version="1.0"?>
-	<root_node>
-	  <elem1 attr1="val1" attr2="val2"/>
-	  <elem2 attr1="val1" attr2="val2"/>
-	  <elem3 attr="baz">
-	    <elem4/>
-	    <elem5>
-	      <elem6>Content for element 6</elem6>
-	    </elem5>
-	  </elem3>
-	  <foo>
-	    <bar>1</bar>
-	    <bar>2</bar>
-	    <bar>3</bar>
-	    <bar>4</bar>
-	    <bar>5</bar>
-	    <bar>6</bar>
-	    <bar>7</bar>
-	    <bar>8</bar>
-	    <bar>9</bar>
-	    <bar>10</bar>
-	  </foo>
-	</root_node>
-
-=== READING
-
-Reading XML is slightly more complex and there are many more ways to
-perform this operation.  This reads in and processes the above
-generated XML document, output.xml. This script assumes that the
-structure of the document is already known.
-
-  # require 'rubygems' # if installed via Gems
-	require 'xml/libxml'
-	doc = XML::Document.file('output.xml')
-	root = doc.root
-	
-	puts "Root element name: #{root.name}"
-	
-	elem3 = root.find('elem3').to_a.first
-	puts "Elem3: #{elem3['attr']}"
-	
-	doc.find('//root_node/foo/bar').each do |node|
-	  puts "Node path: #{node.path} \t Contents: #{node.content}"
-	end
-
-And your terminal should look like:
-
-	Root element name: root_node
-	Elem3: baz
-	Node path: /root_node/foo/bar[1]         Contents: 1
-	Node path: /root_node/foo/bar[2]         Contents: 2
-	Node path: /root_node/foo/bar[3]         Contents: 3
-	Node path: /root_node/foo/bar[4]         Contents: 4
-	Node path: /root_node/foo/bar[5]         Contents: 5
-	Node path: /root_node/foo/bar[6]         Contents: 6
-	Node path: /root_node/foo/bar[7]         Contents: 7
-	Node path: /root_node/foo/bar[8]         Contents: 8
-	Node path: /root_node/foo/bar[9]         Contents: 9
-	Node path: /root_node/foo/bar[10]        Contents: 10
-
-== MORE INFORMATION
-
-If you have any questions, please send email to libxml-devel@rubyforge.org.
-
-# $Id: README 143 2007-08-29 21:45:48Z transami $
+== INSTALLATION
+
+Installation is simple.  Follow the following steps:
+
+=== Rubygems
+
+  gem install libxml-ruby
+	
+=== Tarball/zip	
+
+  $ rake test
+  $ rake install
+
+If extconf yacks up an error, follow the instructions it provides.
+You will need to chdir to ext/xml and run 'ruby extconf.rb' to provide
+options, after which you can either use Rake for everything or 
+do with make (make && make install).
+
+Once installed, look at the test scripts (tests/*.rb), and run 
+'rake doc' to generate API documentation.
+You can find the latest documentation at:
+
+* http://libxml.rubyforge.org/doc
+
+== DEPENDENCIES
+
+libxml requires a few other libraries to be installed inorder to
+function properly.
+
+* libm      (math routines: very standard)
+* libz      (zlib)
+* libiconv
+* libxml2
+
+== USAGE
+
+Basic usage for reading and writing documents.
+
+=== WRITING
+
+Writing a simple document:
+
+  # require 'rubygems' # if installed via Gems
+	require 'xml/libxml'
+	
+	doc = XML::Document.new()
+	doc.root = XML::Node.new('root_node')
+	root = doc.root
+	
+	root << elem1 = XML::Node.new('elem1')
+	elem1['attr1'] = 'val1'
+	elem1['attr2'] = 'val2'
+	
+	root << elem2 = XML::Node.new('elem2')
+	elem2['attr1'] = 'val1'
+	elem2['attr2'] = 'val2'
+	
+	root << elem3 = XML::Node.new('elem3')
+	elem3 << elem4 = XML::Node.new('elem4')
+	elem3 << elem5 = XML::Node.new('elem5')
+	
+	elem5 << elem6 = XML::Node.new('elem6')
+	elem6 << 'Content for element 6'
+	
+	elem3['attr'] = 'baz'
+	
+	# Namespace hack to reduce the numer of times XML:: is typed
+	include XML
+	root << elem7 = Node.new('foo')
+	1.upto(10) do |i|
+	  elem7 << n = Node.new('bar')
+	  n << i
+	end
+	
+	format = true
+	doc.save('output.xml', format)
+
+The file output.xml contains:
+
+	<?xml version="1.0"?>
+	<root_node>
+	  <elem1 attr1="val1" attr2="val2"/>
+	  <elem2 attr1="val1" attr2="val2"/>
+	  <elem3 attr="baz">
+	    <elem4/>
+	    <elem5>
+	      <elem6>Content for element 6</elem6>
+	    </elem5>
+	  </elem3>
+	  <foo>
+	    <bar>1</bar>
+	    <bar>2</bar>
+	    <bar>3</bar>
+	    <bar>4</bar>
+	    <bar>5</bar>
+	    <bar>6</bar>
+	    <bar>7</bar>
+	    <bar>8</bar>
+	    <bar>9</bar>
+	    <bar>10</bar>
+	  </foo>
+	</root_node>
+
+=== READING
+
+Reading XML is slightly more complex and there are many more ways to
+perform this operation.  This reads in and processes the above
+generated XML document, output.xml. This script assumes that the
+structure of the document is already known.
+
+  # require 'rubygems' # if installed via Gems
+	require 'xml/libxml'
+	doc = XML::Document.file('output.xml')
+	root = doc.root
+	
+	puts "Root element name: #{root.name}"
+	
+	elem3 = root.find('elem3').to_a.first
+	puts "Elem3: #{elem3['attr']}"
+	
+	doc.find('//root_node/foo/bar').each do |node|
+	  puts "Node path: #{node.path} \t Contents: #{node.content}"
+	end
+
+And your terminal should look like:
+
+	Root element name: root_node
+	Elem3: baz
+	Node path: /root_node/foo/bar[1]         Contents: 1
+	Node path: /root_node/foo/bar[2]         Contents: 2
+	Node path: /root_node/foo/bar[3]         Contents: 3
+	Node path: /root_node/foo/bar[4]         Contents: 4
+	Node path: /root_node/foo/bar[5]         Contents: 5
+	Node path: /root_node/foo/bar[6]         Contents: 6
+	Node path: /root_node/foo/bar[7]         Contents: 7
+	Node path: /root_node/foo/bar[8]         Contents: 8
+	Node path: /root_node/foo/bar[9]         Contents: 9
+	Node path: /root_node/foo/bar[10]        Contents: 10
+
+== MORE INFORMATION
+
+If you have any questions, please send email to libxml-devel@rubyforge.org.
+
+# $Id: README 143 2007-08-29 21:45:48Z transami $

data/ext/libxml/extconf.rb

@@ -6,6 +6,7 @@ def method_missing(s, *args)
   if v = Config::CONFIG[s] || Config::CONFIG[s.upcase]
     return v
   else
+    puts "missing: #{s}"
     super
   end
 end
@@ -18,7 +19,7 @@ if RUBY_PLATFORM =~ /win32/  # FIXME: Make more robust
   # built with VC++ while here we want to build
   # with MingW.  So just roll our own...
 
-  target = "libxml_so"
+  target = "libxml"
 
   #RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
   #RUBY_BIN_DIR = Config::CONFIG["bindir"]
@@ -31,12 +32,12 @@ if RUBY_PLATFORM =~ /win32/  # FIXME: Make more robust
 
   srcs = Dir['../ext/*.c']
 
-  objs = src.collect do |srcfile|
+  objs = srcs.collect do |srcfile|
     srcfile = File.basename(srcfile)
     srcfile.chomp(File.extname(srcfile) + '.o')
   end
 
-  #src.each do |srcfile|
+  #srcs.each do |srcfile|
   #  srcfile = File.basename(srcfile)
   #  objfile = srcfile.chomp(File.extname(srcfile) + '.o')
   #
@@ -109,11 +110,11 @@ else
 need libiconv.
 
   Install the libiconv or try passing one of the following options
-	to extconf.rb:
+  to extconf.rb:
 
-	  --with-iconv-dir=/path/to/iconv
-	  --with-iconv-lib=/path/to/iconv/lib
-	  --with-iconv-include=/path/to/iconv/include
+    --with-iconv-dir=/path/to/iconv
+    --with-iconv-lib=/path/to/iconv/lib
+    --with-iconv-include=/path/to/iconv/include
 EOL
   end
 
@@ -122,7 +123,7 @@ EOL
           find_library('xml2', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
          (have_header('libxml/xmlversion.h') or
           find_header('libxml/xmlversion.h',
-          						"#{CONFIG['prefix']}/include", 
+                      "#{CONFIG['prefix']}/include", 
                       '/opt/include/libxml2', 
                       '/usr/local/include/libxml2', 
                       '/usr/include/libxml2'))
@@ -149,9 +150,7 @@ EOL
   #$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
 
   create_header()
-  #create_makefile('xml/libxml_so')
-  create_makefile('libxml_so')
-
+  create_makefile('libxml_ruby')
 end
 
 __END__
@@ -255,29 +254,29 @@ TARGET_SO     = $(DLLIB)
 CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
 CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
 
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
+all:    $(DLLIB)
+static:   $(STATIC_LIB)
 
 clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+    @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+distclean:  clean
+    @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+    @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
-realclean:	distclean
+realclean:  distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+  $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
 $(RUBYARCHDIR):
-	$(MAKEDIRS) $@
+  $(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so
@@ -286,23 +285,23 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+  $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+  $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+  $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+  $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+  $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+  @-$(RM) $@
+  $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 $(OBJS): ruby.h defines.h $(RUBY_EXTCONF_H)

data/ext/libxml/libxml.c

@@ -1,42 +1,8 @@
-/* $Id: libxml.c 225 2007-12-07 04:58:09Z transami $ */
+/* $Id: libxml.c 300 2008-07-01 19:14:15Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#include "libxml.h"
-
-/* Ruby's util.h has ruby_strdup */
-#include "util.h"
-
-#ifdef xmlMalloc
-#undef xmlMalloc
-#endif
-#ifdef xmlRealloc
-#undef xmlRealloc
-#endif
-#ifdef xmlMemStrdup
-#undef xmlMemStrdup
-#endif
-#ifdef xmlMemFree
-#undef xmlMemFree
-#endif
-
-#ifdef RubyMemMalloc
-#undef RubyMemMalloc
-#endif
-#ifdef RubyMemRealloc
-#undef RubyMemRealloc
-#endif
-#ifdef RubyMemStrdup
-#undef RubyMemStrdup
-#endif
-#ifdef RubyMemFree
-#undef RubyMemFree
-#endif
-
-#define RubyMemFree     ruby_xfree
-#define RubyMemRealloc  ruby_xrealloc
-#define RubyMemMalloc   ruby_xmalloc
-#define RubyMemStrdup   ruby_strdup
+#include "ruby_libxml.h"
 
 VALUE mXML;
 VALUE eXMLError;
@@ -46,8 +12,12 @@ static xmlMallocFunc mallocFunc = NULL;
 static xmlReallocFunc reallocFunc = NULL;
 static xmlStrdupFunc strdupFunc = NULL;
 
+#if defined(_WIN32)
+__declspec(dllexport) 
+#endif
+
 void
-Init_libxml_so(void) {
+Init_libxml_ruby(void) {
   /* Some libxml memory goo that should be done before anything else */
 #ifdef NONE
   xmlMemGet((xmlFreeFunc *) & freeFunc,