erbal 0.0.3.rc1 → 1.0.rc1

data/ext/erbal/parser.c

@@ -23,10 +23,11 @@ static int act, cs;
 
 inline void erbal_parser_tag_open_common(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, shift);
-    rb_str_buf_cat(parser->src, "\");", 3);
     parser->chars_seen = 0;
   }
 }
@@ -51,11 +52,18 @@ inline void erbal_parser_non_tag(erbal_parser *parser) {
 
 inline void erbal_parser_tag_close_common(erbal_parser *parser, int tag_size) {
   if (parser->state == TAG_OPEN_FOR_OUTPUT) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat((", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
+    rb_str_buf_cat(parser->src, "#{", 2);
     erbal_concat_chars_seen(parser, -tag_size);
-    rb_str_buf_cat(parser->src, ").to_s);", 8);
+    rb_str_buf_cat(parser->src, "}", 1);
   } else if (parser->state == TAG_OPEN) {
+    if (parser->in_buffer_shift) {
+      erbal_close_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, -tag_size);
     rb_str_buf_cat(parser->src, ";", 1);
   }
@@ -76,31 +84,84 @@ inline void erbal_parser_tag_close(erbal_parser *parser) {
   erbal_parser_tag_close_common(parser, 1);
 }
 
-inline void erbal_concat_chars_seen(erbal_parser *parser, int rewind_chars) {
+inline VALUE erbal_escape_special_chars(erbal_parser *parser, int shift) {
+  VALUE buf = rb_str_buf_new(0);
+  int i, n, slashes_seen = 0;
+  char *current_char;
+
+  for (i = 0; i < parser->chars_seen; i++) {
+    current_char = (((p + shift) - parser->chars_seen) + i);
+
+    if (*current_char == '#' || *current_char == '`') {
+      if (slashes_seen == 0) {
+        rb_str_buf_cat(buf, "\\", 1);
+        rb_str_buf_cat(buf, current_char, 1);
+      } else {
+        for (n = 0; n <= (1 * slashes_seen); n++) {
+          rb_str_buf_cat(buf, "\\", 1);
+        }
+        rb_str_buf_cat(buf, current_char, 1);
+      }
+
+      slashes_seen = 0;
+    } else if (*current_char == '\\') {
+      slashes_seen++;
+      rb_str_buf_cat(buf, current_char, 1);
+    } else {
+      rb_str_buf_cat(buf, current_char, 1);
+    }
+  }
+
+  return buf;
+}
+
+inline void erbal_concat_chars_seen(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    rb_str_buf_cat(parser->src, ((p + rewind_chars) - parser->chars_seen), parser->chars_seen);
+    if (parser->in_buffer_shift) {
+      rb_str_concat(parser->src, erbal_escape_special_chars(parser, shift));
+    } else {
+    	rb_str_buf_cat(parser->src, ((p + shift) - parser->chars_seen), parser->chars_seen);
+    }
   }
 
   parser->chars_seen = 0;
 }
 
+inline void erbal_open_buffer_shift(erbal_parser *parser) {
+  rb_str_concat(parser->src, parser->buffer_name);
+  rb_str_buf_cat(parser->src, " << %Q`", 7);
+  parser->in_buffer_shift = 1;
+}
+
+inline void erbal_close_buffer_shift(erbal_parser *parser) {
+  rb_str_buf_cat(parser->src, "`;", 2);
+  parser->in_buffer_shift = 0;
+}
+
 inline void erbal_parser_finish(erbal_parser *parser) {
   if (parser->chars_seen != 0) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, 0);
-    rb_str_buf_cat(parser->src, "\");", 3);
   }
+
+  if (parser->in_buffer_shift) {
+    erbal_close_buffer_shift(parser);
+  }
+
   rb_str_concat(parser->src, parser->buffer_name);
 }
 
 void erbal_parser_init(erbal_parser *parser) {
-  parser->state = 0;
   parser->chars_seen = 0;
+  parser->in_buffer_shift = 0;
+	parser->state = OUTSIDE_TAG;
   parser->src = rb_str_dup(parser->buffer_name);
-  rb_str_buf_cat(parser->src, "=\"\";", 4);
+  rb_str_buf_cat(parser->src, " = '';", 6);
   
-#line 104 "parser.c"
+#line 165 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -108,14 +169,14 @@ void erbal_parser_init(erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 101 "parser.rl"
+#line 162 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 119 "parser.c"
+#line 180 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -161,7 +222,7 @@ st1:
 case 1:
 #line 1 "NONE"
 	{ts = p;}
-#line 165 "parser.c"
+#line 226 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st2;
 		case 45: goto tr4;
@@ -183,7 +244,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 187 "parser.c"
+#line 248 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr6;
@@ -232,6 +293,6 @@ case 5:
 
 	}
 
-#line 107 "parser.rl"
+#line 168 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.h

@@ -4,7 +4,7 @@
 #include "ruby.h"
 
 typedef struct erbal_parser {
-  unsigned int state, chars_seen, tag_seen;
+  unsigned int state, chars_seen, in_buffer_shift;
   VALUE str, src, buffer_name;
 } erbal_parser;
 
@@ -18,6 +18,9 @@ inline void erbal_parser_tag_close_common(erbal_parser*, int shift);
 inline void erbal_parser_finish(erbal_parser*);
 inline void erbal_concat_chars_seen(erbal_parser*, int shift);
 inline void erbal_parser_tag_open_common(erbal_parser*, int shift);
+inline void erbal_open_buffer_shift(erbal_parser*);
+inline void erbal_close_buffer_shift(erbal_parser*);
+inline VALUE erbal_escape_special_chars(erbal_parser*, int shift);
 
 #define TAG_OPEN                1
 #define TAG_OPEN_FOR_COMMENT    2

data/ext/erbal/parser.rl

@@ -21,10 +21,11 @@ static int act, cs;
 
 inline void erbal_parser_tag_open_common(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, shift);
-    rb_str_buf_cat(parser->src, "\");", 3);
     parser->chars_seen = 0;
   }
 }
@@ -49,11 +50,18 @@ inline void erbal_parser_non_tag(erbal_parser *parser) {
 
 inline void erbal_parser_tag_close_common(erbal_parser *parser, int tag_size) {
   if (parser->state == TAG_OPEN_FOR_OUTPUT) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat((", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
+    rb_str_buf_cat(parser->src, "#{", 2);
     erbal_concat_chars_seen(parser, -tag_size);
-    rb_str_buf_cat(parser->src, ").to_s);", 8);
+    rb_str_buf_cat(parser->src, "}", 1);
   } else if (parser->state == TAG_OPEN) {
+    if (parser->in_buffer_shift) {
+      erbal_close_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, -tag_size);
     rb_str_buf_cat(parser->src, ";", 1);
   }
@@ -74,29 +82,82 @@ inline void erbal_parser_tag_close(erbal_parser *parser) {
   erbal_parser_tag_close_common(parser, 1);
 }
 
-inline void erbal_concat_chars_seen(erbal_parser *parser, int rewind_chars) {
+inline VALUE erbal_escape_special_chars(erbal_parser *parser, int shift) {
+  VALUE buf = rb_str_buf_new(0);
+  int i, n, slashes_seen = 0;
+  char *current_char;
+
+  for (i = 0; i < parser->chars_seen; i++) {
+    current_char = (((p + shift) - parser->chars_seen) + i);
+
+    if (*current_char == '#' || *current_char == '`') {
+      if (slashes_seen == 0) {
+        rb_str_buf_cat(buf, "\\", 1);
+        rb_str_buf_cat(buf, current_char, 1);
+      } else {
+        for (n = 0; n <= (1 * slashes_seen); n++) {
+          rb_str_buf_cat(buf, "\\", 1);
+        }
+        rb_str_buf_cat(buf, current_char, 1);
+      }
+
+      slashes_seen = 0;
+    } else if (*current_char == '\\') {
+      slashes_seen++;
+      rb_str_buf_cat(buf, current_char, 1);
+    } else {
+      rb_str_buf_cat(buf, current_char, 1);
+    }
+  }
+
+  return buf;
+}
+
+inline void erbal_concat_chars_seen(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    rb_str_buf_cat(parser->src, ((p + rewind_chars) - parser->chars_seen), parser->chars_seen);
+    if (parser->in_buffer_shift) {
+      rb_str_concat(parser->src, erbal_escape_special_chars(parser, shift));
+    } else {
+    	rb_str_buf_cat(parser->src, ((p + shift) - parser->chars_seen), parser->chars_seen);
+    }
   }
 
   parser->chars_seen = 0;
 }
 
+inline void erbal_open_buffer_shift(erbal_parser *parser) {
+  rb_str_concat(parser->src, parser->buffer_name);
+  rb_str_buf_cat(parser->src, " << %Q`", 7);
+  parser->in_buffer_shift = 1;
+}
+
+inline void erbal_close_buffer_shift(erbal_parser *parser) {
+  rb_str_buf_cat(parser->src, "`;", 2);
+  parser->in_buffer_shift = 0;
+}
+
 inline void erbal_parser_finish(erbal_parser *parser) {
   if (parser->chars_seen != 0) {
-    rb_str_concat(parser->src, parser->buffer_name);
-    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    if (!parser->in_buffer_shift) {
+      erbal_open_buffer_shift(parser);
+    }
+
     erbal_concat_chars_seen(parser, 0);
-    rb_str_buf_cat(parser->src, "\");", 3);
   }
+
+  if (parser->in_buffer_shift) {
+    erbal_close_buffer_shift(parser);
+  }
+
   rb_str_concat(parser->src, parser->buffer_name);
 }
 
 void erbal_parser_init(erbal_parser *parser) {
-  parser->state = 0;
   parser->chars_seen = 0;
+  parser->in_buffer_shift = 0;
+	parser->state = OUTSIDE_TAG;
   parser->src = rb_str_dup(parser->buffer_name);
-  rb_str_buf_cat(parser->src, "=\"\";", 4);
+  rb_str_buf_cat(parser->src, " = '';", 6);
   %% write init;
 }
 

data/spec/erbal_spec.rb

@@ -1,47 +1,82 @@
 require 'spec_helper'
 
 describe Erbal do
-  def parse(str)
+  def erbal_parse(str)
     Erbal.new(str, '@out').parse
   end
 
+  def erubis_parse(str)
+    require 'rubygems'
+    require 'erubis'
+    Erubis::FastEruby.new.convert(str)
+  end
+
+  def compare(str)
+    erbal_parse(str).should == erb_parse(str)
+  end
+
   it "should parse a blank string" do
-    parse("").should == '@out="";@out'
+    erbal_parse("").should == "@out = '';@out"
   end
 
   it "should parse content without any tags" do
-    parse("I love unicorns!").should == '@out="";@out.concat("I love unicorns!");@out'
+    erbal_parse("I love unicorns!").should == "@out = '';@out << %Q`I love unicorns!`;@out"
   end
 
   it "should parse the <% tag" do
-    parse("<% 1 + 1 %>").should == '@out=""; 1 + 1 ;@out'
+    erbal_parse("<% 1 + 1 %>").should == "@out = ''; 1 + 1 ;@out"
   end
 
   it "should parse the <%= tag" do
-    parse("<%= 1 + 1 %>").should == '@out="";@out.concat(( 1 + 1 ).to_s);@out'
+    erbal_parse("<%= 1 + 1 %>").should == "@out = '';@out << %Q`\#{ 1 + 1 }`;@out"
   end
 
   it "should parse the comment tag <%#" do
-    parse("<%# I'm a comment %>").should == '@out="";@out'
+    erbal_parse("<%# I'm a comment %>").should == "@out = '';@out"
   end
 
   it "should swallow the following newline if the -%> tag is used" do
-    parse("<%= 1 + 1 -%>\n").should == '@out="";@out.concat(( 1 + 1 ).to_s);@out'
+    erbal_parse("<%= 1 + 1 -%>\n\n").should == "@out = '';@out << %Q`\#{ 1 + 1 }\n`;@out"
   end
 
   it "should not swallow the following character if the -%> tag is used and the following character is not a newline" do
-    parse("<%= 1 + 1 -%>Z").should == '@out="";@out.concat(( 1 + 1 ).to_s);@out.concat("Z");@out'
+    erbal_parse("<%= 1 + 1 -%>Z").should == "@out = '';@out << %Q`\#{ 1 + 1 }Z`;@out"
   end
 
   it "should concat text surrounding the tags when the opening tag is <%" do
-    parse("1 + 1 is <% 1 + 1 %>. Easy!").should == '@out="";@out.concat("1 + 1 is "); 1 + 1 ;@out.concat(". Easy!");@out'
+    erbal_parse("1 + 1 is <% 1 + 1 %>. Easy!").should == "@out = '';@out << %Q`1 + 1 is `; 1 + 1 ;@out << %Q`. Easy!`;@out"
   end
 
   it "should concat text surrounding the tags when the opening tag is <%=" do
-    parse("1 + 1 is <%= 1 + 1 %>. Easy!").should == '@out="";@out.concat("1 + 1 is ");@out.concat(( 1 + 1 ).to_s);@out.concat(". Easy!");@out'
+    erbal_parse("1 + 1 is <%= 1 + 1 %>. Easy!").should == "@out = '';@out << %Q`1 + 1 is \#{ 1 + 1 }. Easy!`;@out"
   end
 
-  it "should escape double quotes used outside tags" do
-    puts eval(parse("1 + \" 1 is <%= \"weeee\" %>. Easy!"))
+  it "should not open a new buffer shift when there is more than one consecutive <%= tag" do
+    erbal_parse("1 + 1 is <%= 1 + 1 %>, and 2 + 2 is <%= 2 + 2 %>. Easy!").should == "@out = '';@out << %Q`1 + 1 is \#{ 1 + 1 }, and 2 + 2 is \#{ 2 + 2 }. Easy!`;@out"
+  end
+
+  it "should escape a hash character that signifies the start of a string interpolation" do
+    erbal_parse("<%= 1 + 1 -%> wee \#{1 + 3}").should == "@out = '';@out << %Q`\#{ 1 + 1 } wee \\\#{1 + 3}`;@out"
+    eval(erbal_parse("<%= 1 + 1 -%> wee \#{1 + 3}")).should == eval(erubis_parse("<%= 1 + 1 -%> wee \#{1 + 3}"))
+
+    erbal_parse("<%= 1 + 1 -%> wee \\\#{1 + 3}").should == "@out = '';@out << %Q`\#{ 1 + 1 } wee \\\\\\\#{1 + 3}`;@out"
+    eval(erbal_parse("<%= 1 + 1 -%> wee \\\#{1 + 3}")).should == eval(erubis_parse("<%= 1 + 1 -%> wee \\\#{1 + 3}"))
+
+    erbal_parse("<%= 1 + 1 -%> wee \\\\\\\#{1 + 3}").should == "@out = '';@out << %Q`\#{ 1 + 1 } wee \\\\\\\\\\\\\\\#{1 + 3}`;@out"
+    eval(erbal_parse("<%= 1 + 1 -%> wee \\\\\\\#{1 + 3}")).should == eval(erubis_parse("<%= 1 + 1 -%> wee \\\\\\\#{1 + 3}"))
+
+    erbal_parse('<%= 1 + 1 -%> wee #{1 + 3}').should == "@out = '';@out << %Q`\#{ 1 + 1 } wee \\\#{1 + 3}`;@out"
+    eval(erbal_parse('<%= 1 + 1 -%> wee #{1 + 3}')).should == eval(erubis_parse('<%= 1 + 1 -%> wee #{1 + 3}'))
+  end
+
+  it "should escape a backtick character that signifies the end off a buffer shift" do
+    erbal_parse("weeee `").should == "@out = '';@out << %Q`weeee \\``;@out"
+    eval(erbal_parse("weeee `")).should == eval(erubis_parse("weeee `"));
+
+    erbal_parse("weeee \\`").should == "@out = '';@out << %Q`weeee \\\\\\``;@out"
+    eval(erbal_parse("weeee \\`")).should == eval(erubis_parse("weeee \\`"))
+
+    erbal_parse("weeee \\\\\\\`").should == "@out = '';@out << %Q`weeee \\\\\\\\\\\\\\``;@out"
+    eval(erbal_parse("weeee \\\\\\\`")).should == eval(erubis_parse("weeee \\\\\\\`"))
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 `rake clean`
 `rake compile`

data/tasks/gem.rake

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
-ERBAL_VERSION = '0.0.3.rc1'
+ERBAL_VERSION = '1.0.rc1'
 
 task :clean => :clobber_package
 
@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.summary               =
   s.description           = "Very small, very fast Ragel/C based ERB parser"
   s.author                = "Ian Leitch"
-  s.email                 = 'ian.leitch@systino.net'
+  s.email                 = 'port001@gmail.com'
   s.homepage              = 'http://github.com/ileitch/erbal'
   s.has_rdoc              = false
 
@@ -35,8 +35,7 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 namespace :gem do
-  desc "Update the gemspec for GitHub's gem server"
-  task :github do
+  task :gemspec do
     File.open("erbal.gemspec", 'w') { |f| f << YAML.dump(spec) }
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940546
+  hash: 977940502
   prerelease: true
   segments: 
+  - 1
   - 0
-  - 0
-  - 3
   - rc1
-  version: 0.0.3.rc1
+  version: 1.0.rc1
 platform: ruby
 authors: 
 - Ian Leitch
@@ -16,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +11:00
+date: 2010-12-29 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
 description: Very small, very fast Ragel/C based ERB parser
-email: ian.leitch@systino.net
+email: port001@gmail.com
 executables: []
 
 extensions: 
@@ -34,7 +33,6 @@ files:
 - README.rdoc
 - Rakefile
 - lib/erbal/rails.rb
-- lib/erbal.bundle
 - spec/erbal_spec.rb
 - spec/spec_helper.rb
 - tasks/ext.rake