diff options
Diffstat (limited to 'railties/lib/generators.rb')
-rw-r--r-- | railties/lib/generators.rb | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb index bb821c0896..45344bf45f 100644 --- a/railties/lib/generators.rb +++ b/railties/lib/generators.rb @@ -162,11 +162,7 @@ module Rails base, name = name.split(':') return find_by_namespace(name, base) when 0 - if base - base = base.to_sym - attempts << "#{base}:generators:#{name}" - attempts << "#{fallbacks[base]}:generators:#{name}" if fallbacks[base] - end + attempts << "#{base}:generators:#{name}" if base attempts << "#{name}:generators:#{context}" if context end @@ -179,7 +175,7 @@ module Rails return klass if klass end - nil + invoke_fallbacks_for(name, base) end # Receives a namespace, arguments and the behavior to invoke the generator. @@ -242,6 +238,24 @@ module Rails end end + # Try callbacks for the given base. + # + def self.invoke_fallbacks_for(name, base) + return nil unless base && fallbacks[base.to_sym] + + invoked_fallbacks = [] + + Array(fallbacks[base.to_sym]).each do |fallback| + next if invoked_fallbacks.include?(fallback) + invoked_fallbacks << fallback + + klass = find_by_namespace(name, fallback) + return klass if klass + end + + nil + end + # Receives namespaces in an array and tries to find matching generators # in the load path. Each path is traversed into directory lookups. For # example: |