kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#795] Generate error flash on Liquid syntax error

Browse Source
This commit is contained in:
Holger Just 2012-01-16 14:07:38 +01:00
parent 61a65d4624
commit d7ebffb7ad
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/application_helper.rb
View File

@ -487,14 +487,17 @@ module ApplicationHelper
Rails.logger.debug msg Rails.logger.debug msg
end end
rescue Liquid::SyntaxError => exception rescue Liquid::SyntaxError => exception
msg = "[Liquid Syntax Error] #{exception.message}"
if Rails.logger && Rails.logger.debug? if Rails.logger && Rails.logger.debug?
msg = "[Liquid Syntax Error] #{exception.message}\n:\n#{exception.backtrace.join("\n")}" log_msg = "#{msg}\n"
msg << "\n\n" log_msg << exception.backtrace.collect{ |str| " #{str}" }.join("\n")
Rails.logger.debug msg log_msg << "\n\n"
Rails.logger.debug log_msg
end end
# Skip Liquid if there is a syntax error # Skip Liquid if there is a syntax error
text = h(input_text) text = content_tag(:div, msg, :class => "flash error")
text << h(input_text)
end end
@parsed_headings = [] @parsed_headings = []

8
test/unit/lib/chili_project/liquid_test.rb
View File

@ -229,5 +229,13 @@ class ChiliProject::LiquidTest < ActionView::TestCase
formatted = textilizable(text) formatted = textilizable(text)
assert_match '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;', formatted assert_match '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;', formatted
end end
should "have an error flash" do
text = "{% --- something invalid %}\n"
formatted = textilizable(text)
assert_match /flash error/, formatted
assert_match '[Liquid Syntax Error]', formatted
end
end end
end end