libxslt-ruby 0.8.2 → 0.9.0

data/Rakefile

@@ -18,7 +18,7 @@ FILES = FileList[
   'ext/mingw/Rakefile',
   'ext/vc/*.sln',
   'ext/vc/*.vcproj',
-  'tests/**/*'
+  'test/**/*'
 ]
 
 # Default GEM Specification
@@ -42,7 +42,7 @@ default_spec = Gem::Specification.new do |spec|
   
   spec.author = "Charlie Savage"
   spec.email = "libxml-devel@rubyforge.org"
-  spec.add_dependency('libxml-ruby','>=0.8.2')
+  spec.add_dependency('libxml-ruby','>=0.9.0')
   spec.platform = Gem::Platform::RUBY
   spec.require_paths = ["lib", "ext/libxslt"] 
  
@@ -62,39 +62,22 @@ end
 Rake::GemPackageTask.new(default_spec) do |pkg|
   pkg.package_dir = 'admin/pkg'
   pkg.need_tar = true
-  pkg.need_zip = true
 end
 
-# ------- Windows Package ----------
-binaries = (FileList['ext/mingw/*.so',
-                     'ext/mingw/*.dll'])
+# ------- Windows GEM ----------
+if RUBY_PLATFORM.match(/win32/)
+  binaries = (FileList['ext/mingw/*.so',
+                       'ext/mingw/*.dll*'])
 
-# Windows specification
-win_spec = default_spec.clone
-win_spec.extensions = []
-win_spec.platform = Gem::Platform::CURRENT
-win_spec.files += binaries.map {|binaryname| "lib/#{File.basename(binaryname)}"}
+  # Windows specification
+  win_spec = default_spec.clone
+  win_spec.extensions = ['ext/mingw/Rakefile']
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
 
-desc "Create Windows Gem"
-task :create_win32_gem do
-  # Copy the win32 extension built by MingW - easier to install
-  # since there are no dependencies of msvcr80.dll
-  current_dir = File.expand_path(File.dirname(__FILE__))
-
-  binaries.each do |binaryname|
-    target = File.join(current_dir, 'lib', File.basename(binaryname))
-    cp(binaryname, target)
-  end
-
-  # Create the gem, then move it to pkg
-  Gem::Builder.new(win_spec).build
-  gem_file = "#{win_spec.name}-#{win_spec.version}-#{win_spec.platform}.gem"
-  mv(gem_file, "admin/pkg/#{gem_file}")
-
-  # Remove win extension from top level directory  
-  binaries.each do |binaryname|
-    target = File.join(current_dir, 'lib', File.basename(binaryname))
-    rm(target)
+  # Rake task to build the windows package
+  Rake::GemPackageTask.new(win_spec) do |pkg|
+    pkg.package_dir = 'admin/pkg'
   end
 end
 
@@ -115,15 +98,11 @@ Rake::RDocTask.new("rdoc") do |rdoc|
                           'LICENSE')
 end
 
-task :package => :rdoc
-task :package => :create_win32_gem
-task :default => :package
 
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.libs << "ext"
 end
 
-if not RUBY_PLATFORM.match(/mswin32/i)
-  Rake::Task[:test].prerequisites << :extensions
-end
+task :package => :rdoc
+task :default => :package

data/ext/libxslt/extconf.rb

@@ -85,6 +85,24 @@ need libxslt.
 EOL
 end
 
+unless (have_library('exslt','exsltLibexsltVersion') or
+        find_library('exslt', 'exsltLibexsltVersion', '/opt/lib', '/usr/local/lib', '/usr/lib')) and
+       (have_header('exslt.h') or
+        find_header('exslt.h',
+                    '/opt/include/libexslt',
+                    '/usr/local/include/libexslt',
+                    '/usr/include/libexslt'))
+  crash(<<EOL)
+need libexslt.
+
+        Install the library or try one of the following options to extconf.rb:
+
+        --with-exslt-dir=/path/to/libexslt
+        --with-exslt-lib=/path/to/libexslt/lib
+        --with-exslt-include=/path/to/libexslt/include
+EOL
+end
+
 unless have_header('libxml/ruby_libxml.h') and
        have_header('libxml/ruby_xml_document.h')
   crash(<<EOL)

data/ext/libxslt/libxslt.c

@@ -61,4 +61,7 @@ Init_libxslt_ruby(void) {
 
   ruby_init_xslt_stylesheet();
   ruby_init_xslt_transform_context();
+
+  /* Now load exslt. */
+  exsltRegisterAll();
 }

data/ext/libxslt/libxslt.h

@@ -19,7 +19,7 @@
 #include "ruby_xslt_stylesheet.h"
 #include "ruby_xslt_transform_context.h"
 
-#include "version.h"
+#include "version.h"
 
 #if ((RUBY_LIBXML_VER_MAJ != RUBY_LIBXSLT_VER_MAJ) || (RUBY_LIBXML_VER_MIN != RUBY_LIBXSLT_VER_MIN))
 #error "Incompatible LibXML-Ruby headers - please install same major/micro version"

data/ext/libxslt/ruby_xslt_stylesheet.c

@@ -50,7 +50,7 @@ ruby_xslt_stylesheet_alloc(VALUE klass) {
  */
 VALUE
 ruby_xslt_stylesheet_initialize(VALUE self, VALUE document) {
-  ruby_xml_document_t *rdocument;
+  xmlDocPtr xdoc;
   xmlDocPtr xcopy;
   xsltStylesheetPtr xstylesheet;
 
@@ -65,8 +65,8 @@ ruby_xslt_stylesheet_initialize(VALUE self, VALUE document) {
   *  has to be updated to always check and see if the document is 
   *  still valid.  That's all doable, but seems like a pain, so 
   *  just copy the document for now. */
-  Data_Get_Struct(document, ruby_xml_document_t, rdocument);
-  xcopy = xmlCopyDoc(rdocument->doc, 1);
+  Data_Get_Struct(document, xmlDoc, xdoc);
+  xcopy = xmlCopyDoc(xdoc, 1);
   xstylesheet = xsltParseStylesheetDoc(xcopy);
   xstylesheet->_private = (void *)self;
   DATA_PTR(self) = xstylesheet;
@@ -122,7 +122,7 @@ ruby_xslt_coerce_params(VALUE params) {
  */
 VALUE
 ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
-  ruby_xml_document_t *rdocument;
+  xmlDocPtr xdoc;
   xsltStylesheetPtr xstylesheet;
   xmlDocPtr result;
   VALUE document;
@@ -145,10 +145,10 @@ ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
   rb_funcall(params, rb_intern("flatten!"), 0);
   pParams = ruby_xslt_coerce_params(params);
   
-  Data_Get_Struct(document, ruby_xml_document_t, rdocument);
+  Data_Get_Struct(document, xmlDoc, xdoc);
   Data_Get_Struct(self, xsltStylesheet, xstylesheet);
   
-  result = xsltApplyStylesheet(xstylesheet, rdocument->doc, (const char**)pParams);
+  result = xsltApplyStylesheet(xstylesheet, xdoc, (const char**)pParams);
   
   if (!result)
     rb_raise(eXSLTError, "Transformation failed");

data/ext/libxslt/version.h

@@ -1,5 +1,5 @@
-#define RUBY_LIBXSLT_VERSION  "0.8.2"
+#define RUBY_LIBXSLT_VERSION  "0.9.0"
 #define RUBY_LIBXSLT_VERNUM   0
 #define RUBY_LIBXSLT_VER_MAJ  0
-#define RUBY_LIBXSLT_VER_MIN  8
-#define RUBY_LIBXSLT_VER_MIC  2
+#define RUBY_LIBXSLT_VER_MIN  9
+#define RUBY_LIBXSLT_VER_MIC  0

data/ext/mingw/Rakefile

@@ -3,40 +3,26 @@
 # built with VC++ while here we want to build
 # with MingW.  So just roll our own...
 
-require 'rubygems'
-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 = "libxslt_ruby.#{Config::CONFIG['DLEXT']}"
-
-gem_specs = Gem::SourceIndex.from_installed_gems.search('libxml-ruby')
-LIBXML_RUBY_DIR = gem_specs.sort_by {|spec| spec.version}.reverse.first.full_gem_path
-    
-CLEAN.include('*.o')
-CLOBBER.include('libxslt.so')
-
-task :default => "libxslt"
-
-SRC = FileList['../libxslt/*.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 -I../../rlibxml/ext #{srcfile} -I#{LIBXML_RUBY_DIR}/ext -I#{RUBY_INCLUDE_DIR}"
-    sh "sh -c '#{command}'" 
+EXTENSION_NAME = "libxslt_ruby.#{Config::CONFIG["DLEXT"]}"
+
+# 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 dllss
+  Dir.glob('*.dll').each do |dll|
+    cp(dll, dest_path)
   end
 end
 
-file "libxslt" => OBJ do
-  command = "gcc -shared -o #{EXTENSION_NAME} -L#{LIBXML_RUBY_DIR}/lib -L/usr/local/lib #{OBJ} -lxml_ruby -lxslt -lxml2 #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
-  sh "sh -c '#{command}'" 
-end
+task :default => :install

data/ext/vc/libxslt_ruby.vcproj

@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxsl-ruby-0.8.2-x86-mswin32-60\lib"
+			OutputDirectory="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxslt-ruby-0.8.2-x86-mswin32-60\lib"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib libxslt.lib libexslt.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxslt-ruby-0.7.1-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxslt-ruby-0.8.3-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"

data/test/files/commentary.dtd

@@ -0,0 +1,34 @@
+<!ELEMENT commentary (meta, body)>
+<!ELEMENT meta (author, version, date, id, title, subtitle?)>
+
+<!-- Metadata about the requirements -->
+<!ENTITY % string       "#PCDATA">
+<!ENTITY % character    "#PCDATA">
+<!ENTITY % letter       "#PCDATA">
+<!ENTITY % number_att   "CDATA">
+
+
+<!ELEMENT author (first_name, last_name, email)>
+
+<!ELEMENT first_name   (%string;)>
+<!ELEMENT last_name    (%string;)>
+<!ELEMENT email        (%string;)>
+
+<!ELEMENT version       (#PCDATA)>
+<!ELEMENT date          (#PCDATA)>
+<!ELEMENT id            (#PCDATA)>
+<!ELEMENT title         (#PCDATA)>
+<!ELEMENT subtitle      (#PCDATA)>
+
+<!ELEMENT body (para+)>
+
+
+<!ELEMENT para (#PCDATA|thought|url|ol)*>
+<!ATTLIST para
+          style     (default|ps) "default">
+
+<!ELEMENT ol      (li+)>
+<!ELEMENT li      (#PCDATA)>
+<!ELEMENT url     (#PCDATA)>
+<!ELEMENT thought (#PCDATA)>
+

data/{lib/text.xml → test/files/fuzface.xml}

@@ -1,129 +1,154 @@
-<?xml version="1.0"?>
-<html><head><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: 2008-07-09 23:35:19 -0600 (Wed, 09 Jul 2008) $<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>
-
-    <p>
-      I've been working at home for a while now, which has been great.
-      I've been doing a lot of reading, good work, contributing to the
-      FreeBSD project, and living life at my own pace.  The problem?
-      I don't have to interact with people, so I've let my appearance
-      slide a bit, most notably I've gone two weeks without shaving
-      and I have an awful hairy face.
-    </p>
-
-    <p>
-      Nothing is worse than going for a hard run, coming back, and
-      then bending your head down so that the hairs under your chin
-      touch the hairs on your neck.  This has to be one of the most
-      disgusting/gross feelings I've experienced in a while.  While
-      today wasn't the first time I'd experienced such a slimy tangled
-      mess, it is the first time I seriously considered shaving part
-      of my face, but not all of it: I was considering a beard.
-    </p>
-
-    <p>
-      Alright, so it's 5pm and I'm a sweaty post-run mess (it was 110
-      degrees in direct sunlight according to my thermometer) and
-      considering the possibility of growing a beard.  Swifty nift?
-      Maybe.  This is something I'd never done before, let alone
-      seriously consider.  Normally I'd call my dad for such manly
-      advice, but he is: a) normally in another state, and; b) in
-      another country right now probably growing a beard (he's
-      notorious for coming back from a trip with a gnarly unshaven
-      face, sometimes he'll shape it into a decent beard).  So, what's
-      a tech-junkie to do?  Hop on the Internet and see if Google's
-      able to provide me with some inspiration.
-    </p>
-
-    <p>
-      Sure enough, I typed in "pictures of bearded men" and I was able
-      to find something: 14,000 pages of something to be exact.
-      Anyway, so most of these were rinky dink sites, a few of them
-      had some promise.  One guy was trying to start a tradition where
-      everyone grows a beard for New Years.  As I was scrolling down
-      the page trying to find some pictures, my mind was having the
-      following thought process: <i>This seems like a dumb
-      idea... New Years provides a perfectly good excuse to kiss some
-      total stranger that you've had your eye on for the duration of a
-      New Years party.  Why waste such an opportunity with a crappy
-      kiss?</i> And at about this point I said this page sucks,
-      and flipped back to my search results.
-    </p>
-
-    <p>
-      Since I'd never done this before, I didn't know what was
-      fashionably correct in terms of where a guy should shave under
-      his neck, or what the deal was...  I knew there were lots of
-      styles out there, just none that I could picture in my mind
-      (save maybe Santa Claus and a few really gnarly beards that are
-      long enough to be used as full-body covering.  Oooh!  And don't
-      forget the Russian and Amish beards, those stand out in my mind
-      too.).  Google, being pretty comprehensive, and the Internet
-      being huge, found the exact screwball page I was looking for:
-      http://fuzface-gallery.tripod.com/
-    </p>
-
-    <p>
-      I don't know if I really should be amazed at the sheer number of
-      entries that Google returned, or that the Internet is big enough
-      to house such random gallery of crap, but it is and it never
-      ceases to amaze me...  it's almost as amazing as the fact that
-      some bozo spent the time to create such a page.  Don't people
-      have lives?  Oh wait, I just visited his page...  so back to my
-      diatribe...
-    </p>
-
-    <p>
-      There were tons of faces, lots of men, lots of hair, and plenty
-      of styles to choose from.  Page after page of faces and hair.
-      Ugh.  This wasn't getting any where and I was now entertaining
-      the rebound though of shaving my head.  Time to close my browser
-      and hop in the shower: I reak.  So what'd I do?  Well, after
-      looking through enough of those pictures, I decided a few
-      things:
-    </p>
-
-    <p>
-      <ol><li>
-	  I'm amazed that the Internet is big enough to foster the
-	  creation of such random and utterly useless information.  Then
-	  again, I've been on and using the Net since '95, so this
-	  shouldn't surprise me that much.
-        </li><li>
-          There are a lot of guys out there with varying tastes in,
-	  shall we say, "facial hair styles," most of which I find
-	  pretty unappealing.
-        </li><li>
-	  I don't like beards.  After one clogged drain, two
-	  reapplications of shaving cream, and a few pases with the
-	  razor, it took me about 5-10 minutes to get a nice cleanly
-	  shaven face.
-        </li><li>
-          &lt;crass comment&gt;And - back me up here fellas, you can
-	  sympathize with this feeling after you get done looking
-	  through a magazine for a hair-cut style (ladies.. just smile
-	  and nod and pretend you care) - after looking at a few dozen
-	  pictures of men, I was able to safely reaffirm my desire for
-	  heterosexual relations (translation from Bill Clintonese: have
-	  sex with a woman).  And with that thought in mind, I began to
-	  pine for the college porn collection of old.  Mmmm,
-	  Playboy.&lt;/crass comment&gt;
-        </li></ol>
-    </p>
-
-    <p>
-      ::grin::  Until next time.  -Sean
-    </p>
-
-    <p>
-      P.S.  To the guys out there with beards, this is just my
-      opinion: take it with a grain of salt.
-    </p>
-  </body></html>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="fuzface.xsl" type="text/xsl"?>
+
+<!DOCTYPE commentary SYSTEM "commentary.dtd">
+
+<commentary>
+  <meta>
+    <author>
+      <first_name>Sean</first_name>
+      <last_name>Chittenden</last_name>
+      <email>sean@chittenden.org</email>
+    </author>
+    <version>$Version$</version>
+    <date>$Date: 2008-07-09 23:35:19 -0600 (Wed, 09 Jul 2008) $</date>
+    <id>$Id: fuzface.xml 58 2008-07-10 05:35:19Z cfis $</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>
+
+    <para>
+      I've been working at home for a while now, which has been great.
+      I've been doing a lot of reading, good work, contributing to the
+      FreeBSD project, and living life at my own pace.  The problem?
+      I don't have to interact with people, so I've let my appearance
+      slide a bit, most notably I've gone two weeks without shaving
+      and I have an awful hairy face.
+    </para>
+
+    <para>
+      Nothing is worse than going for a hard run, coming back, and
+      then bending your head down so that the hairs under your chin
+      touch the hairs on your neck.  This has to be one of the most
+      disgusting/gross feelings I've experienced in a while.  While
+      today wasn't the first time I'd experienced such a slimy tangled
+      mess, it is the first time I seriously considered shaving part
+      of my face, but not all of it: I was considering a beard.
+    </para>
+
+    <para>
+      Alright, so it's 5pm and I'm a sweaty post-run mess (it was 110
+      degrees in direct sunlight according to my thermometer) and
+      considering the possibility of growing a beard.  Swifty nift?
+      Maybe.  This is something I'd never done before, let alone
+      seriously consider.  Normally I'd call my dad for such manly
+      advice, but he is: a) normally in another state, and; b) in
+      another country right now probably growing a beard (he's
+      notorious for coming back from a trip with a gnarly unshaven
+      face, sometimes he'll shape it into a decent beard).  So, what's
+      a tech-junkie to do?  Hop on the Internet and see if Google's
+      able to provide me with some inspiration.
+    </para>
+
+    <para>
+      Sure enough, I typed in "pictures of bearded men" and I was able
+      to find something: 14,000 pages of something to be exact.
+      Anyway, so most of these were rinky dink sites, a few of them
+      had some promise.  One guy was trying to start a tradition where
+      everyone grows a beard for New Years.  As I was scrolling down
+      the page trying to find some pictures, my mind was having the
+      following thought process: <thought>This seems like a dumb
+      idea... New Years provides a perfectly good excuse to kiss some
+      total stranger that you've had your eye on for the duration of a
+      New Years party.  Why waste such an opportunity with a crappy
+      kiss?</thought> And at about this point I said this page sucks,
+      and flipped back to my search results.
+    </para>
+
+    <para>
+      Since I'd never done this before, I didn't know what was
+      fashionably correct in terms of where a guy should shave under
+      his neck, or what the deal was...  I knew there were lots of
+      styles out there, just none that I could picture in my mind
+      (save maybe Santa Claus and a few really gnarly beards that are
+      long enough to be used as full-body covering.  Oooh!  And don't
+      forget the Russian and Amish beards, those stand out in my mind
+      too.).  Google, being pretty comprehensive, and the Internet
+      being huge, found the exact screwball page I was looking for:
+      <url>http://fuzface-gallery.tripod.com/</url>
+    </para>
+
+    <para>
+      I don't know if I really should be amazed at the sheer number of
+      entries that Google returned, or that the Internet is big enough
+      to house such random gallery of crap, but it is and it never
+      ceases to amaze me...  it's almost as amazing as the fact that
+      some bozo spent the time to create such a page.  Don't people
+      have lives?  Oh wait, I just visited his page...  so back to my
+      diatribe...
+    </para>
+
+    <para>
+      There were tons of faces, lots of men, lots of hair, and plenty
+      of styles to choose from.  Page after page of faces and hair.
+      Ugh.  This wasn't getting any where and I was now entertaining
+      the rebound though of shaving my head.  Time to close my browser
+      and hop in the shower: I reak.  So what'd I do?  Well, after
+      looking through enough of those pictures, I decided a few
+      things:
+    </para>
+
+    <para>
+      <ol>
+        <li>
+	  I'm amazed that the Internet is big enough to foster the
+	  creation of such random and utterly useless information.  Then
+	  again, I've been on and using the Net since '95, so this
+	  shouldn't surprise me that much.
+        </li>
+
+        <li>
+          There are a lot of guys out there with varying tastes in,
+	  shall we say, "facial hair styles," most of which I find
+	  pretty unappealing.
+        </li>
+
+        <li>
+	  I don't like beards.  After one clogged drain, two
+	  reapplications of shaving cream, and a few pases with the
+	  razor, it took me about 5-10 minutes to get a nice cleanly
+	  shaven face.
+        </li>
+
+        <li>
+          &lt;crass comment&gt;And - back me up here fellas, you can
+	  sympathize with this feeling after you get done looking
+	  through a magazine for a hair-cut style (ladies.. just smile
+	  and nod and pretend you care) - after looking at a few dozen
+	  pictures of men, I was able to safely reaffirm my desire for
+	  heterosexual relations (translation from Bill Clintonese: have
+	  sex with a woman).  And with that thought in mind, I began to
+	  pine for the college porn collection of old.  Mmmm,
+	  Playboy.&lt;/crass comment&gt;
+        </li>
+      </ol>
+    </para>
+
+    <para>
+      ::grin::  Until next time.  -Sean
+    </para>
+
+    <para style="ps">
+      P.S.  To the guys out there with beards, this is just my
+      opinion: take it with a grain of salt.
+    </para>
+  </body>
+</commentary>