From ff48e23a4eb9f4a5fd3a02addb398499fb3c1455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 27 Jun 2009 11:05:43 +0200 Subject: Make Observer generator agnostic. --- railties/lib/generators/base.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'railties/lib/generators/base.rb') diff --git a/railties/lib/generators/base.rb b/railties/lib/generators/base.rb index 10bd1ea4af..5c3b3f0782 100644 --- a/railties/lib/generators/base.rb +++ b/railties/lib/generators/base.rb @@ -3,9 +3,10 @@ require 'generators/actions' module Rails module Generators DEFAULTS = { + :orm => 'active_record', + :helper => true, :test_framework => 'test_unit', - :template_engine => 'erb', - :helper => true + :template_engine => 'erb' } class Error < Thor::Error @@ -41,7 +42,7 @@ module Rails # def self.namespace(name=nil) return super if name - @namespace ||= "#{base_name}:generators:#{generator_name}" + @namespace ||= super.sub(/_generator$/, '') end # Invoke a generator based on the value supplied by the user to the @@ -207,7 +208,7 @@ module Rails def self.generator_name @generator_name ||= begin klass_name = self.name.split('::').last - klass_name.gsub!(/Generator$/, '') + klass_name.sub!(/Generator$/, '') klass_name.underscore end end -- cgit v1.2.3