From e75ea474346e74e36d92febd47985c3571b1472b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Jan 2010 12:28:52 +0100
Subject: Automatically remove :generators: from namespaces.

---
 railties/lib/rails/generators.rb      | 2 +-
 railties/lib/rails/generators/base.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index ecd0a1c6ea..e8c7a0993b 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -219,7 +219,7 @@ module Rails
       builtin.sort!
 
       lookup("*")
-      others  = subclasses.map{ |k| k.namespace.gsub(':generators:', ':') }
+      others  = subclasses.map{ |k| k.namespace }
       others -= Rails::Generators.builtin
       others.sort!
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 9cc342b202..37effb77db 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -42,7 +42,7 @@ module Rails
       #
       def self.namespace(name=nil)
         return super if name
-        @namespace ||= super.sub(/_generator$/, '')
+        @namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
       end
 
       # Invoke a generator based on the value supplied by the user to the
-- 
cgit v1.2.3