diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-07-18 15:32:28 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-07-18 15:32:28 -0500 |
| commit | ef6f6625c91ea789a033799f649e4388e4a71045 (patch) | |
| tree | 3202088506d3da2076b8704d17dca3d4a1f7a329 /actionpack | |
| parent | e1f23da53cef20a60e4bf458d959fe2bfe7d52ea (diff) | |
| download | rails-ef6f6625c91ea789a033799f649e4388e4a71045.tar.gz rails-ef6f6625c91ea789a033799f649e4388e4a71045.tar.bz2 rails-ef6f6625c91ea789a033799f649e4388e4a71045.zip | |
Changed ActiveSupport::Memoizable API to extend since it mainly adds the memoize class method
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/renderable.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderable_partial.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb index 46193670f3..5090d0160a 100644 --- a/actionpack/lib/action_view/renderable.rb +++ b/actionpack/lib/action_view/renderable.rb @@ -3,12 +3,12 @@ module ActionView # NOTE: The template that this mixin is beening include into is frozen # So you can not set or modify any instance variables + extend ActiveSupport::Memoizable + def self.included(base) @@mutex = Mutex.new end - include ActiveSupport::Memoizable - def filename 'compiled-template' end diff --git a/actionpack/lib/action_view/renderable_partial.rb b/actionpack/lib/action_view/renderable_partial.rb index fdb1a5e6a7..342850f0f0 100644 --- a/actionpack/lib/action_view/renderable_partial.rb +++ b/actionpack/lib/action_view/renderable_partial.rb @@ -3,7 +3,7 @@ module ActionView # NOTE: The template that this mixin is beening include into is frozen # So you can not set or modify any instance variables - include ActiveSupport::Memoizable + extend ActiveSupport::Memoizable def variable_name name.sub(/\A_/, '').to_sym diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 304aec3a4c..eba42518d7 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -1,7 +1,7 @@ module ActionView #:nodoc: class Template extend TemplateHandlers - include ActiveSupport::Memoizable + extend ActiveSupport::Memoizable include Renderable attr_accessor :filename, :load_path, :base_path, :name, :format, :extension |