Permalink
Browse files

Doc fix (closes #9203) [lazyatom]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent ac4f37e commit c361caf8b41f51e83ec4bd857df1cf58e7f31915 @dhh dhh committed Sep 22, 2007
Showing with 16 additions and 8 deletions.
  1. +7 −3 railties/lib/rails_generator/lookup.rb
  2. +9 −5 railties/test/rails_generator_test.rb
View
10 railties/lib/rails_generator/lookup.rb
@@ -92,9 +92,13 @@ def use_application_sources!
# 1. Rails application. If RAILS_ROOT is defined we know we're
# generating in the context of a Rails application, so search
# RAILS_ROOT/generators.
- # 2. User home directory. Search ~/.rails/generators.
- # 3. RubyGems. Search for gems named *_generator.
- # 4. Builtins. Model, controller, mailer, scaffold.
+ # 2. Look in plugins, either for generators/ or rails_generators/
+ # directories within each plugin
+ # 3. User home directory. Search ~/.rails/generators.
+ # 4. RubyGems. Search for gems named *_generator, and look for
+ # generators within any RubyGem's
+ # /rails_generators/<generator_name>_generator.rb file.
+ # 5. Builtins. Model, controller, mailer, scaffold, and so on.
def use_component_sources!
reset_sources
if defined? ::RAILS_ROOT
View
14 railties/test/rails_generator_test.rb
@@ -37,16 +37,20 @@ class InstanceTag; end
class RailsGeneratorTest < Test::Unit::TestCase
- BUILTINS = %w(controller mailer model scaffold)
+ BUILTINS = %w(controller integration_test mailer migration model observer plugin resource scaffold session_migration web_service)
CAPITALIZED_BUILTINS = BUILTINS.map { |b| b.capitalize }
def setup
ActiveRecord::Base.pluralize_table_names = true
end
def test_sources
- expected = [:lib, :vendor, :plugins, :user, :RubyGems, :builtin]
- expected.delete(:gem) unless Object.const_defined?(:Gem)
+ expected = [:lib, :vendor,
+ :plugins, :plugins, # <plugin>/generators and <plugin>/rails_generators
+ :user,
+ :RubyGems, :RubyGems, # gems named <x>_generator, gems containing /rails_generator/ folder
+ :builtin]
+ expected.delete(:RubyGems) unless Object.const_defined?(:Gem)
assert_equal expected, Rails::Generator::Base.sources.map { |s| s.label }
end
@@ -84,8 +88,8 @@ def test_lookup_missing_class
end
def test_generator_usage
- BUILTINS.each do |name|
- assert_raise(Rails::Generator::UsageError) {
+ (BUILTINS - ["session_migration"]).each do |name|
+ assert_raise(Rails::Generator::UsageError, "Generator '#{name}' should raise an error without arguments") {
Rails::Generator::Base.instance(name)
}
end

0 comments on commit c361caf

Please sign in to comment.