kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-03 16:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

introduce unhandled liquid exception

Browse Source 
check arity
This commit is contained in:
Richard Monette
2016-10-21 13:27:54 -04:00
parent 43e59796f6
commit a549d289d7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/liquid/block_body.rb
View File

@@ -93,10 +93,10 @@ module Liquid
rescue MemoryError => e
raise e
rescue UndefinedVariable, UndefinedDropMethod, UndefinedFilter => e
context.handle_error(e, token.line_number)
context.handle_error(e, token.line_number, token.raw)
output << nil
rescue ::StandardError => e
output << context.handle_error(e, token.line_number)
output << context.handle_error(e, token.line_number, token.raw)
end
end

6
lib/liquid/context.rb
View File

@@ -73,7 +73,7 @@ module Liquid
@interrupts.pop
end
def handle_error(e, line_number = nil)
def handle_error(e, line_number = nil, raw_token = nil)
if e.is_a?(Liquid::Error)
e.template_name ||= template_name
e.line_number ||= line_number
@@ -82,7 +82,9 @@ module Liquid
output = nil
if exception_handler
result = exception_handler.call(e)
args = [e]
args << { line_number: line_number, raw_token: raw_token } if exception_handler.arity == 2
result = exception_handler.call(*args)
case result
when Exception
e = result