Allow hyphenated names for `rails plugin new` generator.

It was not possible to create a new gem with a hyphenated name via the `rails plugin new` generator.

The naming guide of rubygems clearly says dashes should be used for gems that extend other gems. http://guides.rubygems.org/name-your-gem/

21 files changed, 194 insertions, 67 deletions

diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 98cc71b604..ab050fc246 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -18,14 +18,14 @@ module Rails
     def app
       if mountable?
         directory 'app'
-        empty_directory_with_keep_file "app/assets/images/#{name}"
+        empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
       elsif full?
         empty_directory_with_keep_file 'app/models'
         empty_directory_with_keep_file 'app/controllers'
         empty_directory_with_keep_file 'app/views'
         empty_directory_with_keep_file 'app/helpers'
         empty_directory_with_keep_file 'app/mailers'
-        empty_directory_with_keep_file "app/assets/images/#{name}"
+        empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
       end
     end
 
@@ -50,10 +50,10 @@ module Rails
     end
 
     def lib
-      template "lib/%name%.rb"
-      template "lib/tasks/%name%_tasks.rake"
-      template "lib/%name%/version.rb"
-      template "lib/%name%/engine.rb" if engine?
+      template "lib/%namespaced_name%.rb"
+      template "lib/tasks/%namespaced_name%_tasks.rake"
+      template "lib/%namespaced_name%/version.rb"
+      template "lib/%namespaced_name%/engine.rb" if engine?
     end
 
     def config
@@ -62,7 +62,7 @@ module Rails
 
     def test
       template "test/test_helper.rb"
-      template "test/%name%_test.rb"
+      template "test/%namespaced_name%_test.rb"
       append_file "Rakefile", <<-EOF
 #{rakefile_test_tasks}
 
@@ -117,9 +117,9 @@ task default: :test
     def stylesheets
       if mountable?
         copy_file "rails/stylesheets.css",
-                  "app/assets/stylesheets/#{name}/application.css"
+                  "app/assets/stylesheets/#{namespaced_name}/application.css"
       elsif full?
-        empty_directory_with_keep_file "app/assets/stylesheets/#{name}"
+        empty_directory_with_keep_file "app/assets/stylesheets/#{namespaced_name}"
       end
     end
 
@@ -128,9 +128,9 @@ task default: :test
 
       if mountable?
         template "rails/javascripts.js",
-                 "app/assets/javascripts/#{name}/application.js"
+                 "app/assets/javascripts/#{namespaced_name}/application.js"
       elsif full?
-        empty_directory_with_keep_file "app/assets/javascripts/#{name}"
+        empty_directory_with_keep_file "app/assets/javascripts/#{namespaced_name}"
       end
     end
 
@@ -256,6 +256,14 @@ task default: :test
         end
       end
 
+      def underscored_name
+        @underscored_name ||= original_name.underscore
+      end
+
+      def namespaced_name
+        @namespaced_name ||= name.gsub('-', '/')
+      end
+
     protected
 
       def app_templates_dir
@@ -305,6 +313,27 @@ task default: :test
         @original_name ||= File.basename(destination_root)
       end
 
+      def modules
+        @modules ||= namespaced_name.camelize.split("::")
+      end
+
+      def wrap_in_modules(content)
+        content = "#{content}".strip.gsub(/\W$\n/, '')
+        modules.reverse.inject(content) do |content, mod|
+          str = "module #{mod}\n"
+          str += content.lines.map { |line| "  #{line}" }.join
+          str += content.present? ? "\nend" : "end"
+        end
+      end
+
+      def camelized_modules
+        @camelized_modules ||= namespaced_name.camelize
+      end
+
+      def humanized
+        @humanized ||= original_name.underscore.humanize
+      end
+
       def camelized
         @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
       end
@@ -328,8 +357,10 @@ task default: :test
       end
 
       def valid_const?
-        if original_name =~ /[^0-9a-zA-Z_]+/
-          raise Error, "Invalid plugin name #{original_name}. Please give a name which use only alphabetic or numeric or \"_\" characters."
+        if original_name =~ /-\d/
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not contain a namespace starting with numeric characters."
+        elsif original_name =~ /[^\w-]+/
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which uses only alphabetic, numeric, \"_\" or \"-\" characters."
         elsif camelized =~ /^\d/
           raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(name)
diff --git a/railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec
index 266e8f53ed..8d56c2b76c 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec
@@ -1,12 +1,12 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
-require "<%= name %>/version"
+require "<%= namespaced_name %>/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "<%= name %>"
-  s.version     = <%= camelized %>::VERSION
+  s.version     = <%= camelized_modules %>::VERSION
   s.authors     = ["<%= author %>"]
   s.email       = ["<%= email %>"]
   s.homepage    = "TODO"
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/controllers/%name%/application_controller.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt
index 448ad7f989..7157e48c42 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/app/controllers/%name%/application_controller.rb.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt
@@ -1,4 +1,5 @@
-module <%= camelized %>
+<%= wrap_in_modules <<-rb.strip_heredoc
   class ApplicationController < ActionController::Base
   end
-end
+rb
+%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%name%/application_helper.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%name%/application_helper.rb.tt
deleted file mode 100644
index 40ae9f52c2..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%name%/application_helper.rb.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-module <%= camelized %>
-  module ApplicationHelper
-  end
-end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%namespaced_name%/application_helper.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%namespaced_name%/application_helper.rb.tt
new file mode 100644
index 0000000000..25d692732d
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/app/helpers/%namespaced_name%/application_helper.rb.tt
@@ -0,0 +1,5 @@
+<%= wrap_in_modules <<-rb.strip_heredoc
+  module ApplicationHelper
+  end
+rb
+%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%name%/application.html.erb.tt
deleted file mode 100644
index 1d380420b4..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%name%/application.html.erb.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application", media: "all" %>
-  <%%= javascript_include_tag "<%= name %>/application" %>
-  <%%= csrf_meta_tags %>
-</head>
-<body>
-
-<%%= yield %>
-
-</body>
-</html>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt
new file mode 100644
index 0000000000..6bc480161d
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= humanized %></title>
+  <%%= stylesheet_link_tag    "<%= namespaced_name %>/application", media: "all" %>
+  <%%= javascript_include_tag "<%= namespaced_name %>/application" %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+
+<%%= yield %>
+
+</body>
+</html>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
index c3314d7e68..3edaac35c9 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
@@ -1,7 +1,7 @@
 # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/<%= namespaced_name -%>/engine', __FILE__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
diff --git a/railties/lib/rails/generators/rails/plugin/templates/config/routes.rb b/railties/lib/rails/generators/rails/plugin/templates/config/routes.rb
index 8e158d5831..154452bfe5 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/config/routes.rb
@@ -1,5 +1,5 @@
 <% if mountable? -%>
-<%= camelized %>::Engine.routes.draw do
+<%= camelized_modules %>::Engine.routes.draw do
 <% else -%>
 Rails.application.routes.draw do
 <% end -%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%name%.rb
deleted file mode 100644
index 40c074cced..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if engine? -%>
-require "<%= name %>/engine"
-
-<% end -%>
-module <%= camelized %>
-end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/engine.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/engine.rb
deleted file mode 100644
index 967668fe66..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/engine.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module <%= camelized %>
-  class Engine < ::Rails::Engine
-<% if mountable? -%>
-    isolate_namespace <%= camelized %>
-<% end -%>
-  end
-end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/version.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/version.rb
deleted file mode 100644
index ef07ef2e19..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/lib/%name%/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module <%= camelized %>
-  VERSION = "0.0.1"
-end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%.rb
new file mode 100644
index 0000000000..40b1c4cee7
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%.rb
@@ -0,0 +1,5 @@
+<% if engine? -%>
+require "<%= namespaced_name %>/engine"
+
+<% end -%>
+<%= wrap_in_modules "# Your code goes here..." %>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb
new file mode 100644
index 0000000000..9be87f5b1c
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb
@@ -0,0 +1,6 @@
+<%= wrap_in_modules <<-rb.strip_heredoc
+  class Engine < ::Rails::Engine
+  #{mountable? ? '  isolate_namespace ' + modules.first : ' '}
+  end
+rb
+%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb
new file mode 100644
index 0000000000..d257295988
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb
@@ -0,0 +1 @@
+<%= wrap_in_modules 'VERSION = "0.0.1"' %>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%name%_tasks.rake b/railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%namespaced_name%_tasks.rake
index 7121f5ae23..88a2c4120f 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%name%_tasks.rake
+++ b/railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%namespaced_name%_tasks.rake
@@ -1,4 +1,4 @@
 # desc "Explaining what the task does"
-# task :<%= name %> do
+# task :<%= underscored_name %> do
 #   # Task goes here
 # end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
index 9a68edc750..b1038c839e 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
@@ -13,6 +13,6 @@ require "action_view/railtie"
 <% end -%>
 
 Bundler.require(*Rails.groups)
-require "<%= name %>"
+require "<%= namespaced_name %>"
 
 <%= application_definition %>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/routes.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/routes.rb
index 730ee31c3d..673de44108 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/rails/routes.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/routes.rb
@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
 
-  mount <%= camelized %>::Engine => "/<%= name %>"
+  mount <%= camelized_modules %>::Engine => "/<%= name %>"
 end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/%name%_test.rb b/railties/lib/rails/generators/rails/plugin/templates/test/%name%_test.rb
deleted file mode 100644
index 0a8bbd4aaf..0000000000
--- a/railties/lib/rails/generators/rails/plugin/templates/test/%name%_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class <%= camelized %>Test < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, <%= camelized %>
-  end
-end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/%namespaced_name%_test.rb b/railties/lib/rails/generators/rails/plugin/templates/test/%namespaced_name%_test.rb
new file mode 100644
index 0000000000..1ee05d7871
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/test/%namespaced_name%_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class <%= camelized_modules %>::Test < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, <%= camelized_modules %>
+  end
+end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index f67be97e79..2fed8d3bf8 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -28,11 +28,11 @@ class PluginGeneratorTest < Rails::Generators::TestCase
   include SharedGeneratorTests
 
   def test_invalid_plugin_name_raises_an_error
-    content = capture(:stderr){ run_generator [File.join(destination_root, "things-43")] }
-    assert_equal "Invalid plugin name things-43. Please give a name which use only alphabetic or numeric or \"_\" characters.\n", content
+    content = capture(:stderr){ run_generator [File.join(destination_root, "my_plugin-31fr-extension")] }
+    assert_equal "Invalid plugin name my_plugin-31fr-extension. Please give a name which does not contain a namespace starting with numeric characters.\n", content
 
     content = capture(:stderr){ run_generator [File.join(destination_root, "things4.3")] }
-    assert_equal "Invalid plugin name things4.3. Please give a name which use only alphabetic or numeric or \"_\" characters.\n", content
+    assert_equal "Invalid plugin name things4.3. Please give a name which uses only alphabetic, numeric, \"_\" or \"-\" characters.\n", content
 
     content = capture(:stderr){ run_generator [File.join(destination_root, "43things")] }
     assert_equal "Invalid plugin name 43things. Please give a name which does not start with numbers.\n", content
@@ -44,7 +44,14 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_equal "Invalid plugin name Digest, constant Digest is already in use. Please choose another plugin name.\n", content
   end
 
-  def test_camelcase_plugin_name_underscores_filenames
+  def test_correct_file_in_lib_folder_of_hyphenated_plugin_name
+    run_generator [File.join(destination_root, "hyphenated-name")]
+    assert_no_file "hyphenated-name/lib/hyphenated-name.rb"
+    assert_no_file "hyphenated-name/lib/hyphenated_name.rb"
+    assert_file "hyphenated-name/lib/hyphenated/name.rb", /module Hyphenated\n  module Name\n    # Your code goes here...\n  end\nend/
+  end
+
+  def test_correct_file_in_lib_folder_of_camelcase_plugin_name
     run_generator [File.join(destination_root, "CamelCasedName")]
     assert_no_file "CamelCasedName/lib/CamelCasedName.rb"
     assert_file "CamelCasedName/lib/camel_cased_name.rb", /module CamelCasedName/
@@ -252,6 +259,40 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "lib/bukkits.rb", /require "bukkits\/engine"/
   end
 
+  def test_creating_engine_with_hyphenated_name_in_full_mode
+    run_generator [File.join(destination_root, "hyphenated-name"), "--full"]
+    assert_file "hyphenated-name/app/assets/javascripts/hyphenated/name"
+    assert_file "hyphenated-name/app/assets/stylesheets/hyphenated/name"
+    assert_file "hyphenated-name/app/assets/images/hyphenated/name"
+    assert_file "hyphenated-name/app/models"
+    assert_file "hyphenated-name/app/controllers"
+    assert_file "hyphenated-name/app/views"
+    assert_file "hyphenated-name/app/helpers"
+    assert_file "hyphenated-name/app/mailers"
+    assert_file "hyphenated-name/bin/rails"
+    assert_file "hyphenated-name/config/routes.rb",              /Rails.application.routes.draw do/
+    assert_file "hyphenated-name/lib/hyphenated/name/engine.rb", /module Hyphenated\n  module Name\n    class Engine < ::Rails::Engine\n    end\n  end\nend/
+    assert_file "hyphenated-name/lib/hyphenated/name.rb",        /require "hyphenated\/name\/engine"/
+    assert_file "hyphenated-name/bin/rails",                     /\.\.\/\.\.\/lib\/hyphenated\/name\/engine/
+  end
+
+  def test_creating_engine_with_hyphenated_and_underscored_name_in_full_mode
+    run_generator [File.join(destination_root, "my_hyphenated-name"), "--full"]
+    assert_file "my_hyphenated-name/app/assets/javascripts/my_hyphenated/name"
+    assert_file "my_hyphenated-name/app/assets/stylesheets/my_hyphenated/name"
+    assert_file "my_hyphenated-name/app/assets/images/my_hyphenated/name"
+    assert_file "my_hyphenated-name/app/models"
+    assert_file "my_hyphenated-name/app/controllers"
+    assert_file "my_hyphenated-name/app/views"
+    assert_file "my_hyphenated-name/app/helpers"
+    assert_file "my_hyphenated-name/app/mailers"
+    assert_file "my_hyphenated-name/bin/rails"
+    assert_file "my_hyphenated-name/config/routes.rb",              /Rails.application.routes.draw do/
+    assert_file "my_hyphenated-name/lib/my_hyphenated/name/engine.rb", /module MyHyphenated\n  module Name\n    class Engine < ::Rails::Engine\n    end\n  end\nend/
+    assert_file "my_hyphenated-name/lib/my_hyphenated/name.rb",        /require "my_hyphenated\/name\/engine"/
+    assert_file "my_hyphenated-name/bin/rails",                     /\.\.\/\.\.\/lib\/my_hyphenated\/name\/engine/
+  end
+
   def test_being_quiet_while_creating_dummy_application
     assert_no_match(/create\s+config\/application.rb/, run_generator)
   end
@@ -277,6 +318,63 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_create_mountable_application_with_mountable_option_and_hypenated_name
+    run_generator [File.join(destination_root, "hyphenated-name"), "--mountable"]
+    assert_file "hyphenated-name/app/assets/javascripts/hyphenated/name"
+    assert_file "hyphenated-name/app/assets/stylesheets/hyphenated/name"
+    assert_file "hyphenated-name/app/assets/images/hyphenated/name"
+    assert_file "hyphenated-name/config/routes.rb",                                          /Hyphenated::Name::Engine.routes.draw do/
+    assert_file "hyphenated-name/lib/hyphenated/name/version.rb",                            /module Hyphenated\n  module Name\n    VERSION = "0.0.1"\n  end\nend/
+    assert_file "hyphenated-name/lib/hyphenated/name/engine.rb",                             /module Hyphenated\n  module Name\n    class Engine < ::Rails::Engine\n      isolate_namespace Hyphenated\n    end\n  end\nend/
+    assert_file "hyphenated-name/lib/hyphenated/name.rb",                                    /require "hyphenated\/name\/engine"/
+    assert_file "hyphenated-name/test/dummy/config/routes.rb",                               /mount Hyphenated::Name::Engine => "\/hyphenated-name"/
+    assert_file "hyphenated-name/app/controllers/hyphenated/name/application_controller.rb", /module Hyphenated\n  module Name\n    class ApplicationController < ActionController::Base\n    end\n  end\nend/
+    assert_file "hyphenated-name/app/helpers/hyphenated/name/application_helper.rb",         /module Hyphenated\n  module Name\n    module ApplicationHelper\n    end\n  end\nend/
+    assert_file "hyphenated-name/app/views/layouts/hyphenated/name/application.html.erb" do |contents|
+      assert_match "<title>Hyphenated name</title>", contents
+      assert_match(/stylesheet_link_tag\s+['"]hyphenated\/name\/application['"]/, contents)
+      assert_match(/javascript_include_tag\s+['"]hyphenated\/name\/application['"]/, contents)
+    end
+  end
+
+  def test_create_mountable_application_with_mountable_option_and_hypenated_and_underscored_name
+    run_generator [File.join(destination_root, "my_hyphenated-name"), "--mountable"]
+    assert_file "my_hyphenated-name/app/assets/javascripts/my_hyphenated/name"
+    assert_file "my_hyphenated-name/app/assets/stylesheets/my_hyphenated/name"
+    assert_file "my_hyphenated-name/app/assets/images/my_hyphenated/name"
+    assert_file "my_hyphenated-name/config/routes.rb",                                          /MyHyphenated::Name::Engine.routes.draw do/
+    assert_file "my_hyphenated-name/lib/my_hyphenated/name/version.rb",                            /module MyHyphenated\n  module Name\n    VERSION = "0.0.1"\n  end\nend/
+    assert_file "my_hyphenated-name/lib/my_hyphenated/name/engine.rb",                             /module MyHyphenated\n  module Name\n    class Engine < ::Rails::Engine\n      isolate_namespace MyHyphenated\n    end\n  end\nend/
+    assert_file "my_hyphenated-name/lib/my_hyphenated/name.rb",                                    /require "my_hyphenated\/name\/engine"/
+    assert_file "my_hyphenated-name/test/dummy/config/routes.rb",                               /mount MyHyphenated::Name::Engine => "\/my_hyphenated-name"/
+    assert_file "my_hyphenated-name/app/controllers/my_hyphenated/name/application_controller.rb", /module MyHyphenated\n  module Name\n    class ApplicationController < ActionController::Base\n    end\n  end\nend/
+    assert_file "my_hyphenated-name/app/helpers/my_hyphenated/name/application_helper.rb",         /module MyHyphenated\n  module Name\n    module ApplicationHelper\n    end\n  end\nend/
+    assert_file "my_hyphenated-name/app/views/layouts/my_hyphenated/name/application.html.erb" do |contents|
+      assert_match "<title>My hyphenated name</title>", contents
+      assert_match(/stylesheet_link_tag\s+['"]my_hyphenated\/name\/application['"]/, contents)
+      assert_match(/javascript_include_tag\s+['"]my_hyphenated\/name\/application['"]/, contents)
+    end
+  end
+
+  def test_create_mountable_application_with_mountable_option_and_multiple_hypenates_in_name
+    run_generator [File.join(destination_root, "deep-hyphenated-name"), "--mountable"]
+    assert_file "deep-hyphenated-name/app/assets/javascripts/deep/hyphenated/name"
+    assert_file "deep-hyphenated-name/app/assets/stylesheets/deep/hyphenated/name"
+    assert_file "deep-hyphenated-name/app/assets/images/deep/hyphenated/name"
+    assert_file "deep-hyphenated-name/config/routes.rb",                                          /Deep::Hyphenated::Name::Engine.routes.draw do/
+    assert_file "deep-hyphenated-name/lib/deep/hyphenated/name/version.rb",                            /module Deep\n  module Hyphenated\n    module Name\n      VERSION = "0.0.1"\n    end\n  end\nend/
+    assert_file "deep-hyphenated-name/lib/deep/hyphenated/name/engine.rb",                             /module Deep\n  module Hyphenated\n    module Name\n      class Engine < ::Rails::Engine\n        isolate_namespace Deep\n      end\n    end\n  end\nend/
+    assert_file "deep-hyphenated-name/lib/deep/hyphenated/name.rb",                                    /require "deep\/hyphenated\/name\/engine"/
+    assert_file "deep-hyphenated-name/test/dummy/config/routes.rb",                               /mount Deep::Hyphenated::Name::Engine => "\/deep-hyphenated-name"/
+    assert_file "deep-hyphenated-name/app/controllers/deep/hyphenated/name/application_controller.rb", /module Deep\n  module Hyphenated\n    module Name\n      class ApplicationController < ActionController::Base\n      end\n    end\n  end\nend/
+    assert_file "deep-hyphenated-name/app/helpers/deep/hyphenated/name/application_helper.rb",         /module Deep\n  module Hyphenated\n    module Name\n      module ApplicationHelper\n      end\n    end\n  end\nend/
+    assert_file "deep-hyphenated-name/app/views/layouts/deep/hyphenated/name/application.html.erb" do |contents|
+      assert_match "<title>Deep hyphenated name</title>", contents
+      assert_match(/stylesheet_link_tag\s+['"]deep\/hyphenated\/name\/application['"]/, contents)
+      assert_match(/javascript_include_tag\s+['"]deep\/hyphenated\/name\/application['"]/, contents)
+    end
+  end
+
   def test_creating_gemspec
     run_generator
     assert_file "bukkits.gemspec", /s.name\s+= "bukkits"/