Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-04 01:25:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix .include? method on Enumerable drops, used by "contains" conditions

Browse Source
This commit is contained in:
Florian Weingarten
2013-08-02 10:23:10 -04:00
parent 7fdb789eac
commit f98949117d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/drop.rb
+1 -1
View File
@@ -59,7 +59,7 @@ module Liquid
blacklist = (Liquid::Drop.public_instance_methods + [:each]).map(&:to_s) blacklist = (Liquid::Drop.public_instance_methods + [:each]).map(&:to_s)
if include?(Enumerable) if include?(Enumerable)
blacklist += Enumerable.public_instance_methods.map(&:to_s) blacklist += Enumerable.public_instance_methods.map(&:to_s)
blacklist -= [:sort, :count, :first, :min, :max].map(&:to_s) blacklist -= [:sort, :count, :first, :min, :max, :include?].map(&:to_s)
end end
whitelist = [:to_liquid] + (public_instance_methods.map(&:to_s) - blacklist.map(&:to_s)) whitelist = [:to_liquid] + (public_instance_methods.map(&:to_s) - blacklist.map(&:to_s))
@invokable_methods = Set.new(whitelist.map(&:to_s)) @invokable_methods = Set.new(whitelist.map(&:to_s))
test/liquid/drop_test.rb
+2
View File
@@ -220,6 +220,8 @@ class DropsTest < Test::Unit::TestCase
assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => EnumerableDrop.new) assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => EnumerableDrop.new)
end end
assert_equal "yes", Liquid::Template.parse("{% if collection contains 3 %}yes{% endif %}").render('collection' => RealEnumerableDrop.new)
[ :min, :first ].each do |method| [ :min, :first ].each do |method|
assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => RealEnumerableDrop.new) assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => RealEnumerableDrop.new)
assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => RealEnumerableDrop.new) assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => RealEnumerableDrop.new)