erbal 0.0.2 → 0.0.3.rc1

data/benchmark/bench.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'erubis'
 require File.expand_path(File.dirname(__FILE__)) + '/../lib/erbal'
 
-RUNS = 10000
+RUNS = 3000
 REPEAT = 6
 SRC = File.read('sample.erb')
 
@@ -19,10 +19,10 @@ class Benchmark
         total += Time.now-start
       end
       times << total
-      puts " #{i+1}) #{sprintf("%.2f", total)}" unless warmup
+      puts " #{i+1}) #{sprintf("%.3f", total)}" unless warmup
     end
     unless warmup
-      puts "=> Average: #{sprintf("%.2f", times.inject(0){|c, n| c += n} / times.size)}"
+      puts "=> Average: #{sprintf("%.3f", times.inject(0){|c, n| c += n} / times.size)}"
     end
   end
 end

data/ext/erbal/erbal.c

@@ -15,12 +15,12 @@ VALUE rb_erbal_alloc(VALUE klass) {
   return obj;
 }
 
-VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer) {
+VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer_name) {
   Check_Type(str, T_STRING);
-  Check_Type(buffer, T_STRING);
+  Check_Type(buffer_name, T_STRING);
   erbal_parser *parser = NULL;
   Data_Get_Struct(self, erbal_parser, parser);
-  parser->buffer = buffer;
+  parser->buffer_name = buffer_name;
   parser->str = str;
   return self;
 }

data/ext/erbal/parser.c

@@ -21,81 +21,86 @@ static const int erbal_parser_en_main = 1;
 static char *ts, *te, *p, *pe, *eof;
 static int act, cs;
 
-inline void erbal_parser_tag_open(erbal_parser *parser) {
-  parser->open = 1;
-  if (parser->mark) {
-    parser->mark = 0;
+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);
+    erbal_concat_chars_seen(parser, shift);
     rb_str_buf_cat(parser->src, "\");", 3);
+    parser->chars_seen = 0;
   }
 }
 
-inline void erbal_parser_tag_open_with_output(erbal_parser *parser) {
-  erbal_parser_tag_open(parser);
-  parser->output = 1;
-  rb_str_concat(parser->src, parser->buffer);
-  rb_str_buf_cat(parser->src, ".concat((", 9);
+inline void erbal_parser_tag_open(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -1);
+  parser->state = TAG_OPEN;
 }
 
-inline void erbal_parser_tag_open_with_comment(erbal_parser *parser) {
-  erbal_parser_tag_open(parser);
-  parser->comment = 1;
+inline void erbal_parser_tag_open_for_output(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -2);
+  parser->state = TAG_OPEN_FOR_OUTPUT;
 }
 
-inline void erbal_parser_any(erbal_parser *parser) {
-  if (parser->comment) {
-    return;
-  }
+inline void erbal_parser_tag_open_for_comment(erbal_parser *parser) {
+  parser->state = TAG_OPEN_FOR_COMMENT;
+}
 
-  if (parser->open) {
-    rb_str_buf_cat(parser->src, p, 1);
-  } else {
-    if (!parser->mark) {
-      parser->mark = 1;
-      rb_str_concat(parser->src, parser->buffer);
-      rb_str_buf_cat(parser->src, ".concat(\"", 9);
-    }
-    if (p[0] == '"') {
-      rb_str_buf_cat(parser->src, "\\\"", 2);
-    } else {
-      rb_str_buf_cat(parser->src, p, 1);
-    }
+inline void erbal_parser_non_tag(erbal_parser *parser) {
+  parser->chars_seen += 1;
+}
+
+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);
+    erbal_concat_chars_seen(parser, -tag_size);
+    rb_str_buf_cat(parser->src, ").to_s);", 8);
+  } else if (parser->state == TAG_OPEN) {
+    erbal_concat_chars_seen(parser, -tag_size);
+    rb_str_buf_cat(parser->src, ";", 1);
   }
+
+  parser->state = OUTSIDE_TAG;
+  parser->chars_seen = 0;
 }
 
 inline void erbal_parser_tag_close_with_trim(erbal_parser *parser) {
-  erbal_parser_tag_close(parser);
-  if (p[1] == '\n') {
+  erbal_parser_tag_close_common(parser, 2);
+
+  if (*(p + 1) == '\n') {
     p++;
   }
 }
 
 inline void erbal_parser_tag_close(erbal_parser *parser) {
-  parser->open = 0;
-  if (parser->output) {
-    parser->output = 0;
-    rb_str_buf_cat(parser->src, ").to_s);", 8);
-  } else if (!parser->comment) {
-    rb_str_buf_cat(parser->src, ";", 1);
+  erbal_parser_tag_close_common(parser, 1);
+}
+
+inline void erbal_concat_chars_seen(erbal_parser *parser, int rewind_chars) {
+  if (parser->chars_seen != 0) {
+    rb_str_buf_cat(parser->src, ((p + rewind_chars) - parser->chars_seen), parser->chars_seen);
   }
-  parser->comment = 0;
+
+  parser->chars_seen = 0;
 }
 
 inline void erbal_parser_finish(erbal_parser *parser) {
-  if (parser->mark) {
+  if (parser->chars_seen != 0) {
+    rb_str_concat(parser->src, parser->buffer_name);
+    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    erbal_concat_chars_seen(parser, 0);
     rb_str_buf_cat(parser->src, "\");", 3);
   }
-  rb_str_concat(parser->src, parser->buffer);
+  rb_str_concat(parser->src, parser->buffer_name);
 }
 
 void erbal_parser_init(erbal_parser *parser) {
-  parser->mark = 0;
-  parser->open = 0;
-  parser->output = 0;
-  parser->comment = 0;
-  parser->src = rb_str_dup(parser->buffer);
+  parser->state = 0;
+  parser->chars_seen = 0;
+  parser->src = rb_str_dup(parser->buffer_name);
   rb_str_buf_cat(parser->src, "=\"\";", 4);
   
-#line 99 "parser.c"
+#line 104 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -103,37 +108,37 @@ void erbal_parser_init(erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 96 "parser.rl"
+#line 101 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 114 "parser.c"
+#line 119 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
 tr0:
-#line 11 "parser.rl"
-	{{p = ((te))-1;}{ erbal_parser_any(parser); }}
+#line 13 "parser.rl"
+	{{p = ((te))-1;}{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr1:
-#line 12 "parser.rl"
+#line 11 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close_with_trim(parser); }}
 	goto st1;
 tr2:
-#line 11 "parser.rl"
-	{te = p+1;{ erbal_parser_any(parser); }}
+#line 13 "parser.rl"
+	{te = p+1;{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr6:
-#line 11 "parser.rl"
-	{te = p;p--;{ erbal_parser_any(parser); }}
+#line 13 "parser.rl"
+	{te = p;p--;{ erbal_parser_non_tag(parser); }}
 	goto st1;
 tr7:
-#line 13 "parser.rl"
+#line 12 "parser.rl"
 	{te = p+1;{ erbal_parser_tag_close(parser); }}
 	goto st1;
 tr10:
@@ -142,21 +147,21 @@ tr10:
 	goto st1;
 tr11:
 #line 9 "parser.rl"
-	{te = p+1;{ erbal_parser_tag_open_with_comment(parser); }}
+	{te = p+1;{ erbal_parser_tag_open_for_comment(parser); }}
 	goto st1;
 tr12:
 #line 10 "parser.rl"
-	{te = p+1;{ erbal_parser_tag_open_with_output(parser); }}
+	{te = p+1;{ erbal_parser_tag_open_for_output(parser); }}
 	goto st1;
 st1:
-#line 1 "parser.rl"
+#line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 1 "parser.rl"
+#line 1 "NONE"
 	{ts = p;}
-#line 160 "parser.c"
+#line 165 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st2;
 		case 45: goto tr4;
@@ -171,14 +176,14 @@ case 2:
 		goto tr7;
 	goto tr6;
 tr4:
-#line 1 "parser.rl"
+#line 1 "NONE"
 	{te = p+1;}
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 182 "parser.c"
+#line 187 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr6;
@@ -227,6 +232,6 @@ case 5:
 
 	}
 
-#line 102 "parser.rl"
+#line 107 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.h

@@ -4,16 +4,24 @@
 #include "ruby.h"
 
 typedef struct erbal_parser {
-  int output, open, mark, comment;
-  VALUE str, src, buffer;
+  unsigned int state, chars_seen, tag_seen;
+  VALUE str, src, buffer_name;
 } erbal_parser;
 
 inline void erbal_parser_tag_open(erbal_parser*);
-inline void erbal_parser_tag_open_with_comment(erbal_parser*);
-inline void erbal_parser_tag_open_with_output(erbal_parser*);
-inline void erbal_parser_any(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*);
 inline void erbal_parser_tag_close(erbal_parser*);
 inline void erbal_parser_tag_close_with_trim(erbal_parser*);
+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);
 
-#endif
+#define TAG_OPEN                1
+#define TAG_OPEN_FOR_COMMENT    2
+#define TAG_OPEN_FOR_OUTPUT     3
+#define OUTSIDE_TAG             4
+
+#endif

data/ext/erbal/parser.rl

@@ -6,11 +6,11 @@
 
   main := |*
     '<%'  => { erbal_parser_tag_open(parser); };
-    '<%#'  => { erbal_parser_tag_open_with_comment(parser); };
-    '<%=' => { erbal_parser_tag_open_with_output(parser); };
-    any   => { erbal_parser_any(parser); };
+    '<%#' => { erbal_parser_tag_open_for_comment(parser); };
+    '<%=' => { erbal_parser_tag_open_for_output(parser); };
     '-%>' => { erbal_parser_tag_close_with_trim(parser); };
     '%>'  => { erbal_parser_tag_close(parser); };
+    any   => { erbal_parser_non_tag(parser); };
   *|;
 }%%
 
@@ -19,78 +19,83 @@
 static char *ts, *te, *p, *pe, *eof;
 static int act, cs;
 
-inline void erbal_parser_tag_open(erbal_parser *parser) {
-  parser->open = 1;
-  if (parser->mark) {
-    parser->mark = 0;
+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);
+    erbal_concat_chars_seen(parser, shift);
     rb_str_buf_cat(parser->src, "\");", 3);
+    parser->chars_seen = 0;
   }
 }
 
-inline void erbal_parser_tag_open_with_output(erbal_parser *parser) {
-  erbal_parser_tag_open(parser);
-  parser->output = 1;
-  rb_str_concat(parser->src, parser->buffer);
-  rb_str_buf_cat(parser->src, ".concat((", 9);
+inline void erbal_parser_tag_open(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -1);
+  parser->state = TAG_OPEN;
 }
 
-inline void erbal_parser_tag_open_with_comment(erbal_parser *parser) {
-  erbal_parser_tag_open(parser);
-  parser->comment = 1;
+inline void erbal_parser_tag_open_for_output(erbal_parser *parser) {
+  erbal_parser_tag_open_common(parser, -2);
+  parser->state = TAG_OPEN_FOR_OUTPUT;
 }
 
-inline void erbal_parser_any(erbal_parser *parser) {
-  if (parser->comment) {
-    return;
-  }
+inline void erbal_parser_tag_open_for_comment(erbal_parser *parser) {
+  parser->state = TAG_OPEN_FOR_COMMENT;
+}
 
-  if (parser->open) {
-    rb_str_buf_cat(parser->src, p, 1);
-  } else {
-    if (!parser->mark) {
-      parser->mark = 1;
-      rb_str_concat(parser->src, parser->buffer);
-      rb_str_buf_cat(parser->src, ".concat(\"", 9);
-    }
-    if (p[0] == '"') {
-      rb_str_buf_cat(parser->src, "\\\"", 2);
-    } else {
-      rb_str_buf_cat(parser->src, p, 1);
-    }
+inline void erbal_parser_non_tag(erbal_parser *parser) {
+  parser->chars_seen += 1;
+}
+
+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);
+    erbal_concat_chars_seen(parser, -tag_size);
+    rb_str_buf_cat(parser->src, ").to_s);", 8);
+  } else if (parser->state == TAG_OPEN) {
+    erbal_concat_chars_seen(parser, -tag_size);
+    rb_str_buf_cat(parser->src, ";", 1);
   }
+
+  parser->state = OUTSIDE_TAG;
+  parser->chars_seen = 0;
 }
 
 inline void erbal_parser_tag_close_with_trim(erbal_parser *parser) {
-  erbal_parser_tag_close(parser);
-  if (p[1] == '\n') {
+  erbal_parser_tag_close_common(parser, 2);
+
+  if (*(p + 1) == '\n') {
     p++;
   }
 }
 
 inline void erbal_parser_tag_close(erbal_parser *parser) {
-  parser->open = 0;
-  if (parser->output) {
-    parser->output = 0;
-    rb_str_buf_cat(parser->src, ").to_s);", 8);
-  } else if (!parser->comment) {
-    rb_str_buf_cat(parser->src, ";", 1);
+  erbal_parser_tag_close_common(parser, 1);
+}
+
+inline void erbal_concat_chars_seen(erbal_parser *parser, int rewind_chars) {
+  if (parser->chars_seen != 0) {
+    rb_str_buf_cat(parser->src, ((p + rewind_chars) - parser->chars_seen), parser->chars_seen);
   }
-  parser->comment = 0;
+
+  parser->chars_seen = 0;
 }
 
 inline void erbal_parser_finish(erbal_parser *parser) {
-  if (parser->mark) {
+  if (parser->chars_seen != 0) {
+    rb_str_concat(parser->src, parser->buffer_name);
+    rb_str_buf_cat(parser->src, ".concat(\"", 9);
+    erbal_concat_chars_seen(parser, 0);
     rb_str_buf_cat(parser->src, "\");", 3);
   }
-  rb_str_concat(parser->src, parser->buffer);
+  rb_str_concat(parser->src, parser->buffer_name);
 }
 
 void erbal_parser_init(erbal_parser *parser) {
-  parser->mark = 0;
-  parser->open = 0;
-  parser->output = 0;
-  parser->comment = 0;
-  parser->src = rb_str_dup(parser->buffer);
+  parser->state = 0;
+  parser->chars_seen = 0;
+  parser->src = rb_str_dup(parser->buffer_name);
   rb_str_buf_cat(parser->src, "=\"\";", 4);
   %% write init;
 }

data/spec/erbal_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Erbal do
+  def parse(str)
+    Erbal.new(str, '@out').parse
+  end
+
+  it "should parse a blank string" do
+    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'
+  end
+
+  it "should parse the <% tag" do
+    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'
+  end
+
+  it "should parse the comment tag <%#" do
+    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'
+  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'
+  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'
+  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'
+  end
+
+  it "should escape double quotes used outside tags" do
+    puts eval(parse("1 + \" 1 is <%= \"weeee\" %>. Easy!"))
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
+`rake clean`
+`rake compile`
+require 'erbal'
+RSpec.configure do |config|
+  config.after :suite do
+    puts
+    `rake clean`
+  end
+end

data/tasks/gem.rake

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
-ERBAL_VERSION = '0.0.2'
+ERBAL_VERSION = '0.0.3.rc1'
 
 task :clean => :clobber_package
 
@@ -10,7 +10,7 @@ spec = Gem::Specification.new do |s|
   s.name                  = 'erbal'
   s.version               = ERBAL_VERSION
   s.platform              = WIN ? Gem::Platform::CURRENT : Gem::Platform::RUBY
-  s.summary               = 
+  s.summary               =
   s.description           = "Very small, very fast Ragel/C based ERB parser"
   s.author                = "Ian Leitch"
   s.email                 = 'ian.leitch@systino.net'
@@ -18,15 +18,15 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc              = false
 
   s.files                 = %w(COPYING CHANGELOG README.rdoc Rakefile) +
-                            Dir.glob("{lib,spec,tasks,benchmark}/**/*") + 
+                            Dir.glob("{lib,spec,tasks,benchmark}/**/*") +
                             Dir.glob("ext/**/*.{h,c,rb,rl}")
-  
+
   if WIN
     s.files              += ["lib/erbal.#{Config::CONFIG['DLEXT']}"]
   else
     s.extensions          = FileList["ext/**/extconf.rb"].to_a
   end
-  
+
   s.require_path          = "lib"
 end
 
@@ -38,7 +38,7 @@ namespace :gem do
   desc "Update the gemspec for GitHub's gem server"
   task :github do
     File.open("erbal.gemspec", 'w') { |f| f << YAML.dump(spec) }
-  end  
+  end
 end
 
 task :install => [:clean, :clobber, :ragel, :compile, :package] do

data/tasks/spec.rake

@@ -0,0 +1,7 @@
+require 'bundler'
+Bundler.load
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+end

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  hash: 977940546
+  prerelease: true
+  segments: 
+  - 0
+  - 0
+  - 3
+  - rc1
+  version: 0.0.3.rc1
 platform: ruby
 authors: 
 - Ian Leitch
@@ -9,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -04:00
+date: 2010-12-17 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +35,8 @@ files:
 - Rakefile
 - lib/erbal/rails.rb
 - lib/erbal.bundle
+- spec/erbal_spec.rb
+- spec/spec_helper.rb
 - tasks/ext.rake
 - tasks/gem.rake
 - tasks/spec.rake
@@ -48,21 +57,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Very small, very fast Ragel/C based ERB parser