From 8606943a19174cca626075e71916cf0c0272c52f Mon Sep 17 00:00:00 2001 From: tdreyno Date: Wed, 5 Aug 2009 15:50:37 -0700 Subject: [PATCH] make template an instance variable for helpers to use --- lib/middleman.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/middleman.rb b/lib/middleman.rb index e9b82605..3d922f33 100644 --- a/lib/middleman.rb +++ b/lib/middleman.rb @@ -72,20 +72,20 @@ class Middleman < Sinatra::Base get /(.*)/ do |path| path << "index.html" if path.match(%r{/$}) path.gsub!(%r{^/}, '') - template = path.gsub(File.extname(path), '').to_sym + @template = path.gsub(File.extname(path), '').to_sym @full_request_path = path result = nil %w(haml erb builder maruku mab sass).each do |renderer| - next if !File.exists?(File.join(options.views, "#{template}.#{renderer}")) + next if !File.exists?(File.join(options.views, "#{@template}.#{renderer}")) renderer = "markaby" if renderer == "mab" result = if renderer == "sass" content_type 'text/css', :charset => 'utf-8' - sass(template, Compass.sass_engine_options) + sass(@template, Compass.sass_engine_options) else - send(renderer.to_sym, template) + send(renderer.to_sym, @template) end break