applies remaining conventions across the project

78 files changed, 143 insertions, 207 deletions

diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb
index 2098341763..f2fe8875b9 100644
--- a/activerecord/examples/performance.rb
+++ b/activerecord/examples/performance.rb
@@ -48,13 +48,13 @@ puts "Generating data..."
 
 module ActiveRecord
   class Faker
-    LOREM = %Q{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non aliquet diam. Curabitur vel urna metus, quis malesuada elit.
+    LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non aliquet diam. Curabitur vel urna metus, quis malesuada elit.
      Integer consequat tincidunt felis. Etiam non erat dolor. Vivamus imperdiet nibh sit amet diam eleifend id posuere diam malesuada. Mauris at accumsan sem.
      Donec id lorem neque. Fusce erat lorem, ornare eu congue vitae, malesuada quis neque. Maecenas vel urna a velit pretium fermentum. Donec tortor enim,
      tempor venenatis egestas a, tempor sed ipsum. Ut arcu justo, faucibus non imperdiet ac, interdum at diam. Pellentesque ipsum enim, venenatis ut iaculis vitae,
      varius vitae sem. Sed rutrum quam ac elit euismod bibendum. Donec ultricies ultricies magna, at lacinia libero mollis aliquam. Sed ac arcu in tortor elementum
      tincidunt vel interdum sem. Curabitur eget erat arcu. Praesent eget eros leo. Nam magna enim, sollicitudin vehicula scelerisque in, vulputate ut libero.
-     Praesent varius tincidunt commodo}.split
+     Praesent varius tincidunt commodo".split
 
     def self.name
       LOREM.grep(/^\w*$/).sort_by { rand }.first(2).join " "
diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb
index 24997370b2..64b2311911 100644
--- a/activerecord/lib/active_record/associations/belongs_to_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -2,7 +2,6 @@ module ActiveRecord
   # = Active Record Belongs To Association
   module Associations
     class BelongsToAssociation < SingularAssociation #:nodoc:
-
       def handle_dependency
         target.send(options[:dependent]) if load_target
       end
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index 6857929d61..edeb6491bd 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -4,7 +4,6 @@ require "active_record/associations"
 
 module ActiveRecord::Associations::Builder # :nodoc:
   class CollectionAssociation < Association #:nodoc:
-
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
 
     def self.valid_options(options)
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 7d106015d7..6e5877f6f5 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -24,7 +24,6 @@ module ActiveRecord
     # If you need to work on all current children, new and existing records,
     # +load_target+ and the +loaded+ flag are your friends.
     class CollectionAssociation < Association #:nodoc:
-
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       def reader(force_reload = false)
         if force_reload
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index 0fe9b2e81b..08a4611013 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -60,12 +60,12 @@ module ActiveRecord
       def delete(method = options[:dependent])
         if load_target
           case method
-            when :delete
-              target.delete
-            when :destroy
-              target.destroy
-            when :nullify
-              target.update_columns(reflection.foreign_key => nil) if target.persisted?
+          when :delete
+            target.delete
+          when :destroy
+            target.destroy
+          when :nullify
+            target.update_columns(reflection.foreign_key => nil) if target.persisted?
           end
         end
       end
@@ -82,18 +82,18 @@ module ActiveRecord
 
         def remove_target!(method)
           case method
-            when :delete
-              target.delete
-            when :destroy
-              target.destroy
+          when :delete
+            target.delete
+          when :destroy
+            target.destroy
             else
-              nullify_owner_attributes(target)
+            nullify_owner_attributes(target)
 
-              if target.persisted? && owner.persisted? && !target.save
-                set_owner_attributes(target)
-                raise RecordNotSaved, "Failed to remove the existing associated #{reflection.name}. " +
-                                      "The record failed to save after its foreign key was set to nil."
-              end
+            if target.persisted? && owner.persisted? && !target.save
+              set_owner_attributes(target)
+              raise RecordNotSaved, "Failed to remove the existing associated #{reflection.name}. " +
+                                    "The record failed to save after its foreign key was set to nil."
+            end
           end
         end
 
diff --git a/activerecord/lib/active_record/associations/preloader/belongs_to.rb b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
index 5091d4717a..38e231826c 100644
--- a/activerecord/lib/active_record/associations/preloader/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
@@ -2,7 +2,6 @@ module ActiveRecord
   module Associations
     class Preloader
       class BelongsTo < SingularAssociation #:nodoc:
-
         def association_key_name
           reflection.options[:primary_key] || klass && klass.primary_key
         end
@@ -10,7 +9,6 @@ module ActiveRecord
         def owner_key_name
           reflection.foreign_key
         end
-
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/preloader/has_many.rb b/activerecord/lib/active_record/associations/preloader/has_many.rb
index 3ea91a8c11..20df1cc19a 100644
--- a/activerecord/lib/active_record/associations/preloader/has_many.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_many.rb
@@ -2,7 +2,6 @@ module ActiveRecord
   module Associations
     class Preloader
       class HasMany < CollectionAssociation #:nodoc:
-
         def association_key_name
           reflection.foreign_key
         end
@@ -10,7 +9,6 @@ module ActiveRecord
         def owner_key_name
           reflection.active_record_primary_key
         end
-
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/preloader/singular_association.rb b/activerecord/lib/active_record/associations/preloader/singular_association.rb
index 9f8d98c5a5..0888d383a6 100644
--- a/activerecord/lib/active_record/associations/preloader/singular_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/singular_association.rb
@@ -2,7 +2,6 @@ module ActiveRecord
   module Associations
     class Preloader
       class SingularAssociation < Association #:nodoc:
-
         private
 
           def preload(preloader)
@@ -14,7 +13,6 @@ module ActiveRecord
               association.set_inverse_instance(record) if record
             end
           end
-
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
index cb10031015..f4129edc5a 100644
--- a/activerecord/lib/active_record/associations/through_association.rb
+++ b/activerecord/lib/active_record/associations/through_association.rb
@@ -2,7 +2,6 @@ module ActiveRecord
   # = Active Record Through Association
   module Associations
     module ThroughAssociation #:nodoc:
-
       delegate :source_reflection, :through_reflection, to: :reflection
 
       protected
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 95853501db..58f82cfd30 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -69,7 +69,6 @@ module ActiveRecord
 
       alias :attribute :_read_attribute
       private :attribute
-
     end
   end
 end
diff --git a/activerecord/lib/active_record/coders/yaml_column.rb b/activerecord/lib/active_record/coders/yaml_column.rb
index ee38172742..1c8c9fa272 100644
--- a/activerecord/lib/active_record/coders/yaml_column.rb
+++ b/activerecord/lib/active_record/coders/yaml_column.rb
@@ -4,7 +4,6 @@ require "active_support/core_ext/regexp"
 module ActiveRecord
   module Coders # :nodoc:
     class YAMLColumn # :nodoc:
-
       attr_accessor :object_class
 
       def initialize(object_class = Object)
diff --git a/activerecord/lib/active_record/collection_cache_key.rb b/activerecord/lib/active_record/collection_cache_key.rb
index 8d41c0d799..43784b70e3 100644
--- a/activerecord/lib/active_record/collection_cache_key.rb
+++ b/activerecord/lib/active_record/collection_cache_key.rb
@@ -1,6 +1,5 @@
 module ActiveRecord
   module CollectionCacheKey
-
     def collection_cache_key(collection = all, timestamp_column = :updated_at) # :nodoc:
       query_signature = Digest::MD5.hexdigest(collection.to_sql)
       key = "#{collection.model_name.cache_key}/query-#{query_signature}"
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb
index 6711049588..95c72f1e20 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb
@@ -1,7 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module DatabaseLimits
-
       # Returns the maximum length of a table alias.
       def table_alias_length
         255
@@ -61,7 +60,6 @@ module ActiveRecord
       def joins_per_query
         256
       end
-
     end
   end
 end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 1d18a58eab..c10f45937e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -11,7 +11,6 @@ module ActiveRecord
     # +columns+ attribute of said TableDefinition object, in order to be used
     # for generating a number of table creation or table changing SQL statements.
     class ColumnDefinition < Struct.new(:name, :type, :limit, :precision, :scale, :default, :null, :first, :after, :auto_increment, :primary_key, :collation, :sql_type, :comment) #:nodoc:
-
       def primary_key?
         primary_key || type.to_sym == :primary_key
       end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index d6b03e1eb1..6bb072dd73 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -41,7 +41,6 @@ module ActiveRecord
     end
 
     class Transaction #:nodoc:
-
       attr_reader :connection, :state, :records, :savepoint_name
       attr_writer :joinable
 
@@ -101,7 +100,6 @@ module ActiveRecord
     end
 
     class SavepointTransaction < Transaction
-
       def initialize(connection, savepoint_name, options, *args)
         super(connection, options, *args)
         if options[:isolation]
@@ -124,7 +122,6 @@ module ActiveRecord
     end
 
     class RealTransaction < Transaction
-
       def initialize(connection, options, *args)
         super
         if options[:isolation]
@@ -226,7 +223,6 @@ module ActiveRecord
           return unless error.is_a?(ActiveRecord::PreparedStatementCacheExpired)
           @connection.clear_cache!
         end
-
     end
   end
 end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 8a2a1fafb1..8ef887cb77 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -549,8 +549,8 @@ module ActiveRecord
 
         def extract_scale(sql_type) # :nodoc:
           case sql_type
-            when /\((\d+)\)/ then 0
-            when /\((\d+)(,(\d+))\)/ then $3.to_i
+          when /\((\d+)\)/ then 0
+          when /\((\d+)(,(\d+))\)/ then $3.to_i
           end
         end
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index bea8d8dda6..4faf664b26 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -571,20 +571,20 @@ module ActiveRecord
       # Maps logical Rails types to MySQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = nil)
         sql = case type.to_s
-        when "integer"
-          integer_to_sql(limit)
-        when "text"
-          text_to_sql(limit)
-        when "blob"
-          binary_to_sql(limit)
-        when "binary"
-          if (0..0xfff) === limit
-            "varbinary(#{limit})"
-          else
-            binary_to_sql(limit)
-          end
+              when "integer"
+                integer_to_sql(limit)
+              when "text"
+                text_to_sql(limit)
+              when "blob"
+                binary_to_sql(limit)
+              when "binary"
+                if (0..0xfff) === limit
+                  "varbinary(#{limit})"
+                else
+                  binary_to_sql(limit)
+                end
         else
-          super(type, limit, precision, scale)
+                super(type, limit, precision, scale)
         end
 
         sql << " unsigned" if unsigned && type != :primary_key
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index c0c7ce46b2..a7869f44ea 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -19,7 +19,6 @@ module ActiveRecord
 
       # Expands a connection string into a hash.
       class ConnectionUrlResolver # :nodoc:
-
         # == Example
         #
         #   url = "postgresql://foo:bar@localhost:9000/foo_test?pool=5&timeout=3000"
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 56280f15e9..531d323a55 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -40,22 +40,22 @@ module ActiveRecord
 
           option_string = options.inject("") do |memo, (key, value)|
             memo += case key
-            when :owner
-              " OWNER = \"#{value}\""
-            when :template
-              " TEMPLATE = \"#{value}\""
-            when :encoding
-              " ENCODING = '#{value}'"
-            when :collation
-              " LC_COLLATE = '#{value}'"
-            when :ctype
-              " LC_CTYPE = '#{value}'"
-            when :tablespace
-              " TABLESPACE = \"#{value}\""
-            when :connection_limit
-              " CONNECTION LIMIT = #{value}"
+                    when :owner
+                      " OWNER = \"#{value}\""
+                    when :template
+                      " TEMPLATE = \"#{value}\""
+                    when :encoding
+                      " ENCODING = '#{value}'"
+                    when :collation
+                      " LC_COLLATE = '#{value}'"
+                    when :ctype
+                      " LC_CTYPE = '#{value}'"
+                    when :tablespace
+                      " TABLESPACE = \"#{value}\""
+                    when :connection_limit
+                      " CONNECTION LIMIT = #{value}"
             else
-              ""
+                      ""
             end
           end
 
@@ -294,7 +294,7 @@ module ActiveRecord
         end
 
         # Creates a schema for the given schema name.
-        def create_schema schema_name
+        def create_schema(schema_name)
           execute "CREATE SCHEMA #{quote_schema_name(schema_name)}"
         end
 
@@ -626,29 +626,29 @@ module ActiveRecord
         # Maps logical Rails types to PostgreSQL-specific data types.
         def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
           sql = case type.to_s
-          when "binary"
+                when "binary"
             # PostgreSQL doesn't support limits on binary (bytea) columns.
             # The hard limit is 1GB, because of a 32-bit size field, and TOAST.
-            case limit
-            when nil, 0..0x3fffffff; super(type)
-            else raise(ActiveRecordError, "No binary type has byte size #{limit}.")
-            end
-          when "text"
+                  case limit
+                  when nil, 0..0x3fffffff; super(type)
+                  else raise(ActiveRecordError, "No binary type has byte size #{limit}.")
+                  end
+                when "text"
             # PostgreSQL doesn't support limits on text columns.
             # The hard limit is 1GB, according to section 8.3 in the manual.
-            case limit
-            when nil, 0..0x3fffffff; super(type)
-            else raise(ActiveRecordError, "The limit on text can be at most 1GB - 1byte.")
-            end
-          when "integer"
-            case limit
-            when 1, 2; "smallint"
-            when nil, 3, 4; "integer"
-            when 5..8; "bigint"
-            else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with scale 0 instead.")
-            end
+                  case limit
+                  when nil, 0..0x3fffffff; super(type)
+                  else raise(ActiveRecordError, "The limit on text can be at most 1GB - 1byte.")
+                  end
+                when "integer"
+                  case limit
+                  when 1, 2; "smallint"
+                  when nil, 3, 4; "integer"
+                  when 5..8; "bigint"
+                  else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with scale 0 instead.")
+                  end
           else
-            super(type, limit, precision, scale)
+                  super(type, limit, precision, scale)
           end
 
           sql << "[]" if array && type != :primary_key
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index ced5fed2e2..bd53123511 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -526,26 +526,26 @@ module ActiveRecord
         def extract_value_from_default(default) # :nodoc:
           case default
             # Quoted types
-            when /\A[\(B]?'(.*)'.*::"?([\w. ]+)"?(?:\[\])?\z/m
+          when /\A[\(B]?'(.*)'.*::"?([\w. ]+)"?(?:\[\])?\z/m
               # The default 'now'::date is CURRENT_DATE
-              if $1 == "now".freeze && $2 == "date".freeze
-                nil
-              else
-                $1.gsub("''".freeze, "'".freeze)
-              end
+            if $1 == "now".freeze && $2 == "date".freeze
+              nil
+            else
+              $1.gsub("''".freeze, "'".freeze)
+            end
             # Boolean types
-            when "true".freeze, "false".freeze
-              default
+          when "true".freeze, "false".freeze
+            default
             # Numeric types
-            when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/
-              $1
+          when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/
+            $1
             # Object identifier types
-            when /\A-?\d+\z/
-              $1
+          when /\A-?\d+\z/
+            $1
             else
               # Anything else is blank, some user type, or some function
               # and we can't know the value of that, so return nil.
-              nil
+            nil
           end
         end
 
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb
index d21f7a6126..0edb4b8a34 100644
--- a/activerecord/lib/active_record/counter_cache.rb
+++ b/activerecord/lib/active_record/counter_cache.rb
@@ -159,6 +159,5 @@ module ActiveRecord
           yield association(name.to_sym) if reflection.belongs_to? && reflection.counter_cache_column
         end
       end
-
   end
 end
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
index 03e6e1eee3..8fbe43e3ec 100644
--- a/activerecord/lib/active_record/errors.rb
+++ b/activerecord/lib/active_record/errors.rb
@@ -1,5 +1,4 @@
 module ActiveRecord
-
   # = Active Record Errors
   #
   # Generic Active Record exception class.
@@ -96,7 +95,6 @@ module ActiveRecord
   #
   # Wraps the underlying database error as +cause+.
   class StatementInvalid < ActiveRecordError
-
     def initialize(message = nil, original_exception = nil)
       if original_exception
         ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
@@ -166,7 +164,6 @@ module ActiveRecord
         super("Stale object error.")
       end
     end
-
   end
 
   # Raised when association is being configured improperly or user tries to use
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 0dc64c8853..40a9aa2783 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -799,7 +799,6 @@ module ActiveRecord
       def yaml_file_path(path)
         "#{path}.yml"
       end
-
   end
 
   class Fixture #:nodoc:
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index bb9f898cf0..20910fbb15 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -67,22 +67,22 @@ module ActiveRecord
 
       def sql_color(sql)
         case sql
-          when /\A\s*rollback/mi
-            RED
-          when /select .*for update/mi, /\A\s*lock/mi
-            WHITE
-          when /\A\s*select/i
-            BLUE
-          when /\A\s*insert/i
-            GREEN
-          when /\A\s*update/i
-            YELLOW
-          when /\A\s*delete/i
-            RED
-          when /transaction\s*\Z/i
-            CYAN
+        when /\A\s*rollback/mi
+          RED
+        when /select .*for update/mi, /\A\s*lock/mi
+          WHITE
+        when /\A\s*select/i
+          BLUE
+        when /\A\s*insert/i
+          GREEN
+        when /\A\s*update/i
+          YELLOW
+        when /\A\s*delete/i
+          RED
+        when /transaction\s*\Z/i
+          CYAN
           else
-            MAGENTA
+          MAGENTA
         end
       end
 
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index a8dbda118e..9206547acf 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -934,7 +934,6 @@ module ActiveRecord
   # MigrationProxy is used to defer loading of the actual migration classes
   # until they are needed
   class MigrationProxy < Struct.new(:name, :version, :filename, :scope)
-
     def initialize(name, version, filename, scope)
       super
       @migration = nil
@@ -960,7 +959,6 @@ module ActiveRecord
         require(File.expand_path(filename))
         name.constantize.new(name, version)
       end
-
   end
 
   class NullMigration < MigrationProxy #:nodoc:
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index 682b404060..2cbef2425b 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -520,12 +520,12 @@ module ActiveRecord
       def check_record_limit!(limit, attributes_collection)
         if limit
           limit = case limit
-          when Symbol
-            send(limit)
-          when Proc
-            limit.call
+                  when Symbol
+                    send(limit)
+                  when Proc
+                    limit.call
           else
-            limit
+                    limit
           end
 
           if limit && attributes_collection.size > limit
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 6f0dbeb9e5..a2bcf54377 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -323,10 +323,10 @@ db_namespace = namespace :db do
     # desc "Recreate the test database from the current schema"
     task load: %w(db:test:purge) do
       case ActiveRecord::Base.schema_format
-        when :ruby
-          db_namespace["test:load_schema"].invoke
-        when :sql
-          db_namespace["test:load_structure"].invoke
+      when :ruby
+        db_namespace["test:load_schema"].invoke
+      when :sql
+        db_namespace["test:load_structure"].invoke
       end
     end
 
@@ -351,10 +351,10 @@ db_namespace = namespace :db do
     # desc "Recreate the test database from a fresh schema"
     task clone: %w(db:test:deprecated environment) do
       case ActiveRecord::Base.schema_format
-        when :ruby
-          db_namespace["test:clone_schema"].invoke
-        when :sql
-          db_namespace["test:clone_structure"].invoke
+      when :ruby
+        db_namespace["test:clone_schema"].invoke
+      when :sql
+        db_namespace["test:clone_structure"].invoke
       end
     end
 
diff --git a/activerecord/lib/active_record/railties/jdbcmysql_error.rb b/activerecord/lib/active_record/railties/jdbcmysql_error.rb
index 6a38211bff..d7cf4df339 100644
--- a/activerecord/lib/active_record/railties/jdbcmysql_error.rb
+++ b/activerecord/lib/active_record/railties/jdbcmysql_error.rb
@@ -3,7 +3,7 @@ module ArJdbcMySQL #:nodoc:
   class Error < StandardError #:nodoc:
     attr_accessor :error_number, :sql_state
 
-    def initialize msg
+    def initialize(msg)
       super
       @error_number = nil
       @sql_state    = nil
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 1a092a8c18..7caac60960 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -978,7 +978,6 @@ module ActiveRecord
           public_instance_methods
 
         delegate(*delegate_methods, to: :delegate_reflection)
-
     end
 
     class PolymorphicReflection < ThroughReflection # :nodoc:
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 233a0622d5..ecf3700aab 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -355,9 +355,9 @@ module ActiveRecord
 
       def type_cast_calculated_value(value, type, operation = nil)
         case operation
-          when "count"   then value.to_i
-          when "sum"     then type.deserialize(value || 0)
-          when "average" then value.respond_to?(:to_d) ? value.to_d : value
+        when "count"   then value.to_i
+        when "sum"     then type.deserialize(value || 0)
+        when "average" then value.respond_to?(:to_d) ? value.to_d : value
           else type.deserialize(value)
         end
       end
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index 619616c878..190e339ea8 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -4,7 +4,6 @@ require "active_record/relation/merger"
 
 module ActiveRecord
   module SpawnMethods
-
     # This is overridden by Associations::CollectionProxy
     def spawn #:nodoc:
       clone
diff --git a/activerecord/lib/active_record/statement_cache.rb b/activerecord/lib/active_record/statement_cache.rb
index 8a29547bda..fd67032235 100644
--- a/activerecord/lib/active_record/statement_cache.rb
+++ b/activerecord/lib/active_record/statement_cache.rb
@@ -1,5 +1,4 @@
 module ActiveRecord
-
   # Statement cache is used to cache a single statement in order to avoid creating the AST again.
   # Initializing the cache is done by passing the statement in the create block:
   #
diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
index c9e7262709..6eac9af236 100644
--- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
@@ -47,12 +47,12 @@ module ActiveRecord
         set_psql_env
 
         search_path = case ActiveRecord::Base.dump_schemas
-        when :schema_search_path
-          configuration["schema_search_path"]
-        when :all
-          nil
-        when String
-          ActiveRecord::Base.dump_schemas
+                      when :schema_search_path
+                        configuration["schema_search_path"]
+                      when :all
+                        nil
+                      when String
+                        ActiveRecord::Base.dump_schemas
         end
 
         args = ["-s", "-x", "-O", "-f", filename]
diff --git a/activerecord/lib/active_record/touch_later.rb b/activerecord/lib/active_record/touch_later.rb
index 598873ea3a..c337a7532f 100644
--- a/activerecord/lib/active_record/touch_later.rb
+++ b/activerecord/lib/active_record/touch_later.rb
@@ -58,6 +58,5 @@ module ActiveRecord
       def belongs_to_touch_method
         :touch_later
       end
-
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql2/json_test.rb b/activerecord/test/cases/adapters/mysql2/json_test.rb
index f0e670d4b8..2f7dc3f7ef 100644
--- a/activerecord/test/cases/adapters/mysql2/json_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/json_test.rb
@@ -91,7 +91,7 @@ if ActiveRecord::Base.connection.supports_json?
     end
 
     def test_null_json
-      @connection.execute %q|insert into json_data_type (payload) VALUES(null)|
+      @connection.execute "insert into json_data_type (payload) VALUES(null)"
       x = JsonDataType.first
       assert_equal(nil, x.payload)
     end
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index ff78bca173..7736113a19 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -148,5 +148,4 @@ class Mysql2ReservedWordTest < ActiveRecord::Mysql2TestCase
         connection.execute("CREATE TABLE `#{table_name}` ( #{column_properties} )")
       end
     end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 26f3e66324..e496960f21 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -306,7 +306,7 @@ class PostgresqlArrayTest < ActiveRecord::PostgreSQLTestCase
   end
 
   private
-    def assert_cycle field, array
+    def assert_cycle(field, array)
       # test creation
       x = PgArray.create!(field => array)
       x.reload
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 5da4a3ac0f..817dfbf705 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -166,19 +166,19 @@ if ActiveRecord::Base.connection.supports_extensions?
     end
 
     def test_gen1
-      assert_equal(%q(" "=>""), @type.serialize(" "=>""))
+      assert_equal('" "=>""', @type.serialize(" "=>""))
     end
 
     def test_gen2
-      assert_equal(%q(","=>""), @type.serialize(","=>""))
+      assert_equal('","=>""', @type.serialize(","=>""))
     end
 
     def test_gen3
-      assert_equal(%q("="=>""), @type.serialize("="=>""))
+      assert_equal('"="=>""', @type.serialize("="=>""))
     end
 
     def test_gen4
-      assert_equal(%q(">"=>""), @type.serialize(">"=>""))
+      assert_equal('">"=>""', @type.serialize(">"=>""))
     end
 
     def test_parse1
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 8b5a5f1bab..d0e206ae80 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -108,7 +108,7 @@ module PostgresqlJSONSharedTestCases
   end
 
   def test_null_json
-    @connection.execute %q|insert into json_data_type (payload) VALUES(null)|
+    @connection.execute "insert into json_data_type (payload) VALUES(null)"
     x = JsonDataType.first
     assert_equal(nil, x.payload)
   end
diff --git a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
index f1519db48b..b898929f8a 100644
--- a/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/prepared_statements_test.rb
@@ -18,5 +18,4 @@ class PreparedStatementsTest < ActiveRecord::PostgreSQLTestCase
       Developer.where(id: 1)
     end
   end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index 84af276874..22f935f24e 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -109,7 +109,7 @@ class SchemaAuthorizationTest < ActiveRecord::PostgreSQLTestCase
   end
 
   private
-    def set_session_auth auth = nil
+    def set_session_auth(auth = nil)
       @connection.session_auth =  auth || "default"
     end
 
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index c2a6377cc6..d821cbafdf 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -29,7 +29,7 @@ class SchemaTest < ActiveRecord::PostgreSQLTestCase
   INDEX_A_COLUMN = "name"
   INDEX_B_COLUMN_S1 = "email"
   INDEX_B_COLUMN_S2 = "moment"
-  INDEX_C_COLUMN = %q{(to_tsvector('english', coalesce(things.name, '')))}
+  INDEX_C_COLUMN = "(to_tsvector('english', coalesce(things.name, '')))"
   INDEX_D_COLUMN = "description"
   INDEX_E_COLUMN = "name_vector"
   COLUMNS = [
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index 104c71f0d3..321b74c1f5 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -290,5 +290,4 @@ class PostgresqlUUIDTestInverseOf < ActiveRecord::PostgreSQLTestCase
       assert_nil UuidPost.find_by(id: 789)
     end
   end
-
 end
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index dc80834b21..826b384fb3 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -30,7 +30,7 @@ class PostgresqlXMLTest < ActiveRecord::PostgreSQLTestCase
   end
 
   def test_null_xml
-    @connection.execute %q|insert into xml_data_type (payload) VALUES(null)|
+    @connection.execute "insert into xml_data_type (payload) VALUES(null)"
     assert_nil XmlDataType.first.payload
   end
 
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index ca775e3704..4800d3d7d5 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -420,7 +420,7 @@ module ActiveRecord
 
       private
 
-        def assert_logged logs
+        def assert_logged(logs)
           subscriber = SQLSubscriber.new
           subscription = ActiveSupport::Notifications.subscribe("sql.active_record", subscriber)
           yield
diff --git a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
index 38c5fd8f1a..aa82b9dd2a 100644
--- a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
+++ b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -10,7 +10,6 @@ module Namespaced
 end
 
 class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
-
   def setup
     generate_test_objects
   end
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index b600bf2835..3ff9a625b2 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -122,7 +122,6 @@ class AssociationsTest < ActiveRecord::TestCase
     firm = companies(:first_firm)
     assert_includes firm.association_with_references.references_values, "foo"
   end
-
 end
 
 class AssociationProxyTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 7d619c6a91..73ca83f21b 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1393,7 +1393,7 @@ class BasicsTest < ActiveRecord::TestCase
     attrs.delete "id"
 
     typecast = Class.new(ActiveRecord::Type::Value) {
-      def cast value
+      def cast(value)
         "t.lo"
       end
     }
diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index e424f13352..98d202dd79 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -79,7 +79,7 @@ module ActiveRecord
             @debugs = []
           end
 
-          def debug str
+          def debug(str)
             @debugs << str
           end
         }.new
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 2a0e63a781..51bf51b28d 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -61,7 +61,6 @@ class ParentDeveloper < ActiveRecord::Base
 end
 
 class ChildDeveloper < ParentDeveloper
-
 end
 
 class ImmutableDeveloper < ActiveRecord::Base
@@ -632,5 +631,4 @@ class CallbacksTest < ActiveRecord::TestCase
     child.save
     assert child.after_save_called
   end
-
 end
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index c5fe103efd..31e618664f 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -26,7 +26,7 @@ module ActiveRecord
         column_def = ColumnDefinition.new(
           column.name, "string",
           column.limit, column.precision, column.scale, column.default, column.null)
-        assert_equal %Q{title varchar(20) DEFAULT 'Hello'}, @viz.accept(column_def)
+        assert_equal "title varchar(20) DEFAULT 'Hello'", @viz.accept(column_def)
       end
 
       def test_should_specify_not_null_if_null_option_is_false
@@ -35,7 +35,7 @@ module ActiveRecord
         column_def = ColumnDefinition.new(
           column.name, "string",
           column.limit, column.precision, column.scale, column.default, column.null)
-        assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, @viz.accept(column_def)
+        assert_equal "title varchar(20) DEFAULT 'Hello' NOT NULL", @viz.accept(column_def)
       end
 
       if current_adapter?(:Mysql2Adapter)
diff --git a/activerecord/test/cases/date_time_precision_test.rb b/activerecord/test/cases/date_time_precision_test.rb
index 7876542379..a1c3c5af9c 100644
--- a/activerecord/test/cases/date_time_precision_test.rb
+++ b/activerecord/test/cases/date_time_precision_test.rb
@@ -83,6 +83,5 @@ if subsecond_precision_supported?
         assert_match %r{t\.datetime\s+"updated_at",\s+precision: 0,\s+null: false$}, output
       end
     end
-
   end
 end
diff --git a/activerecord/test/cases/finder_respond_to_test.rb b/activerecord/test/cases/finder_respond_to_test.rb
index 6e772c9d8a..a7af8ac0ea 100644
--- a/activerecord/test/cases/finder_respond_to_test.rb
+++ b/activerecord/test/cases/finder_respond_to_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "models/topic"
 
 class FinderRespondToTest < ActiveRecord::TestCase
-
   fixtures :topics
 
   def test_should_preserve_normal_respond_to_behaviour_on_base
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 3855bf4420..64251c5d11 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1125,7 +1125,7 @@ class FinderTest < ActiveRecord::TestCase
       e = assert_raises(ActiveRecord::RecordNotFound) do
         model.find "Hello World!"
       end
-      assert_equal %Q{Couldn't find MercedesCar with 'name'=Hello World!}, e.message
+      assert_equal "Couldn't find MercedesCar with 'name'=Hello World!", e.message
     end
   end
 
@@ -1135,7 +1135,7 @@ class FinderTest < ActiveRecord::TestCase
       e = assert_raises(ActiveRecord::RecordNotFound) do
         model.find "Hello", "World!"
       end
-      assert_equal %Q{Couldn't find all MercedesCars with 'name': (Hello, World!) (found 0 results, but was looking for 2)}, e.message
+      assert_equal "Couldn't find all MercedesCars with 'name': (Hello, World!) (found 0 results, but was looking for 2)", e.message
     end
   end
 
@@ -1229,5 +1229,4 @@ class FinderTest < ActiveRecord::TestCase
       err = assert_raises(exception_class) { block.call }
       assert_match message, err.message
     end
-
 end
diff --git a/activerecord/test/cases/forbidden_attributes_protection_test.rb b/activerecord/test/cases/forbidden_attributes_protection_test.rb
index 1a606d3118..b17daafe01 100644
--- a/activerecord/test/cases/forbidden_attributes_protection_test.rb
+++ b/activerecord/test/cases/forbidden_attributes_protection_test.rb
@@ -161,5 +161,4 @@ class ForbiddenAttributesProtectionTest < ActiveRecord::TestCase
     assert_equal "Necklace", part.trinkets[0].name
     assert_equal "Spoon", part.trinkets[1].name
   end
-
 end
diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 6c90dc4996..ab3a1132e8 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -3,7 +3,6 @@ require "models/topic"
 require "models/reply"
 
 class ActiveRecordI18nTests < ActiveRecord::TestCase
-
   def setup
     I18n.backend = I18n::Backend::Simple.new
   end
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 9f9bb63a4d..9090184622 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -502,7 +502,6 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase
 end
 
 class InheritanceAttributeTest < ActiveRecord::TestCase
-
   class Company < ActiveRecord::Base
     self.table_name = "companies"
     attribute :type, :string, default: "InheritanceAttributeTest::Startup"
diff --git a/activerecord/test/cases/invertible_migration_test.rb b/activerecord/test/cases/invertible_migration_test.rb
index 861042bef6..81e8b0000a 100644
--- a/activerecord/test/cases/invertible_migration_test.rb
+++ b/activerecord/test/cases/invertible_migration_test.rb
@@ -382,6 +382,5 @@ module ActiveRecord
               "horses_index_named index should not exist"
       end
     end
-
   end
 end
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index 8a10399ec2..90ad970e16 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -30,7 +30,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
       super
     end
 
-    def debug message
+    def debug(message)
       @debugs << message
     end
   end
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index a9a3885e32..cab2069754 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -286,7 +286,6 @@ if ActiveRecord::Base.connection.supports_foreign_keys?
           silence_stream($stdout) { migration.migrate(:down) }
           ActiveRecord::Base.table_name_suffix = nil
         end
-
       end
     end
   end
diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb
index f59aec040f..0ac6df4a3d 100644
--- a/activerecord/test/cases/migration/index_test.rb
+++ b/activerecord/test/cases/migration/index_test.rb
@@ -212,7 +212,6 @@ module ActiveRecord
         def good_index_name
           "x" * connection.allowed_index_name_length
         end
-
     end
   end
 end
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb
index 72d4345702..3d7c7ad469 100644
--- a/activerecord/test/cases/migration/logger_test.rb
+++ b/activerecord/test/cases/migration/logger_test.rb
@@ -8,7 +8,7 @@ module ActiveRecord
 
       Migration = Struct.new(:name, :version) do
         def disable_ddl_transaction; false end
-        def migrate direction
+        def migrate(direction)
           # do nothing
         end
       end
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
index a44bf08095..1ba18bc9c2 100644
--- a/activerecord/test/cases/migrator_test.rb
+++ b/activerecord/test/cases/migrator_test.rb
@@ -9,7 +9,7 @@ class MigratorTest < ActiveRecord::TestCase
   class Sensor < ActiveRecord::Migration::Current
     attr_reader :went_up, :went_down
 
-    def initialize name = self.class.name, version = nil
+    def initialize(name = self.class.name, version = nil)
       super
       @went_up  = false
       @went_down = false
diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index 06af75af0f..a8af8e30f7 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -63,5 +63,4 @@ class TouchTest < ActiveRecord::TestCase
   ensure
     Mixin.record_timestamps = true
   end
-
 end
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index fc47c42ed1..f0cf02ce54 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -405,7 +405,6 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
 
     Pirate.accepts_nested_attributes_for :update_only_ship, update_only: true, allow_destroy: false
   end
-
 end
 
 class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
@@ -978,7 +977,6 @@ class TestNestedAttributesWithNonStandardPrimaryKeys < ActiveRecord::TestCase
     @owner.update(attributes)
     assert_equal "John", Pet.after_destroy_output
   end
-
 end
 
 class TestHasOneAutosaveAssociationWhichItselfHasAutosaveAssociations < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index c9f7f2d542..74a5b79dfd 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -565,7 +565,7 @@ class RelationTest < ActiveRecord::TestCase
   def test_respond_to_delegates_to_relation
     relation = Topic.all
     fake_arel = Struct.new(:responds) {
-      def respond_to? method, access = false
+      def respond_to?(method, access = false)
         responds << [method, access]
       end
     }.new []
diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb
index 690544ed26..4e799d6dc0 100644
--- a/activerecord/test/cases/scoping/named_scoping_test.rb
+++ b/activerecord/test/cases/scoping/named_scoping_test.rb
@@ -564,5 +564,4 @@ class NamedScopingTest < ActiveRecord::TestCase
     Topic.create!
     assert Topic.one?
   end
-
 end
diff --git a/activerecord/test/cases/time_precision_test.rb b/activerecord/test/cases/time_precision_test.rb
index 4668dc1890..03f6c234e8 100644
--- a/activerecord/test/cases/time_precision_test.rb
+++ b/activerecord/test/cases/time_precision_test.rb
@@ -79,6 +79,5 @@ if subsecond_precision_supported?
         assert_match %r{t\.time\s+"finish",\s+precision: 0$}, output
       end
     end
-
   end
 end
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 5e97077cb8..efb420b403 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -451,7 +451,6 @@ end
 
 
 class TransactionEnrollmentCallbacksTest < ActiveRecord::TestCase
-
   class TopicWithoutTransactionalEnrollmentCallbacks < ActiveRecord::Base
     self.table_name = :topics
 
diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb
index 61289cd299..cbb5362f3f 100644
--- a/activerecord/test/cases/validations/i18n_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_validation_test.rb
@@ -80,5 +80,4 @@ class I18nValidationTest < ActiveRecord::TestCase
     replied_topic.valid?
     assert_equal ["global message"], replied_topic.errors[:replies]
   end
-
 end
diff --git a/activerecord/test/models/country.rb b/activerecord/test/models/country.rb
index 7db9a4e731..7912719ddd 100644
--- a/activerecord/test/models/country.rb
+++ b/activerecord/test/models/country.rb
@@ -1,7 +1,5 @@
 class Country < ActiveRecord::Base
-
   self.primary_key = :country_id
 
   has_and_belongs_to_many :treaties
-
 end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 6dc3c6d632..5ca1d37f6d 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -83,7 +83,6 @@ class Developer < ActiveRecord::Base
     self.class.instance_count += 1
   end
   private :track_instance_count
-
 end
 
 class AuditLog < ActiveRecord::Base
diff --git a/activerecord/test/models/minivan.rb b/activerecord/test/models/minivan.rb
index 3c12406425..e9b05dadf2 100644
--- a/activerecord/test/models/minivan.rb
+++ b/activerecord/test/models/minivan.rb
@@ -5,5 +5,4 @@ class Minivan < ActiveRecord::Base
   has_one :dashboard, through: :speedometer
 
   attr_readonly :color
-
 end
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index 45508a7f67..21fc9b6eb8 100644
--- a/activerecord/test/models/owner.rb
+++ b/activerecord/test/models/owner.rb
@@ -6,14 +6,14 @@ class Owner < ActiveRecord::Base
 
   belongs_to :last_pet, class_name: "Pet"
   scope :including_last_pet, -> {
-    select(%q[
+    select('
       owners.*, (
         select p.pet_id from pets p
         where p.owner_id = owners.owner_id
         order by p.name desc
         limit 1
       ) as last_pet_id
-    ]).includes(:last_pet)
+    ').includes(:last_pet)
   }
 
   after_commit :execute_blocks
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index eb117f92e1..84ffddb74e 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -123,13 +123,13 @@ end
 class Insure
   INSURES = %W{life annuality}
 
-  def self.load mask
+  def self.load(mask)
     INSURES.select do |insure|
       (1 << INSURES.index(insure)) & mask.to_i > 0
     end
   end
 
-  def self.dump insures
+  def self.dump(insures)
     numbers = insures.map { |insure| INSURES.index(insure) }
     numbers.inject(0) { |sum, n| sum + (1 << n) }
   end
diff --git a/activerecord/test/models/subject.rb b/activerecord/test/models/subject.rb
index 9b96f11c9d..f31a33ec7e 100644
--- a/activerecord/test/models/subject.rb
+++ b/activerecord/test/models/subject.rb
@@ -1,7 +1,6 @@
 # used for OracleSynonymTest, see test/synonym_test_oracle.rb
 #
 class Subject < ActiveRecord::Base
-
   # added initialization of author_email_address in the same way as in Topic class
   # as otherwise synonym test was failing
   after_initialize :set_email_address
@@ -12,5 +11,4 @@ class Subject < ActiveRecord::Base
         self.author_email_address = "test@test.com"
       end
     end
-
 end
diff --git a/activerecord/test/models/treaty.rb b/activerecord/test/models/treaty.rb
index 41fd1350f3..373cd48f71 100644
--- a/activerecord/test/models/treaty.rb
+++ b/activerecord/test/models/treaty.rb
@@ -1,7 +1,5 @@
 class Treaty < ActiveRecord::Base
-
   self.primary_key = :treaty_id
 
   has_and_belongs_to_many :countries
-
 end
diff --git a/activerecord/test/models/vegetables.rb b/activerecord/test/models/vegetables.rb
index ef310d2359..a4590d06e0 100644
--- a/activerecord/test/models/vegetables.rb
+++ b/activerecord/test/models/vegetables.rb
@@ -1,5 +1,4 @@
 class Vegetable < ActiveRecord::Base
-
   validates_presence_of :name
 
   def self.inheritance_column