erbal 1.0.rc3 → 1.0.rc4

data/ext/erbal/parser.c

@@ -4,7 +4,7 @@
 #include "parser.h"
 
 
-#line 15 "parser.rl"
+#line 16 "parser.rl"
 
 
 
@@ -16,7 +16,7 @@ static const int erbal_parser_error = -1;
 static const int erbal_parser_en_main = 1;
 
 
-#line 18 "parser.rl"
+#line 19 "parser.rl"
 
 static char *ts, *te, *p, *pe, *eof;
 static int act, cs;
@@ -37,6 +37,11 @@ inline void erbal_parser_tag_open(erbal_parser *parser) {
   parser->state = TAG_OPEN;
 }
 
+inline void erbal_parser_tag_open_with_dash(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -2);
+  parser->state = TAG_OPEN;
+}
+
 inline void erbal_parser_tag_open_for_output(erbal_parser *parser) {
   erbal_parser_tag_open_common(parser, -2);
   parser->state = TAG_OPEN_FOR_OUTPUT;
@@ -171,7 +176,7 @@ void erbal_parser_init(erbal_parser *parser) {
   parser->src = rb_str_dup(parser->buffer_name);
   rb_str_buf_cat(parser->src, " = '';", 6);
   
-#line 175 "parser.c"
+#line 180 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -179,37 +184,37 @@ void erbal_parser_init(erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 172 "parser.rl"
+#line 178 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 190 "parser.c"
+#line 195 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
 tr0:
-#line 13 "parser.rl"
+#line 14 "parser.rl"
 	{{p = ((te))-1;}{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr1:
-#line 11 "parser.rl"
+#line 12 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close_with_trim(parser); }}
 	goto st1;
 tr2:
-#line 13 "parser.rl"
+#line 14 "parser.rl"
 	{te = p+1;{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr6:
-#line 13 "parser.rl"
+#line 14 "parser.rl"
 	{te = p;p--;{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr7:
-#line 12 "parser.rl"
+#line 13 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close(parser); }}
 	goto st1;
 tr10:
@@ -217,11 +222,15 @@ tr10:
 	{te = p;p--;{ erbal_parser_tag_open(parser); }}
 	goto st1;
 tr11:
-#line 9 "parser.rl"
+#line 10 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_open_for_comment(parser); }}
 	goto st1;
 tr12:
-#line 10 "parser.rl"
+#line 9 "parser.rl"
+	{te = p+1;{ erbal_parser_tag_open_with_dash(parser); }}
+	goto st1;
+tr13:
+#line 11 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_open_for_output(parser); }}
 	goto st1;
 st1:
@@ -232,7 +241,7 @@ st1:
 case 1:
 #line 1 "NONE"
 	{ts = p;}
-#line 236 "parser.c"
+#line 245 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st2;
 		case 45: goto tr4;
@@ -254,7 +263,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 258 "parser.c"
+#line 267 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr6;
@@ -278,7 +287,8 @@ st5:
 case 5:
 	switch( (*p) ) {
 		case 35: goto tr11;
-		case 61: goto tr12;
+		case 45: goto tr12;
+		case 61: goto tr13;
 	}
 	goto tr10;
 	}
@@ -303,6 +313,6 @@ case 5:
 
 	}
 
-#line 178 "parser.rl"
+#line 184 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.h

@@ -9,6 +9,7 @@ typedef struct erbal_parser {
 } erbal_parser;
 
 inline void erbal_parser_tag_open(erbal_parser*);
+inline void erbal_parser_tag_open_with_dash(erbal_parser*);
 inline void erbal_parser_tag_open_for_comment(erbal_parser*);
 inline void erbal_parser_tag_open_for_output(erbal_parser*);
 inline void erbal_parser_non_tag(erbal_parser*);

data/ext/erbal/parser.rl

@@ -6,6 +6,7 @@
 
   main := |*
     '<%'  => { erbal_parser_tag_open(parser); };
+    '<%-' => { erbal_parser_tag_open_with_dash(parser); };
     '<%#' => { erbal_parser_tag_open_for_comment(parser); };
     '<%=' => { erbal_parser_tag_open_for_output(parser); };
     '-%>' => { erbal_parser_tag_close_with_trim(parser); };
@@ -35,6 +36,11 @@ inline void erbal_parser_tag_open(erbal_parser *parser) {
   parser->state = TAG_OPEN;
 }
 
+inline void erbal_parser_tag_open_with_dash(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -2);
+  parser->state = TAG_OPEN;
+}
+
 inline void erbal_parser_tag_open_for_output(erbal_parser *parser) {
   erbal_parser_tag_open_common(parser, -2);
   parser->state = TAG_OPEN_FOR_OUTPUT;

data/spec/erbal_spec.rb

@@ -27,6 +27,10 @@ describe Erbal do
     erbal_parse("<% 1 + 1 %>").should == "@out = ''; 1 + 1 ;\n@out"
   end
 
+  it "should parse the <%- tag" do
+    erbal_parse("1 + 1 is <%- 1 + 1 %>").should == "@out = '';@out << %Q`1 + 1 is `; 1 + 1 ;\n@out"
+  end
+
   it "should add a line break after <% %> tags incase the tags ended with a comment" do
     erbal_parse("<% 1 + 1 # eeek comment! %> hi mom").should == "@out = ''; 1 + 1 # eeek comment! ;\n@out << %Q` hi mom`;@out"
   end

data/tasks/gem.rake

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940500
+  hash: 977940501
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc3
-  version: 1.0.rc3
+  - rc4
+  version: 1.0.rc4
 platform: ruby
 authors: 
 - Ian Leitch