diff options
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/inline_template.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderable.rb (renamed from actionpack/lib/action_view/renderer.rb) | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 49768fe264..8f928d6fdf 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -25,7 +25,7 @@ require 'action_view/template_handlers' require 'action_view/template_file' require 'action_view/view_load_paths' -require 'action_view/renderer' +require 'action_view/renderable' require 'action_view/template' require 'action_view/partial_template' require 'action_view/inline_template' diff --git a/actionpack/lib/action_view/inline_template.rb b/actionpack/lib/action_view/inline_template.rb index 1ccb23a3fc..49147901a1 100644 --- a/actionpack/lib/action_view/inline_template.rb +++ b/actionpack/lib/action_view/inline_template.rb @@ -1,6 +1,6 @@ module ActionView #:nodoc: class InlineTemplate #:nodoc: - include Renderer + include Renderable def initialize(view, source, locals = {}, type = nil) @view = view diff --git a/actionpack/lib/action_view/renderer.rb b/actionpack/lib/action_view/renderable.rb index e6c64d2749..61bd8140fb 100644 --- a/actionpack/lib/action_view/renderer.rb +++ b/actionpack/lib/action_view/renderable.rb @@ -1,5 +1,5 @@ module ActionView - module Renderer + module Renderable # TODO: Local assigns should not be tied to template instance attr_accessor :locals diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index dbc8ccdee8..f696ea366d 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -1,7 +1,7 @@ module ActionView #:nodoc: class Template #:nodoc: extend TemplateHandlers - include Renderer + include Renderable attr_reader :path, :extension |