From f1a5f6899ba0315b6165e821b26c1611fa3cd42e Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@shopify.com>
Date: Mon, 25 Nov 2013 10:48:03 -0500
Subject: [PATCH] Add raggi's change to History, remove Ruby 1.8 code from test

---
 History.md                   | 1 +
 lib/liquid/strainer.rb       | 4 ++--
 test/liquid/strainer_test.rb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 7777e85..ba21d87 100644
--- a/History.md
+++ b/History.md
@@ -3,6 +3,7 @@
 ## 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]
 * Add default filter to standard filters, see #267 [Derrick Reimer, djreimer]
 * Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume]
diff --git a/lib/liquid/strainer.rb b/lib/liquid/strainer.rb
index f5d525d..bc429b6 100644
--- a/lib/liquid/strainer.rb
+++ b/lib/liquid/strainer.rb
@@ -41,8 +41,8 @@ module Liquid
       @@strainer_class_cache
     end
 
-    def self.create(context, filters = nil)
-      filters = @@filters + (filters || [])
+    def self.create(context, filters = [])
+      filters = @@filters + filters
       strainer_class_cache[filters].new(context)
     end
 
diff --git a/test/liquid/strainer_test.rb b/test/liquid/strainer_test.rb
index b7ec593..fd0a969 100644
--- a/test/liquid/strainer_test.rb
+++ b/test/liquid/strainer_test.rb
@@ -55,7 +55,7 @@ class StrainerTest < Test::Unit::TestCase
     assert_kind_of Strainer, strainer
     assert_kind_of a, 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
     end
   end