aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/renderable.rb4
-rw-r--r--actionpack/lib/action_view/renderable_partial.rb4
-rw-r--r--actionpack/lib/action_view/template.rb12
3 files changed, 10 insertions, 10 deletions
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index 9185045adf..f66356c939 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -12,12 +12,12 @@ module ActionView
def handler
Template.handler_class_for_extension(extension)
end
- memorize :handler
+ memoize :handler
def compiled_source
handler.new(nil).compile(self) if handler.compilable?
end
- memorize :compiled_source
+ memoize :compiled_source
def render(view, local_assigns = {})
view._first_render ||= self
diff --git a/actionpack/lib/action_view/renderable_partial.rb b/actionpack/lib/action_view/renderable_partial.rb
index d2fe635b9c..fdb1a5e6a7 100644
--- a/actionpack/lib/action_view/renderable_partial.rb
+++ b/actionpack/lib/action_view/renderable_partial.rb
@@ -8,12 +8,12 @@ module ActionView
def variable_name
name.sub(/\A_/, '').to_sym
end
- memorize :variable_name
+ memoize :variable_name
def counter_name
"#{variable_name}_counter".to_sym
end
- memorize :counter_name
+ memoize :counter_name
def render(view, local_assigns = {})
ActionController::Base.benchmark("Rendered #{path_without_format_and_extension}", Logger::DEBUG, false) do
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index b39ba0c48b..304aec3a4c 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -20,34 +20,34 @@ module ActionView #:nodoc:
def format_and_extension
(extensions = [format, extension].compact.join(".")).blank? ? nil : extensions
end
- memorize :format_and_extension
+ memoize :format_and_extension
def path
[base_path, [name, format, extension].compact.join('.')].compact.join('/')
end
- memorize :path
+ memoize :path
def path_without_extension
[base_path, [name, format].compact.join('.')].compact.join('/')
end
- memorize :path_without_extension
+ memoize :path_without_extension
def path_without_format_and_extension
[base_path, name].compact.join('/')
end
- memorize :path_without_format_and_extension
+ memoize :path_without_format_and_extension
def source
File.read(filename)
end
- memorize :source
+ memoize :source
def method_segment
segment = File.expand_path(filename)
segment.sub!(/^#{Regexp.escape(File.expand_path(RAILS_ROOT))}/, '') if defined?(RAILS_ROOT)
segment.gsub!(/([^a-zA-Z0-9_])/) { $1.ord }
end
- memorize :method_segment
+ memoize :method_segment
def render_template(view, local_assigns = {})
render(view, local_assigns)