libxslt-ruby 0.8.0 → 0.8.2

data/doc/fr_file_index.html

@@ -28,6 +28,7 @@
     <a href="files/ext/libxslt/ruby_xslt_transform_context_c.html">ext/libxslt/ruby_xslt_transform_context.c</a><br />
     <a href="files/lib/libxslt_rb.html">lib/libxslt.rb</a><br />
     <a href="files/lib/libxslt/deprecated_rb.html">lib/libxslt/deprecated.rb</a><br />
+    <a href="files/lib/xslt_rb.html">lib/xslt.rb</a><br />
   </div>
 </div>
 </body>

data/ext/libxslt/version.h

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

data/ext/mingw/Rakefile

@@ -0,0 +1,42 @@
+# 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 'rubygems'
+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 = "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}'" 
+  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

data/{vc → ext/vc}/libxslt_ruby.sln

@@ -1,9 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_ruby", "libxslt_ruby.vcproj", "{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "..\..\..\libxml-ruby\trunk\vc\libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "..\..\..\libxml-ruby\ext\vc\libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

data/{vc → ext/vc}/libxslt_ruby.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="libxslt_ruby"
 	ProjectGUID="{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}"
 	RootNamespace="libxsl"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -17,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxsl-ruby-0.6.1-x86-mswin32-60\lib"
+			OutputDirectory="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxsl-ruby-0.8.2-x86-mswin32-60\lib"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Development\msys\src\libiconv-1.12\include&quot;;&quot;C:\Development\ruby\lib\ruby\1.8\i386-mswin32&quot;;&quot;C:\Development\msys\src\libxml2-2.6.32\include&quot;;&quot;C:\Development\msys\src\libxslt-1.1.24&quot;;&quot;C:\Development\msys\src\libxml-ruby\trunk\ext&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Development\src\libxml-ruby\ext&quot;;&quot;C:\Development\ruby\lib\ruby\1.8\i386-mswin32&quot;;C:\Development\msys\local\include;C:\Development\msys\local\include\libxml2"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;libxsl_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,9 +65,11 @@
 				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"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Development\ruby\lib;&quot;C:\Development\msys\src\libxml2-2.6.32\win32\bin.msvc&quot;;&quot;C:\Development\msys\src\libxslt-1.1.24\win32\bin.msvc&quot;"
+				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -87,9 +90,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -146,6 +146,8 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -166,9 +168,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -177,7 +176,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
-			RelativePathToProject="..\..\..\libxml-ruby\trunk\vc\libxml_ruby.vcproj"
+			RelativePathToProject="..\..\..\libxml-ruby\ext\vc\libxml_ruby.vcproj"
 		/>
 	</References>
 	<Files>
@@ -187,15 +186,15 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\ext\libxslt\libxslt.c"
+				RelativePath="..\libxslt\libxslt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\ext\libxslt\ruby_xslt_stylesheet.c"
+				RelativePath="..\libxslt\ruby_xslt_stylesheet.c"
 				>
 			</File>
 			<File
-				RelativePath="..\ext\libxslt\ruby_xslt_transform_context.c"
+				RelativePath="..\libxslt\ruby_xslt_transform_context.c"
 				>
 			</File>
 		</Filter>
@@ -205,19 +204,19 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\ext\libxslt\libxslt.h"
+				RelativePath="..\libxslt\libxslt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ext\libxslt\ruby_xslt_stylesheet.h"
+				RelativePath="..\libxslt\ruby_xslt_stylesheet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ext\libxslt\ruby_xslt_transform_context.h"
+				RelativePath="..\libxslt\ruby_xslt_transform_context.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ext\libxslt\version.h"
+				RelativePath="..\libxslt\version.h"
 				>
 			</File>
 		</Filter>

data/lib/libxslt.rb

@@ -1,9 +1,13 @@
+# First make sure libxml is loaded
 require 'libxml'
+
+# Now if running on Windows, then add the current directory to the PATH
+# for the current process so it can find the pre-built libxml2 and 
+# iconv2 shared libraries (dlls).
+if RUBY_PLATFORM.match(/mswin/i)
+  ENV['PATH'] += ";#{File.dirname(__FILE__)}"
+end
+
 require 'libxslt_ruby'
-require 'libxslt/deprecated'
 
-# Map the LibXSLT module into the XSLT module for both backwards
-# compatibility and ease of use.
-module XSLT
-  include LibXSLT::XSLT
-end
+require 'libxslt/deprecated'

data/lib/libxslt/deprecated.rb

@@ -2,65 +2,66 @@
 # These classes provide provide backwards compatibility with 
 # versions of libxslt-ruby prior to version 0.7.0
 
-module XML 
-  module XSLT 
-    MAX_DEPTH            = LibXSLT::XSLT::MAX_DEPTH
-    MAX_SORT             = LibXSLT::XSLT::MAX_SORT
-    ENGINE_VERSION       = LibXSLT::XSLT::ENGINE_VERSION
-    LIBXSLT_VERSION      = LibXSLT::XSLT::LIBXSLT_VERSION
-    LIBXML_VERSION       = LibXSLT::XSLT::LIBXML_VERSION
-    XSLT_NAMESPACE       = LibXSLT::XSLT::XSLT_NAMESPACE
-    DEFAULT_VENDOR       = LibXSLT::XSLT::DEFAULT_VENDOR
-    DEFAULT_VERSION      = LibXSLT::XSLT::DEFAULT_VERSION
-    DEFAULT_URL          = LibXSLT::XSLT::DEFAULT_URL
-    NAMESPACE_LIBXSLT    = LibXSLT::XSLT::NAMESPACE_LIBXSLT
-    NAMESPACE_NORM_SAXON = LibXSLT::XSLT::NAMESPACE_NORM_SAXON
-    NAMESPACE_SAXON      = LibXSLT::XSLT::NAMESPACE_SAXON
-    NAMESPACE_XT         = LibXSLT::XSLT::NAMESPACE_XT
-    NAMESPACE_XALAN      = LibXSLT::XSLT::NAMESPACE_XALAN
-    
-    def self.new
-      Stylesheet.new(nil)
-    end
-    
-    def self.file(filename)
-      doc = XML::Document.file(filename)
-      stylesheet = LibXSLT::XSLT::Stylesheet.new(doc)
-      
-      result = Stylesheet.new(stylesheet)
-      result.filename = filename
-      result
-    end
-    
-    class Stylesheet
-      attr_accessor :doc, :filename
-      
-      def initialize(stylesheet)
-        @stylesheet = stylesheet
-      end
-      
-      def filename=(value)
-        @doc = XML::Document.file(value)
-        @filename = value
-      end
-      
-      def parse
-        self
-      end
-      
-      def apply
-        @result = @stylesheet.apply(@doc)
+module LibXML
+  module XML
+    module XSLT 
+      MAX_DEPTH            = LibXSLT::XSLT::MAX_DEPTH
+      MAX_SORT             = LibXSLT::XSLT::MAX_SORT
+      ENGINE_VERSION       = LibXSLT::XSLT::ENGINE_VERSION
+      LIBXSLT_VERSION      = LibXSLT::XSLT::LIBXSLT_VERSION
+      LIBXML_VERSION       = LibXSLT::XSLT::LIBXML_VERSION
+      XSLT_NAMESPACE       = LibXSLT::XSLT::XSLT_NAMESPACE
+      DEFAULT_VENDOR       = LibXSLT::XSLT::DEFAULT_VENDOR
+      DEFAULT_VERSION      = LibXSLT::XSLT::DEFAULT_VERSION
+      DEFAULT_URL          = LibXSLT::XSLT::DEFAULT_URL
+      NAMESPACE_LIBXSLT    = LibXSLT::XSLT::NAMESPACE_LIBXSLT
+      NAMESPACE_NORM_SAXON = LibXSLT::XSLT::NAMESPACE_NORM_SAXON
+      NAMESPACE_SAXON      = LibXSLT::XSLT::NAMESPACE_SAXON
+      NAMESPACE_XT         = LibXSLT::XSLT::NAMESPACE_XT
+      NAMESPACE_XALAN      = LibXSLT::XSLT::NAMESPACE_XALAN
+
+      def self.new
+        Stylesheet.new(nil)
       end
-      
-      def save(filename)
-        raise(ArgumentError) unless @result
-        @result.save(filename)
+
+      def self.file(filename)
+        doc = ::LibXML::XML::Document.file(filename)
+        stylesheet = LibXSLT::XSLT::Stylesheet.new(doc)
+
+        result = Stylesheet.new(stylesheet)
+        result.filename = filename
+        result
       end
-      
-      def print(filename)
-        raise(ArgumentError) unless @result
+
+      class Stylesheet
+        attr_accessor :doc, :filename
+
+        def initialize(stylesheet)
+          @stylesheet = stylesheet
+        end
+
+        def filename=(value)
+          @doc = ::LibXML::XML::Document.file(value)
+          @filename = value
+        end
+
+        def parse
+          self
+        end
+
+        def apply
+          @result = @stylesheet.apply(@doc)
+        end
+
+        def save(filename)
+          raise(ArgumentError) unless @result
+          @result.save(filename)
+        end
+
+        def print(filename)
+          raise(ArgumentError) unless @result
+        end
       end
     end
   end
 end
-  

data/lib/text.xml

@@ -0,0 +1,129 @@
+<?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>