diff options
Diffstat (limited to 'actionpack/lib/action_controller')
8 files changed, 10 insertions, 20 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 91da89ad5a..1556fd26ba 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -156,8 +156,7 @@ module ActionController #:nodoc: # "david.somewhere.com/lists/show/1". This allows the cacher to differentiate between "david.somewhere.com/lists/" and # "jamis.somewhere.com/lists/" -- which is a helpful way of assisting the subdomain-as-account-key pattern. module Actions - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) base.send(:attr_accessor, :rendered_action_cache) end @@ -246,8 +245,7 @@ module ActionController #:nodoc: # ActionController::Base.fragment_cache_store = :mem_cache_store, "localhost" # ActionController::Base.fragment_cache_store = MyOwnStore.new("parameter") module Fragments - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.class_eval do @@fragment_cache_store = MemoryStore.new cattr_reader :fragment_cache_store @@ -493,8 +491,7 @@ module ActionController #:nodoc: # # In the example above, four actions are cached and three actions are responsible for expiring those caches. module Sweeping - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) end diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb index 2d437faaa6..0f4c16cad4 100644 --- a/actionpack/lib/action_controller/dependencies.rb +++ b/actionpack/lib/action_controller/dependencies.rb @@ -1,7 +1,6 @@ module ActionController #:nodoc: module Dependencies #:nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index e2d97b8fa0..cdfcfd7e91 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -1,7 +1,6 @@ module ActionController #:nodoc: module Helpers #:nodoc: - def self.append_features(base) - super + def self.included(base) # Initialize the base module to aggregate its helpers. base.class_inheritable_accessor :master_helper_module diff --git a/actionpack/lib/action_controller/macros/auto_complete.rb b/actionpack/lib/action_controller/macros/auto_complete.rb index 917f151e03..c320ae79e1 100644 --- a/actionpack/lib/action_controller/macros/auto_complete.rb +++ b/actionpack/lib/action_controller/macros/auto_complete.rb @@ -4,8 +4,7 @@ module ActionController # backing. module Macros module AutoComplete #:nodoc: - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) end diff --git a/actionpack/lib/action_controller/macros/in_place_editing.rb b/actionpack/lib/action_controller/macros/in_place_editing.rb index 30e94c51a9..40b083e3fc 100644 --- a/actionpack/lib/action_controller/macros/in_place_editing.rb +++ b/actionpack/lib/action_controller/macros/in_place_editing.rb @@ -1,8 +1,7 @@ module ActionController module Macros module InPlaceEditing #:nodoc: - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) end diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index d97a294964..9f0cd47092 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -6,8 +6,7 @@ module ActionController #:nodoc: # # You can tailor the rescuing behavior and appearance by overwriting the following two stub methods. module Rescue - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) base.class_eval do alias_method :perform_action_without_rescue, :perform_action diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb index 2481107aa7..86242aa723 100644 --- a/actionpack/lib/action_controller/scaffolding.rb +++ b/actionpack/lib/action_controller/scaffolding.rb @@ -1,7 +1,6 @@ module ActionController module Scaffolding # :nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb index b12907c35f..cd6f777486 100644 --- a/actionpack/lib/action_controller/verification.rb +++ b/actionpack/lib/action_controller/verification.rb @@ -1,7 +1,6 @@ module ActionController #:nodoc: module Verification #:nodoc: - def self.append_features(base) #:nodoc: - super + def self.included(base) #:nodoc: base.extend(ClassMethods) end |