test/assign_test.rb @@ -9,7 +9,7 @@ module Liquid # {{ monkey }} # class Assign < Tag - Syntax = /(#{VariableSignature}+)\s*=\s*(#{QuotedFragment}+)/ + Syntax = /(#{VariableSignature}+)\s*=\s*(#{Expression}+)/ def initialize(tag_name, markup, tokens) if markup =~ Syntax lib/liquid/tags/assign.rb @@ -1,7 +1,7 @@ module Liquid class Case < Block - Syntax = /(#{QuotedFragment})/ - WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/ + Syntax = /(#{Expression})/ + WhenSyntax = /(#{Expression})(?:(?:\s+or\s+|\s*\,\s*)(#{Expression}.*))?/ def initialize(tag_name, markup, tokens) @blocks = [] lib/liquid/tags/case.rb @@ -13,8 +13,8 @@ module Liquid # <div class="green"> Item five</div> # class Cycle < Tag - SimpleSyntax = /#{QuotedFragment}/ - NamedSyntax = /(#{QuotedFragment})\s*\:\s*(.*)/ + SimpleSyntax = /#{Expression}/ + NamedSyntax = /(#{Expression})\s*\:\s*(.*)/ def initialize(tag_name, markup, tokens) case markup @@ -49,7 +49,7 @@ module Liquid def variables_from_string(markup) markup.split(',').collect do |var| - var =~ /\s*(#{QuotedFragment})\s*/ + var =~ /\s*(#{Expression})\s*/ $1 ? $1 : nil end.compact end lib/liquid/tags/cycle.rb @@ -117,6 +117,18 @@ class IfElseTest < Test::Unit::TestCase assert_template_result('yes','{% if "FOO BAR"|truncatewords:1,"--" == "FOO--" %}yes{% endif %}') assert_template_result('yes','{% if "FOO BAR"|truncatewords:1,"--"|downcase == "foo--" %}yes{% endif %}') assert_template_result('yes','{% if "foo--" == "FOO BAR"|truncatewords:1,"--"|downcase %}yes{% endif %}') + # array transformation, to make sure we aren't converting arrays to strings somewhere along the way: + assert_template_result('yes','{% if values|sort == sorted %}yes{% endif %}', 'values' => %w{foo bar baz}, 'sorted' => %w{bar baz foo}) + end + + def test_allow_no_spaces_in_filtered_expressions + assert_template_result('','{% if "foo--" == "FOO BAR" |truncatewords:1,"--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"| truncatewords:1,"--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"|truncatewords :1,"--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"|truncatewords: 1,"--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"|truncatewords:1 ,"--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"|truncatewords:1, "--"|downcase %}yes{% endif %}') + assert_template_result('','{% if "foo--" == "FOO BAR"|truncatewords:1,"--" |downcase %}yes{% endif %}') end def test_syntax_error_no_variable test/if_else_test.rb 282786d7e2deb728f82977d4db38b0f7a05e7e76 James MacAulay james@jadedpixel.com http://github.com/tobi/liquid/commit/edf7b5577b5aa60567335dff1e6bc1d2568eea68 edf7b5577b5aa60567335dff1e6bc1d2568eea68 2008-10-15T14:02:26-07:00 2008-10-15T12:16:29-07:00 filtered variables for assign, case, and cycle 77f5044fdfa8f73d059b40505114fe2f5e498fc2 James MacAulay james@jadedpixel.com