mongrel_esi 0.4.0 → 0.4.1

data/ext/esi/esi_parser.c

@@ -20,27 +20,13 @@
 #define RSTRING_LEN(str) RSTRING(str)->len
 #endif
 
-#define OUTPUT_BUFFER_SIZE 1024
-
 static VALUE rb_ESI;
 static VALUE rb_ESIParser;
 
-// TODO: we can use rb_iv_set instead and just pass the whole parser as the user_data to each call back
-typedef struct _ParserUserData{
-  VALUE output_block;
-  VALUE start_tag_block;
-  VALUE end_tag_block;
-  VALUE depth;
-  VALUE esi_tag;
-  char buffer[OUTPUT_BUFFER_SIZE]; /* buffer bytes before sending them to ruby */
-  size_t buffered; /* amount buffered */
-}ParserUserData;
-
 static 
 VALUE ESIParser_set_output_cb( VALUE self )
 {
   ESIParser *parser;
-  ParserUserData *user_data;
 
   if( !rb_block_given_p() ){
     rb_raise(rb_eArgError, "Block expected. Call this method with a closure. { ... }");
@@ -48,9 +34,7 @@ VALUE ESIParser_set_output_cb( VALUE self )
 
   Data_Get_Struct( self, ESIParser, parser );
 
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->output_block = rb_block_proc();
+  rb_ivar_set( self, rb_intern("@output"), rb_block_proc() );
 
   return Qnil;
 }
@@ -59,7 +43,6 @@ static
 VALUE ESIParser_set_start_tag_cb( VALUE self )
 {
   ESIParser *parser;
-  ParserUserData *user_data;
 
   if( !rb_block_given_p() ){
     rb_raise(rb_eArgError, "Block expected. Call this method with a closure. { ... }");
@@ -67,9 +50,7 @@ VALUE ESIParser_set_start_tag_cb( VALUE self )
 
   Data_Get_Struct( self, ESIParser, parser );
 
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->start_tag_block = rb_block_proc();
+  rb_ivar_set( self, rb_intern("@start_tag_block"), rb_block_proc() );
 
   return Qnil;
 }
@@ -78,7 +59,6 @@ static
 VALUE ESIParser_set_end_tag_cb( VALUE self )
 {
   ESIParser *parser;
-  ParserUserData *user_data;
 
   if( !rb_block_given_p() ){
     rb_raise(rb_eArgError, "Block expected. Call this method with a closure. { ... }");
@@ -86,9 +66,7 @@ VALUE ESIParser_set_end_tag_cb( VALUE self )
 
   Data_Get_Struct( self, ESIParser, parser );
 
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->end_tag_block = rb_block_proc();
+  rb_ivar_set( self, rb_intern("@end_tag_block"), rb_block_proc() );
 
   return Qnil;
 }
@@ -96,32 +74,8 @@ VALUE ESIParser_set_end_tag_cb( VALUE self )
 static 
 void ESIParser_free( ESIParser *parser )
 {
-  ParserUserData *user_data = (ParserUserData*)parser->user_data;
-
-  free( user_data );
-  parser->user_data = NULL;
-
   esi_parser_free( parser );
 }
-static
-void ESIParser_mark( ESIParser *parser )
-{
-  ParserUserData *user_data = (ParserUserData*)parser->user_data;
-  if( user_data ){
-
-    if( !NIL_P( user_data->output_block ) )
-      rb_gc_mark( user_data->output_block );
-    if( !NIL_P( user_data->start_tag_block ) )
-      rb_gc_mark( user_data->start_tag_block );
-    if( !NIL_P( user_data->end_tag_block ) )
-      rb_gc_mark( user_data->end_tag_block );
-    if( !NIL_P( user_data->depth ) )
-      rb_gc_mark( user_data->depth );
-    if( !NIL_P( user_data->esi_tag ) )
-      rb_gc_mark( user_data->esi_tag );
-
-  }
-}
 
 /* default callbacks */
 static void 
@@ -131,8 +85,9 @@ esi_parser_default_start_cb( const void *data,
                              ESIAttribute *attr,
                              void *user_data )
 {
-  ParserUserData *ud = (ParserUserData*)user_data;
-  if( ud->start_tag_block && !NIL_P(ud->start_tag_block) && rb_respond_to( ud->start_tag_block, rb_intern("call") ) ){
+  VALUE start_tag_block = rb_ivar_get( (VALUE)user_data, rb_intern("@start_tag_block") );
+
+  if( start_tag_block && !NIL_P(start_tag_block) && rb_respond_to( start_tag_block, rb_intern("call") ) ){
     VALUE attr_hash = rb_hash_new();
     VALUE tag_text = rb_str_new( name_start, name_length );
     while( attr ){
@@ -141,7 +96,7 @@ esi_parser_default_start_cb( const void *data,
       rb_hash_aset( attr_hash, name, value );
       attr = attr->next;
     }
-    rb_funcall( ud->start_tag_block, rb_intern("call"), 2, tag_text, attr_hash );
+    rb_funcall( start_tag_block, rb_intern("call"), 2, tag_text, attr_hash );
   }
 }
 
@@ -151,10 +106,11 @@ esi_parser_default_end_cb( const void *data,
                            size_t name_length,
                            void *user_data )
 {
-  ParserUserData *ud = (ParserUserData*)user_data;
-  if( ud->end_tag_block && !NIL_P(ud->end_tag_block) && rb_respond_to( ud->end_tag_block, rb_intern("call") ) ){
-    VALUE tag_text =  rb_str_new( name_start, name_length );
-    rb_funcall( ud->end_tag_block, rb_intern("call"), 1, tag_text );
+  VALUE end_tag_block = rb_ivar_get( (VALUE)user_data, rb_intern("@end_tag_block") );
+
+  if( end_tag_block && !NIL_P(end_tag_block) && rb_respond_to( end_tag_block, rb_intern("call") ) ){
+    VALUE tag_text = rb_str_new( name_start, name_length );
+    rb_funcall( end_tag_block, rb_intern("call"), 1, tag_text );
   }
 }
 
@@ -177,31 +133,14 @@ send_output( VALUE output, VALUE esi_tag_context, VALUE rbstr )
 }
 
 static void 
-esi_parser_default_output_cp( const void *data,
-                              size_t length,
-                              void *user_data )
+esi_parser_default_output_cp( const void *data, size_t length, void *user_data )
 {
-  VALUE rbstr;
-  ParserUserData *ud = (ParserUserData*)user_data;
-
-  if( ud->output_block && !NIL_P(ud->output_block) ){
-    rbstr = rb_str_new( data, length );
-    send_output( ud->output_block, ud->esi_tag, rbstr );
-    /* buffer the output to the ruby script */
-    /*if( ud->buffered+length < OUTPUT_BUFFER_SIZE ){
-      memcpy( ud->buffer + ud->buffered, data, length );
-      ud->buffered += length;
-    }
-    else{
-      if( ud->buffered > 0 ){
-        rbstr = rb_str_new( ud->buffer, ud->buffered );
-        send_output( ud->output_block, ud->esi_tag, rbstr );
-        ud->buffered = 0;
-      }
-      rbstr = rb_str_new( data, length );
-      send_output( ud->output_block, ud->esi_tag, rbstr );
-    }*/
-    //rb_funcall( ud->output_block, rb_intern("call"), 1, rb_str_new( data, length ) );
+  VALUE output = rb_ivar_get( (VALUE)user_data, rb_intern("@output") );
+  VALUE esi_tag = rb_ivar_get( (VALUE)user_data, rb_intern("@esi_tag") );
+
+  if( output && !NIL_P(output) ){
+    VALUE rbstr = rb_str_new( data, length );
+    send_output( output, esi_tag, rbstr );
   }
 }
 
@@ -221,21 +160,11 @@ static
 VALUE ESIParser_finish( VALUE self )
 {
   ESIParser *parser;
-  ParserUserData *user_data;
 
   Data_Get_Struct( self, ESIParser, parser );
-  user_data = (ParserUserData*)parser->user_data;
 
   esi_parser_finish( parser );
-/*
-  if( user_data->buffered > 0 ){
-    VALUE rbstr = rb_str_new( user_data->buffer, user_data->buffered );
-    send_output( user_data->output_block, user_data->esi_tag, rbstr );
-    memset( user_data->buffer, 0, OUTPUT_BUFFER_SIZE );
-    user_data->buffered = 0;
-  }
-  */
-
+  
   return Qnil;
 }
 
@@ -245,18 +174,6 @@ VALUE ESIParser_alloc(VALUE klass)
   VALUE object;
   ESIParser *parser = esi_parser_new();
 
-  ParserUserData *user_data = (ParserUserData*)malloc(sizeof(ParserUserData));
-
-  user_data->output_block = Qnil;
-  user_data->start_tag_block = Qnil;
-  user_data->end_tag_block = Qnil;
-  user_data->depth = rb_int_new(0);
-  user_data->esi_tag = Qnil;
-  memset( user_data->buffer, 0, OUTPUT_BUFFER_SIZE );
-  user_data->buffered = 0;
-
-  parser->user_data = user_data;
-
   esi_parser_init( parser );
 
   esi_parser_start_tag_handler( parser, esi_parser_default_start_cb );
@@ -265,7 +182,15 @@ VALUE ESIParser_alloc(VALUE klass)
 
   esi_parser_output_handler( parser, esi_parser_default_output_cp );
 
-  object = Data_Wrap_Struct( klass, ESIParser_mark, ESIParser_free, parser );
+  object = Data_Wrap_Struct( klass, NULL, ESIParser_free, parser );
+
+  parser->user_data = (void*)object;
+
+  rb_ivar_set( object, rb_intern("@depth"), rb_int_new(0) );
+  rb_ivar_set( object, rb_intern("@output"), Qnil );
+  rb_ivar_set( object, rb_intern("@start_tag_block"), Qnil );
+  rb_ivar_set( object, rb_intern("@end_tag_block"), Qnil );
+  rb_ivar_set( object, rb_intern("@esi_tag"), Qnil );
 
   return object;
 }
@@ -273,85 +198,40 @@ VALUE ESIParser_alloc(VALUE klass)
 static
 VALUE ESIParser_set_esi_tag( VALUE self, VALUE esi_tag )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->esi_tag = esi_tag;
-
+  rb_ivar_set( self, rb_intern("@esi_tag"), esi_tag );
   return esi_tag;
 }
 
 static
 VALUE ESIParser_get_esi_tag( VALUE self )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  return user_data->esi_tag;
+  return rb_ivar_get( self, rb_intern("@esi_tag") );
 }
 
 static
 VALUE ESIParser_set_depth( VALUE self, VALUE depth )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->depth = depth;
-
+  rb_ivar_set( self, rb_intern("@depth"), depth );
   return depth;
 }
 
 static
 VALUE ESIParser_get_depth( VALUE self )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  return user_data->depth;
+  return rb_ivar_get( self, rb_intern("@depth") );
 }
 
 static
 VALUE ESIParser_set_output( VALUE self, VALUE output )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  user_data->output_block = output;
-
+  rb_ivar_set( self, rb_intern("@output"), output );
   return output;
 }
 
 static
 VALUE ESIParser_get_output( VALUE self )
 {
-  ESIParser *parser;
-  ParserUserData *user_data;
-
-  Data_Get_Struct( self, ESIParser, parser );
-
-  user_data = (ParserUserData*)parser->user_data;
-
-  return user_data->output_block;
+  return rb_ivar_get( self, rb_intern("@output") );
 }
 static
 VALUE ESIParser_send_output( VALUE self, VALUE output )
@@ -360,7 +240,7 @@ VALUE ESIParser_send_output( VALUE self, VALUE output )
 
   Data_Get_Struct( self, ESIParser, parser );
 
-  esi_parser_default_output_cp( RSTRING_PTR(output), RSTRING_LEN(output), parser->user_data );
+  esi_parser_default_output_cp( RSTRING_PTR(output), RSTRING_LEN(output), (void*)self );
 
   return Qnil;
 }

data/ext/esi/test/parser.c

@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
 #include "parser.h"
 
 /* define default callbacks */
@@ -81,18 +80,18 @@ static void ltrim_pointer( const char **ptr, const char *bounds, size_t *len )
   }
 }
 
-#line 199 "parser.rl"
+#line 198 "parser.rl"
 
 
 
-#line 89 "parser.c"
+#line 88 "parser.c"
 static const int esi_start = 56;
 static const int esi_first_final = 56;
 static const int esi_error = -1;
 
 static const int esi_en_main = 56;
 
-#line 202 "parser.rl"
+#line 201 "parser.rl"
 
 char *esi_strndup( const char *str, size_t len )
 {
@@ -187,11 +186,11 @@ int esi_parser_init( ESIParser *parser )
 {
   int cs;
   
-#line 191 "parser.c"
+#line 190 "parser.c"
 	{
 	cs = esi_start;
 	}
-#line 296 "parser.rl"
+#line 295 "parser.rl"
   parser->prev_state = parser->cs = cs;
   return 0;
 }
@@ -248,7 +247,7 @@ int esi_parser_execute( ESIParser *parser, const char *data, size_t length )
 //  debug_string( "data", data, length );
 
   
-#line 252 "parser.c"
+#line 251 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -1102,7 +1101,7 @@ case 55:
 	tr68: cs = 60; goto f8;
 
 f0:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1126,7 +1125,7 @@ f0:
   }
 	goto _again;
 f1:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1148,14 +1147,14 @@ f1:
     }
     parser->prev_state = cs;
   }
-#line 86 "parser.rl"
+#line 85 "parser.rl"
 	{
     parser->mark = p;
     //debug_string( "begin", p, 1 );
   }
 	goto _again;
 f9:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1177,13 +1176,13 @@ f9:
     }
     parser->prev_state = cs;
   }
-#line 90 "parser.rl"
+#line 89 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
 	goto _again;
 f3:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1205,7 +1204,7 @@ f3:
     }
     parser->prev_state = cs;
   }
-#line 95 "parser.rl"
+#line 94 "parser.rl"
 	{
     parser->tag_text = parser->mark+1;
     parser->tag_text_length = p - (parser->mark+1);
@@ -1215,7 +1214,7 @@ f3:
   }
 	goto _again;
 f8:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1237,7 +1236,7 @@ f8:
     }
     parser->prev_state = cs;
   }
-#line 103 "parser.rl"
+#line 102 "parser.rl"
 	{
     //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
     ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
@@ -1253,7 +1252,7 @@ f8:
   }
 	goto _again;
 f5:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1275,7 +1274,7 @@ f5:
     }
     parser->prev_state = cs;
   }
-#line 117 "parser.rl"
+#line 116 "parser.rl"
 	{
 //    debug_string( "parsed esi tag", parser->tag_text, parser->tag_text_length );
     ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
@@ -1285,7 +1284,7 @@ f5:
   }
 	goto _again;
 f6:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1307,7 +1306,7 @@ f6:
     }
     parser->prev_state = cs;
   }
-#line 125 "parser.rl"
+#line 124 "parser.rl"
 	{
     parser->attr_key = parser->mark;
     parser->attr_key_length = p - parser->mark;
@@ -1318,7 +1317,7 @@ f6:
   }
 	goto _again;
 f7:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1340,7 +1339,7 @@ f7:
     }
     parser->prev_state = cs;
   }
-#line 134 "parser.rl"
+#line 133 "parser.rl"
 	{
     ESIAttribute *attr;
     parser->attr_value = parser->mark;
@@ -1364,7 +1363,7 @@ f7:
   }
 	goto _again;
 f4:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1386,7 +1385,7 @@ f4:
     }
     parser->prev_state = cs;
   }
-#line 156 "parser.rl"
+#line 155 "parser.rl"
 	{
     parser->tag_text = parser->mark;
     parser->tag_text_length = p - parser->mark;
@@ -1397,7 +1396,7 @@ f4:
   }
 	goto _again;
 f2:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1419,7 +1418,7 @@ f2:
     }
     parser->prev_state = cs;
   }
-#line 165 "parser.rl"
+#line 164 "parser.rl"
 	{
     parser->tag_text = parser->mark+2;
     parser->tag_text_length = p - (parser->mark+2);
@@ -1432,7 +1431,7 @@ f2:
   }
 	goto _again;
 f10:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1454,18 +1453,18 @@ f10:
     }
     parser->prev_state = cs;
   }
-#line 86 "parser.rl"
+#line 85 "parser.rl"
 	{
     parser->mark = p;
     //debug_string( "begin", p, 1 );
   }
-#line 90 "parser.rl"
+#line 89 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
 	goto _again;
 f11:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1487,7 +1486,7 @@ f11:
     }
     parser->prev_state = cs;
   }
-#line 103 "parser.rl"
+#line 102 "parser.rl"
 	{
     //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
     ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
@@ -1501,13 +1500,13 @@ f11:
     parser->mark = p;
     //debug_string( "see_end_tag", p, 1 );
   }
-#line 90 "parser.rl"
+#line 89 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
 	goto _again;
 f13:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1529,12 +1528,12 @@ f13:
     }
     parser->prev_state = cs;
   }
-#line 86 "parser.rl"
+#line 85 "parser.rl"
 	{
     parser->mark = p;
     //debug_string( "begin", p, 1 );
   }
-#line 103 "parser.rl"
+#line 102 "parser.rl"
 	{
     //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
     ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
@@ -1548,13 +1547,13 @@ f13:
     parser->mark = p;
     //debug_string( "see_end_tag", p, 1 );
   }
-#line 90 "parser.rl"
+#line 89 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
 	goto _again;
 f12:
-#line 176 "parser.rl"
+#line 175 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1576,7 +1575,7 @@ f12:
     }
     parser->prev_state = cs;
   }
-#line 103 "parser.rl"
+#line 102 "parser.rl"
 	{
     //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
     ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
@@ -1590,7 +1589,7 @@ f12:
     parser->mark = p;
     //debug_string( "see_end_tag", p, 1 );
   }
-#line 134 "parser.rl"
+#line 133 "parser.rl"
 	{
     ESIAttribute *attr;
     parser->attr_value = parser->mark;
@@ -1612,7 +1611,7 @@ f12:
 //    debug_string( "\tattribute value", parser->attr_value, parser->attr_value_length );
     //debug_string( "see_attribute_value", p, 1 );
   }
-#line 90 "parser.rl"
+#line 89 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
@@ -1623,7 +1622,7 @@ _again:
 		goto _resume;
 	_out: {}
 	}
-#line 352 "parser.rl"
+#line 351 "parser.rl"
 
   parser->cs = cs;
 
@@ -1660,8 +1659,8 @@ _again:
 int esi_parser_finish( ESIParser *parser )
 {
   
-#line 1664 "parser.c"
-#line 388 "parser.rl"
+#line 1663 "parser.c"
+#line 387 "parser.rl"
   return 0;
 }