libxslt-ruby 0.3.6 → 0.6.0

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

@@ -1,4 +1,4 @@
-/* $Id: libxslt.h,v 1.2 2006/03/09 23:13:28 roscopeco Exp $ */
+/* $Id: libxslt.h 43 2007-12-07 12:38:59Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -16,22 +16,21 @@
 #include <libxslt/xsltutils.h>
 #include <libexslt/exslt.h>
 
-#include "libxml-ruby/libxml.h"
-#include "libxml-ruby/ruby_xml_document.h"
+// Includes from libxml-ruby
+#include <libxml/ruby_libxml.h>
+#include <libxml/ruby_xml_document.h>
+
+
 #include "ruby_xslt_stylesheet.h"
 #include "ruby_xslt_transform_context.h"
 
-#define RUBY_LIBXSLT_VERSION  "0.3.6"
-#define RUBY_LIBXSLT_VERNUM   036
-#define RUBY_LIBXSLT_VER_MAJ  0
-#define RUBY_LIBXSLT_VER_MIN  3
-#define RUBY_LIBXSLT_VER_MIC  6
+#include "version.h"
 
 #define RUBY_LIBXSLT_SRC_TYPE_NULL    0
 #define RUBY_LIBXSLT_SRC_TYPE_FILE    1
 
 extern VALUE mXML;
-extern VALUE cXMLDocument;
+//extern VALUE cXMLDocument;
 
 extern VALUE cXSLT;
 extern VALUE eXMLXSLTStylesheetRequireParsedDoc;

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

@@ -1,4 +1,4 @@
-/* $Id: ruby_xslt_stylesheet.c,v 1.2 2006/03/21 22:42:21 roscopeco Exp $ */
+/* $Id: ruby_xslt_stylesheet.c 42 2007-12-07 06:09:35Z transami $ */
 
 /* See the LICENSE file for copyright and distribution information. */
 
@@ -16,7 +16,7 @@ VALUE cXSLTStylesheet;
 VALUE
 ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
   ruby_xslt_stylesheet *xss;
-  ruby_xml_document *rxd;
+  ruby_xml_document_t *rxd;
   const char **params;
   VALUE parameter, tmp;
   int i, len;
@@ -26,7 +26,7 @@ ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
   if (NIL_P(xss->xml_doc_obj))
     rb_raise(rb_eArgError, "Need a document object");
 
-  Data_Get_Struct(xss->xml_doc_obj, ruby_xml_document, rxd);
+  Data_Get_Struct(xss->xml_doc_obj, ruby_xml_document_t, rxd);
 
   params = NULL;
 
@@ -67,12 +67,11 @@ ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");
   }
 
-  xss->parsed = ruby_xml_document_new(cXMLDocument,
-				      xsltApplyStylesheet(xss->xsp,
-							  rxd->doc, params));
+  xss->parsed = ruby_xml_document_wrap(xsltApplyStylesheet(xss->xsp,
+							   rxd->doc, params));
 
   if (params) {
-    free(params);
+    ruby_xfree(params);
   }
 
   if (xss->parsed == Qnil)
@@ -97,7 +96,7 @@ ruby_xslt_stylesheet_debug(int argc, VALUE *argv, VALUE self) {
   OpenFile *fptr;
   VALUE io;
   FILE *out;
-  ruby_xml_document *parsed;
+  ruby_xml_document_t *parsed;
   ruby_xslt_stylesheet *xss;
 
   Data_Get_Struct(self, ruby_xslt_stylesheet, xss);
@@ -117,7 +116,7 @@ ruby_xslt_stylesheet_debug(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");
   }
 
-  Data_Get_Struct(xss->parsed, ruby_xml_document, parsed);
+  Data_Get_Struct(xss->parsed, ruby_xml_document_t, parsed);
   if (parsed->doc == NULL)
     return(Qnil);
 
@@ -140,7 +139,7 @@ ruby_xslt_stylesheet_free(ruby_xslt_stylesheet *xss) {
     xss->xsp = NULL;
   }
 
-  free(xss);
+  ruby_xfree(xss);
 }
 
 
@@ -161,16 +160,17 @@ ruby_xslt_stylesheet_mark(ruby_xslt_stylesheet *xss) {
 VALUE
 ruby_xslt_stylesheet_new(VALUE class, xsltStylesheetPtr xsp) {
   ruby_xslt_stylesheet *xss;
+  VALUE rval;
 
-  xss = ALLOC(ruby_xslt_stylesheet);
+  rval=Data_Make_Struct(cXSLTStylesheet,ruby_xslt_stylesheet,ruby_xslt_stylesheet_mark,
+			ruby_xslt_stylesheet_free,xss);
   xss->xsp = xsp;
   xss->xml_doc_obj = Qnil;
   xss->parsed = Qnil;
   xss->data_type = RUBY_LIBXSLT_SRC_TYPE_NULL;
   xss->data = NULL;
 
-  return(Data_Wrap_Struct(cXSLTStylesheet, ruby_xslt_stylesheet_mark,
-			  ruby_xslt_stylesheet_free, xss));
+  return rval;
 }
 
 // TODO should this automatically apply the sheet if not already,
@@ -188,7 +188,7 @@ ruby_xslt_stylesheet_print(int argc, VALUE *argv, VALUE self) {
   OpenFile *fptr;
   VALUE io;
   FILE *out;
-  ruby_xml_document *parsed;
+  ruby_xml_document_t *parsed;
   ruby_xslt_stylesheet *xss;
   int bytes;
 
@@ -209,7 +209,7 @@ ruby_xslt_stylesheet_print(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");
   }
 
-  Data_Get_Struct(xss->parsed, ruby_xml_document, parsed);
+  Data_Get_Struct(xss->parsed, ruby_xml_document_t, parsed);
   if (parsed->doc == NULL)
     return(Qnil);
 
@@ -232,7 +232,7 @@ ruby_xslt_stylesheet_print(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 ruby_xslt_stylesheet_to_s(VALUE self) {
-  ruby_xml_document *parsed;
+  ruby_xml_document_t *parsed;
   ruby_xslt_stylesheet *xss;
   xmlChar *str;
   int len;
@@ -240,7 +240,7 @@ ruby_xslt_stylesheet_to_s(VALUE self) {
   Data_Get_Struct(self, ruby_xslt_stylesheet, xss);
   if (NIL_P(xss->parsed))
     rb_raise(eXMLXSLTStylesheetRequireParsedDoc, "must have a parsed XML result");
-  Data_Get_Struct(xss->parsed, ruby_xml_document, parsed);
+  Data_Get_Struct(xss->parsed, ruby_xml_document_t, parsed);
   if (parsed->doc == NULL)
     return(Qnil);
 
@@ -262,7 +262,7 @@ ruby_xslt_stylesheet_to_s(VALUE self) {
  */
 VALUE
 ruby_xslt_stylesheet_save(VALUE self, VALUE io) {
-  ruby_xml_document *parsed;
+  ruby_xml_document_t *parsed;
   ruby_xslt_stylesheet *xss;
   OpenFile *fptr;
 
@@ -272,7 +272,7 @@ ruby_xslt_stylesheet_save(VALUE self, VALUE io) {
   GetOpenFile(io, fptr);
 
   Data_Get_Struct(self, ruby_xslt_stylesheet, xss);
-  Data_Get_Struct(xss->parsed, ruby_xml_document, parsed);
+  Data_Get_Struct(xss->parsed, ruby_xml_document_t, parsed);
 
   xsltSaveResultToFile(fptr->f, parsed->doc, xss->xsp);
 

data/ext/{xml → libxslt}/ruby_xslt_stylesheet.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xslt_stylesheet.h,v 1.1.1.1 2006/03/09 01:36:19 roscopeco Exp $ */
+/* $Id: ruby_xslt_stylesheet.h 42 2007-12-07 06:09:35Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information. */
 

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

@@ -1,10 +1,9 @@
-/* $Id: ruby_xslt_transform_context.c,v 1.1.1.1 2006/03/09 01:36:19 roscopeco Exp $ */
+/* $Id: ruby_xslt_transform_context.c 42 2007-12-07 06:09:35Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "libxslt.h"
 #include "ruby_xslt_transform_context.h"
-#include "libxml-ruby/libxml.h"
 
 VALUE cXSLTTransformContext;
 
@@ -14,7 +13,7 @@ ruby_xslt_transform_context_free(ruby_xslt_transform_context *rxtc) {
     xsltFreeTransformContext(rxtc->ctxt);
     rxtc->ctxt = NULL;
   }
-  free(rxtc);
+  ruby_xfree(rxtc);
 }
 
 void
@@ -29,7 +28,6 @@ ruby_xslt_transform_context_new(VALUE class, VALUE xslt,
 				      xsltTransformContextPtr ctxt) {
   ruby_xslt_transform_context *rxtc;
   rxtc = ALLOC(ruby_xslt_transform_context);
-  ruby_xml_parser_count++;
   rxtc->ctxt = ctxt;
   rxtc->xslt = xslt;
    //fprintf(stderr,"ruby_xslt_transform_context_new 2\n");

data/ext/{xml → libxslt}/ruby_xslt_transform_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xslt_transform_context.h,v 1.1.1.1 2006/03/09 01:36:20 roscopeco Exp $ */
+/* $Id: ruby_xslt_transform_context.h 42 2007-12-07 06:09:35Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/libxslt/version.h

@@ -0,0 +1,5 @@
+#define RUBY_LIBXSLT_VERSION  "0.6.0"
+#define RUBY_LIBXSLT_VERNUM   0
+#define RUBY_LIBXSLT_VER_MAJ  0
+#define RUBY_LIBXSLT_VER_MIN  6
+#define RUBY_LIBXSLT_VER_MIC  0

data/lib/libxslt.rb

@@ -0,0 +1,2 @@
+require 'libxml'
+require 'libxslt_ruby.so'

data/mingw/mingw.rake

@@ -0,0 +1,36 @@
+# 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')
+    
+CLEAN.include('*.o')
+CLOBBER.include('libxslt.so')
+
+task :default => "libxslt"
+
+SRC = FileList['../ext/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#{RUBY_INCLUDE_DIR}"
+    sh "sh -c '#{command}'" 
+  end
+end
+
+file "libxslt" => OBJ do
+  command = "libtool --mode=link gcc -shared -o libxslt_ruby.so -L/usr/local/lib -lxml2 -lxslt ../../rlibxml/mingw/libxml_ruby.so #{OBJ} #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
+  sh "sh -c '#{command}'" 
+end

data/vc/libxslt_ruby.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+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", "..\..\rlibxml\vc\libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}.Debug|Win32.Build.0 = Debug|Win32
+		{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}.Release|Win32.ActiveCfg = Release|Win32
+		{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}.Release|Win32.Build.0 = Release|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.Build.0 = Debug|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.ActiveCfg = Release|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/vc/libxslt_ruby.vcproj

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libxslt_ruby"
+	ProjectGUID="{6DCFD1E6-224E-479C-BBD9-B6931DFCD02C}"
+	RootNamespace="libxsl"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxsl-ruby-0.6.1-x86-mswin32-60\lib"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<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;;C:\Development\msys\src\rlibxml\ext"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;libxsl_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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.6.0-x86-mswin32-60\lib\$(ProjectName).so"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Development\ruby\lib;&quot;C:\Development\msys\src\libxslt-1.1.24\win32\bin.msvc&quot;;&quot;C:\Development\msys\src\libxml2-2.6.32\win32\bin.msvc&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				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;;C:\Development\msys\src\rlibxml\ext"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBXML_EXPORTS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib libxslt.lib libexslt.lib"
+				OutputFile="$(OutDir)\$(ProjectName).so"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="C:\Development\ruby\lib;&quot;C:\Development\msys\src\libxslt-1.1.24\win32\bin.msvc&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+			RelativePathToProject="..\..\rlibxml\vc\libxml.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\ext\libxslt\libxslt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\ext\libxslt\ruby_xslt_stylesheet.c"
+				>
+			</File>
+			<File
+				RelativePath="..\ext\libxslt\ruby_xslt_transform_context.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\ext\libxslt\libxslt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ext\libxslt\ruby_xslt_stylesheet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ext\libxslt\ruby_xslt_transform_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ext\libxslt\version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>