@@ -22,7 +22,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) module Liquid - FilterSeparator = /\|/ + FilterSperator = /\|/ ArgumentSeparator = ',' FilterArgumentSeparator = ':' VariableAttributeSeparator = '.' @@ -33,13 +33,7 @@ module Liquid VariableStart = /\{\{/ VariableEnd = /\}\}/ VariableIncompleteEnd = /\}\}?/ - QuotedString = /"[^"]+"|'[^']+'/ - QuotedFragment = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/ - StrictQuotedFragment = /"[^"]+"|'[^']+'|[^\s,\|,\:,\,]+/ - FirstFilterArgument = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/ - OtherFilterArgument = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/ - SpacelessFilter = /#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/ - Expression = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/ + QuotedFragment = /"[^"]+"|'[^']+'|[^\s,|]+/ TagAttributes = /(\w+)\s*\:\s*(#{QuotedFragment})/ AnyStartingTag = /\{\{|\{\%/ PartialTemplateParser = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/ lib/liquid.rb @@ -133,9 +133,6 @@ module Liquid :blank? when 'empty' :empty? - # filtered variables - when SpacelessFilter - filtered_variable(key) # Single quoted strings when /^'(.*)'$/ $1.to_s @@ -224,9 +221,5 @@ module Liquid object end - - def filtered_variable(markup) - Variable.new(markup).render(self) - end end end lib/liquid/context.rb @@ -9,7 +9,7 @@ module Liquid # {{ monkey }} # class Assign < Tag - Syntax = /(#{VariableSignature}+)\s*=\s*(#{Expression}+)/ + Syntax = /(#{VariableSignature}+)\s*=\s*(#{QuotedFragment}+)/ def initialize(tag_name, markup, tokens) if markup =~ Syntax lib/liquid/tags/assign.rb @@ -1,7 +1,7 @@ module Liquid class Case < Block - Syntax = /(#{Expression})/ - WhenSyntax = /(#{Expression})(?:(?:\s+or\s+|\s*\,\s*)(#{Expression}.*))?/ + Syntax = /(#{QuotedFragment})/ + WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/ 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 = /^#{Expression}/ - NamedSyntax = /^(#{Expression})\s*\:\s*(.*)/ + SimpleSyntax = /^#{QuotedFragment}/ + NamedSyntax = /^(#{QuotedFragment})\s*\:\s*(.*)/ def initialize(tag_name, markup, tokens) case markup @@ -48,7 +48,7 @@ module Liquid def variables_from_string(markup) markup.split(',').collect do |var| - var =~ /\s*(#{Expression})\s*/ + var =~ /\s*(#{QuotedFragment})\s*/ $1 ? $1 : nil end.compact end lib/liquid/tags/cycle.rb @@ -42,7 +42,7 @@ module Liquid # forloop.last:: Returns true if the item is the last item. # class For < Block - Syntax = /(\w+)\s+in\s+(#{Expression}+)\s*(reversed)?/ + Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/ def initialize(tag_name, markup, tokens) if markup =~ Syntax lib/liquid/tags/for.rb @@ -13,7 +13,7 @@ module Liquid # class If < Block SyntaxHelp = "Syntax Error in tag 'if' - Valid syntax: if [expression]" - Syntax = /(#{Expression})\s*([=!<>a-z_]+)?\s*(#{Expression})?/ + Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/ def initialize(tag_name, markup, tokens) lib/liquid/tags/if.rb @@ -19,8 +19,9 @@ module Liquid @filters = [] if match = markup.match(/\s*(#{QuotedFragment})/) @name = match[1] - if markup.match(/#{FilterSeparator}\s*(.*)/) - filters = Regexp.last_match(1).split(/#{FilterSeparator}/) + if markup.match(/#{FilterSperator}\s*(.*)/) + filters = Regexp.last_match(1).split(/#{FilterSperator}/) + filters.each do |f| if matches = f.match(/\s*(\w+)/) filtername = matches[1] lib/liquid/variable.rb @@ -1,11 +1,10 @@ require File.dirname(__FILE__) + '/helper' -class IfElseTest < Test::Unit::TestCase +class AssignTest < Test::Unit::TestCase include Liquid - def test_with_filtered_expressions - assert_template_result('foo','{% assign foo = values|sort|last %}{{ foo }}', 'values' => %w{foo bar baz}) - assert_template_result('foo','{% assign sorted = values|sort %}{{ sorted | last }}', 'values' => %w{foo bar baz}) + def test_assigned_variable + assert_template_result('.foo.','{% assign foo = values %}.{{ foo }}.', 'values' => %w{foo bar baz}) end end \ No newline at end of file test/assign_test.rb @@ -112,25 +112,6 @@ class IfElseTest < Test::Unit::TestCase assert_template_result('elsif','{% if false %}if{% elsif true %}elsif{% endif %}') end - def test_with_filtered_expressions - assert_template_result('yes','{% if "BLAH"|downcase == "blah" %}yes{% endif %}') - 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 assert_raise(SyntaxError){ assert_template_result('', '{% if jerry == 1 %}')} end test/if_else_test.rb @@ -98,11 +98,7 @@ HERE assigns = {'array' => [1,2,3] } assert_template_result('+--', '{%for item in array%}{% if forloop.first %}+{% else %}-{% endif %}{%endfor%}', assigns) end - - def test_for_with_filtered_expressions - assert_template_result('abc','{% for letter in letters|sort %}{{ letter }}{% endfor %}', 'letters' => %w{c b a}) - end - + def test_limiting assigns = {'array' => [1,2,3,4,5,6,7,8,9,0]} assert_template_result('12','{%for i in array limit:2 %}{{ i }}{%endfor%}',assigns) @@ -353,10 +349,10 @@ HERE assert_template_result('one two one','{%cycle "one", "two"%} {%cycle "one", "two"%} {%cycle "one", "two"%}') - assert_template_result('text-align: left text-align: right','{%cycle "text-align: left", "text-align: right" %} {%cycle "text-align: left", "text-align: right"%}') + assert_template_result('text-align: left,text-align: right','{%cycle "text-align: left", "text-align: right" %},{%cycle "text-align: left", "text-align: right"%}') - assert_template_result(' ','{% cycle "", "", "</tr><tr>" %}') - assert_template_result(' </tr><tr> ','{% cycle "", "", "</tr><tr>" %} {% cycle "", "", "</tr><tr>" %} {% cycle "", "", "</tr><tr>" %} {% cycle "", "", "</tr><tr>" %}') + assert_template_result('.','.{% cycle "", "", "</tr><tr>" %}') + assert_template_result('...</tr><tr> ','.{% cycle "", "", "</tr><tr>" %}.{% cycle "", "", "</tr><tr>" %}.{% cycle "", "", "</tr><tr>" %} {% cycle "", "", "</tr><tr>" %}') end test/standard_tag_test.rb e3fd003a7492ebd91e0f6334007649904d358482 Tobias Lütke tobi@jadedpixel.com http://github.com/tobi/liquid/commit/edcc14f148e06df32dc11a84e9758eb1d02d548b edcc14f148e06df32dc11a84e9758eb1d02d548b 2009-04-06T07:30:19-07:00 2009-04-06T07:30:19-07:00 Reverted james filter in tags branch This reverts commit 282786d7e2deb728f82977d4db38b0f7a05e7e76. Conflicts: lib/liquid.rb lib/liquid/variable.rb test/if_else_test.rb ec5c387624b30b35d5515ac42f8859a9a8ada0ff Tobias Lütke tobi@jadedpixel.com