Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-03 09:05:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

try not using regexes ar all, because they are evil

Browse Source
This commit is contained in:
Isha
2014-02-28 19:31:52 +00:00
parent f367dd7915
commit d0ed4711b2
2 changed files with 257 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/liquid/variable.c
+81 -63
View File
@@ -18,34 +18,34 @@ static VALUE rb_variable_allocate(VALUE klass)
return obj; return obj;
} }
static void rb_variable_lax_parse(VALUE self, VALUE markup) // static void rb_variable_lax_parse(VALUE self, VALUE markup)
{ // {
struct liquid_variable *variable; // struct liquid_variable *variable;
variable->markup = RSTRING_PTR(markup); // variable->markup = RSTRING_PTR(markup);
variable->markup_len = RSTRING_LEN(markup); // variable->markup_len = RSTRING_LEN(markup);
regex_t regex, regex_f_args; // regex_t regex, regex_f_args;
int reti; // int reti;
regmatch_t match[3], f_match[5], f_arg_match[5]; // regmatch_t match[3], f_match[5], f_arg_match[5];
regcomp(&regex, "\\s*(((\"[^\"]*\"|'[^']*')|([^\\s,\\|'\"]|(\"[^\"]*\"|'[^']*'))+))(.*)", REG_EXTENDED | REG_ICASE); // regcomp(&regex, "\\s*(((\"[^\"]*\"|'[^']*')|([^\\s,\\|'\"]|(\"[^\"]*\"|'[^']*'))+))(.*)", REG_EXTENDED | REG_ICASE);
// regcomp(&regex, "\\s*((?:(?:\"[^\"]*\"|'[^']*')|(?:[^\\s,\\|'\"]|(?:\"[^\"]*\"|'[^']*'))+))(.*)", REG_ICASE | REG_ECMASCRIPT; // // regcomp(&regex, "\\s*((?:(?:\"[^\"]*\"|'[^']*')|(?:[^\\s,\\|'\"]|(?:\"[^\"]*\"|'[^']*'))+))(.*)", REG_ICASE | REG_ECMASCRIPT;
reti = regexec(&regex, variable->markup, 3, match, 0); // reti = regexec(&regex, variable->markup, 3, match, 0);
if( !reti ){ // if( !reti ){
/* Extract name */ // /* Extract name */
// printf("\nWith the whole expression, a matched substring %.*s is found at position %d to %d. " // // printf("\nWith the whole expression, a matched substring %.*s is found at position %d to %d. "
// " and rest at %.*s is found at position %d to %d.\n", // // " and rest at %.*s is found at position %d to %d.\n",
// match[1].rm_eo - match[1].rm_so, &variable->markup[match[1].rm_so], match[1].rm_so, match[1].rm_eo, // // match[1].rm_eo - match[1].rm_so, &variable->markup[match[1].rm_so], match[1].rm_so, match[1].rm_eo,
// match[2].rm_eo - match[2].rm_so, &variable->markup[match[2].rm_so], match[2].rm_so, match[2].rm_eo); // // match[2].rm_eo - match[2].rm_so, &variable->markup[match[2].rm_so], match[2].rm_so, match[2].rm_eo);
variable->name = &variable->markup[match[1].rm_so]; // variable->name = &variable->markup[match[1].rm_so];
variable->name_len = match[1].rm_eo - match[1].rm_so; // variable->name_len = match[1].rm_eo - match[1].rm_so;
rb_iv_set(self, "@name", rb_str_new(variable->name, variable->name_len)); // rb_iv_set(self, "@name", rb_str_new(variable->name, variable->name_len));
/* Extract filters */ // /* Extract filters */
// char * cursor = &variable->markup[match[2].rm_so]; int size = match[2].rm_eo - match[2].rm_so; // char * cursor = &variable->markup[match[2].rm_so]; int size = match[2].rm_eo - match[2].rm_so;
// while (cursor++ < &variable->markup[match[2].rm_eo]) { // while (cursor++ < &variable->markup[match[2].rm_eo]) {
// if (*cursor == ' ' || *cursor == '\n' || *cursor == '\f' || *cursor == '\t' || *cursor == '\r' || *cursor == '\v') continue; // if (*cursor == ' ' || *cursor == '\n' || *cursor == '\f' || *cursor == '\t' || *cursor == '\r' || *cursor == '\v') continue;
@@ -84,62 +84,80 @@ static void rb_variable_lax_parse(VALUE self, VALUE markup)
// rb_iv_set(self, "@filters", filters_array); // rb_iv_set(self, "@filters", filters_array);
// } // }
// } // }
// }
// }
static int skip_whitespace(char * str, int len)
} {
int i = 0; char * ptr = str;
while (i < len && (*ptr == " " || *ptr == "\t" || *ptr == "\n" || *ptr == "\v" || *ptr == "\f" || *ptr == "\r"))
i++;
return i;
} }
// static void rb_easy_parse(VALUE self) static char * cpy_string(char * str, int len)
// { {
// struct liquid_variable *variable; char * s = malloc(len*sizeof(char) + 1);
// Data_Get_Struct(self, struct liquid_variable, variable); int i = 0;
while (i<len) s[i] = str[i];
s[i] = '\0';
return s;
}
// regex_t regex; int reti; regmatch_t match[2]; static char * get_quoted_fragment(char * cursor, int len, char * name)
// reti = regcomp(&regex, " *(\\w+(\\.\\w+)*) *", REG_EXTENDED); {
// reti = regexec(&regex, variable->markup, 2, match, 0); int count = 0; int start = -1, end = -1;
// if( !reti ){ while (count < len) {
// variable->name = &variable->markup[match[1].rm_so];
// variable->name_len = match[1].rm_eo - match[1].rm_so;
// return; switch (cursor[count]) {
// } case '"':
if (start == -1) start = count;
else {end = count+1; goto form_name;}
break;
case '\'':
if (start == -1) start = count;
else {end = count+1; goto form_name;}
break;
default:
if (cursor[count] != '|' && cursor[count] != ':' && cursor[count] != ',' && cursor[count] != ' ' &&
cursor[count] != '\n' && cursor[count] != '\v' && cursor[count] != '\t' && cursor[count] != '\f' && cursor[count] != '\r')
{ if (start == -1) start = count; }
else
{ end = count+1; goto form_name;}
}
count++;
}
form_name:
if (end > start) name = cpy_string(&cursor[start], end-start);
// VALUE p = rb_funcall(rb_path2class("Liquid::Parser"), rb_intern("new"), 1, rb_str_new(variable->markup, variable->markup_len)); if (end != -1) return &cursor[end];
else return NULL;
}
// if (rb_funcall(p, rb_intern("look"), 1, ID2SYM(rb_intern("pipe")) )) static void rb_variable_lax_parse_new(VALUE self, VALUE m)
// { {
// variable->name = NULL; variable->name_len = 0; char * markup = RSTRING_PTR(m);
// } int markup_len = RSTRING_LEN(m);
// else
// {
// VALUE val = rb_funcall(p, rb_intern("expression"), 0);
// variable->name = RSTRING_PTR(val);
// variable->name_len = RSTRING_LEN(val);
// }
// }
// static VALUE rb_variable_initialize(VALUE self, VALUE markup) char * cursor = markup; int count = 0;
// {
// Check_Type(markup, T_STRING);
// rb_iv_set(self, "@filters", rb_ary_new()); /* Extract name */
// rb_iv_set(self, "@markup", markup); char * name;
count += skip_whitespace(markup, markup_len); cursor = markup+count;
cursor = get_quoted_fragment(cursor, markup_len-count, name);
// // FIXME need to be able to accept :error_mode parameter when creating if (name == NULL) rb_iv_set(self, "@name", Qnil);
// VALUE val = rb_funcall(rb_path2class("Liquid::Template"), rb_intern("error_mode"), 0); else
{
rb_iv_set(self, "@name", rb_str_new2(name));
// lax_parse(self, markup); /* Extract filters */
}
// // if (val == ID2SYM(rb_intern("strict"))) rb_funcall(self, rb_intern("strict_parse"), 1, markup); }
// // else if (val == ID2SYM(rb_intern("lax"))) lax_parse(self, markup);
// // FIXME handle :warn case
// return self;
// }
void init_liquid_variable() void init_liquid_variable()
{ {
cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject); cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject);
rb_define_alloc_func(cLiquidVariable, rb_variable_allocate); rb_define_alloc_func(cLiquidVariable, rb_variable_allocate);
rb_define_method(cLiquidVariable, "lax_parse", rb_variable_lax_parse, 1); rb_define_method(cLiquidVariable, "lax_parse", rb_variable_lax_parse_new, 1);
} }
test/liquid/variable_test.rb
+165 -165
View File
@@ -3,196 +3,196 @@ require 'test_helper'
class VariableTest < Test::Unit::TestCase class VariableTest < Test::Unit::TestCase
include Liquid include Liquid
def test_variable # def test_variable
var = Variable.new('hello') # var = Variable.new('hello')
assert_equal 'hello', var.name # assert_equal 'hello', var.name
# end
# def test_filters
# var = Variable.new('hello | textileze')
# assert_equal 'hello', var.name
# assert_equal [["textileze",[]]], var.filters
# var = Variable.new('hello | textileze | paragraph')
# assert_equal 'hello', var.name
# assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
# var = Variable.new(%! hello | strftime: '%Y'!)
# assert_equal 'hello', var.name
# assert_equal [["strftime",["'%Y'"]]], var.filters
# var = Variable.new(%! 'typo' | link_to: 'Typo', true !)
# assert_equal %!'typo'!, var.name
# assert_equal [["link_to",["'Typo'", "true"]]], var.filters
# var = Variable.new(%! 'typo' | link_to: 'Typo', false !)
# assert_equal %!'typo'!, var.name
# assert_equal [["link_to",["'Typo'", "false"]]], var.filters
# var = Variable.new(%! 'foo' | repeat: 3 !)
# assert_equal %!'foo'!, var.name
# assert_equal [["repeat",["3"]]], var.filters
# var = Variable.new(%! 'foo' | repeat: 3, 3 !)
# assert_equal %!'foo'!, var.name
# assert_equal [["repeat",["3","3"]]], var.filters
# var = Variable.new(%! 'foo' | repeat: 3, 3, 3 !)
# assert_equal %!'foo'!, var.name
# assert_equal [["repeat",["3","3","3"]]], var.filters
# var = Variable.new(%! hello | strftime: '%Y, okay?'!)
# assert_equal 'hello', var.name
# assert_equal [["strftime",["'%Y, okay?'"]]], var.filters
# var = Variable.new(%! hello | things: "%Y, okay?", 'the other one'!)
# assert_equal 'hello', var.name
# assert_equal [["things",["\"%Y, okay?\"","'the other one'"]]], var.filters
# end
# def test_filter_with_date_parameter
# var = Variable.new(%! '2006-06-06' | date: "%m/%d/%Y"!)
# assert_equal "'2006-06-06'", var.name
# assert_equal [["date",["\"%m/%d/%Y\""]]], var.filters
# end
# def test_filters_without_whitespace
# var = Variable.new('hello | textileze | paragraph')
# assert_equal 'hello', var.name
# assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
# var = Variable.new('hello|textileze|paragraph')
# assert_equal 'hello', var.name
# assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
# var = Variable.new("hello|replace:'foo','bar'|textileze")
# assert_equal 'hello', var.name
# assert_equal [["replace", ["'foo'", "'bar'"]], ["textileze", []]], var.filters
# end
def test_symbol
var = Variable.new("http://disney.com/logo.gif | image: 'med' ", :error_mode => :lax)
assert_equal "http://disney.com/logo.gif", var.name
# assert_equal [["image",["'med'"]]], var.filters
end end
def test_filters # def test_string_to_filter
var = Variable.new('hello | textileze') # var = Variable.new("'http://disney.com/logo.gif' | image: 'med' ")
assert_equal 'hello', var.name # assert_equal "'http://disney.com/logo.gif'", var.name
assert_equal [["textileze",[]]], var.filters
var = Variable.new('hello | textileze | paragraph')
assert_equal 'hello', var.name
assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
var = Variable.new(%! hello | strftime: '%Y'!)
assert_equal 'hello', var.name
assert_equal [["strftime",["'%Y'"]]], var.filters
var = Variable.new(%! 'typo' | link_to: 'Typo', true !)
assert_equal %!'typo'!, var.name
assert_equal [["link_to",["'Typo'", "true"]]], var.filters
var = Variable.new(%! 'typo' | link_to: 'Typo', false !)
assert_equal %!'typo'!, var.name
assert_equal [["link_to",["'Typo'", "false"]]], var.filters
var = Variable.new(%! 'foo' | repeat: 3 !)
assert_equal %!'foo'!, var.name
assert_equal [["repeat",["3"]]], var.filters
var = Variable.new(%! 'foo' | repeat: 3, 3 !)
assert_equal %!'foo'!, var.name
assert_equal [["repeat",["3","3"]]], var.filters
var = Variable.new(%! 'foo' | repeat: 3, 3, 3 !)
assert_equal %!'foo'!, var.name
assert_equal [["repeat",["3","3","3"]]], var.filters
var = Variable.new(%! hello | strftime: '%Y, okay?'!)
assert_equal 'hello', var.name
assert_equal [["strftime",["'%Y, okay?'"]]], var.filters
var = Variable.new(%! hello | things: "%Y, okay?", 'the other one'!)
assert_equal 'hello', var.name
assert_equal [["things",["\"%Y, okay?\"","'the other one'"]]], var.filters
end
def test_filter_with_date_parameter
var = Variable.new(%! '2006-06-06' | date: "%m/%d/%Y"!)
assert_equal "'2006-06-06'", var.name
assert_equal [["date",["\"%m/%d/%Y\""]]], var.filters
end
def test_filters_without_whitespace
var = Variable.new('hello | textileze | paragraph')
assert_equal 'hello', var.name
assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
var = Variable.new('hello|textileze|paragraph')
assert_equal 'hello', var.name
assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
var = Variable.new("hello|replace:'foo','bar'|textileze")
assert_equal 'hello', var.name
assert_equal [["replace", ["'foo'", "'bar'"]], ["textileze", []]], var.filters
end
# def test_symbol
# var = Variable.new("http://disney.com/logo.gif | image: 'med' ", :error_mode => :lax)
# assert_equal "http://disney.com/logo.gif", var.name
# assert_equal [["image",["'med'"]]], var.filters # assert_equal [["image",["'med'"]]], var.filters
# end # end
def test_string_to_filter # def test_string_single_quoted
var = Variable.new("'http://disney.com/logo.gif' | image: 'med' ") # var = Variable.new(%| "hello" |)
assert_equal "'http://disney.com/logo.gif'", var.name # assert_equal '"hello"', var.name
# assert_equal [["image",["'med'"]]], var.filters # end
end
def test_string_single_quoted # def test_string_double_quoted
var = Variable.new(%| "hello" |) # var = Variable.new(%| 'hello' |)
assert_equal '"hello"', var.name # assert_equal "'hello'", var.name
end # end
def test_string_double_quoted # def test_integer
var = Variable.new(%| 'hello' |) # var = Variable.new(%| 1000 |)
assert_equal "'hello'", var.name # assert_equal "1000", var.name
end # end
def test_integer # def test_float
var = Variable.new(%| 1000 |) # var = Variable.new(%| 1000.01 |)
assert_equal "1000", var.name # assert_equal "1000.01", var.name
end # end
def test_float # def test_string_with_special_chars
var = Variable.new(%| 1000.01 |) # var = Variable.new(%| 'hello! $!@.;"ddasd" ' |)
assert_equal "1000.01", var.name # assert_equal %|'hello! $!@.;"ddasd" '|, var.name
end # end
def test_string_with_special_chars # def test_string_dot
var = Variable.new(%| 'hello! $!@.;"ddasd" ' |) # var = Variable.new(%| test.test |)
assert_equal %|'hello! $!@.;"ddasd" '|, var.name # assert_equal 'test.test', var.name
end # end
def test_string_dot # def test_filter_with_keyword_arguments
var = Variable.new(%| test.test |) # var = Variable.new(%! hello | things: greeting: "world", farewell: 'goodbye'!)
assert_equal 'test.test', var.name # assert_equal 'hello', var.name
end
def test_filter_with_keyword_arguments
var = Variable.new(%! hello | things: greeting: "world", farewell: 'goodbye'!)
assert_equal 'hello', var.name
# assert_equal [['things',["greeting: \"world\"","farewell: 'goodbye'"]]], var.filters # assert_equal [['things',["greeting: \"world\"","farewell: 'goodbye'"]]], var.filters
end # end
# def test_lax_filter_argument_parsing def test_lax_filter_argument_parsing
# var = Variable.new(%! number_of_comments | pluralize: 'comment': 'comments' !, :error_mode => :lax) # var = Variable.new(%! number_of_comments | pluralize: 'comment': 'comments' !, :error_mode => :lax)
# assert_equal 'number_of_comments', var.name # assert_equal 'number_of_comments', var.name
# assert_equal [['pluralize',["'comment'","'comments'"]]], var.filters # assert_equal [['pluralize',["'comment'","'comments'"]]], var.filters
# end end
def test_strict_filter_argument_parsing # def test_strict_filter_argument_parsing
with_error_mode(:strict) do # with_error_mode(:strict) do
assert_raises(SyntaxError) do # assert_raises(SyntaxError) do
Variable.new(%! number_of_comments | pluralize: 'comment': 'comments' !) # Variable.new(%! number_of_comments | pluralize: 'comment': 'comments' !)
end # end
end # end
end # end
end end
class VariableResolutionTest < Test::Unit::TestCase # class VariableResolutionTest < Test::Unit::TestCase
include Liquid # include Liquid
def test_simple_variable # def test_simple_variable
template = Template.parse(%|{{test}}|) # template = Template.parse(%|{{test}}|)
assert_equal 'worked', template.render('test' => 'worked') # assert_equal 'worked', template.render('test' => 'worked')
assert_equal 'worked wonderfully', template.render('test' => 'worked wonderfully') # assert_equal 'worked wonderfully', template.render('test' => 'worked wonderfully')
end # end
def test_simple_with_whitespaces # def test_simple_with_whitespaces
template = Template.parse(%| {{ test }} |) # template = Template.parse(%| {{ test }} |)
assert_equal ' worked ', template.render('test' => 'worked') # assert_equal ' worked ', template.render('test' => 'worked')
assert_equal ' worked wonderfully ', template.render('test' => 'worked wonderfully') # assert_equal ' worked wonderfully ', template.render('test' => 'worked wonderfully')
end # end
def test_ignore_unknown # def test_ignore_unknown
template = Template.parse(%|{{ test }}|) # template = Template.parse(%|{{ test }}|)
assert_equal '', template.render # assert_equal '', template.render
end # end
def test_hash_scoping # def test_hash_scoping
template = Template.parse(%|{{ test.test }}|) # template = Template.parse(%|{{ test.test }}|)
assert_equal 'worked', template.render('test' => {'test' => 'worked'}) # assert_equal 'worked', template.render('test' => {'test' => 'worked'})
end # end
def test_preset_assigns # def test_preset_assigns
template = Template.parse(%|{{ test }}|) # template = Template.parse(%|{{ test }}|)
template.assigns['test'] = 'worked' # template.assigns['test'] = 'worked'
assert_equal 'worked', template.render # assert_equal 'worked', template.render
end # end
def test_reuse_parsed_template # def test_reuse_parsed_template
template = Template.parse(%|{{ greeting }} {{ name }}|) # template = Template.parse(%|{{ greeting }} {{ name }}|)
template.assigns['greeting'] = 'Goodbye' # template.assigns['greeting'] = 'Goodbye'
assert_equal 'Hello Tobi', template.render('greeting' => 'Hello', 'name' => 'Tobi') # assert_equal 'Hello Tobi', template.render('greeting' => 'Hello', 'name' => 'Tobi')
assert_equal 'Hello ', template.render('greeting' => 'Hello', 'unknown' => 'Tobi') # assert_equal 'Hello ', template.render('greeting' => 'Hello', 'unknown' => 'Tobi')
assert_equal 'Hello Brian', template.render('greeting' => 'Hello', 'name' => 'Brian') # assert_equal 'Hello Brian', template.render('greeting' => 'Hello', 'name' => 'Brian')
assert_equal 'Goodbye Brian', template.render('name' => 'Brian') # assert_equal 'Goodbye Brian', template.render('name' => 'Brian')
assert_equal({'greeting'=>'Goodbye'}, template.assigns) # assert_equal({'greeting'=>'Goodbye'}, template.assigns)
end # end
def test_assigns_not_polluted_from_template # def test_assigns_not_polluted_from_template
template = Template.parse(%|{{ test }}{% assign test = 'bar' %}{{ test }}|) # template = Template.parse(%|{{ test }}{% assign test = 'bar' %}{{ test }}|)
template.assigns['test'] = 'baz' # template.assigns['test'] = 'baz'
assert_equal 'bazbar', template.render # assert_equal 'bazbar', template.render
assert_equal 'bazbar', template.render # assert_equal 'bazbar', template.render
assert_equal 'foobar', template.render('test' => 'foo') # assert_equal 'foobar', template.render('test' => 'foo')
assert_equal 'bazbar', template.render # assert_equal 'bazbar', template.render
end # end
def test_hash_with_default_proc # def test_hash_with_default_proc
template = Template.parse(%|Hello {{ test }}|) # template = Template.parse(%|Hello {{ test }}|)
assigns = Hash.new { |h,k| raise "Unknown variable '#{k}'" } # assigns = Hash.new { |h,k| raise "Unknown variable '#{k}'" }
assigns['test'] = 'Tobi' # assigns['test'] = 'Tobi'
assert_equal 'Hello Tobi', template.render!(assigns) # assert_equal 'Hello Tobi', template.render!(assigns)
assigns.delete('test') # assigns.delete('test')
e = assert_raises(RuntimeError) { # e = assert_raises(RuntimeError) {
template.render!(assigns) # template.render!(assigns)
} # }
assert_equal "Unknown variable 'test'", e.message # assert_equal "Unknown variable 'test'", e.message
end # end
end # VariableTest # end # VariableTest