erbal 1.0.rc1 → 1.0.rc2

data/ext/erbal/erbal.c

@@ -15,13 +15,22 @@ VALUE rb_erbal_alloc(VALUE klass) {
   return obj;
 }
 
-VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer_name) {
+VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer_name, VALUE options) {
   Check_Type(str, T_STRING);
   Check_Type(buffer_name, T_STRING);
+
   erbal_parser *parser = NULL;
   Data_Get_Struct(self, erbal_parser, parser);
   parser->buffer_name = buffer_name;
   parser->str = str;
+
+  if (options == Qtrue) {
+    parser->options = rb_hash_new();
+  } else {
+    Check_Type(options, T_HASH);
+    parser->options = options;
+  }
+
   return self;
 }
 
@@ -36,6 +45,6 @@ VALUE rb_erbal_parse(VALUE self) {
 void Init_erbal() {
   cErbal = rb_define_class("Erbal", rb_cObject);
   rb_define_alloc_func(cErbal, rb_erbal_alloc);
-  rb_define_method(cErbal, "initialize", rb_erbal_initialize, 2);
+  rb_define_method(cErbal, "initialize", rb_erbal_initialize, 3);
   rb_define_method(cErbal, "parse", rb_erbal_parse, 0);
 }

data/ext/erbal/parser.c

@@ -152,16 +152,26 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   }
 
   rb_str_concat(parser->src, parser->buffer_name);
+  
+  if (parser->debug) {
+    printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
+  }
 }
 
 void erbal_parser_init(erbal_parser *parser) {
   parser->chars_seen = 0;
   parser->in_buffer_shift = 0;
 	parser->state = OUTSIDE_TAG;
+  parser->debug = 0;
+
+  if (rb_hash_aref(parser->options, ID2SYM(rb_intern("debug"))) == Qtrue) {
+    parser->debug = 1;
+  }
+
   parser->src = rb_str_dup(parser->buffer_name);
   rb_str_buf_cat(parser->src, " = '';", 6);
   
-#line 165 "parser.c"
+#line 175 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -169,14 +179,14 @@ void erbal_parser_init(erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 162 "parser.rl"
+#line 172 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 180 "parser.c"
+#line 190 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -222,7 +232,7 @@ st1:
 case 1:
 #line 1 "NONE"
 	{ts = p;}
-#line 226 "parser.c"
+#line 236 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st2;
 		case 45: goto tr4;
@@ -244,7 +254,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 248 "parser.c"
+#line 258 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr6;
@@ -293,6 +303,6 @@ case 5:
 
 	}
 
-#line 168 "parser.rl"
+#line 178 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.h

@@ -4,8 +4,8 @@
 #include "ruby.h"
 
 typedef struct erbal_parser {
-  unsigned int state, chars_seen, in_buffer_shift;
-  VALUE str, src, buffer_name;
+  unsigned int state, chars_seen, in_buffer_shift, debug;
+  VALUE str, src, buffer_name, options;
 } erbal_parser;
 
 inline void erbal_parser_tag_open(erbal_parser*);

data/ext/erbal/parser.rl

@@ -150,12 +150,22 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   }
 
   rb_str_concat(parser->src, parser->buffer_name);
+  
+  if (parser->debug) {
+    printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
+  }
 }
 
 void erbal_parser_init(erbal_parser *parser) {
   parser->chars_seen = 0;
   parser->in_buffer_shift = 0;
 	parser->state = OUTSIDE_TAG;
+  parser->debug = 0;
+
+  if (rb_hash_aref(parser->options, ID2SYM(rb_intern("debug"))) == Qtrue) {
+    parser->debug = 1;
+  }
+
   parser->src = rb_str_dup(parser->buffer_name);
   rb_str_buf_cat(parser->src, " = '';", 6);
   %% write init;

data/spec/erbal_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Erbal do
   def erbal_parse(str)
-    Erbal.new(str, '@out').parse
+    Erbal.new(str, '@out', {:debug => false}).parse
   end
 
   def erubis_parse(str)

data/tasks/gem.rake

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
-ERBAL_VERSION = '1.0.rc1'
+ERBAL_VERSION = '1.0.rc2'
 
 task :clean => :clobber_package
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940502
+  hash: 977940503
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc1
-  version: 1.0.rc1
+  - rc2
+  version: 1.0.rc2
 platform: ruby
 authors: 
 - Ian Leitch