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

changed access to @template_cache to a reader.

Browse source
This commit is contained in:
Nick Sutterer 2010-05-26 19:56:04 +08:00 • committed by Ryan Tomayko
parent 5d4d140a45
commit a5ceae91e8
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/sinatra/base.rb
View file

@ -355,7 +355,7 @@ module Sinatra
end end
def compile_template(engine, data, options, views) def compile_template(engine, data, options, views)
@template_cache.fetch engine, data, options do template_cache.fetch engine, data, options do
template = Tilt[engine] template = Tilt[engine]
raise "Template engine not found: #{engine}" if template.nil? raise "Template engine not found: #{engine}" if template.nil?
@ -387,6 +387,7 @@ module Sinatra
include Templates include Templates
attr_accessor :app attr_accessor :app
attr_reader :template_cache
def initialize(app=nil) def initialize(app=nil)
@app = app @app = app
@ -406,7 +407,7 @@ module Sinatra
@request = Request.new(env) @request = Request.new(env)
@response = Response.new @response = Response.new
@params = indifferent_params(@request.params) @params = indifferent_params(@request.params)
@template_cache.clear if settings.reload_templates template_cache.clear if settings.reload_templates
invoke { dispatch! } invoke { dispatch! }
invoke { error_block!(response.status) } invoke { error_block!(response.status) }

4
test/sinatra_test.rb
View file

@ -10,4 +10,8 @@ class SinatraTest < Test::Unit::TestCase
end end
assert_same Sinatra::Base, app.superclass assert_same Sinatra::Base, app.superclass
end end
it "responds to #template_cache" do
assert_kind_of Tilt::Cache, Sinatra::Base.new.template_cache
end
end end