aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template_handlers
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-12 14:33:46 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-12 14:33:46 -0500
commit73b34e9f75d33dc0709d4ad36c912bdbb8977994 (patch)
treeeea7cb8c3cb428ecfacb6263f4e8f1d903a71824 /actionpack/lib/action_view/template_handlers
parent30204c4e66cea989c4ee48b52c8827c79e98f14a (diff)
downloadrails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.tar.gz
rails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.tar.bz2
rails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.zip
Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class.
Diffstat (limited to 'actionpack/lib/action_view/template_handlers')
-rw-r--r--actionpack/lib/action_view/template_handlers/compilable.rb50
1 files changed, 0 insertions, 50 deletions
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
index 95ae75ca68..a0ebaefeef 100644
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -3,8 +3,6 @@ module ActionView
module Compilable
def self.included(base)
base.extend ClassMethod
-
- @@mutex = Mutex.new
end
module ClassMethod
@@ -17,54 +15,6 @@ module ActionView
def render(template, local_assigns = {})
@view.send(:execute, template, local_assigns)
end
-
- # Compile and evaluate the template's code
- def compile_template(template)
- return false unless recompile_template?(template)
-
- @@mutex.synchronize do
- locals_code = template.locals.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
-
- source = <<-end_src
- def #{template.method}(local_assigns)
- old_output_buffer = output_buffer;#{locals_code};#{compile(template)}
- ensure
- self.output_buffer = old_output_buffer
- end
- end_src
-
- begin
- file_name = template.filename || 'compiled-template'
- ActionView::Base::CompiledTemplates.module_eval(source, file_name, 0)
- rescue Exception => e # errors from template code
- if logger = ActionController::Base.logger
- logger.debug "ERROR: compiling #{template.method} RAISED #{e}"
- logger.debug "Function body: #{source}"
- logger.debug "Backtrace: #{e.backtrace.join("\n")}"
- end
-
- raise ActionView::TemplateError.new(template, @view.assigns, e)
- end
- end
- end
-
- private
- # Method to check whether template compilation is necessary.
- # The template will be compiled if the inline template or file has not been compiled yet,
- # if local_assigns has a new key, which isn't supported by the compiled code yet.
- def recompile_template?(template)
- # Unless the template has been complied yet, compile
- return true unless Base::CompiledTemplates.instance_methods.include?(template.method.to_s)
-
- # If template caching is disabled, compile
- return true unless Base.cache_template_loading
-
- # Always recompile inline templates
- return true if template.is_a?(InlineTemplate)
-
- # Otherwise, use compiled method
- return false
- end
end
end
end