ruby-xslt 0.9.7 → 0.9.8

data/ChangeLog

@@ -1,3 +1,6 @@
+0.9.8 :
+* Replace STR2CSTR by StringValuePtr
+
 0.9.7 :
 * Ruby 1.9
 * Bug correction (Issue #1)

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/glejeune/ruby-xslt"
     gem.authors = ["Gregoire Lejeune"]
     gem.extensions = FileList["ext/**/extconf.rb"].to_a
+    gem.test_files = Dir.glob('test/**/*.rb')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/ext/xslt_lib/extfunc.c

@@ -127,7 +127,7 @@ xmlXPathObjectPtr value2xpathObj (VALUE val) {
       xmlChar *str;
 
     // we need the Strdup (this is the major bugfix for 0.8.1)
-      str = xmlStrdup((const xmlChar *) STR2CSTR(val));
+      str = xmlStrdup((const xmlChar *) StringValuePtr(val));
       ret = xmlXPathWrapString(str);
     }
       break;
@@ -152,7 +152,7 @@ xmlXPathObjectPtr value2xpathObj (VALUE val) {
       if( strcmp( getRubyObjectName( val ), "REXML::Document" ) == 0 || strcmp(getRubyObjectName( val ),  "REXML::Element") == 0 ) {
 
         VALUE to_s = rb_funcall( val, rb_intern( "to_s" ), 0 );
-        xmlDocPtr doc = xmlParseDoc((xmlChar *) STR2CSTR(to_s));
+        xmlDocPtr doc = xmlParseDoc((xmlChar *) StringValuePtr(to_s));
 
         ret = xmlXPathNewNodeSet((xmlNode *)doc->children);
         break;
@@ -161,7 +161,7 @@ xmlXPathObjectPtr value2xpathObj (VALUE val) {
 
         xmlChar *str;
 
-        str = xmlStrdup((const xmlChar *) STR2CSTR(to_s));
+        str = xmlStrdup((const xmlChar *) StringValuePtr(to_s));
         ret = xmlXPathWrapString(str);
         break;
       }

data/ext/xslt_lib/parameters.c

@@ -45,7 +45,7 @@ VALUE process_pair( VALUE pair, VALUE rbparams ) {
   Check_Type( key, T_STRING );
   Check_Type( value, T_STRING );
 
-  xValue = STR2CSTR( value );
+  xValue = StringValuePtr( value );
   if( xValue[0] != '\'' && xValue[strlen( xValue ) - 1] != '\'' ) {
     value = rb_str_concat( value, rb_str_new2( "'" ) );
     value = rb_str_concat( rb_str_new2( "'" ), value );

data/ext/xslt_lib/parser.c

@@ -113,14 +113,14 @@ VALUE object_to_string( VALUE object ) {
   switch( TYPE( object ) ) {
     case T_STRING:
       {
-        if( isFile( STR2CSTR( object ) ) == 0 ) {
+        if( isFile( StringValuePtr( object ) ) == 0 ) {
           vOut = object;
         } else {
           long iBufferLength;
           long iCpt;
           char *xBuffer;
 
-          FILE* fStream = fopen( STR2CSTR( object ), "r" );
+          FILE* fStream = fopen( StringValuePtr( object ), "r" );
           if( fStream == NULL ) {
             return( Qnil );
           }
@@ -178,7 +178,7 @@ int objectIsFile( VALUE object ) {
   switch( TYPE( object ) ) {
     case T_STRING:
       {
-        if( isFile( STR2CSTR( object ) ) == 0 )
+        if( isFile( StringValuePtr( object ) ) == 0 )
           bOut = 0;
         else
           bOut = 1;

data/ext/xslt_lib/rb_utils.c

@@ -20,7 +20,8 @@
 
 char * getRubyObjectName( VALUE rb_Object ) {
   VALUE klass = rb_funcall( rb_Object, rb_intern( "class" ), 0 );
-  return( STR2CSTR( rb_funcall( klass, rb_intern( "to_s" ), 0 ) ) );
+	VALUE tmp = rb_funcall( klass, rb_intern( "to_s" ), 0 );
+  return( StringValuePtr( tmp ) );
 }
 
 int isFile( const char *filename ) {

data/ext/xslt_lib/xslt.h

@@ -57,8 +57,8 @@
 #include "parameters.h"
 #include "extfunc.h"
 
-#define RUBY_XSLT_VERSION  "0.9.7"
-#define RUBY_XSLT_VERNUM   097
+#define RUBY_XSLT_VERSION  "0.9.8"
+#define RUBY_XSLT_VERNUM   098
 
 #define RUBY_XSLT_XSLSRC_TYPE_NULL     0
 #define RUBY_XSLT_XSLSRC_TYPE_STR      1

data/ext/xslt_lib/xslt_lib.c

@@ -139,7 +139,7 @@ VALUE ruby_xslt_xml_obj_set( VALUE self, VALUE xml_doc_obj ) {
 		xmlFreeDoc(pRbTxslt->tXMLDocument);
 	}
 	
-  pRbTxslt->tXMLDocument = parse_xml( STR2CSTR( pRbTxslt->xXmlData ), pRbTxslt->iXmlType );
+  pRbTxslt->tXMLDocument = parse_xml( StringValuePtr( pRbTxslt->xXmlData ), pRbTxslt->iXmlType );
   if( pRbTxslt->tXMLDocument == NULL ) {
     rb_raise( eXSLTParsingError, "XML parsing error" );
   }
@@ -238,7 +238,7 @@ VALUE ruby_xslt_xsl_obj_set( VALUE self, VALUE xsl_doc_obj ) {
 	  xsltFreeStylesheet(pRbTxslt->tParsedXslt);
 	}
 	
-  pRbTxslt->tParsedXslt = parse_xsl( STR2CSTR( pRbTxslt->xXslData ), pRbTxslt->iXslType );
+  pRbTxslt->tParsedXslt = parse_xsl( StringValuePtr( pRbTxslt->xXslData ), pRbTxslt->iXslType );
   if( pRbTxslt->tParsedXslt == NULL ) {
     rb_raise( eXSLTParsingError, "XSL Stylesheet parsing error" );
   }
@@ -305,7 +305,8 @@ VALUE ruby_xslt_serve( VALUE self ) {
       MEMZERO( pxParams, void *, pRbTxslt->iNbParams );
 
       for( iCpt = 0; iCpt <= pRbTxslt->iNbParams - 3; iCpt++ ) {
-        pxParams[iCpt] = STR2CSTR( rb_ary_entry( pRbTxslt->pxParams, iCpt ) );
+				VALUE tmp = rb_ary_entry( pRbTxslt->pxParams, iCpt );
+        pxParams[iCpt] = StringValuePtr( tmp );
       }
     }
     
@@ -342,12 +343,12 @@ VALUE ruby_xslt_save( VALUE self, VALUE xOutFilename ) {
   rOut = ruby_xslt_serve( self );
   
   if( rOut != Qnil ) {
-    xOut = STR2CSTR( rOut );
+    xOut = StringValuePtr( rOut );
   
-    fOutFile = fopen( STR2CSTR( xOutFilename ), "w" );
+    fOutFile = fopen( StringValuePtr( xOutFilename ), "w" );
     if( fOutFile == NULL ) {
       free( xOut );
-      rb_raise( rb_eRuntimeError, "Can't create file %s\n", STR2CSTR( xOutFilename ) );
+      rb_raise( rb_eRuntimeError, "Can't create file %s\n", StringValuePtr( xOutFilename ) );
       rOut = Qnil;
     } else {
       fwrite( xOut, 1, strlen( xOut ), fOutFile );
@@ -480,7 +481,7 @@ VALUE ruby_xslt_media_type( VALUE self ) {
  * internal use only.
  */
  VALUE ruby_xslt_reg_function( VALUE class, VALUE namespace, VALUE name ) {
-   xsltRegisterExtModuleFunction( BAD_CAST STR2CSTR(name), BAD_CAST STR2CSTR(namespace), xmlXPathFuncCallback );
+   xsltRegisterExtModuleFunction( BAD_CAST StringValuePtr(name), BAD_CAST StringValuePtr(namespace), xmlXPathFuncCallback );
 
    return Qnil;
  }
@@ -496,7 +497,7 @@ VALUE ruby_xslt_to_s( VALUE self ) {
 
   Data_Get_Struct( self, RbTxslt, pRbTxslt );
 
-  //vXSLTSheet = xsltParseStylesheetDoc( xmlParseMemory( STR2CSTR( pRbTxslt->xXslData ), strlen( STR2CSTR( pRbTxslt->xXslData ) ) ) );
+  //vXSLTSheet = xsltParseStylesheetDoc( xmlParseMemory( StringValuePtr( pRbTxslt->xXslData ), strlen( StringValuePtr( pRbTxslt->xXslData ) ) ) );
   vXSLTSheet = pRbTxslt->tParsedXslt;
   if (vXSLTSheet == NULL) return Qnil;
 

data/ruby-xslt.gemspec

@@ -1,67 +1,55 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-xslt}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregoire Lejeune"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-11-26}
   s.description = %q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>}
   s.email = %q{gregoire.lejeune@free.fr}
   s.extensions = ["ext/xslt_lib/extconf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "AUTHORS",
-     "COPYING",
-     "ChangeLog",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "ext/xslt_lib/extconf.rb",
-     "ext/xslt_lib/extfunc.c",
-     "ext/xslt_lib/extfunc.h",
-     "ext/xslt_lib/parameters.c",
-     "ext/xslt_lib/parameters.h",
-     "ext/xslt_lib/parser.c",
-     "ext/xslt_lib/parser.h",
-     "ext/xslt_lib/rb_utils.c",
-     "ext/xslt_lib/rb_utils.h",
-     "ext/xslt_lib/xslt.h",
-     "ext/xslt_lib/xslt_lib.c",
-     "lib/xml/xslt.rb",
-     "ruby-xslt.gemspec",
-     "setup.rb",
-     "test/subdir/result.xsl",
-     "test/subdir/test.xsl",
-     "test/t.xml",
-     "test/t.xsl",
-     "test/test.rb"
+    "AUTHORS",
+    "COPYING",
+    "ChangeLog",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/xslt_lib/extconf.rb",
+    "ext/xslt_lib/extfunc.c",
+    "ext/xslt_lib/extfunc.h",
+    "ext/xslt_lib/parameters.c",
+    "ext/xslt_lib/parameters.h",
+    "ext/xslt_lib/parser.c",
+    "ext/xslt_lib/parser.h",
+    "ext/xslt_lib/rb_utils.c",
+    "ext/xslt_lib/rb_utils.h",
+    "ext/xslt_lib/xslt.h",
+    "ext/xslt_lib/xslt_lib.c",
+    "lib/xml/xslt.rb",
+    "ruby-xslt.gemspec",
+    "setup.rb",
+    "test/subdir/result.xsl",
+    "test/subdir/test.xsl",
+    "test/t.xml",
+    "test/t.xsl",
+    "test/test.rb"
   ]
   s.homepage = %q{http://github.com/glejeune/ruby-xslt}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>}
   s.test_files = [
-    "test/test.rb",
-     "examples/bug.rb",
-     "examples/fuzface.rb",
-     "examples/fuzface_data.rb",
-     "examples/fuzface_error.rb",
-     "examples/fuzface_REXML.rb",
-     "examples/fuzface_to_s.rb",
-     "examples/fuzface_XML-Simple.rb",
-     "examples/info.rb",
-     "examples/test_functions.rb",
-     "examples/test_parameters.rb"
+    "test/test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-xslt
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +02:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,6 @@ extra_rdoc_files:
 - ChangeLog
 - README.rdoc
 files: 
-- .gitignore
 - AUTHORS
 - COPYING
 - ChangeLog
@@ -55,23 +54,13 @@ files:
 - test/t.xml
 - test/t.xsl
 - test/test.rb
-- examples/bug.rb
-- examples/fuzface.rb
-- examples/fuzface_data.rb
-- examples/fuzface_error.rb
-- examples/fuzface_REXML.rb
-- examples/fuzface_to_s.rb
-- examples/fuzface_XML-Simple.rb
-- examples/info.rb
-- examples/test_functions.rb
-- examples/test_parameters.rb
 has_rdoc: true
 homepage: http://github.com/glejeune/ruby-xslt
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -101,13 +90,3 @@ specification_version: 3
 summary: Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>
 test_files: 
 - test/test.rb
-- examples/bug.rb
-- examples/fuzface.rb
-- examples/fuzface_data.rb
-- examples/fuzface_error.rb
-- examples/fuzface_REXML.rb
-- examples/fuzface_to_s.rb
-- examples/fuzface_XML-Simple.rb
-- examples/info.rb
-- examples/test_functions.rb
-- examples/test_parameters.rb

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-ext/xslt_lib/Makefile
-ext/xslt_lib/mkmf.log
-examples