From 61864909628f5ac2f20d3337e0274dab016ac7c5 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Sat, 29 Apr 2006 18:10:14 +0000 Subject: Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/CHANGELOG | 4 ++++ actionmailer/lib/action_mailer/adv_attr_accessor.rb | 3 +-- actionmailer/lib/action_mailer/helpers.rb | 4 +--- actionpack/CHANGELOG | 4 +++- actionpack/lib/action_controller/caching.rb | 9 +++------ actionpack/lib/action_controller/dependencies.rb | 3 +-- actionpack/lib/action_controller/helpers.rb | 3 +-- actionpack/lib/action_controller/macros/auto_complete.rb | 3 +-- actionpack/lib/action_controller/macros/in_place_editing.rb | 3 +-- actionpack/lib/action_controller/rescue.rb | 3 +-- actionpack/lib/action_controller/scaffolding.rb | 3 +-- actionpack/lib/action_controller/verification.rb | 3 +-- actionwebservice/CHANGELOG | 2 ++ .../action_web_service/container/action_controller_container.rb | 2 +- .../lib/action_web_service/container/delegated_container.rb | 3 +-- .../lib/action_web_service/container/direct_container.rb | 3 +-- actionwebservice/lib/action_web_service/dispatcher/abstract.rb | 3 +-- .../dispatcher/action_controller_dispatcher.rb | 3 +-- actionwebservice/lib/action_web_service/invocation.rb | 6 ++---- actionwebservice/lib/action_web_service/scaffolding.rb | 3 +-- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record/acts/list.rb | 3 +-- activerecord/lib/active_record/acts/nested_set.rb | 3 +-- activerecord/lib/active_record/acts/tree.rb | 3 +-- activerecord/lib/active_record/associations.rb | 3 +-- activerecord/lib/active_record/callbacks.rb | 4 +--- activerecord/lib/active_record/locking.rb | 3 +-- activerecord/lib/active_record/observer.rb | 3 +-- activerecord/lib/active_record/timestamp.rb | 4 +--- activerecord/lib/active_record/transactions.rb | 3 +-- activerecord/lib/active_record/validations.rb | 3 +-- activerecord/lib/active_record/wrappings.rb | 3 +-- activesupport/CHANGELOG | 2 ++ activesupport/lib/active_support/core_ext/time/conversions.rb | 3 +-- railties/CHANGELOG | 2 ++ railties/lib/rails_generator/commands.rb | 2 +- railties/lib/rails_generator/lookup.rb | 3 +-- railties/lib/rails_generator/options.rb | 3 +-- 38 files changed, 50 insertions(+), 72 deletions(-) diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index f864dc92e3..bf23f7b4dd 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -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) diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb index 50afe4d742..cfd723011a 100644 --- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb +++ b/actionmailer/lib/action_mailer/adv_attr_accessor.rb @@ -1,7 +1,6 @@ module ActionMailer module AdvAttrAccessor #:nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/actionmailer/lib/action_mailer/helpers.rb b/actionmailer/lib/action_mailer/helpers.rb index b53326ca72..ee7523a507 100644 --- a/actionmailer/lib/action_mailer/helpers.rb +++ b/actionmailer/lib/action_mailer/helpers.rb @@ -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 diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 681206720e..865aec8672 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -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 ] * Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros ] @@ -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 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 diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index 8cbad8c779..c84787ef75 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -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) diff --git a/actionwebservice/lib/action_web_service/container/action_controller_container.rb b/actionwebservice/lib/action_web_service/container/action_controller_container.rb index b74b5ba6d4..e96ee0692d 100644 --- a/actionwebservice/lib/action_web_service/container/action_controller_container.rb +++ b/actionwebservice/lib/action_web_service/container/action_controller_container.rb @@ -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 diff --git a/actionwebservice/lib/action_web_service/container/delegated_container.rb b/actionwebservice/lib/action_web_service/container/delegated_container.rb index 12a857e4e3..5477f8d103 100644 --- a/actionwebservice/lib/action_web_service/container/delegated_container.rb +++ b/actionwebservice/lib/action_web_service/container/delegated_container.rb @@ -4,8 +4,7 @@ module ActionWebService # :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 diff --git a/actionwebservice/lib/action_web_service/container/direct_container.rb b/actionwebservice/lib/action_web_service/container/direct_container.rb index b53c542fc8..8818d8f459 100644 --- a/actionwebservice/lib/action_web_service/container/direct_container.rb +++ b/actionwebservice/lib/action_web_service/container/direct_container.rb @@ -4,8 +4,7 @@ module ActionWebService # :nodoc: class ContainerError < ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: base.extend(ClassMethods) end diff --git a/actionwebservice/lib/action_web_service/dispatcher/abstract.rb b/actionwebservice/lib/action_web_service/dispatcher/abstract.rb index cf3af538ab..96016ef67e 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/abstract.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/abstract.rb @@ -5,8 +5,7 @@ module ActionWebService # :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) diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb index 8f04ed292c..f1fd6137f5 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb @@ -4,8 +4,7 @@ require 'builder/xmlmarkup' 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 diff --git a/actionwebservice/lib/action_web_service/invocation.rb b/actionwebservice/lib/action_web_service/invocation.rb index 62f38b8ecd..c37e923fc7 100644 --- a/actionwebservice/lib/action_web_service/invocation.rb +++ b/actionwebservice/lib/action_web_service/invocation.rb @@ -3,8 +3,7 @@ module ActionWebService # :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 @@ module ActionWebService # :nodoc: 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 diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb index e0e00d831b..8f15032c3a 100644 --- a/actionwebservice/lib/action_web_service/scaffolding.rb +++ b/actionwebservice/lib/action_web_service/scaffolding.rb @@ -6,8 +6,7 @@ module ActionWebService class ScaffoldingError < ActionWebServiceError # :nodoc: end - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index f43040b9ad..906f0a39db 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -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 ] * Update FrontBase adapter to check binding version. Closes #4920. [mlaster@metavillage.com] diff --git a/activerecord/lib/active_record/acts/list.rb b/activerecord/lib/active_record/acts/list.rb index 0e0e1e4f36..6d235967c6 100644 --- a/activerecord/lib/active_record/acts/list.rb +++ b/activerecord/lib/active_record/acts/list.rb @@ -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 diff --git a/activerecord/lib/active_record/acts/nested_set.rb b/activerecord/lib/active_record/acts/nested_set.rb index 8b02b358a9..9d5bcf4d3d 100644 --- a/activerecord/lib/active_record/acts/nested_set.rb +++ b/activerecord/lib/active_record/acts/nested_set.rb @@ -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 diff --git a/activerecord/lib/active_record/acts/tree.rb b/activerecord/lib/active_record/acts/tree.rb index c5aa4cd22d..b8654ce4e6 100644 --- a/activerecord/lib/active_record/acts/tree.rb +++ b/activerecord/lib/active_record/acts/tree.rb @@ -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 diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 2861a3940b..98f4e43883 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -77,8 +77,7 @@ module ActiveRecord end module Associations # :nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index 2ffb52ad00..26d8bfa7b6 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -170,9 +170,7 @@ module ActiveRecord 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 diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb index ca83a98b30..3e0c47e706 100644 --- a/activerecord/lib/active_record/locking.rb +++ b/activerecord/lib/active_record/locking.rb @@ -21,8 +21,7 @@ module ActiveRecord # To override the name of the lock_version column, invoke the set_locking_column method. # This method uses the same syntax as set_table_name 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 diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb index 97aa58872a..8fe71f82f5 100644 --- a/activerecord/lib/active_record/observer.rb +++ b/activerecord/lib/active_record/observer.rb @@ -2,8 +2,7 @@ require 'singleton' module ActiveRecord module Observing # :nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index 3c947f0eb6..44936a1432 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -6,9 +6,7 @@ module ActiveRecord # This behavior can be turned off by setting ActiveRecord::Base.record_timestamps = false. # This behavior by default uses local time, but can use UTC by setting ActiveRecord::Base.default_timezone = :utc 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 diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 2c5692c036..01bbdf4c8a 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -9,8 +9,7 @@ module ActiveRecord class TransactionError < ActiveRecordError # :nodoc: end - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) base.class_eval do diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index d416773464..d66c5934fb 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -214,8 +214,7 @@ module ActiveRecord 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 diff --git a/activerecord/lib/active_record/wrappings.rb b/activerecord/lib/active_record/wrappings.rb index 01976417b7..e8b6018850 100644 --- a/activerecord/lib/active_record/wrappings.rb +++ b/activerecord/lib/active_record/wrappings.rb @@ -9,8 +9,7 @@ module ActiveRecord end end - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index bdd1c4d9f8..f781fe321d 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -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] diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index be8dc0e76f..c141d082e2 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -13,8 +13,7 @@ module ActiveSupport #:nodoc: :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 diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 23e295cd72..75f4f15e06 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -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] diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 8d0ac52b03..0d039838d3 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -16,7 +16,7 @@ module Rails # 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 diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 6ec6886485..06f1a9eb1b 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -48,8 +48,7 @@ module Rails # 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 diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index fe80f8340d..8301f5c5b5 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -3,8 +3,7 @@ require 'optparse' module Rails module Generator module Options - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) class << base if respond_to?(:inherited) -- cgit v1.2.3