Rename the RenderingController module to just plain Rendering

rails · Dec 21, 2009 · 83f4d86 · 83f4d86
1 parent bdccffc
commit 83f4d86
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -253,7 +253,7 @@ module ActionMailer #:nodoc:
   class Base
     include AdvAttrAccessor, PartContainer, Quoting, Utils
 
-    include AbstractController::RenderingController
+    include AbstractController::Rendering
     include AbstractController::LocalizedCache
     include AbstractController::Layouts
 

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
@@ -15,6 +15,6 @@ module AbstractController
     autoload :Layouts
     autoload :LocalizedCache
     autoload :Logger
-    autoload :RenderingController
+    autoload :Rendering
   end
 end
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Helpers
     extend ActiveSupport::Concern
 
-    include RenderingController
+    include Rendering
 
     def self.next_serial
       @helper_serial ||= 0

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Layouts
     extend ActiveSupport::Concern
 
-    include RenderingController
+    include Rendering
 
     included do
       extlib_inheritable_accessor(:_layout_conditions) { Hash.new }

diff --git a/...stract_controller/rendering_controller.rb → ...pack/lib/abstract_controller/rendering.rb b/...stract_controller/rendering_controller.rb → ...pack/lib/abstract_controller/rendering.rb
@@ -10,7 +10,7 @@ def initialize(message = nil)
     end
   end
 
-  module RenderingController
+  module Rendering
     extend ActiveSupport::Concern
 
     include AbstractController::Logger
@@ -80,7 +80,7 @@ def render_to_body(options = {})
     #
     # :api: plugin
     def render_to_string(options = {})
-      AbstractController::RenderingController.body_to_s(render_to_body(options))
+      AbstractController::Rendering.body_to_s(render_to_body(options))
     end
 
     # Renders the template from an object.

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
@@ -25,7 +25,7 @@ module ActionController
       autoload :RackConvenience
       autoload :Compatibility
       autoload :Redirector
-      autoload :RenderingController
+      autoload :Rendering
       autoload :RenderOptions
       autoload :Rescue
       autoload :Responder

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -9,7 +9,7 @@ class Base < Metal
     include ActionController::HideActions
     include ActionController::UrlFor
     include ActionController::Redirector
-    include ActionController::RenderingController
+    include ActionController::Rendering
     include ActionController::RenderOptions::All
     include ActionController::Layouts
     include ActionController::ConditionalGet

diff --git a/actionpack/lib/action_controller/metal/layouts.rb b/actionpack/lib/action_controller/metal/layouts.rb
@@ -158,7 +158,7 @@ module ActionController
   module Layouts
     extend ActiveSupport::Concern
 
-    include ActionController::RenderingController
+    include ActionController::Rendering
     include AbstractController::Layouts
 
     module ClassMethods

diff --git a/..._controller/metal/rendering_controller.rb → .../lib/action_controller/metal/rendering.rb b/..._controller/metal/rendering_controller.rb → .../lib/action_controller/metal/rendering.rb
@@ -1,9 +1,9 @@
 module ActionController
-  module RenderingController
+  module Rendering
     extend ActiveSupport::Concern
 
     included do
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::LocalizedCache
     end
 

diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
@@ -4,7 +4,7 @@ module ActionController #:nodoc:
   module Streaming
     extend ActiveSupport::Concern
 
-    include ActionController::RenderingController
+    include ActionController::Rendering
 
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,

diff --git a/actionpack/lib/action_controller/metal/verification.rb b/actionpack/lib/action_controller/metal/verification.rb
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
   module Verification #:nodoc:
     extend ActiveSupport::Concern
 
-    include AbstractController::Callbacks, Session, Flash, RenderingController
+    include AbstractController::Callbacks, Session, Flash, Rendering
 
     # This module provides a class-level method for specifying that certain
     # actions are guarded against being called without certain prerequisites

diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
@@ -28,7 +28,7 @@ class TestBasic < ActiveSupport::TestCase
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::RenderingController
+      include ::AbstractController::Rendering
 
       def _prefix() end
 

diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
@@ -6,7 +6,7 @@ module AbstractController
   module Testing
 
     class ControllerWithHelpers < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include Helpers
 
       def with_module

diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
@@ -6,7 +6,7 @@ module Layouts
 
     # Base controller for these tests
     class Base < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::Layouts
 
       self.view_paths = [ActionView::FixtureResolver.new(

diff --git a/actionpack/test/abstract/localized_cache_test.rb b/actionpack/test/abstract/localized_cache_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
 
     class CachedController < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::LocalizedCache
 
       self.view_paths = [ActionView::FixtureResolver.new(

diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
 
     class ControllerRenderer < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
 
       self.view_paths = [ActionView::FixtureResolver.new(
         "default.erb" => "With Default",