erbal 1.0.rc4 → 1.0.rc6

data/ext/erbal/erbal.c

@@ -15,7 +15,11 @@ VALUE rb_erbal_alloc(VALUE klass) {
   return obj;
 }
 
-VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer_name, VALUE options) {
+VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
+  VALUE str, buffer_name, options;
+
+  rb_scan_args(argc, argv, "21", &str, &buffer_name, &options);
+
   Check_Type(str, T_STRING);
   Check_Type(buffer_name, T_STRING);
 
@@ -24,7 +28,7 @@ VALUE rb_erbal_initialize(VALUE self, VALUE str, VALUE buffer_name, VALUE option
   parser->buffer_name = buffer_name;
   parser->str = str;
 
-  if (options == Qtrue) {
+  if (NIL_P(options)) {
     parser->options = rb_hash_new();
   } else {
     Check_Type(options, T_HASH);
@@ -45,6 +49,6 @@ VALUE rb_erbal_parse(VALUE self) {
 void Init_erbal() {
   cErbal = rb_define_class("Erbal", rb_cObject);
   rb_define_alloc_func(cErbal, rb_erbal_alloc);
-  rb_define_method(cErbal, "initialize", rb_erbal_initialize, 3);
+  rb_define_method(cErbal, "initialize", rb_erbal_initialize, -1);
   rb_define_method(cErbal, "parse", rb_erbal_parse, 0);
 }

data/ext/erbal/parser.c

@@ -122,7 +122,7 @@ inline VALUE erbal_escape_special_chars(erbal_parser *parser, int shift) {
 
 inline void erbal_concat_chars_seen(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    if (parser->in_buffer_shift) {
+    if (parser->in_buffer_shift && parser->state == OUTSIDE_TAG) {
       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);
@@ -157,7 +157,7 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   }
 
   rb_str_concat(parser->src, parser->buffer_name);
-  
+
   if (parser->debug) {
     printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
   }

data/ext/erbal/parser.rl

@@ -121,7 +121,7 @@ inline VALUE erbal_escape_special_chars(erbal_parser *parser, int shift) {
 
 inline void erbal_concat_chars_seen(erbal_parser *parser, int shift) {
   if (parser->chars_seen != 0) {
-    if (parser->in_buffer_shift) {
+    if (parser->in_buffer_shift && parser->state == OUTSIDE_TAG) {
       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);
@@ -156,7 +156,7 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   }
 
   rb_str_concat(parser->src, parser->buffer_name);
-  
+
   if (parser->debug) {
     printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
   }

data/spec/erbal_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Erbal do
   def erbal_parse(str)
-    Erbal.new(str, '@out', {:debug => false}).parse
+    Erbal.new(str, '@out').parse
   end
 
   def erubis_parse(str)
@@ -63,7 +63,7 @@ describe Erbal 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
+  it "should escape a hash character that signifies the start of a string interpolation when outside tags" 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}"))
 
@@ -77,6 +77,11 @@ describe Erbal do
     eval(erbal_parse('<%= 1 + 1 -%> wee #{1 + 3}')).should == eval(erubis_parse('<%= 1 + 1 -%> wee #{1 + 3}'))
   end
 
+  it "should not escape a hash character that signifies the start of a string interpolation when inside tags" do
+    erbal_parse('<%= "#{1 + 1}" -%>').should == "@out = '';@out << %Q`\#{ \"\#{1 + 1}\" }`;@out"
+    eval(erbal_parse('<%= "#{1 + 1}" -%>')).should == eval(erubis_parse('<%= "#{1 + 1}" -%>'))
+  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 `"));

data/tasks/gem.rake

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940501
+  hash: 977940499
   prerelease: true
   segments: 
   - 1
   - 0
-  - rc4
-  version: 1.0.rc4
+  - rc6
+  version: 1.0.rc6
 platform: ruby
 authors: 
 - Ian Leitch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +11:00
+date: 2010-12-30 00:00:00 +11:00
 default_executable: 
 dependencies: []