erbal 1.2.rc2 → 1.2.rc3

data/README.rdoc

@@ -15,10 +15,14 @@ Erbal is a lightweight ERB parser that uses the Ragel State Machine Compiler (ht
 Erbal.new takes an optional 2nd argument which is a hash of options, available options are:
 
 * <b>:buffer</b> - The name of the output buffer. Default is '@output_buffer'.
+
 * <b>:buffer_initial_value</b> - The initial value of the output buffer. Default is a blank string.
-* <b>:safe_concat_method</b> - The method to call on the buffer when concatenating a string which doesn't need escaping, i.e text outside of ERB tags uses the safe concatenation method. Default is 'concat'.
+
 * <b>:unsafe_concat_method</b> - The method to call on the buffer when concatenating a string which DOES need escaping, i.e <%= some_method %> will result in the use of unsafe_concat_method. Default is 'concat'.
-* <b>:safe_concat_method</b> - Normally the '<%=' tag uses the unsafe_concat_method, with this option you can specify a keyword to signify that safe_concat_method should be used instead. For example if safe_concat_method is set to 'raw' then <%= raw some_method %> will result in a concatenation using the safe_concat_method. Default is blank, i.e no keyword is specified.
+
+* <b>:safe_concat_method</b> - The method to call on the buffer when concatenating a string which doesn't need escaping, i.e text outside of ERB tags (your raw HTML) uses the safe concatenation method. Default is 'concat'.
+
+* <b>:safe_concat_keyword</b> - By default the '<%=' tag uses the unsafe_concat_method, with this option you can specify a keyword to signify that the safe_concat_method should be used instead. For example if safe_concat_method is set to 'raw' then <%= raw some_method %> will result in a concatenation using the safe_concat_method. Be mindful that even thought the 'raw' keyword looks like a method call, it isn't. Erbal expects that the key is followed by one or more spaces, so a tag like '<%= raw(some_method) %>' will not be recognised by Erbal. Whitespace before the keyword is optional, so '<%=raw' is valid. The keyword can either be one or more a-z characters, or a single of the following: ! @ $ * = ^ & +. For example, given :safe_concat_keyword => '!' then the following is valid: '<%=! some_method %>'. Default is blank, i.e no keyword is specified.
 
 <b>NOTE: Erbal itself does NOT perform escaping, it is the responsibility of your unsafe_concat_method to escape the string passed to it.</b>
 
@@ -28,6 +32,27 @@ Create the file 'config/initializers/erbal.rb' containing:
 
   require 'erbal/rails'
 
+=== Rails 2.3 + rails_xss (https://github.com/rails/rails_xss)
+
+If you're using the rails_xss plugin, use this in your initialiser instead:
+
+  require 'erbal'
+
+  class ErbalTemplateHandler < ActionView::TemplateHandler
+    include ActionView::TemplateHandlers::Compilable
+    def compile(template)
+      ::Erbal.new("<% __in_erb_template=true %>#{template.source}",
+        {:buffer => '@output_buffer',
+         :buffer_initial_value => 'ActiveSupport::SafeBuffer.new',
+         :safe_concat_method => 'safe_concat',
+         :unsafe_concat_method => 'concat',
+         :safe_concat_keyword => 'raw'}
+      ).parse
+    end
+  end
+
+  ActionView::Template.register_template_handler :erb, ErbalTemplateHandler
+
 == Rails 3
 
 I've not looked into yet.. patches are welcome! ;)
@@ -43,37 +68,37 @@ Erubis: 2.6.6
 Erbal: 1.1
 
   => Parsing Benchmark
-  
+
   => Erb
   0.851 0.853 0.848 0.847 0.849 0.847
   => Average: 0.849
-  
+
   => Erubis (using FastEruby engine)
   0.442 0.442 0.444 0.442 0.441 0.442
   => Average: 0.442
-  
+
   => Erubis (using default Eruby engine)
   0.451 0.424 0.446 0.425 0.445 0.446
   => Average: 0.439
-  
+
   => Erbal
   0.036 0.039 0.066 0.038 0.067 0.039
   => Average: 0.047
-  
+
   => eval() Benchmark
-  
+
   => Erb
   0.203 0.192 0.180 0.180 0.179 0.191
   => Average: 0.187
-  
+
   => Erubis (using FastEruby engine)
   0.129 0.127 0.128 0.128 0.114 0.128
   => Average: 0.125
-  
+
   => Erubis (using default Eruby engine)
   0.178 0.176 0.165 0.176 0.175 0.164
   => Average: 0.172
-  
+
   => Erbal
   0.111 0.125 0.124 0.110 0.133 0.124
   => Average: 0.121
@@ -89,6 +114,6 @@ Erbal: 1.1
 
 Many thanks to Adrian Thurston for writing the Ragel State Machine Compiler (http://www.complang.org/ragel/)!
 
-== Copyright
+== Copyrigh
 
-Copyright (c) 2010 Envato & Ian Leitch. See LICENSE for details.
+Copyright (c) 2010-2011 Envato & Ian Leitch. See LICENSE for details.

data/ext/erbal/erbal.c

@@ -7,11 +7,21 @@ void rb_erbal_free(erbal_parser *parser) {
   free(parser->state);
   free(parser);
 }
+void rb_erbal_mark(erbal_parser *parser) {
+  rb_gc_mark_maybe(parser->str);
+  rb_gc_mark_maybe(parser->src);
+  rb_gc_mark_maybe(parser->buffer_name);
+  rb_gc_mark_maybe(parser->options);
+  rb_gc_mark_maybe(parser->safe_concat_method);
+  rb_gc_mark_maybe(parser->unsafe_concat_method);
+  rb_gc_mark_maybe(parser->keyword);
+  rb_gc_mark_maybe(parser->safe_concat_keyword);
+}
 
 VALUE rb_erbal_alloc(VALUE klass) {
   erbal_parser *parser = ALLOC(erbal_parser);
   parser->state = ALLOC(parser_state);
-  VALUE obj = Data_Wrap_Struct(klass, 0, rb_erbal_free, parser);
+  VALUE obj = Data_Wrap_Struct(klass, rb_erbal_mark, rb_erbal_free, parser);
   return obj;
 }
 
@@ -24,10 +34,6 @@ void rb_erbal_setup_option(VALUE self, erbal_parser* parser, VALUE* parser_optio
   } else {
     *(parser_option) = rb_str_new2(default_value);
   }
-
-  VALUE ivar = rb_str_new2("@");
-  ivar = rb_str_cat2(ivar, key);
-  rb_iv_set(self, RSTRING(ivar)->ptr, *(parser_option));
 }
 
 VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
@@ -48,8 +54,6 @@ VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
     parser->options = options;
   }
 
-  rb_iv_set(self, "@options", parser->options);
-
   if (rb_hash_aref(parser->options, ID2SYM(rb_intern("debug"))) == Qtrue) {
     parser->debug = 1;
   } else {

data/ext/erbal/parser.c

@@ -9,11 +9,11 @@
 
 
 #line 12 "parser.c"
-static const int erbal_parser_start = 3;
-static const int erbal_parser_first_final = 3;
+static const int erbal_parser_start = 4;
+static const int erbal_parser_first_final = 4;
 static const int erbal_parser_error = -1;
 
-static const int erbal_parser_en_main = 3;
+static const int erbal_parser_en_main = 4;
 
 
 #line 34 "parser.rl"
@@ -227,8 +227,6 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 
   parser->src = rb_str_dup(parser->buffer_name);
 
-  rb_iv_set(self, "@src", parser->src);
-
   VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
 
   if (!NIL_P(buffer_init_val)) {
@@ -241,7 +239,7 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
   }
 
   
-#line 245 "parser.c"
+#line 243 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -249,14 +247,14 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 258 "parser.rl"
+#line 256 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 260 "parser.c"
+#line 258 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -265,83 +263,83 @@ void erbal_parser_exec(erbal_parser *parser) {
 tr0:
 #line 23 "parser.rl"
 	{{p = ((te))-1;}{ erbal_parser_non_tag(parser); }}
-	goto st3;
+	goto st4;
 tr1:
 #line 21 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close_with_trim(parser); }}
-	goto st3;
+	goto st4;
 tr2:
 #line 20 "parser.rl"
 	{{p = ((te))-1;}{ erbal_parser_tag_open_for_unsafe_concat(parser); }}
-	goto st3;
-tr7:
+	goto st4;
+tr8:
 #line 23 "parser.rl"
 	{te = p+1;{ erbal_parser_non_tag(parser); }}
-	goto st3;
-tr11:
+	goto st4;
+tr12:
 #line 23 "parser.rl"
 	{te = p;p--;{ erbal_parser_non_tag(parser); }}
-	goto st3;
-tr12:
+	goto st4;
+tr13:
 #line 22 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close(parser); }}
-	goto st3;
-tr15:
+	goto st4;
+tr16:
 #line 17 "parser.rl"
 	{te = p;p--;{ erbal_parser_tag_open(parser); }}
-	goto st3;
-tr16:
+	goto st4;
+tr17:
 #line 19 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_open_for_comment(parser); }}
-	goto st3;
-tr17:
+	goto st4;
+tr18:
 #line 18 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_open_with_dash(parser); }}
-	goto st3;
-tr19:
+	goto st4;
+tr20:
 #line 20 "parser.rl"
 	{te = p;p--;{ erbal_parser_tag_open_for_unsafe_concat(parser); }}
-	goto st3;
-tr22:
+	goto st4;
+tr24:
 #line 9 "parser.rl"
 	{ parser->keyword_trailing_whitespace = p; }
 #line 29 "parser.rl"
 	{te = p;p--;{ erbal_parser_tag_open_choose_concat(parser); }}
-	goto st3;
-st3:
+	goto st4;
+st4:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
+		goto _test_eof4;
+case 4:
 #line 1 "NONE"
 	{ts = p;}
-#line 320 "parser.c"
+#line 318 "parser.c"
 	switch( (*p) ) {
-		case 37: goto st4;
-		case 45: goto tr9;
-		case 60: goto st6;
+		case 37: goto st5;
+		case 45: goto tr10;
+		case 60: goto st7;
 	}
-	goto tr7;
-st4:
+	goto tr8;
+st5:
 	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
+		goto _test_eof5;
+case 5:
 	if ( (*p) == 62 )
-		goto tr12;
-	goto tr11;
-tr9:
+		goto tr13;
+	goto tr12;
+tr10:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st5;
-st5:
+	goto st6;
+st6:
 	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-#line 342 "parser.c"
+		goto _test_eof6;
+case 6:
+#line 340 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
-	goto tr11;
+	goto tr12;
 st0:
 	if ( ++p == pe )
 		goto _test_eof0;
@@ -349,38 +347,48 @@ case 0:
 	if ( (*p) == 62 )
 		goto tr1;
 	goto tr0;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-	if ( (*p) == 37 )
-		goto st7;
-	goto tr11;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
+	if ( (*p) == 37 )
+		goto st8;
+	goto tr12;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
 	switch( (*p) ) {
-		case 35: goto tr16;
-		case 45: goto tr17;
-		case 61: goto tr18;
+		case 35: goto tr17;
+		case 45: goto tr18;
+		case 61: goto tr19;
 	}
-	goto tr15;
-tr18:
+	goto tr16;
+tr19:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st8;
-st8:
+	goto st9;
+st9:
 	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-#line 378 "parser.c"
-	if ( (*p) == 32 )
-		goto tr20;
-	if ( 97 <= (*p) && (*p) <= 122 )
-		goto tr21;
-	goto tr19;
-tr20:
+		goto _test_eof9;
+case 9:
+#line 376 "parser.c"
+	switch( (*p) ) {
+		case 32: goto tr21;
+		case 33: goto tr22;
+		case 36: goto tr22;
+		case 38: goto tr22;
+		case 61: goto tr22;
+		case 64: goto tr22;
+		case 94: goto tr22;
+	}
+	if ( (*p) > 43 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr23;
+	} else if ( (*p) >= 42 )
+		goto tr22;
+	goto tr20;
+tr21:
 #line 8 "parser.rl"
 	{ parser->keyword_preceding_whitespace = p; }
 	goto st1;
@@ -388,17 +396,27 @@ st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 392 "parser.c"
-	if ( (*p) == 32 )
-		goto st1;
-	if ( 97 <= (*p) && (*p) <= 122 )
+#line 400 "parser.c"
+	switch( (*p) ) {
+		case 32: goto st1;
+		case 33: goto tr4;
+		case 36: goto tr4;
+		case 38: goto tr4;
+		case 61: goto tr4;
+		case 64: goto tr4;
+		case 94: goto tr4;
+	}
+	if ( (*p) > 43 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr5;
+	} else if ( (*p) >= 42 )
 		goto tr4;
 	goto tr2;
 tr4:
 #line 7 "parser.rl"
 	{ parser->keyword_start = p; }
 	goto st2;
-tr21:
+tr22:
 #line 8 "parser.rl"
 	{ parser->keyword_preceding_whitespace = p; }
 #line 7 "parser.rl"
@@ -408,57 +426,77 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 412 "parser.c"
+#line 430 "parser.c"
 	if ( (*p) == 32 )
-		goto tr5;
-	if ( 97 <= (*p) && (*p) <= 122 )
-		goto st2;
+		goto tr6;
 	goto tr2;
-tr5:
+tr6:
 #line 11 "parser.rl"
 	{
     parser->keyword_end = p;
     parser->keyword = rb_str_new(parser->keyword_start, (p - parser->keyword_start));
   }
-	goto st9;
-st9:
+	goto st10;
+st10:
 	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-#line 429 "parser.c"
+		goto _test_eof10;
+case 10:
+#line 445 "parser.c"
+	if ( (*p) == 32 )
+		goto st10;
+	goto tr24;
+tr5:
+#line 7 "parser.rl"
+	{ parser->keyword_start = p; }
+	goto st3;
+tr23:
+#line 8 "parser.rl"
+	{ parser->keyword_preceding_whitespace = p; }
+#line 7 "parser.rl"
+	{ parser->keyword_start = p; }
+	goto st3;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+#line 463 "parser.c"
 	if ( (*p) == 32 )
-		goto st9;
-	goto tr22;
+		goto tr6;
+	if ( 97 <= (*p) && (*p) <= 122 )
+		goto st3;
+	goto tr2;
 	}
-	_test_eof3: cs = 3; goto _test_eof; 
 	_test_eof4: cs = 4; goto _test_eof; 
 	_test_eof5: cs = 5; goto _test_eof; 
-	_test_eof0: cs = 0; goto _test_eof; 
 	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof0: cs = 0; goto _test_eof; 
 	_test_eof7: cs = 7; goto _test_eof; 
 	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
 	_test_eof1: cs = 1; goto _test_eof; 
 	_test_eof2: cs = 2; goto _test_eof; 
-	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( cs ) {
-	case 4: goto tr11;
-	case 5: goto tr11;
+	case 5: goto tr12;
+	case 6: goto tr12;
 	case 0: goto tr0;
-	case 6: goto tr11;
-	case 7: goto tr15;
-	case 8: goto tr19;
+	case 7: goto tr12;
+	case 8: goto tr16;
+	case 9: goto tr20;
 	case 1: goto tr2;
 	case 2: goto tr2;
-	case 9: goto tr22;
+	case 10: goto tr24;
+	case 3: goto tr2;
 	}
 	}
 
 	}
 
-#line 264 "parser.rl"
+#line 262 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.rl

@@ -24,7 +24,7 @@
 
     '<%=' (
             [ ]* >keyword_preceding_whitespace
-            [a-z]+ >keyword_start %keyword_end
+            ([a-z]+|[!@$*=^&+]{1,1}) >keyword_start %keyword_end
             [ ]+ %keyword_trailing_whitespace
           ) => { erbal_parser_tag_open_choose_concat(parser); };
   *|;
@@ -241,8 +241,6 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 
   parser->src = rb_str_dup(parser->buffer_name);
 
-  rb_iv_set(self, "@src", parser->src);
-
   VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
 
   if (!NIL_P(buffer_init_val)) {

data/lib/erbal/rails.rb

@@ -1,12 +1,12 @@
+require 'action_pack'
 require 'erbal'
 
 class Erbal
   module Rails
-    class Rails_2_3_10_TemplateHandler < ActionView::TemplateHandler
+    class Rails_2_3_TemplateHandler < ActionView::TemplateHandler
       include ActionView::TemplateHandlers::Compilable
       def compile(template)
-        ::Erbal.new("<% __in_erb_template=true %>#{template.source}", {:buffer => '@output_buffer', :buffer_initial_value => 'ActiveSupport::SafeBuffer.new',
-          :safe_concat_method => 'safe_concat', :unsafe_concat_method => 'concat', :safe_concat_keyword => 'raw'}).parse
+        ::Erbal.new("<% __in_erb_template=true %>#{template.source}", {:buffer => '@output_buffer'}).parse
       end
     end
 
@@ -14,12 +14,9 @@ class Erbal
       raise "Sorry, this version of Erbal doesn't support Rails #{ActionPack::VERSION::MAJOR}.#{ActionPack::VERSION::MINOR}.#{ActionPack::VERSION::TINY}."
     end
 
-    def self.register_template_handler(handler_class)
-      ActionView::Template.register_template_handler :erb, handler_class
-    end
-
-    def self.register_template_handler_for_2_3_10
-      register_template_handler(Rails_2_3_10_TemplateHandler)
+    def self.register_template_handler_for_2_3
+      ActionView::Template.register_template_handler :erb, Rails_2_3_TemplateHandler
+      ActionView::Template.register_template_handler :rhtml, Rails_2_3_TemplateHandler
     end
   end
 end
@@ -28,15 +25,10 @@ case ActionPack::VERSION::MAJOR
 when 2
   case ActionPack::VERSION::MINOR
   when 3
-    case ActionPack::VERSION::TINY
-    when 10
-      Erbal::Rails.register_template_handler_for_2_3_10
-    else
-      Erbal::Rails.version_unsupported
-    end
+    Erbal::Rails.register_template_handler_for_2_3
   else
     Erbal::Rails.version_unsupported
   end
 else
   Erbal::Rails.version_unsupported
-end
+end

data/spec/erbal_spec.rb

@@ -144,6 +144,25 @@ describe Erbal do
       erbal_parse("1 + 1 is <%= raw 1 + 1 %>", :unsafe_concat_method => 'unsafe_concat', :safe_concat_keyword => nil).should == "@output_buffer = '';@output_buffer.concat(%Q`1 + 1 is `);@output_buffer.unsafe_concat(%Q`\#{ raw 1 + 1 }`);@output_buffer"
     end
 
+    it "should allow a non a-z character as the safe_concat_keyword" do
+      erbal_parse("<%=! 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '!').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=@ 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '@').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=$ 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '$').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=* 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '*').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%== 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '=').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=^ 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '^').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=& 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '&').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+      erbal_parse("<%=+ 1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => '+').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{ 1 + 1 }`);@output_buffer"
+    end
+
+    it "should not allow more than a single non a-z character as the safe_concat_keyword" do
+      erbal_parse("<%=!= 1 + 1 %>", :unsafe_concat_method => 'unsafe_concat', :safe_concat_keyword => '!=').should == "@output_buffer = '';@output_buffer.unsafe_concat(%Q`\#{!= 1 + 1 }`);@output_buffer"
+    end
+    
+    it "should not allow a mix of a-z and non a-z characters as the safe_concat_keyword" do
+      erbal_parse("<%=!raw 1 + 1 %>", :unsafe_concat_method => 'unsafe_concat', :safe_concat_keyword => '!raw').should == "@output_buffer = '';@output_buffer.unsafe_concat(%Q`\#{!raw 1 + 1 }`);@output_buffer"
+    end
+
     it "should preserve the whitespace following the safe_concat_keyword" do
       erbal_parse("<%= raw   1 + 1 %>", :safe_concat_method => 'safe_concat', :safe_concat_keyword => 'raw').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`\#{   1 + 1 }`);@output_buffer"
     end
@@ -160,6 +179,10 @@ describe Erbal do
       erbal_parse("omglololo <%=blah 1 + 1 %>", :unsafe_concat_method => 'unsafe_concat').should == "@output_buffer = '';@output_buffer.concat(%Q`omglololo `);@output_buffer.unsafe_concat(%Q`\#{blah 1 + 1 }`);@output_buffer"
     end
 
+    it "should not use the safe concat method if the it is used as a helper method call" do
+      erbal_parse("<%= raw(1 + 1) %>", :unsafe_concat_method => 'unsafe_concat', :safe_concat_keyword => 'raw').should == "@output_buffer = '';@output_buffer.unsafe_concat(%Q`\#{ raw(1 + 1) }`);@output_buffer"
+    end
+
     it "should end the current safe concat and begin a new unsafe concat" do
       erbal_parse("hello <%= \"world\" %>", :unsafe_concat_method => 'unsafe_concat', :safe_concat_method => 'safe_concat').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`hello `);@output_buffer.unsafe_concat(%Q`\#{ \"world\" }`);@output_buffer"
     end
@@ -188,6 +211,10 @@ describe Erbal do
       it "should use interpolation if we switch from an unsafe concat to a safe concat and then back again" do
         erbal_parse("omg <%= \"hello\" %> world", :unsafe_concat_method => 'concat', :safe_concat_method => 'concat').should == "@output_buffer = '';@output_buffer.concat(%Q`omg \#{ \"hello\" } world`);@output_buffer"
       end
+
+      it "should not use interpolation if the unsafe and safe concat methods are not the same" do
+        erbal_parse("omg <%= raw \"hello\" %> world", :unsafe_concat_method => 'concat', :safe_concat_method => 'safe_concat').should == "@output_buffer = '';@output_buffer.safe_concat(%Q`omg `);@output_buffer.concat(%Q`\#{ raw \"hello\" }`);@output_buffer.safe_concat(%Q` world`);@output_buffer" 
+      end
     end
   end
 end

data/tasks/gem.rake

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940511
+  hash: 977940508
   prerelease: true
   segments: 
   - 1
   - 2
-  - rc2
-  version: 1.2.rc2
+  - rc3
+  version: 1.2.rc3
 platform: ruby
 authors: 
 - Ian Leitch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +11:00
+date: 2011-01-08 00:00:00 +11:00
 default_executable: 
 dependencies: []