Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix a few more rubocop offenses

Browse Source
This commit is contained in:
Florian Weingarten
2015-06-04 13:09:58 -04:00
parent b347fac3c0
commit 82269e2509
10 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/variable.rb
+5 -6
View File
@@ -41,11 +41,10 @@ module Liquid
if filter_markup =~ /#{FilterSeparator}\s*(.*)/om
filters = $1.scan(FilterParser)
filters.each do |f|
if f =~ /\w+/
filtername = Regexp.last_match(0)
filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
@filters << parse_filter_expressions(filtername, filterargs)
end
next unless f =~ /\w+/
filtername = Regexp.last_match(0)
filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
@filters << parse_filter_expressions(filtername, filterargs)
end
end
end
@@ -74,7 +73,7 @@ module Liquid
def render(context)
@filters.inject(context.evaluate(@name)) do |output, (filter_name, filter_args, filter_kwargs)|
filter_args = evaluate_filter_expressions(context, filter_args, filter_kwargs)
output = context.invoke(filter_name, output, *filter_args)
context.invoke(filter_name, output, *filter_args)
end.tap{ |obj| taint_check(obj) }
end