From c788bcb416f4487f99a9e5dacf9a48623412b034 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 2 Apr 2005 09:14:19 +0000 Subject: Automatically extend the class which gets a module included with the ClassMethods module if it exists #970 [Lucas Carlson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1068 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/scaffolding.rb | 5 ----- actionpack/lib/action_controller/verification.rb | 5 ----- .../lib/action_web_service/container/direct_container.rb | 5 ----- activerecord/lib/active_record/acts/list.rb | 5 ----- activerecord/lib/active_record/acts/tree.rb | 5 ----- activerecord/lib/active_record/aggregations.rb | 5 ----- activerecord/lib/active_record/associations.rb | 5 ----- activerecord/lib/active_record/wrappings.rb | 5 ----- 8 files changed, 40 deletions(-) diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb index 4faa23cdf3..ac5b68b4e3 100644 --- a/actionpack/lib/action_controller/scaffolding.rb +++ b/actionpack/lib/action_controller/scaffolding.rb @@ -1,10 +1,5 @@ module ActionController module Scaffolding # :nodoc: - def self.append_features(base) - super - base.extend(ClassMethods) - end - # Scaffolding is a way to quickly put an Active Record class online by providing a series of standardized actions # for listing, showing, creating, updating, and destroying objects of the class. These standardized actions come # with both controller logic and default templates that through introspection already know which fields to display diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb index b0f5236adf..e65610f5ec 100644 --- a/actionpack/lib/action_controller/verification.rb +++ b/actionpack/lib/action_controller/verification.rb @@ -27,11 +27,6 @@ module ActionController #:nodoc: # :redirect_to => :category_url # module Verification - def self.append_features(base) #:nodoc: - super - base.extend(ClassMethods) - end - module ClassMethods # Verify the given actions so that if certain prerequisites are not met, # the user is redirected to a different action. The +options+ parameter diff --git a/actionwebservice/lib/action_web_service/container/direct_container.rb b/actionwebservice/lib/action_web_service/container/direct_container.rb index b53c542fc8..1d71417f82 100644 --- a/actionwebservice/lib/action_web_service/container/direct_container.rb +++ b/actionwebservice/lib/action_web_service/container/direct_container.rb @@ -4,11 +4,6 @@ module ActionWebService # :nodoc: class ContainerError < ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super - base.extend(ClassMethods) - end - module ClassMethods # Attaches ActionWebService API +definition+ to the calling class. # diff --git a/activerecord/lib/active_record/acts/list.rb b/activerecord/lib/active_record/acts/list.rb index abd295d4e9..c6a33cf9a0 100644 --- a/activerecord/lib/active_record/acts/list.rb +++ b/activerecord/lib/active_record/acts/list.rb @@ -1,11 +1,6 @@ module ActiveRecord module Acts #:nodoc: module List #:nodoc: - def self.append_features(base) - super - base.extend(ClassMethods) - end - # This act provides the capabilities for sorting and reordering a number of objects in list. # The class that has this specified needs to have a "position" column defined as an integer on # the mapped database table. diff --git a/activerecord/lib/active_record/acts/tree.rb b/activerecord/lib/active_record/acts/tree.rb index 61163941d3..5fd1a59334 100644 --- a/activerecord/lib/active_record/acts/tree.rb +++ b/activerecord/lib/active_record/acts/tree.rb @@ -1,11 +1,6 @@ module ActiveRecord module Acts #:nodoc: module Tree #:nodoc: - def self.append_features(base) - super - base.extend(ClassMethods) - end - # Specify this act if you want to model a tree structure by providing a parent association and an children # association. This act assumes that requires that you have a foreign key column, which by default is called parent_id. # diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index 208dc35321..6141d2d535 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -1,10 +1,5 @@ module ActiveRecord module Aggregations # :nodoc: - def self.append_features(base) - super - base.extend(ClassMethods) - end - # Active Record implements aggregation through a macro-like class method called +composed_of+ for representing attributes # as value objects. It expresses relationships like "Account [is] composed of Money [among other things]" or "Person [is] # composed of [an] address". Each call to the macro adds a description on how the value objects are created from the diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 5bdc6247ff..7ce06f9c37 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -8,11 +8,6 @@ require 'active_record/deprecated_associations' module ActiveRecord module Associations # :nodoc: - def self.append_features(base) - super - base.extend(ClassMethods) - end - # Clears out the association cache def clear_association_cache #:nodoc: self.class.reflect_on_all_associations.to_a.each do |assoc| diff --git a/activerecord/lib/active_record/wrappings.rb b/activerecord/lib/active_record/wrappings.rb index 01976417b7..1284450994 100644 --- a/activerecord/lib/active_record/wrappings.rb +++ b/activerecord/lib/active_record/wrappings.rb @@ -9,11 +9,6 @@ module ActiveRecord end end - def self.append_features(base) - super - base.extend(ClassMethods) - end - class AbstractWrapper #:nodoc: def self.wrap(attribute, record_binding) #:nodoc: %w( before_save after_save after_initialize ).each do |callback| -- cgit v1.2.3