Merge pull request #5902 from avakhov/generator-no-indent-blank-lines

Don't indent blank lines in named base generators

2 files changed, 9 insertions, 1 deletions

diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index c457b5fbbc..e85d1b8fa2 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -40,7 +40,7 @@ module Rails
 
         def indent(content, multiplier = 2)
           spaces = " " * multiplier
-          content = content.each_line.map {|line| "#{spaces}#{line}" }.join
+          content = content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
         def wrap_with_namespace(content)
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 76c34d4c50..abafcefde5 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -61,6 +61,14 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
     run_generator ["account"]
     assert_file "app/views/test_app/account"
   end
+
+  def test_namespaced_controller_dont_indent_blank_lines
+    run_generator
+    assert_file "app/controllers/test_app/account_controller.rb"
+    File.readlines(File.expand_path("app/controllers/test_app/account_controller.rb", destination_root)).each do |line|
+      assert_no_match line.chomp, /^\s+$/, "Don't indent blank lines"
+    end
+  end
 end
 
 class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase