Fix scaffold generator to be aware of namespace in isolated engine

11 files changed, 178 insertions, 5 deletions

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index d12b2ff0e5..c8ee939ad7 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <%%= form_for(@<%= singular_table_name %>) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
@@ -21,3 +22,4 @@
     <%%= f.submit %>
   </div>
 <%% end %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
index e58b9fbd08..d1bfcbc429 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
@@ -1,6 +1,8 @@
+<% without_namespacing do -%>
 <h1>Editing <%= singular_table_name %></h1>
 
 <%%= render 'form' %>
 
 <%%= link_to 'Show', @<%= singular_table_name %> %> |
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 4c46db4d67..435d126ee4 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <h1>Listing <%= plural_table_name %></h1>
 
 <table>
@@ -25,3 +26,4 @@
 <br />
 
 <%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
index 02ae4d015e..fe4d0971c4 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
@@ -1,5 +1,7 @@
+<% without_namespacing do -%>
 <h1>New <%= singular_table_name %></h1>
 
 <%%= render 'form' %>
 
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
index c0e5ccff1e..bc3a87b99f 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <p id="notice"><%%= notice %></p>
 
 <% for attribute in attributes -%>
@@ -10,3 +11,4 @@
 
 <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 9131a19043..badf981d05 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -30,9 +30,15 @@ module Rails
           end
         end
 
+        def without_namespacing(&block)
+          inside_namespace do
+            concat(capture(&block))
+          end
+        end
+
         def indent(content, multiplier = 2)
           spaces = " " * multiplier
-          content.each_line.map {|line| "#{spaces}#{line}" }.join("\n")
+          content = content.each_line.map {|line| "#{spaces}#{line}" }.join
         end
 
         def wrap_with_namespace(content)
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index 8a943013d3..c7345f3cfb 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -16,9 +16,9 @@ module Rails
 
       def add_resource_route
         return if options[:actions].present?
-        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
+        route_config =  regular_class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
         route_config << "resources :#{file_name.pluralize}"
-        route_config << " end" * class_path.size
+        route_config << " end" * regular_class_path.size
         route route_config
       end
     end
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index b21340f755..b5317a055b 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -1,3 +1,4 @@
+<% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>
   # GET <%= route_url %>.xml
@@ -81,3 +82,4 @@ class <%= controller_class_name %>Controller < ApplicationController
     end
   end
 end
+<% end -%>
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 829f4b200a..c9e70468a1 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -34,7 +34,7 @@ module Rails
         attr_reader :controller_name
 
         def controller_class_path
-          @class_path
+          class_path
         end
 
         def controller_file_name
@@ -46,7 +46,7 @@ module Rails
         end
 
         def controller_class_name
-          @controller_class_name ||= (controller_class_path + [controller_file_name]).map!{ |m| m.camelize }.join('::')
+          (controller_class_path + [controller_file_name]).map!{ |m| m.camelize }.join('::')
         end
 
         def controller_i18n_scope
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index f23e495450..964d59d84c 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -1,5 +1,6 @@
 require 'test_helper'
 
+<% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   setup do
     @<%= singular_table_name %> = <%= table_name %>(:one)
@@ -47,3 +48,4 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
     assert_redirected_to <%= index_helper %>_path
   end
 end
+<% end -%>
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index d1190fd17d..d61a02d32f 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -3,6 +3,7 @@ require 'rails/generators/rails/controller/controller_generator'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/rails/observer/observer_generator'
 require 'rails/generators/mailer/mailer_generator'
+require 'rails/generators/rails/scaffold/scaffold_generator'
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
   def setup
@@ -202,3 +203,155 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
     assert_file "app/views/test_app/notifier"
   end
 end
+
+class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
+  include GeneratorsTestHelper
+  arguments %w(product_line title:string price:integer)
+  tests Rails::Generators::ScaffoldGenerator
+
+  setup :copy_routes
+
+  def test_scaffold_on_invoke
+    run_generator
+
+    # Model
+    assert_file "app/models/test_app/product_line.rb", /module TestApp\n  class ProductLine < ActiveRecord::Base/
+    assert_file "test/unit/test_app/product_line_test.rb", /module TestApp\n  class ProductLineTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/test_app/product_lines.yml"
+    assert_migration "db/migrate/create_test_app_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match(/resources :product_lines$/, route)
+    end
+
+    # Controller
+    assert_file "app/controllers/test_app/product_lines_controller.rb" do |content|
+      assert_match(/module TestApp\n  class ProductLinesController < ApplicationController/, content)
+    end
+
+    assert_file "test/functional/test_app/product_lines_controller_test.rb",
+                /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
+
+    # Views
+    %w(
+      index
+      edit
+      new
+      show
+      _form
+    ).each { |view| assert_file "app/views/test_app/product_lines/#{view}.html.erb" }
+    assert_no_file "app/views/layouts/test_app/product_lines.html.erb"
+
+    # Helpers
+    assert_file "app/helpers/test_app/product_lines_helper.rb"
+    assert_file "test/unit/helpers/test_app/product_lines_helper_test.rb"
+
+    # Stylesheets
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_on_revoke
+    run_generator
+    run_generator ["product_line"], :behavior => :revoke
+
+    # Model
+    assert_no_file "app/models/test_app/product_line.rb"
+    assert_no_file "test/unit/test_app/product_line_test.rb"
+    assert_no_file "test/fixtures/test_app/product_lines.yml"
+    assert_no_migration "db/migrate/create_test_app_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_no_match(/resources :product_lines$/, route)
+    end
+
+    # Controller
+    assert_no_file "app/controllers/test_app/product_lines_controller.rb"
+    assert_no_file "test/functional/test_app/product_lines_controller_test.rb"
+
+    # Views
+    assert_no_file "app/views/test_app/product_lines"
+    assert_no_file "app/views/test_app/layouts/product_lines.html.erb"
+
+    # Helpers
+    assert_no_file "app/helpers/test_app/product_lines_helper.rb"
+    assert_no_file "test/unit/helpers/test_app/product_lines_helper_test.rb"
+
+    # Stylesheets (should not be removed)
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_with_namespace_on_invoke
+    run_generator [ "admin/role", "name:string", "description:string" ]
+
+    # Model
+    assert_file "app/models/test_app/admin.rb", /module TestApp\n  module Admin/
+    assert_file "app/models/test_app/admin/role.rb", /module TestApp\n  class Admin::Role < ActiveRecord::Base/
+    assert_file "test/unit/test_app/admin/role_test.rb", /module TestApp\n  class Admin::RoleTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/test_app/admin/roles.yml"
+    assert_migration "db/migrate/create_test_app_admin_roles.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match(/namespace :admin do resources :roles end$/, route)
+    end
+
+    # Controller
+    assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
+      assert_match(/module TestApp\n  class Admin::RolesController < ApplicationController/, content)
+    end
+
+    assert_file "test/functional/test_app/admin/roles_controller_test.rb",
+                /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
+
+    # Views
+    %w(
+      index
+      edit
+      new
+      show
+      _form
+    ).each { |view| assert_file "app/views/test_app/admin/roles/#{view}.html.erb" }
+    assert_no_file "app/views/layouts/admin/roles.html.erb"
+
+    # Helpers
+    assert_file "app/helpers/test_app/admin/roles_helper.rb"
+    assert_file "test/unit/helpers/test_app/admin/roles_helper_test.rb"
+
+    # Stylesheets
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_with_namespace_on_revoke
+    run_generator [ "admin/role", "name:string", "description:string" ]
+    run_generator [ "admin/role" ], :behavior => :revoke
+
+    # Model
+    assert_file "app/models/test_app/admin.rb"	# ( should not be remove )
+    assert_no_file "app/models/test_app/admin/role.rb"
+    assert_no_file "test/unit/test_app/admin/role_test.rb"
+    assert_no_file "test/fixtures/test_app/admin/roles.yml"
+    assert_no_migration "db/migrate/create_test_app_admin_roles.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_no_match(/namespace :admin do resources :roles end$/, route)
+    end
+
+    # Controller
+    assert_no_file "app/controllers/test_app/admin/roles_controller.rb"
+    assert_no_file "test/functional/test_app/admin/roles_controller_test.rb"
+
+    # Views
+    assert_no_file "app/views/test_app/admin/roles"
+    assert_no_file "app/views/layouts/test_app/admin/roles.html.erb"
+
+    # Helpers
+    assert_no_file "app/helpers/test_app/admin/roles_helper.rb"
+    assert_no_file "test/unit/helpers/test_app/admin/roles_helper_test.rb"
+
+    # Stylesheets (should not be removed)
+    assert_file "public/stylesheets/scaffold.css"
+  end
+end