aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-12-13 01:28:27 +0100
committerPiotr Sarnacki <drogus@gmail.com>2010-12-14 10:28:00 +0100
commit34d1e5d04d2e2583bf28fc2365f43d5917e2c648 (patch)
tree0f2d75ba6a9e327923c552cbc34eadb2dfbca84a
parent79e6c7d2301d452c721d0b806071b0ebe2255eca (diff)
downloadrails-34d1e5d04d2e2583bf28fc2365f43d5917e2c648.tar.gz
rails-34d1e5d04d2e2583bf28fc2365f43d5917e2c648.tar.bz2
rails-34d1e5d04d2e2583bf28fc2365f43d5917e2c648.zip
Fix indentation and newlines in generated engine
-rw-r--r--railties/lib/rails/generators/named_base.rb2
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index e0dde4360f..44a2639488 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -42,7 +42,7 @@ module Rails
end
def wrap_with_namespace(content)
- content = indent(content)
+ content = indent(content).chomp
"module #{namespace.name}\n#{content}\nend\n"
end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
index 9600ee0c3f..aa8ea77bae 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
@@ -1,7 +1,7 @@
module <%= camelized %>
class Engine < Rails::Engine
<% if mountable? -%>
- isolate_namespace <%= camelized %>
+ isolate_namespace <%= camelized %>
<% end -%>
end
end