applies remaining conventions across the project

20 files changed, 29 insertions, 46 deletions

diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index da0df95c06..f7e1b5194c 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -2,7 +2,6 @@ require "rails/code_statistics_calculator"
 require "active_support/core_ext/enumerable"
 
 class CodeStatistics #:nodoc:
-
   TEST_TYPES = ["Controller tests",
                 "Helper tests",
                 "Model tests",
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index ce2628fd96..708c0b11d6 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -279,7 +279,7 @@ module Rails
 
       # This code is based directly on the Text gem implementation
       # Returns a value representing the "cost" of transforming str1 into str2
-      def self.levenshtein_distance str1, str2
+      def self.levenshtein_distance(str1, str2)
         s = str1
         t = str2
         n = s.length
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index 46f376a38e..587c61fd42 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -5,7 +5,6 @@ module Rails
   module Generators
     module Actions
       class CreateMigration < Thor::Actions::CreateFile #:nodoc:
-
         def migration_dir
           File.dirname(@destination)
         end
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index f427e9311c..7d061ed27c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -163,12 +163,12 @@ module Rails
       def set_default_accessors!
         self.destination_root = File.expand_path(app_path, destination_root)
         self.rails_template = case options[:template]
-          when /^https?:\/\//
-            options[:template]
-          when String
-            File.expand_path(options[:template], Dir.pwd)
+                              when /^https?:\/\//
+                                options[:template]
+                              when String
+                                File.expand_path(options[:template], Dir.pwd)
           else
-            options[:template]
+                                options[:template]
         end
       end
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index d52654cae9..60ef2d50ef 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -373,7 +373,6 @@ module Rails
           path = File.expand_path(File.join(base_name, generator_name), base_root)
           path if File.exist?(path)
         end
-
     end
   end
 end
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 6407a860cb..58ffdcc464 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -66,31 +66,31 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer              then :number_field
-          when :float, :decimal      then :text_field
-          when :time                 then :time_select
-          when :datetime, :timestamp then :datetime_select
-          when :date                 then :date_select
-          when :text                 then :text_area
-          when :boolean              then :check_box
+                        when :integer              then :number_field
+                        when :float, :decimal      then :text_field
+                        when :time                 then :time_select
+                        when :datetime, :timestamp then :datetime_select
+                        when :date                 then :date_select
+                        when :text                 then :text_area
+                        when :boolean              then :check_box
           else
-            :text_field
+                          :text_field
         end
       end
 
       def default
         @default ||= case type
-          when :integer                     then 1
-          when :float                       then 1.5
-          when :decimal                     then "9.99"
-          when :datetime, :timestamp, :time then Time.now.to_s(:db)
-          when :date                        then Date.today.to_s(:db)
-          when :string                      then name == "type" ? "" : "MyString"
-          when :text                        then "MyText"
-          when :boolean                     then false
-          when :references, :belongs_to     then nil
+                     when :integer                     then 1
+                     when :float                       then 1.5
+                     when :decimal                     then "9.99"
+                     when :datetime, :timestamp, :time then Time.now.to_s(:db)
+                     when :date                        then Date.today.to_s(:db)
+                     when :string                      then name == "type" ? "" : "MyString"
+                     when :text                        then "MyText"
+                     when :boolean                     then false
+                     when :references, :belongs_to     then nil
           else
-            ""
+                       ""
         end
       end
 
diff --git a/railties/lib/rails/generators/rails/generator/generator_generator.rb b/railties/lib/rails/generators/rails/generator/generator_generator.rb
index c0373d2eb8..8040ec5e7b 100644
--- a/railties/lib/rails/generators/rails/generator/generator_generator.rb
+++ b/railties/lib/rails/generators/rails/generator/generator_generator.rb
@@ -21,7 +21,6 @@ module Rails
             File.join("lib", "generators", regular_class_path)
           end
         end
-
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/task/task_generator.rb b/railties/lib/rails/generators/rails/task/task_generator.rb
index 360f310974..bb96bdf0dd 100644
--- a/railties/lib/rails/generators/rails/task/task_generator.rb
+++ b/railties/lib/rails/generators/rails/task/task_generator.rb
@@ -6,7 +6,6 @@ module Rails
       def create_task_files
         template "task.rb", File.join("lib/tasks", "#{file_name}.rake")
       end
-
     end
   end
 end
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 0ea7418ba2..c7829869ef 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -6,7 +6,6 @@ module Rails
     # Deal with controller names on scaffold and add some helpers to deal with
     # ActiveModel.
     module ResourceHelpers # :nodoc:
-
       def self.included(base) #:nodoc:
         base.include(Rails::Generators::ModelHelpers)
         base.class_option :model_name, type: :string, desc: "ModelName to be used"
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 8182281e75..3eec929aeb 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -30,7 +30,6 @@ module Rails
       include Rails::Generators::Testing::SetupAndTeardown
       include Rails::Generators::Testing::Assertions
       include FileUtils
-
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb
index 44d881b3b4..99495d5247 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -3,7 +3,6 @@ require "rails/generators/test_unit"
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ModelGenerator < Base # :nodoc:
-
       RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
 
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index 76758df86d..1cabf4e28c 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -29,10 +29,10 @@ module Rails
 
           contents.each do |content|
             case content
-              when String
-                assert_equal content, read
-              when Regexp
-                assert_match content, read
+            when String
+              assert_equal content, read
+            when Regexp
+              assert_match content, read
             end
           end
         end
diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb
index 5a290e48e0..fc91482d3b 100644
--- a/railties/lib/rails/generators/testing/behaviour.rb
+++ b/railties/lib/rails/generators/testing/behaviour.rb
@@ -103,7 +103,6 @@ module Rails
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, "")
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
-
       end
     end
   end
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index b3f379d707..e7ffea2e71 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -129,7 +129,7 @@ module ApplicationTests
       test "register additional directories" do
         app_file "spec/spec_helper.rb", "# TODO: note in spec"
         app_file "spec/models/user_spec.rb", "# TODO: note in model spec"
-        add_to_config %q{ config.annotations.register_directories("spec") }
+        add_to_config ' config.annotations.register_directories("spec") '
 
         run_rake_notes do |output, lines|
           assert_match(/note in spec/, output)
diff --git a/railties/test/code_statistics_test.rb b/railties/test/code_statistics_test.rb
index 2c0db2fd0a..965b6eeb79 100644
--- a/railties/test/code_statistics_test.rb
+++ b/railties/test/code_statistics_test.rb
@@ -29,5 +29,4 @@ class CodeStatisticsTest < ActiveSupport::TestCase
       CodeStatistics.new(["hidden file", @tmp_path])
     end
   end
-
 end
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 5304790c92..545460e933 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -3,8 +3,6 @@ require "minitest/mock"
 require "rails/commands/dbconsole"
 
 class Rails::DBConsoleTest < ActiveSupport::TestCase
-
-
   def setup
     Rails::DBConsole.const_set("APP_PATH", "rails/all")
   end
@@ -260,5 +258,4 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
         end
       end
     end
-
 end
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index c15eab1df3..9d0d0dc59d 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -374,5 +374,4 @@ F
     def action(*args, &block)
       capture(:stdout){ generator.send(*args, &block) }
     end
-
 end
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 47e8ac5e61..2cdddc8713 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -46,5 +46,4 @@ module GeneratorsTestHelper
     FileUtils.mkdir_p(destination)
     FileUtils.cp routes, destination
   end
-
 end
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 34fe395bf7..4b67c91cc5 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -2,7 +2,6 @@ require "abstract_unit"
 require "rails/initializable"
 
 module InitializableTests
-
   class Foo
     include Rails::Initializable
     attr_accessor :foo, :bar
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 534761c6a7..d6bd281c53 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -4,7 +4,6 @@ require "rack/test"
 
 module RailtiesTest
   class EngineTest < ActiveSupport::TestCase
-
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods