Simplify interface for setting template resource limits

This commit is contained in:
Justin Li
2014-12-04 16:18:21 -05:00
parent db00ec8b32
commit 1593b784a7
3 changed files with 15 additions and 21 deletions
+1 -6
View File
@@ -21,12 +21,7 @@ module Liquid
@scopes = [(outer_scope || {})]
@registers = registers
@errors = []
@resource_limits = if resource_limits.is_a?(ResourceLimits)
resource_limits
else
ResourceLimits.new(resource_limits || Template.default_resource_limits)
end
@resource_limits = resource_limits || ResourceLimits.new(Template.default_resource_limits)
squash_instance_assigns_with_environments
@this_stack_used = false
+1 -5
View File
@@ -21,10 +21,6 @@ module Liquid
attr_accessor :root
attr_reader :resource_limits
def resource_limits=(limits)
@resource_limits = ResourceLimits.new(limits)
end
@@file_system = BlankFileSystem.new
class TagRegistry
@@ -116,7 +112,7 @@ module Liquid
end
def initialize
self.resource_limits = self.class.default_resource_limits
@resource_limits = ResourceLimits.new(self.class.default_resource_limits)
end
# Parse source code.