kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

take views into account for template caching, fixes #631

Browse source
This commit is contained in:
Konstantin Haase 2013-02-26 12:49:39 +11:00
parent 2d687ab6c3
commit 0e1585ceae
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -77,6 +77,8 @@
* Fix mixed indentation for private methods. (Robin Dupret)
* Take views option into account for template caching. (Konstantin Haase)
= 1.3.5 / 2013-02-25
* Fix for RubyGems 2.0 (Uchio KONDO)

2
lib/sinatra/base.rb
View file

@ -782,7 +782,7 @@ module Sinatra
def compile_template(engine, data, options, views)
eat_errors = options.delete :eat_errors
template_cache.fetch engine, data, options do
template_cache.fetch engine, data, options, views do
template = Tilt[engine]
raise "Template engine not found: #{engine}" if template.nil?

9
test/templates_test.rb
View file

@ -196,11 +196,18 @@ class TemplatesTest < Test::Unit::TestCase
end
it 'loads templates from specified views directory' do
render_app { render( :test, :hello, :views => settings.views + '/foo') }
render_app { render(:test, :hello, :views => settings.views + '/foo') }
assert_equal "from another views directory\n", body
end
it 'takes views directory into consideration for caching' do
render_app do
render(:test, :hello) + render(:test, :hello, :views => settings.views + '/foo')
end
assert_equal "Hello World!\nfrom another views directory\n", body
end
it 'passes locals to the layout' do
mock_app do
template(:my_layout) { 'Hello <%= name %>!<%= yield %>' }