@@ -637,7 +637,7 @@ module Sinatra file ||= caller_files.first begin - data = ::IO.read(file).split('__END__')[1] + data = ::IO.read(file).split(/^__END__$/)[1] rescue data = nil end lib/sinatra/base.rb @@ -87,6 +87,8 @@ class TemplatesTest < Test::Unit::TestCase end end +# __END__ : this is not the real end of the script. + __END__ @@ foo test/templates_test.rb b88c0f579aabf4d32e8b6c2e3d861506e0f9a8f1 Yoji Shidara unknown http://github.com/bmizerany/sinatra/commit/64d852ea6f30ca4264f329415426d6cd2ebc7ae6 64d852ea6f30ca4264f329415426d6cd2ebc7ae6 2009-04-19T20:42:07-07:00 2009-04-17T05:17:15-07:00 Better handling of in file templates `__END__` in the middle of lines should not be recognized as the end of the ruby script. Ruby only accepts the line just contain `__END__`. Beginning/tailing whitespaces are not allowed. Signed-off-by: Simon Rozet <simon@rozet.name> 2775049f50ca8b909bfc4aaf5539c3332796d5f3 Ryan Tomayko rtomayko@gmail.com