diff --git a/History.md b/History.md index 99ecab1..66f6528 100644 --- a/History.md +++ b/History.md @@ -6,6 +6,7 @@ * Block parsing moved to BlockBody class (#458) [Dylan Thacker-Smith, dylanahsmith] * Add concat filter to concatenate arrays (#429) [Diogo Beato, dvbeato] * Ruby 1.9 support dropped (#491) [Justin Li, pushrax] +* Liquid::Template.file_system's read_template_file method is no longer passed the context. (#441) [James Reid-Smith, sunblaze] ### Fixed * Fix capturing into variables with a hyphen in the name (#505) [Florian Weingarten, fw42] diff --git a/lib/liquid/file_system.rb b/lib/liquid/file_system.rb index f95f644..6c4396b 100644 --- a/lib/liquid/file_system.rb +++ b/lib/liquid/file_system.rb @@ -14,7 +14,7 @@ module Liquid # This will parse the template with a LocalFileSystem implementation rooted at 'template_path'. class BlankFileSystem # Called by Liquid to retrieve a template file - def read_template_file(template_path, context) + def read_template_file(template_path) raise FileSystemError, "This liquid context does not allow includes." end end @@ -49,7 +49,7 @@ module Liquid @pattern = pattern end - def read_template_file(template_path, context) + def read_template_file(template_path) full_path = full_path(template_path) raise FileSystemError, "No such template '#{template_path}'" unless File.exists?(full_path) diff --git a/performance/theme_runner.rb b/performance/theme_runner.rb index 9b7a19a..5c959ac 100644 --- a/performance/theme_runner.rb +++ b/performance/theme_runner.rb @@ -17,7 +17,7 @@ class ThemeRunner end # Called by Liquid to retrieve a template file - def read_template_file(template_path, context) + def read_template_file(template_path) File.read(@path + '/' + template_path + '.liquid') end end diff --git a/test/unit/file_system_unit_test.rb b/test/unit/file_system_unit_test.rb index 02e3638..da09eed 100644 --- a/test/unit/file_system_unit_test.rb +++ b/test/unit/file_system_unit_test.rb @@ -5,7 +5,7 @@ class FileSystemUnitTest < Minitest::Test def test_default assert_raises(FileSystemError) do - BlankFileSystem.new.read_template_file("dummy", {'dummy'=>'smarty'}) + BlankFileSystem.new.read_template_file("dummy") end end