mirror of
https://github.com/kemko/liquid.git
synced 2026-01-01 15:55:40 +03:00
fix variable output with quoted strings containing pipe ("|") characters
This commit is contained in:
@@ -11,16 +11,17 @@ module Liquid
|
||||
# {{ user | link }}
|
||||
#
|
||||
class Variable
|
||||
FilterParser = /(?:#{FilterSeparator}|(?:\s*(?!(?:#{FilterSeparator}))(?:#{QuotedFragment}|\S+)\s*)+)/
|
||||
attr_accessor :filters, :name
|
||||
|
||||
def initialize(markup)
|
||||
@markup = markup
|
||||
@name = nil
|
||||
@filters = []
|
||||
if match = markup.match(/\s*(#{QuotedFragment})/)
|
||||
if match = markup.match(/\s*(#{QuotedFragment})(.*)/)
|
||||
@name = match[1]
|
||||
if markup.match(/#{FilterSeparator}\s*(.*)/)
|
||||
filters = Regexp.last_match(1).split(/#{FilterSeparator}/)
|
||||
if match[2].match(/#{FilterSeparator}\s*(.*)/)
|
||||
filters = Regexp.last_match(1).scan(FilterParser)
|
||||
filters.each do |f|
|
||||
if matches = f.match(/\s*(\w+)/)
|
||||
filtername = matches[1]
|
||||
|
||||
@@ -116,6 +116,10 @@ class StandardFiltersTest < Test::Unit::TestCase
|
||||
assert_equal 'a a a', @filters.remove_first("a a a a", 'a ')
|
||||
assert_template_result 'a a a', "{{ 'a a a a' | remove_first: 'a ' }}"
|
||||
end
|
||||
|
||||
def test_pipes_in_string_arguments
|
||||
assert_template_result 'foobar', "{{ 'foo|bar' | remove: '|' }}"
|
||||
end
|
||||
|
||||
def test_strip_newlines
|
||||
assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\nb\nc"
|
||||
|
||||
Reference in New Issue
Block a user