libxslt-ruby 0.3.6 → 0.6.0

data/LICENSE

@@ -1,21 +1,21 @@
-# $Id: LICENSE,v 1.1.1.1 2006/03/09 01:36:19 roscopeco Exp $
-
-Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
-
-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.
+# $Id: LICENSE 33 2007-08-29 18:18:15Z transami $
+
+Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
+
+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,49 +1,153 @@
-== INSTALLATION
-
-Installation is simple.  Follow the following steps:
-
-=== Rubygems
-
-  gem install libxslt-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.
-
-== DOCUMENTATION
-
-RDoc comments are included - run 'rake doc' to generate documentation.
-You can find the latest documentation at:
-
-* http://libxml.rubyforge.org/doc/xslt
-
-== USAGE EXAMPLE
-
-*Note*: To use libxslt, you have to require both 'xml/libxml' and 'xml/libxslt'.
-
-  $ cd tests
-  $ ruby fuzface.rb
-
-== If you checked out from CVS
-
-If you checked out the source from CVS, you must install a copy of
-the current (or matching) libxml-ruby headers in:
-
-  ext/xml/libxml-ruby
-	
-prior to running the above. This can be done via rake, and will
-happen automatically if ../libxml/ext/xml is found, or the
-LIBXMLH=/path/to/headers commandline option is supplied.
-
-# $Id: README,v 1.3 2006/03/21 22:42:21 roscopeco Exp $
-
+== INSTALLATION
+
+Installation is simple.  Follow the following steps:
+
+=== Rubygems
+
+  gem install libxsl-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.
+
+== DOCUMENTATION
+
+RDoc comments are included - run 'rake doc' to generate documentation.
+You can find the latest documentation at:
+
+* http://libxsl.rubyforge.org
+
+== USAGE EXAMPLE
+
+*Note*: To use libxsl-ruby, you have to require both 'xml/libxml' and 
+'xml/libxslt'. The following example is an abridged version of that 
+included with the distribution, which you can run with:
+
+  $ cd tests
+  $ ruby fuzface.rb
+  
+Given an XML file like:
+
+	<?xml version="1.0" encoding="UTF-8"?>
+	<?xml-stylesheet href="fuzface.xsl" type="text/xsl"?>
+	
+	<commentary>
+	  <meta>
+	    <author>       
+	      <first_name>Sean</first_name>
+	      <last_name>Chittenden</last_name>
+	      <email>sean@chittenden.org</email>
+	    </author>
+	    <version>$Version$</version>
+	    <date>$Date: 2007-08-29 12:18:15 -0600 (Wed, 29 Aug 2007) $</date>
+	    <id>$Id: README 33 2007-08-29 18:18:15Z transami $</id>     <title>Fuzface...</title>
+	    <subtitle>The Internet's a big place and here's some proof...</subtitle>
+	  </meta>
+	
+	  <body>
+	    <para>
+	      I think it's a tragedy that I'm going to start off my new
+	      commentary by talking about facial hair and the Internet.
+	      Something about that just screams pathetic, but whatever: it's
+	      humor and that's life.
+	    </para>
+	  </body>
+	</commentary>
+
+And an XSLT like:
+
+	<?xml version="1.0" ?>
+	<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:template match="/">
+	  <xsl:element name="html">
+	    <xsl:element name="head">
+	      <xsl:element name="title">Ramblings - <xsl:value-of select="commentary/meta/title" /> - <xsl:value-of select="commentary/meta/subtitle" /></xsl:element>
+	    </xsl:element>
+	
+	    <xsl:element name="body">
+	      <xsl:element name="h1"><xsl:value-of select="commentary/meta/title" /></xsl:element>
+	      <xsl:element name="h3"><xsl:value-of select="commentary/meta/subtitle" /></xsl:element>
+	      By: <xsl:value-of select="commentary/meta/author/first_name" /> <xsl:value-of select="commentary/meta/author/last_name" /><xsl:element name="br" />
+	      Date: <xsl:value-of select="commentary/meta/date" /><xsl:element name="br" />
+	
+	      <xsl:for-each select="./commentary/body">
+	        <xsl:apply-templates />
+	      </xsl:for-each>
+	
+	    </xsl:element>
+	  </xsl:element>
+	</xsl:template>
+	
+	<xsl:template match="para">
+	  <xsl:element name="p">
+	    <xsl:value-of select="." />
+	  </xsl:element>
+	</xsl:template>
+	</xsl:stylesheet>
+
+We can easily transform the XML with the following ruby code:
+
+	# require 'rubygems'  # if installed via gems
+	require 'xml/libxml'
+	require 'xml/libxslt'
+	
+	# Create a new XSL Transform
+	xslt = XML::XSLT.file('fuzface.xsl')
+	xslt.doc = XML::Document.file('fuzface.xml')
+	
+	# Parse to create a stylesheet, then apply.
+	s = xslt.parse
+	s.apply
+	
+	# To save the result to a file:
+	File.open('fuzface.html', 'w') do |f|
+	  s.save(f) 
+	end
+	
+	# To output the result to stdout
+	s.print
+
+To give the following result:
+
+	<html>
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Ramblings - Fuzface... - The Internet's a big place and here's some proof...</title>
+	</head>
+	<body>
+	<h1>Fuzface...</h1>
+	<h3>The Internet's a big place and here's some proof...</h3>
+	      By: SeanChittenden<br>
+	      Date: $Date: 2007-08-29 12:18:15 -0600 (Wed, 29 Aug 2007) $<br>
+	    <p>
+	      I think it's a tragedy that I'm going to start off my new
+	      commentary by talking about facial hair and the Internet.
+	      Something about that just screams pathetic, but whatever: it's
+	      humor and that's life.
+	    </p>
+	  </body>
+	</html>
+
+== If you checked out from CVS
+
+If you checked out the source from CVS, you must install a copy of
+the current (or matching) libxml-ruby headers in:
+
+  ext/xml/libxml-ruby
+	
+prior to running the above. This can be done via rake, and will
+happen automatically if ../libxml/ext/xml is found, or the
+LIBXMLH=/path/to/headers commandline option is supplied.
+
+# $Id: README 33 2007-08-29 18:18:15Z transami $
+
 # See the LICENSE file for copyright and distribution information

data/ext/{xml → libxslt}/extconf.rb

@@ -1,10 +1,10 @@
 #!/usr/local/bin/ruby -w
 
-# $Id: extconf.rb,v 1.1.1.1 2006/03/09 01:36:20 roscopeco Exp $
+# $Id: extconf.rb 43 2007-12-07 12:38:59Z transami $
 #
 # See the LICENSE file for copyright and distribution information
 
-require "mkmf"
+require 'mkmf'
 
 $preload = nil
 $LIBPATH.push(Config::CONFIG['libdir'])
@@ -14,9 +14,24 @@ def crash(str)
   exit 1
 end
 
+require 'rubygems'
+gem_specs = Gem::SourceIndex.from_installed_gems.search('libxml-ruby')
+if gem_specs.empty? 
+  crash(<<EOL)
+libxml-ruby bindings must be installed
+EOL
+end
+
+# Sort by version, newest first
+gem_specs = gem_specs.sort_by {|spec| spec.version}.reverse
+
+libxml_ruby_path = gem_specs.first.full_gem_path
+
+$INCFLAGS += " -I#{libxml_ruby_path}/ext"
+
+# Directories
 dir_config('xml2')
 dir_config('xslt')
-#dir_config('libxml-ruby', '../../../libxml', '../../../libxml/ext/xml')
 
 unless have_library('m', 'atan')
   # try again for gcc 4.0
@@ -35,11 +50,11 @@ else
 end
 
 unless (have_library('xml2', 'xmlXPtrNewRange') or
-        find_library('xml2', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
+        find_library('xml2', 'xmlXPtrNewRange', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
        (have_header('libxml/xmlversion.h') or
-        find_header('libxml/xmlversion.h', 
-                    '/opt/include/libxml2', 
-                    '/usr/local/include/libxml2', 
+        find_header('libxml/xmlversion.h',
+                    '/opt/include/libxml2',
+                    '/usr/local/include/libxml2',
                     '/usr/include/libxml2'))
   crash(<<EOL)
 need libxml2.
@@ -53,11 +68,11 @@ EOL
 end
 
 unless (have_library('xslt','xsltApplyStylesheet') or
-        find_library('xslt', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
+        find_library('xslt', 'xsltApplyStylesheet', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
        (have_header('xslt.h') or
-        find_header('xslt.h', 
-                    '/opt/include/libxslt', 
-                    '/usr/local/include/libxslt', 
+        find_header('xslt.h',
+                    '/opt/include/libxslt',
+                    '/usr/local/include/libxslt',
                     '/usr/include/libxslt'))
   crash(<<EOL)
 need libxslt.
@@ -70,7 +85,8 @@ need libxslt.
 EOL
 end
 
-unless have_header('libxml-ruby/libxml.h') 
+unless have_header('libxml/ruby_libxml.h') and
+       have_header('libxml/ruby_xml_document.h')
   crash(<<EOL)
 need headers for libxml-ruby.
 
@@ -84,14 +100,5 @@ need headers for libxml-ruby.
 EOL
 end
 
-$LDFLAGS << ' -lexslt'
-#$LDFLAGS << ' -lxml'
-#$LDFLAGS << ' ' + `xslt-config --libs`.chomp
-#$LDFLAGS << ' ' + `xml2-config --libs`.chomp
-#$CFLAGS << ' ' + `xslt-config --cflags`.chomp
-#$CFLAGS << ' ' + `xml2-config --cflags`.chomp
-$CFLAGS = '-g -Wall ' + $CFLAGS + ' ' + $INCFLAGS
-
-
 create_header()
-create_makefile("xml/libxslt")
+create_makefile("libxslt_ruby")

data/ext/{xml → libxslt}/libxslt.c

@@ -1,10 +1,13 @@
-/* $Id: libxslt.c,v 1.2 2006/03/21 22:42:21 roscopeco Exp $ */
+/* $Id: libxslt.c 42 2007-12-07 06:09:35Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "libxslt.h"
 #include "libxml/xmlversion.h"
 
+VALUE mXML;
+VALUE cXMLDocument;
+
 VALUE cXSLT;
 VALUE eXMLXSLTStylesheetRequireParsedDoc;
 
@@ -28,7 +31,7 @@ ruby_xslt_doc_get(VALUE self) {
 VALUE
 ruby_xslt_doc_set(VALUE self, VALUE xml_doc_obj) {
   ruby_xslt *rxslt;
-  ruby_xml_document *rxd;
+  ruby_xml_document_t *rxd;
   ruby_xslt_transform_context *rxtc;
 
   if (rb_obj_is_kind_of(xml_doc_obj, cXMLDocument) == Qfalse)
@@ -37,7 +40,7 @@ ruby_xslt_doc_set(VALUE self, VALUE xml_doc_obj) {
   Data_Get_Struct(self, ruby_xslt, rxslt);
   rxslt->xml_doc_obj = xml_doc_obj;
 
-  Data_Get_Struct(xml_doc_obj, ruby_xml_document, rxd);
+  Data_Get_Struct(xml_doc_obj, ruby_xml_document_t, rxd);
   if (rxd->doc == NULL)
       return(Qnil);
 
@@ -92,7 +95,7 @@ ruby_xslt_filename_set(VALUE self, VALUE filename) {
 void
 ruby_xslt_free(ruby_xslt *rxslt) {
   if (rxslt != NULL)
-    free(rxslt);
+    ruby_xfree(rxslt);
 }
 
 
@@ -121,9 +124,8 @@ ruby_xslt_mark(ruby_xslt *rxslt) {
  */
 VALUE
 ruby_xslt_new(VALUE class) {
-  ruby_xslt *rxslt;
+  ruby_xslt *rxslt = ALLOC(ruby_xslt);
 
-  rxslt = (ruby_xslt *)malloc(sizeof(ruby_xslt));
   if (rxslt == NULL)
     rb_raise(rb_eNoMemError, "No memory left for XSLT struct");
 
@@ -162,7 +164,7 @@ ruby_xslt_new_file(VALUE class, VALUE filename) {
  */
 VALUE
 ruby_xslt_parse(VALUE self) {
-  ruby_xml_document *rxd;
+  ruby_xml_document_t *rxd;
   ruby_xslt *rxslt;
   ruby_xslt_stylesheet *xss;
   VALUE xssobj;
@@ -172,9 +174,9 @@ ruby_xslt_parse(VALUE self) {
 
   if (rxslt->data_type == RUBY_LIBXSLT_SRC_TYPE_FILE) {
     /*xssobj = ruby_xslt_stylesheet_new(cXSLTStylesheet,
-				      xsltParseStylesheetFile((const xmlChar *)
-							      STR2CSTR(rxslt->data)));*/
-	sheet = xsltParseStylesheetFile((const xmlChar *) STR2CSTR(rxslt->data));
+              xsltParseStylesheetFile((const xmlChar *)
+                    STR2CSTR(rxslt->data)));*/
+  sheet = xsltParseStylesheetFile((const xmlChar *) STR2CSTR(rxslt->data));
 
     if (sheet) {
         xssobj = ruby_xslt_stylesheet_new(cXSLTStylesheet, sheet);
@@ -185,9 +187,9 @@ ruby_xslt_parse(VALUE self) {
         xssobj = Qnil;
 
   } else if (rxslt->xml_doc_obj != Qnil) {
-    Data_Get_Struct(rxslt->xml_doc_obj, ruby_xml_document, rxd);
+    Data_Get_Struct(rxslt->xml_doc_obj, ruby_xml_document_t, rxd);
     /*xssobj = ruby_xslt_stylesheet_new(cXSLTStylesheet,
-				      xsltParseStylesheetDoc(rxd->doc));*/
+              xsltParseStylesheetDoc(rxd->doc));*/
     sheet = xsltParseStylesheetDoc(rxd->doc);
     if (sheet) {
         xssobj = ruby_xslt_stylesheet_new(cXSLTStylesheet,sheet);
@@ -203,13 +205,15 @@ ruby_xslt_parse(VALUE self) {
   return(xssobj);
 }
 
-#ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
-#endif
+#if defined(_WIN32)
+__declspec(dllexport) 
+#endif
 
 void
-Init_libxslt(void) {
-  LIBXML_TEST_VERSION;  
+Init_libxslt_ruby(void) {
+  LIBXML_TEST_VERSION;
+  
+  // Must load libxml bindings to use xslst
   mXML = rb_const_get(rb_cObject, rb_intern("XML"));
   cXMLDocument = rb_const_get(mXML, rb_intern("Document"));
 
@@ -243,5 +247,5 @@ Init_libxslt(void) {
   rb_define_method(cXSLT, "filename=", ruby_xslt_filename_set, 1);
   rb_define_method(cXSLT, "parse", ruby_xslt_parse, 0);
 
-  exsltRegisterAll();
+  //exsltRegisterAll();
 }