erbal 1.0.rc7 → 1.0.rc8

data/ext/erbal/erbal.c

@@ -16,16 +16,14 @@ VALUE rb_erbal_alloc(VALUE klass) {
 }
 
 VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
-  VALUE str, buffer_name, options;
+  VALUE str, options;
 
-  rb_scan_args(argc, argv, "21", &str, &buffer_name, &options);
+  rb_scan_args(argc, argv, "11", &str, &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 (NIL_P(options)) {

data/ext/erbal/parser.c

@@ -168,16 +168,37 @@ 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;
+  } else {
+    parser->debug = 0;
+  }
+
+  VALUE buffer_name_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer")));
+
+  if (!NIL_P(buffer_name_val)) {
+    Check_Type(buffer_name_val, T_STRING);
+    parser->buffer_name = buffer_name_val;
+  } else {
+    parser->buffer_name = rb_str_new2("@output_buffer");
   }
 
   parser->src = rb_str_dup(parser->buffer_name);
-  rb_str_buf_cat(parser->src, " = '';", 6);
+
+  VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
+
+  if (!NIL_P(buffer_init_val)) {
+    Check_Type(buffer_init_val, T_STRING);
+    rb_str_buf_cat(parser->src, " = ", 3);
+    rb_str_concat(parser->src, buffer_init_val);
+    rb_str_buf_cat(parser->src, ";", 1);
+  } else {
+    rb_str_buf_cat(parser->src, " = '';", 6);
+  }
+
   
-#line 181 "parser.c"
+#line 202 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -185,14 +206,14 @@ void erbal_parser_init(erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 179 "parser.rl"
+#line 200 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 196 "parser.c"
+#line 217 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -242,7 +263,7 @@ st1:
 case 1:
 #line 1 "NONE"
 	{ts = p;}
-#line 246 "parser.c"
+#line 267 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st2;
 		case 45: goto tr4;
@@ -264,7 +285,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 268 "parser.c"
+#line 289 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr6;
@@ -314,6 +335,6 @@ case 5:
 
 	}
 
-#line 185 "parser.rl"
+#line 206 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.rl

@@ -167,14 +167,35 @@ 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;
+  } else {
+    parser->debug = 0;
+  }
+
+  VALUE buffer_name_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer")));
+
+  if (!NIL_P(buffer_name_val)) {
+    Check_Type(buffer_name_val, T_STRING);
+    parser->buffer_name = buffer_name_val;
+  } else {
+    parser->buffer_name = rb_str_new2("@output_buffer");
   }
 
   parser->src = rb_str_dup(parser->buffer_name);
-  rb_str_buf_cat(parser->src, " = '';", 6);
+
+  VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
+
+  if (!NIL_P(buffer_init_val)) {
+    Check_Type(buffer_init_val, T_STRING);
+    rb_str_buf_cat(parser->src, " = ", 3);
+    rb_str_concat(parser->src, buffer_init_val);
+    rb_str_buf_cat(parser->src, ";", 1);
+  } else {
+    rb_str_buf_cat(parser->src, " = '';", 6);
+  }
+
   %% write init;
 }
 

data/lib/erbal/rails.rb

@@ -1,8 +1,21 @@
 require 'erbal'
 
-class ErbalTemplateHandler < ActionView::TemplateHandler
-  include ActionView::TemplateHandlers::Compilable
-  def compile(template)
-    ::Erbal.new("<% __in_erb_template=true %>#{template.source}", '@output_buffer').parse
+if ActiveSupport.const_defined?('SafeBuffer')
+
+  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'}).parse
+    end
   end
+
+else
+
+  class ErbalTemplateHandler < ActionView::TemplateHandler
+    include ActionView::TemplateHandlers::Compilable
+    def compile(template)
+      ::Erbal.new("<% __in_erb_template=true %>#{template.source}", {:buffer => '@output_buffer'}).parse
+    end
+  end
+
 end

data/spec/erbal_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Erbal do
-  def erbal_parse(str)
-    Erbal.new(str, '@out').parse
+  def erbal_parse(str, options = {:buffer => '@out'})
+    Erbal.new(str, options).parse
   end
 
   def erubis_parse(str)
@@ -11,8 +11,28 @@ describe Erbal do
     Erubis::FastEruby.new.convert(str)
   end
 
-  def compare(str)
-    erbal_parse(str).should == erb_parse(str)
+  it "should default to @output_buffer if the :buffer option is not specified" do
+    erbal_parse("", :buffer => nil).should == "@output_buffer = '';@output_buffer"
+  end
+
+  it "should use the buffer specified via the :buffer option" do
+    erbal_parse("", :buffer => "_woot").should == "_woot = '';_woot"
+  end
+
+  it "should raise an error if the value given as the :buffer option is not a string" do
+    expect { erbal_parse("", :buffer => Class.new) }.should raise_error("wrong argument type Class (expected String)")
+  end
+
+  it "should default to an empty string as the initial buffer value if the :buffer_initial_value is not specified" do
+    erbal_parse("", :buffer_initial_value => nil).should == "@output_buffer = '';@output_buffer"
+  end
+
+  it "should use the initial value for the buffer specified by the :buffer_initial_value option" do
+    erbal_parse("", :buffer_initial_value => 'MyClass.new').should == "@output_buffer = MyClass.new;@output_buffer"
+  end
+
+  it "should raise an error if the value given as the :buffer_initial_value option is not a string" do
+    expect { erbal_parse("", :buffer_initial_value => Class.new) }.should raise_error("wrong argument type Class (expected String)")
   end
 
   it "should parse a blank string" do

data/tasks/gem.rake

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940496
+  hash: 977940497
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc7
-  version: 1.0.rc7
+  - rc8
+  version: 1.0.rc8
 platform: ruby
 authors: 
 - Ian Leitch