From d796b602ec3002e95ba9b71ad61b39e0efc13a0c Mon Sep 17 00:00:00 2001 From: Kane Date: Fri, 24 Jul 2009 18:38:15 +0200 Subject: [PATCH] fixed migration generation for namespaced models and fixture generation for namespaced models --- railties/lib/rails_generator/base.rb | 3 +-- .../generators/components/model/model_generator.rb | 2 +- .../test/generators/rails_model_generator_test.rb | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index aa7081f..0bac4ea 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -237,8 +237,7 @@ module Rails if @class_nesting.empty? @class_name = @class_name_without_nesting else - @table_name = @class_nesting.underscore << "_" << @table_name - @class_name = "#{@class_nesting}::#{@class_name_without_nesting}" + @class_name = "#{@class_nesting}::#{@class_name_without_nesting}" end end diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb index 582a289..629c177 100644 --- a/railties/lib/rails_generator/generators/components/model/model_generator.rb +++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb @@ -16,7 +16,7 @@ class ModelGenerator < Rails::Generator::NamedBase m.template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb") unless options[:skip_fixture] - m.template 'fixtures.yml', File.join('test/fixtures', "#{table_name}.yml") + m.template 'fixtures.yml', File.join('test/fixtures', class_path, "#{table_name}.yml") end unless options[:skip_migration] diff --git a/railties/test/generators/rails_model_generator_test.rb b/railties/test/generators/rails_model_generator_test.rb index aea2aba..4e68a03 100644 --- a/railties/test/generators/rails_model_generator_test.rb +++ b/railties/test/generators/rails_model_generator_test.rb @@ -30,6 +30,17 @@ class RailsModelGeneratorTest < GeneratorTestCase end end + def test_namespaced_model_with_attributes_generates_resources_with_attributes + run_generator('model', %w(Needless::Product name:string)) + + assert_generated_model_for :'needless/product' + assert_generated_fixtures_for :'needless/products' + assert_generated_migration :create_needless_products do |t| + assert t =~ /create_table :products/, "should create table without namespace" + assert_generated_column t, :name, :string + end + end + def test_model_with_reference_attributes_generates_belongs_to_associations run_generator('model', %w(Product name:string supplier:references)) -- 1.6.2.2.1669.g7eaf8