Permalink
Browse files

Replace Ruby's deprecated append_features in favor of included. [Marc…

…el Molina Jr.]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent df26041 commit 61864909628f5ac2f20d3337e0274dab016ac7c5 Marcel Molina committed Apr 29, 2006
Showing with 50 additions and 72 deletions.
  1. +4 −0 actionmailer/CHANGELOG
  2. +1 −2 actionmailer/lib/action_mailer/adv_attr_accessor.rb
  3. +1 −3 actionmailer/lib/action_mailer/helpers.rb
  4. +3 −1 actionpack/CHANGELOG
  5. +3 −6 actionpack/lib/action_controller/caching.rb
  6. +1 −2 actionpack/lib/action_controller/dependencies.rb
  7. +1 −2 actionpack/lib/action_controller/helpers.rb
  8. +1 −2 actionpack/lib/action_controller/macros/auto_complete.rb
  9. +1 −2 actionpack/lib/action_controller/macros/in_place_editing.rb
  10. +1 −2 actionpack/lib/action_controller/rescue.rb
  11. +1 −2 actionpack/lib/action_controller/scaffolding.rb
  12. +1 −2 actionpack/lib/action_controller/verification.rb
  13. +2 −0 actionwebservice/CHANGELOG
  14. +1 −1 actionwebservice/lib/action_web_service/container/action_controller_container.rb
  15. +1 −2 actionwebservice/lib/action_web_service/container/delegated_container.rb
  16. +1 −2 actionwebservice/lib/action_web_service/container/direct_container.rb
  17. +1 −2 actionwebservice/lib/action_web_service/dispatcher/abstract.rb
  18. +1 −2 actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
  19. +2 −4 actionwebservice/lib/action_web_service/invocation.rb
  20. +1 −2 actionwebservice/lib/action_web_service/scaffolding.rb
  21. +2 −0 activerecord/CHANGELOG
  22. +1 −2 activerecord/lib/active_record/acts/list.rb
  23. +1 −2 activerecord/lib/active_record/acts/nested_set.rb
  24. +1 −2 activerecord/lib/active_record/acts/tree.rb
  25. +1 −2 activerecord/lib/active_record/associations.rb
  26. +1 −3 activerecord/lib/active_record/callbacks.rb
  27. +1 −2 activerecord/lib/active_record/locking.rb
  28. +1 −2 activerecord/lib/active_record/observer.rb
  29. +1 −3 activerecord/lib/active_record/timestamp.rb
  30. +1 −2 activerecord/lib/active_record/transactions.rb
  31. +1 −2 activerecord/lib/active_record/validations.rb
  32. +1 −2 activerecord/lib/active_record/wrappings.rb
  33. +2 −0 activesupport/CHANGELOG
  34. +1 −2 activesupport/lib/active_support/core_ext/time/conversions.rb
  35. +2 −0 railties/CHANGELOG
  36. +1 −1 railties/lib/rails_generator/commands.rb
  37. +1 −2 railties/lib/rails_generator/lookup.rb
  38. +1 −2 railties/lib/rails_generator/options.rb
@@ -1,3 +1,7 @@
+*SVN*
+
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.]
*1.2.1* (April 6th, 2006)
@@ -1,7 +1,6 @@
module ActionMailer
module AdvAttrAccessor #:nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -1,8 +1,6 @@
module ActionMailer
module Helpers #:nodoc:
- def self.append_features(base) #:nodoc:
- super
-
+ def self.included(base) #:nodoc:
# Initialize the base module to aggregate its helpers.
base.class_inheritable_accessor :master_helper_module
base.master_helper_module = Module.new
@@ -1,5 +1,7 @@
*SVN*
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Use #flush between switching from #write to #syswrite. Closes #4907. [Blair Zajac <blair@orcaware.com>]
* Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros <sl33p3r@free.fr>]
@@ -1930,7 +1932,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
Before:
module WeblogHelper
- def self.append_features(controller) #:nodoc:
+ def self.included(controller) #:nodoc:
controller.ancestors.include?(ActionController::Base) ? controller.add_template_helper(self) : super
end
end
@@ -156,8 +156,7 @@ def caching_allowed
# "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 @@ def after(controller)
# 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 @@ def initialize(cache_path)
#
# 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
@@ -1,7 +1,6 @@
module ActionController #:nodoc:
module Dependencies #:nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,6 @@
module ActionController
module Scaffolding # :nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -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
@@ -1,5 +1,7 @@
*SVN*
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Fix test database name typo. [Marcel Molina Jr.]
*1.1.2* (April 9th, 2005)
@@ -1,7 +1,7 @@
module ActionWebService # :nodoc:
module Container # :nodoc:
module ActionController # :nodoc:
- def self.append_features(base) # :nodoc:
+ def self.included(base) # :nodoc:
class << base
include ClassMethods
alias_method :inherited_without_api, :inherited
@@ -4,8 +4,7 @@ module Delegated # :nodoc:
class ContainerError < ActionWebServiceError # :nodoc:
end
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
base.extend(ClassMethods)
base.send(:include, ActionWebService::Container::Delegated::InstanceMethods)
end
@@ -4,8 +4,7 @@ module Direct # :nodoc:
class ContainerError < ActionWebServiceError # :nodoc:
end
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
base.extend(ClassMethods)
end
@@ -5,8 +5,7 @@ module Dispatcher # :nodoc:
class DispatcherError < ActionWebService::ActionWebServiceError # :nodoc:
end
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
base.class_inheritable_option(:web_service_dispatching_mode, :direct)
base.class_inheritable_option(:web_service_exception_reporting, true)
base.send(:include, ActionWebService::Dispatcher::InstanceMethods)
@@ -4,8 +4,7 @@
module ActionWebService # :nodoc:
module Dispatcher # :nodoc:
module ActionController # :nodoc:
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
class << base
include ClassMethods
alias_method :inherited_without_action_controller, :inherited
@@ -3,8 +3,7 @@ module Invocation # :nodoc:
class InvocationError < ActionWebService::ActionWebServiceError # :nodoc:
end
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
base.extend(ClassMethods)
base.send(:include, ActionWebService::Invocation::InstanceMethods)
end
@@ -125,8 +124,7 @@ def condition_hash(interceptors, *methods)
end
module InstanceMethods # :nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.class_eval do
alias_method :perform_invocation_without_interception, :perform_invocation
alias_method :perform_invocation, :perform_invocation_with_interception
@@ -6,8 +6,7 @@ module Scaffolding # :nodoc:
class ScaffoldingError < ActionWebServiceError # :nodoc:
end
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -1,5 +1,7 @@
*SVN*
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Remove duplicate fixture entry in comments.yml. Closes #4923. [Blair Zajac <blair@orcaware.com>]
* Update FrontBase adapter to check binding version. Closes #4920. [mlaster@metavillage.com]
@@ -1,8 +1,7 @@
module ActiveRecord
module Acts #:nodoc:
module List #:nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -1,8 +1,7 @@
module ActiveRecord
module Acts #:nodoc:
module NestedSet #:nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -1,8 +1,7 @@
module ActiveRecord
module Acts #:nodoc:
module Tree #:nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -77,8 +77,7 @@ def message
end
module Associations # :nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -170,9 +170,7 @@ module Callbacks
after_validation_on_update before_destroy after_destroy
)
- def self.append_features(base) #:nodoc:
- super
-
+ def self.included(base) #:nodoc:
base.extend(ClassMethods)
base.class_eval do
class << self
@@ -21,8 +21,7 @@ module ActiveRecord
# To override the name of the lock_version column, invoke the <tt>set_locking_column</tt> method.
# This method uses the same syntax as <tt>set_table_name</tt>
module Locking
- def self.append_features(base) #:nodoc:
- super
+ def self.included(base) #:nodoc:
base.class_eval do
alias_method :update_without_lock, :update
alias_method :update, :update_with_lock
@@ -2,8 +2,7 @@
module ActiveRecord
module Observing # :nodoc:
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -6,9 +6,7 @@ module ActiveRecord
# This behavior can be turned off by setting <tt>ActiveRecord::Base.record_timestamps = false</tt>.
# This behavior by default uses local time, but can use UTC by setting <tt>ActiveRecord::Base.default_timezone = :utc</tt>
module Timestamp
- def self.append_features(base) # :nodoc:
- super
-
+ def self.included(base) # :nodoc:
base.class_eval do
alias_method :create_without_timestamps, :create
alias_method :create, :create_with_timestamps
@@ -9,8 +9,7 @@ module Transactions # :nodoc:
class TransactionError < ActiveRecordError # :nodoc:
end
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
base.class_eval do
@@ -214,8 +214,7 @@ def to_xml(options={})
module Validations
VALIDATIONS = %w( validate validate_on_create validate_on_update )
- def self.append_features(base) # :nodoc:
- super
+ def self.included(base) # :nodoc:
base.extend ClassMethods
base.class_eval do
alias_method :save_without_validation, :save
@@ -9,8 +9,7 @@ def wrap_with(wrapper, *attributes)
end
end
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
end
@@ -1,5 +1,7 @@
*SVN*
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Allow default options in with_options to be overridden. Closes #4480. [murphy@cYcnus.de]
* Added Module#alias_method_chain [Jamis Buck]
@@ -13,8 +13,7 @@ module Conversions
:rfc822 => "%a, %d %b %Y %H:%M:%S %z"
}
- def self.append_features(klass)
- super
+ def self.included(klass)
klass.send(:alias_method, :to_default_s, :to_s)
klass.send(:alias_method, :to_s, :to_formatted_s)
end
View
@@ -1,5 +1,7 @@
*SVN*
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [DHH]
* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [DHH]
@@ -16,7 +16,7 @@ def self.instance(command, generator)
# Even more convenient access to commands. Include Commands in
# the generator Base class to get a nice #command instance method
# which returns a delegate for the requested command.
- def self.append_features(base)
+ def self.included(base)
base.send(:define_method, :command) do |command|
Commands.instance(command, self)
end
@@ -48,8 +48,7 @@ module Generator
# the generator and how to create it. A source is anything that
# yields generators from #each. PathSource and GemSource are provided.
module Lookup
- def self.append_features(base)
- super
+ def self.included(base)
base.extend(ClassMethods)
base.use_component_sources!
end
Oops, something went wrong.

0 comments on commit 6186490

Please sign in to comment.