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

Add raggi's change to History, remove Ruby 1.8 code from test

Browse Source
This commit is contained in:
Florian Weingarten
2013-11-25 10:48:03 -05:00
parent de497eaed2
commit f1a5f6899b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
History.md
+1
View File
@@ -3,6 +3,7 @@
## 3.0.0 / not yet released / branch "master" ## 3.0.0 / not yet released / branch "master"
* ... * ...
* Add a class cache to avoid runtime extend calls, see #249 [James Tucker, raggi]
* Remove some legacy Ruby 1.8 compatibility code, see #276 [Florian Weingarten, fw42] * Remove some legacy Ruby 1.8 compatibility code, see #276 [Florian Weingarten, fw42]
* Add default filter to standard filters, see #267 [Derrick Reimer, djreimer] * Add default filter to standard filters, see #267 [Derrick Reimer, djreimer]
* Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume] * Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume]
lib/liquid/strainer.rb
+2 -2
View File
@@ -41,8 +41,8 @@ module Liquid
@@strainer_class_cache @@strainer_class_cache
end end
def self.create(context, filters = nil) def self.create(context, filters = [])
filters = @@filters + (filters || []) filters = @@filters + filters
strainer_class_cache[filters].new(context) strainer_class_cache[filters].new(context)
end end
test/liquid/strainer_test.rb
+1 -1
View File
@@ -55,7 +55,7 @@ class StrainerTest < Test::Unit::TestCase
assert_kind_of Strainer, strainer assert_kind_of Strainer, strainer
assert_kind_of a, strainer assert_kind_of a, strainer
assert_kind_of b, strainer assert_kind_of b, strainer
Strainer.send(:class_variable_get, :@@filters).each do |m| Strainer.class_variable_get(:@@filters).each do |m|
assert_kind_of m, strainer assert_kind_of m, strainer
end end
end end