Merge pull request rails#1716 from ryanb/namespace_engine_assets_3_1

Namespace engine assets for 3-1-stable
jkraemer · Jun 15, 2011 · b4b27a3 · b4b27a3
2 parents 1f813d9 + 40dd641
commit b4b27a3
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -11,15 +11,15 @@ def rakefile
     def app
       if mountable?
         directory "app"
-        template "#{app_templates_dir}/app/views/layouts/application.html.erb.tt",
+        template "app/views/layouts/application.html.erb.tt",
                  "app/views/layouts/#{name}/application.html.erb"
-        empty_directory_with_gitkeep "app/assets/images"
+        empty_directory_with_gitkeep "app/assets/images/#{name}"
       elsif full?
         empty_directory_with_gitkeep "app/models"
         empty_directory_with_gitkeep "app/controllers"
         empty_directory_with_gitkeep "app/views"
         empty_directory_with_gitkeep "app/helpers"
-        empty_directory_with_gitkeep "app/assets/images"
+        empty_directory_with_gitkeep "app/assets/images/#{name}"
       end
     end
 
@@ -108,9 +108,9 @@ def test_dummy_clean
     def stylesheets
       if mountable?
         copy_file "#{app_templates_dir}/app/assets/stylesheets/application.css",
-                  "app/assets/stylesheets/application.css"
+                  "app/assets/stylesheets/#{name}/application.css"
       elsif full?
-        empty_directory_with_gitkeep "app/assets/stylesheets"
+        empty_directory_with_gitkeep "app/assets/stylesheets/#{name}"
       end
     end
 
@@ -119,9 +119,9 @@ def javascripts
 
       if mountable?
         copy_file "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
-                  "app/assets/javascripts/application.js"
+                  "app/assets/javascripts/#{name}/application.js"
       elsif full?
-        empty_directory_with_gitkeep "app/assets/javascripts"
+        empty_directory_with_gitkeep "app/assets/javascripts/#{name}"
       end
     end
 

diff --git a/...lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt b/...lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= camelized %></title>
+  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= javascript_include_tag "<%= name %>/application" %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+
+<%%= yield %>
+
+</body>
+</html>
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
@@ -102,19 +102,19 @@ def test_generation_runs_bundle_install_with_full_and_mountable
 
   def test_skipping_javascripts_without_mountable_option
     run_generator
-    assert_no_file "app/assets/javascripts/application.js"
+    assert_no_file "app/assets/javascripts/bukkits/application.js"
     assert_no_file "vendor/assets/javascripts/jquery.js"
     assert_no_file "vendor/assets/javascripts/jquery_ujs.js"
   end
 
   def test_javascripts_generation
     run_generator [destination_root, "--mountable"]
-    assert_file "app/assets/javascripts/application.js"
+    assert_file "app/assets/javascripts/bukkits/application.js"
   end
 
   def test_skip_javascripts
     run_generator [destination_root, "--skip-javascript", "--mountable"]
-    assert_no_file "app/assets/javascripts/application.js"
+    assert_no_file "app/assets/javascripts/bukkits/application.js"
     assert_no_file "vendor/assets/javascripts/jquery.js"
     assert_no_file "vendor/assets/javascripts/jquery_ujs.js"
   end
@@ -140,9 +140,9 @@ def test_ensure_that_tests_works_in_full_mode
 
   def test_creating_engine_in_full_mode
     run_generator [destination_root, "--full"]
-    assert_file "app/assets/javascripts"
-    assert_file "app/assets/stylesheets"
-    assert_file "app/assets/images"
+    assert_file "app/assets/javascripts/bukkits"
+    assert_file "app/assets/stylesheets/bukkits"
+    assert_file "app/assets/images/bukkits"
     assert_file "app/models"
     assert_file "app/controllers"
     assert_file "app/views"
@@ -158,15 +158,19 @@ def test_being_quiet_while_creating_dummy_application
 
   def test_create_mountable_application_with_mountable_option
     run_generator [destination_root, "--mountable"]
-    assert_file "app/assets/javascripts"
-    assert_file "app/assets/stylesheets"
-    assert_file "app/assets/images"
+    assert_file "app/assets/javascripts/bukkits"
+    assert_file "app/assets/stylesheets/bukkits"
+    assert_file "app/assets/images/bukkits"
     assert_file "config/routes.rb", /Bukkits::Engine.routes.draw do/
     assert_file "lib/bukkits/engine.rb", /isolate_namespace Bukkits/
     assert_file "test/dummy/config/routes.rb", /mount Bukkits::Engine => "\/bukkits"/
     assert_file "app/controllers/bukkits/application_controller.rb", /module Bukkits\n  class ApplicationController < ActionController::Base/
     assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n  module ApplicationHelper/
-    assert_file "app/views/layouts/bukkits/application.html.erb", /<title>Bukkits<\/title>/
+    assert_file "app/views/layouts/bukkits/application.html.erb" do |contents|
+      assert_match "<title>Bukkits</title>", contents
+      assert_match /stylesheet_link_tag\s+['"]bukkits\/application['"]/, contents
+      assert_match /javascript_include_tag\s+['"]bukkits\/application['"]/, contents
+    end
   end
 
   def test_passing_dummy_path_as_a_parameter