aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-05 12:50:08 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-05 13:01:27 +0200
commita5dda97602f2188a13cbcab5c7e9a5ba84ba876b (patch)
treebe84ca4360059f6eb3f696b46e1bdad3d57b1ce2 /actionpack/lib/action_dispatch
parent5bf3294c8b3aeb3afd426e8c182456c675829c1e (diff)
downloadrails-a5dda97602f2188a13cbcab5c7e9a5ba84ba876b.tar.gz
rails-a5dda97602f2188a13cbcab5c7e9a5ba84ba876b.tar.bz2
rails-a5dda97602f2188a13cbcab5c7e9a5ba84ba876b.zip
Define a convention for descendants and subclasses.
The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children. By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/deprecated_mapper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index e122bdf232..05e8dfded6 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -19,8 +19,8 @@ module ActionDispatch
def in_memory_controller_namespaces
namespaces = Set.new
- ActionController::Base.subclasses.each do |klass|
- controller_name = klass.underscore
+ ActionController::Base.descendants.each do |klass|
+ controller_name = klass.name.underscore
namespaces << controller_name.split('/')[0...-1].join('/')
end
namespaces.delete('')