normalizes indentation and whitespace across the project

25 files changed, 307 insertions, 307 deletions

diff --git a/activemodel/lib/active_model/attribute_assignment.rb b/activemodel/lib/active_model/attribute_assignment.rb
index 541076486d..7dad3b6dff 100644
--- a/activemodel/lib/active_model/attribute_assignment.rb
+++ b/activemodel/lib/active_model/attribute_assignment.rb
@@ -35,18 +35,18 @@ module ActiveModel
 
     private
 
-    def _assign_attributes(attributes)
-      attributes.each do |k, v|
-        _assign_attribute(k, v)
+      def _assign_attributes(attributes)
+        attributes.each do |k, v|
+          _assign_attribute(k, v)
+        end
       end
-    end
 
-    def _assign_attribute(k, v)
-      if respond_to?("#{k}=")
-        public_send("#{k}=", v)
-      else
-        raise UnknownAttributeError.new(self, k)
+      def _assign_attribute(k, v)
+        if respond_to?("#{k}=")
+          public_send("#{k}=", v)
+        else
+          raise UnknownAttributeError.new(self, k)
+        end
       end
-    end
   end
 end
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 8a87025536..283090e380 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -122,28 +122,28 @@ module ActiveModel
 
     private
 
-    def _define_before_model_callback(klass, callback) #:nodoc:
-      klass.define_singleton_method("before_#{callback}") do |*args, &block|
-        set_callback(:"#{callback}", :before, *args, &block)
+      def _define_before_model_callback(klass, callback) #:nodoc:
+        klass.define_singleton_method("before_#{callback}") do |*args, &block|
+          set_callback(:"#{callback}", :before, *args, &block)
+        end
       end
-    end
 
-    def _define_around_model_callback(klass, callback) #:nodoc:
-      klass.define_singleton_method("around_#{callback}") do |*args, &block|
-        set_callback(:"#{callback}", :around, *args, &block)
+      def _define_around_model_callback(klass, callback) #:nodoc:
+        klass.define_singleton_method("around_#{callback}") do |*args, &block|
+          set_callback(:"#{callback}", :around, *args, &block)
+        end
       end
-    end
 
-    def _define_after_model_callback(klass, callback) #:nodoc:
-      klass.define_singleton_method("after_#{callback}") do |*args, &block|
-        options = args.extract_options!
-        options[:prepend] = true
-        conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
-          v != false
-        }
-        options[:if] = Array(options[:if]) << conditional
-        set_callback(:"#{callback}", :after, *(args << options), &block)
+      def _define_after_model_callback(klass, callback) #:nodoc:
+        klass.define_singleton_method("after_#{callback}") do |*args, &block|
+          options = args.extract_options!
+          options[:prepend] = true
+          conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
+            v != false
+          }
+          options[:if] = Array(options[:if]) << conditional
+          set_callback(:"#{callback}", :after, *(args << options), &block)
+        end
       end
-    end
   end
 end
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index a9c62fc3a5..3830d1486d 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -191,9 +191,9 @@ module ActiveModel
 
     private
 
-    def _singularize(string)
-      ActiveSupport::Inflector.underscore(string).tr("/".freeze, "_".freeze)
-    end
+      def _singularize(string)
+        ActiveSupport::Inflector.underscore(string).tr("/".freeze, "_".freeze)
+      end
   end
 
   # == Active \Model \Naming
diff --git a/activemodel/lib/active_model/type/big_integer.rb b/activemodel/lib/active_model/type/big_integer.rb
index 6829736cff..3b629682fe 100644
--- a/activemodel/lib/active_model/type/big_integer.rb
+++ b/activemodel/lib/active_model/type/big_integer.rb
@@ -5,9 +5,9 @@ module ActiveModel
     class BigInteger < Integer # :nodoc:
       private
 
-      def max_value
-        ::Float::INFINITY
-      end
+        def max_value
+          ::Float::INFINITY
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/boolean.rb b/activemodel/lib/active_model/type/boolean.rb
index 618423ba8a..f2a47370a3 100644
--- a/activemodel/lib/active_model/type/boolean.rb
+++ b/activemodel/lib/active_model/type/boolean.rb
@@ -20,13 +20,13 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        if value == ""
-          nil
-        else
-          !FALSE_VALUES.include?(value)
+        def cast_value(value)
+          if value == ""
+            nil
+          else
+            !FALSE_VALUES.include?(value)
+          end
         end
-      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/date.rb b/activemodel/lib/active_model/type/date.rb
index edd07ac38c..6e313fbca8 100644
--- a/activemodel/lib/active_model/type/date.rb
+++ b/activemodel/lib/active_model/type/date.rb
@@ -17,38 +17,38 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        if value.is_a?(::String)
-          return if value.empty?
-          fast_string_to_date(value) || fallback_string_to_date(value)
-        elsif value.respond_to?(:to_date)
-          value.to_date
-        else
-          value
+        def cast_value(value)
+          if value.is_a?(::String)
+            return if value.empty?
+            fast_string_to_date(value) || fallback_string_to_date(value)
+          elsif value.respond_to?(:to_date)
+            value.to_date
+          else
+            value
+          end
         end
-      end
 
-      ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
-      def fast_string_to_date(string)
-        if string =~ ISO_DATE
-          new_date $1.to_i, $2.to_i, $3.to_i
+        ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
+        def fast_string_to_date(string)
+          if string =~ ISO_DATE
+            new_date $1.to_i, $2.to_i, $3.to_i
+          end
         end
-      end
 
-      def fallback_string_to_date(string)
-        new_date(*::Date._parse(string, false).values_at(:year, :mon, :mday))
-      end
+        def fallback_string_to_date(string)
+          new_date(*::Date._parse(string, false).values_at(:year, :mon, :mday))
+        end
 
-      def new_date(year, mon, mday)
-        if year && year != 0
-          ::Date.new(year, mon, mday) rescue nil
+        def new_date(year, mon, mday)
+          if year && year != 0
+            ::Date.new(year, mon, mday) rescue nil
+          end
         end
-      end
 
-      def value_from_multiparameter_assignment(*)
-        time = super
-        time && time.to_date
-      end
+        def value_from_multiparameter_assignment(*)
+          time = super
+          time && time.to_date
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/date_time.rb b/activemodel/lib/active_model/type/date_time.rb
index 2f2df4320f..f88c9e5071 100644
--- a/activemodel/lib/active_model/type/date_time.rb
+++ b/activemodel/lib/active_model/type/date_time.rb
@@ -12,33 +12,33 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        return apply_seconds_precision(value) unless value.is_a?(::String)
-        return if value.empty?
+        def cast_value(value)
+          return apply_seconds_precision(value) unless value.is_a?(::String)
+          return if value.empty?
 
-        fast_string_to_time(value) || fallback_string_to_time(value)
-      end
+          fast_string_to_time(value) || fallback_string_to_time(value)
+        end
 
       # '0.123456' -> 123456
       # '1.123456' -> 123456
-      def microseconds(time)
-        time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
-      end
+        def microseconds(time)
+          time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
+        end
 
-      def fallback_string_to_time(string)
-        time_hash = ::Date._parse(string)
-        time_hash[:sec_fraction] = microseconds(time_hash)
+        def fallback_string_to_time(string)
+          time_hash = ::Date._parse(string)
+          time_hash[:sec_fraction] = microseconds(time_hash)
 
-        new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
-      end
+          new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
+        end
 
-      def value_from_multiparameter_assignment(values_hash)
-        missing_parameter = (1..3).detect { |key| !values_hash.key?(key) }
-        if missing_parameter
-          raise ArgumentError, missing_parameter
+        def value_from_multiparameter_assignment(values_hash)
+          missing_parameter = (1..3).detect { |key| !values_hash.key?(key) }
+          if missing_parameter
+            raise ArgumentError, missing_parameter
+          end
+          super
         end
-        super
-      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/decimal.rb b/activemodel/lib/active_model/type/decimal.rb
index 11ea327026..273798593b 100644
--- a/activemodel/lib/active_model/type/decimal.rb
+++ b/activemodel/lib/active_model/type/decimal.rb
@@ -15,46 +15,46 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        casted_value = case value
-        when ::Float
-          convert_float_to_big_decimal(value)
-        when ::Numeric, ::String
-          BigDecimal(value, precision.to_i)
-        else
-          if value.respond_to?(:to_d)
-            value.to_d
+        def cast_value(value)
+          casted_value = case value
+          when ::Float
+            convert_float_to_big_decimal(value)
+          when ::Numeric, ::String
+            BigDecimal(value, precision.to_i)
           else
-            cast_value(value.to_s)
+            if value.respond_to?(:to_d)
+              value.to_d
+            else
+              cast_value(value.to_s)
+            end
           end
-        end
 
-        apply_scale(casted_value)
-      end
+          apply_scale(casted_value)
+        end
 
-      def convert_float_to_big_decimal(value)
-        if precision
-          BigDecimal(apply_scale(value), float_precision)
-        else
-          value.to_d
+        def convert_float_to_big_decimal(value)
+          if precision
+            BigDecimal(apply_scale(value), float_precision)
+          else
+            value.to_d
+          end
         end
-      end
 
-      def float_precision
-        if precision.to_i > ::Float::DIG + 1
-          ::Float::DIG + 1
-        else
-          precision.to_i
+        def float_precision
+          if precision.to_i > ::Float::DIG + 1
+            ::Float::DIG + 1
+          else
+            precision.to_i
+          end
         end
-      end
 
-      def apply_scale(value)
-        if scale
-          value.round(scale)
-        else
-          value
+        def apply_scale(value)
+          if scale
+            value.round(scale)
+          else
+            value
+          end
         end
-      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/float.rb b/activemodel/lib/active_model/type/float.rb
index 0f925bc7e1..94bb7e700c 100644
--- a/activemodel/lib/active_model/type/float.rb
+++ b/activemodel/lib/active_model/type/float.rb
@@ -11,15 +11,15 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        case value
-        when ::Float then value
-        when "Infinity" then ::Float::INFINITY
-        when "-Infinity" then -::Float::INFINITY
-        when "NaN" then ::Float::NAN
-        else value.to_f
+        def cast_value(value)
+          case value
+          when ::Float then value
+          when "Infinity" then ::Float::INFINITY
+          when "-Infinity" then -::Float::INFINITY
+          when "NaN" then ::Float::NAN
+          else value.to_f
+          end
         end
-      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/helpers/numeric.rb b/activemodel/lib/active_model/type/helpers/numeric.rb
index c883010506..ec1d1daf1a 100644
--- a/activemodel/lib/active_model/type/helpers/numeric.rb
+++ b/activemodel/lib/active_model/type/helpers/numeric.rb
@@ -18,16 +18,16 @@ module ActiveModel
 
         private
 
-        def number_to_non_number?(old_value, new_value_before_type_cast)
-          old_value != nil && non_numeric_string?(new_value_before_type_cast)
-        end
+          def number_to_non_number?(old_value, new_value_before_type_cast)
+            old_value != nil && non_numeric_string?(new_value_before_type_cast)
+          end
 
-        def non_numeric_string?(value)
-          # 'wibble'.to_i will give zero, we want to make sure
-          # that we aren't marking int zero to string zero as
-          # changed.
-          value.to_s !~ /\A-?\d+\.?\d*\z/
-        end
+          def non_numeric_string?(value)
+            # 'wibble'.to_i will give zero, we want to make sure
+            # that we aren't marking int zero to string zero as
+            # changed.
+            value.to_s !~ /\A-?\d+\.?\d*\z/
+          end
       end
     end
   end
diff --git a/activemodel/lib/active_model/type/helpers/time_value.rb b/activemodel/lib/active_model/type/helpers/time_value.rb
index e4947fc75d..64780ebbdc 100644
--- a/activemodel/lib/active_model/type/helpers/time_value.rb
+++ b/activemodel/lib/active_model/type/helpers/time_value.rb
@@ -47,30 +47,30 @@ module ActiveModel
 
         private
 
-        def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil)
-          # Treat 0000-00-00 00:00:00 as nil.
-          return if year.nil? || (year == 0 && mon == 0 && mday == 0)
+          def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil)
+            # Treat 0000-00-00 00:00:00 as nil.
+            return if year.nil? || (year == 0 && mon == 0 && mday == 0)
 
-          if offset
-            time = ::Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
-            return unless time
+            if offset
+              time = ::Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
+              return unless time
 
-            time -= offset
-            is_utc? ? time : time.getlocal
-          else
-            ::Time.public_send(default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
+              time -= offset
+              is_utc? ? time : time.getlocal
+            else
+              ::Time.public_send(default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
+            end
           end
-        end
 
-        ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
+          ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
 
         # Doesn't handle time zones.
-        def fast_string_to_time(string)
-          if string =~ ISO_DATETIME
-            microsec = ($7.to_r * 1_000_000).to_i
-            new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
+          def fast_string_to_time(string)
+            if string =~ ISO_DATETIME
+              microsec = ($7.to_r * 1_000_000).to_i
+              new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
+            end
           end
-        end
       end
     end
   end
diff --git a/activemodel/lib/active_model/type/immutable_string.rb b/activemodel/lib/active_model/type/immutable_string.rb
index 20b8ca0cc4..41e4a2a1ac 100644
--- a/activemodel/lib/active_model/type/immutable_string.rb
+++ b/activemodel/lib/active_model/type/immutable_string.rb
@@ -16,14 +16,14 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        result = case value
-                 when true then "t"
-                 when false then "f"
-                 else value.to_s
-                 end
-        result.freeze
-      end
+        def cast_value(value)
+          result = case value
+                   when true then "t"
+                   when false then "f"
+                   else value.to_s
+                   end
+          result.freeze
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/integer.rb b/activemodel/lib/active_model/type/integer.rb
index eea2280b22..b76e9d96f6 100644
--- a/activemodel/lib/active_model/type/integer.rb
+++ b/activemodel/lib/active_model/type/integer.rb
@@ -31,36 +31,36 @@ module ActiveModel
 
       protected
 
-      attr_reader :range
+        attr_reader :range
 
       private
 
-      def cast_value(value)
-        case value
-        when true then 1
-        when false then 0
-        else
-          value.to_i rescue nil
+        def cast_value(value)
+          case value
+          when true then 1
+          when false then 0
+          else
+            value.to_i rescue nil
+          end
         end
-      end
 
-      def ensure_in_range(value)
-        unless range.cover?(value)
-          raise ActiveModel::RangeError, "#{value} is out of range for #{self.class} with limit #{_limit}"
+        def ensure_in_range(value)
+          unless range.cover?(value)
+            raise ActiveModel::RangeError, "#{value} is out of range for #{self.class} with limit #{_limit}"
+          end
         end
-      end
 
-      def max_value
-        1 << (_limit * 8 - 1) # 8 bits per byte with one bit for sign
-      end
+        def max_value
+          1 << (_limit * 8 - 1) # 8 bits per byte with one bit for sign
+        end
 
-      def min_value
-        -max_value
-      end
+        def min_value
+          -max_value
+        end
 
-      def _limit
-        self.limit || DEFAULT_LIMIT
-      end
+        def _limit
+          self.limit || DEFAULT_LIMIT
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/registry.rb b/activemodel/lib/active_model/type/registry.rb
index adc88eb624..d25f1a129e 100644
--- a/activemodel/lib/active_model/type/registry.rb
+++ b/activemodel/lib/active_model/type/registry.rb
@@ -23,17 +23,17 @@ module ActiveModel
 
       protected
 
-      attr_reader :registrations
+        attr_reader :registrations
 
       private
 
-      def registration_klass
-        Registration
-      end
+        def registration_klass
+          Registration
+        end
 
-      def find_registration(symbol, *args)
-        registrations.find { |r| r.matches?(symbol, *args) }
-      end
+        def find_registration(symbol, *args)
+          registrations.find { |r| r.matches?(symbol, *args) }
+        end
     end
 
     class Registration
@@ -57,7 +57,7 @@ module ActiveModel
 
       protected
 
-      attr_reader :name, :block
+        attr_reader :name, :block
     end
   end
   # :startdoc:
diff --git a/activemodel/lib/active_model/type/string.rb b/activemodel/lib/active_model/type/string.rb
index 8a91410998..c7e0208a5a 100644
--- a/activemodel/lib/active_model/type/string.rb
+++ b/activemodel/lib/active_model/type/string.rb
@@ -11,9 +11,9 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        ::String.new(super)
-      end
+        def cast_value(value)
+          ::String.new(super)
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/time.rb b/activemodel/lib/active_model/type/time.rb
index 5a7851ba29..54d6214e81 100644
--- a/activemodel/lib/active_model/type/time.rb
+++ b/activemodel/lib/active_model/type/time.rb
@@ -25,22 +25,22 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        return value unless value.is_a?(::String)
-        return if value.empty?
-
-        if value.start_with?("2000-01-01")
-          dummy_time_value = value
-        else
-          dummy_time_value = "2000-01-01 #{value}"
+        def cast_value(value)
+          return value unless value.is_a?(::String)
+          return if value.empty?
+
+          if value.start_with?("2000-01-01")
+            dummy_time_value = value
+          else
+            dummy_time_value = "2000-01-01 #{value}"
+          end
+
+          fast_string_to_time(dummy_time_value) || begin
+            time_hash = ::Date._parse(dummy_time_value)
+            return if time_hash[:hour].nil?
+            new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
+          end
         end
-
-        fast_string_to_time(dummy_time_value) || begin
-          time_hash = ::Date._parse(dummy_time_value)
-          return if time_hash[:hour].nil?
-          new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
-        end
-      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/unsigned_integer.rb b/activemodel/lib/active_model/type/unsigned_integer.rb
index 3f49f9f5f7..288fa23efe 100644
--- a/activemodel/lib/active_model/type/unsigned_integer.rb
+++ b/activemodel/lib/active_model/type/unsigned_integer.rb
@@ -3,13 +3,13 @@ module ActiveModel
     class UnsignedInteger < Integer # :nodoc:
       private
 
-      def max_value
-        super * 2
-      end
+        def max_value
+          super * 2
+        end
 
-      def min_value
-        0
-      end
+        def min_value
+          0
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/type/value.rb b/activemodel/lib/active_model/type/value.rb
index 0d2d6873a8..4d3a1b29d6 100644
--- a/activemodel/lib/active_model/type/value.rb
+++ b/activemodel/lib/active_model/type/value.rb
@@ -108,9 +108,9 @@ module ActiveModel
       # Convenience method for types which do not need separate type casting
       # behavior for user and database inputs. Called by Value#cast for
       # values except +nil+.
-      def cast_value(value) # :doc:
-        value
-      end
+        def cast_value(value) # :doc:
+          value
+        end
     end
   end
 end
diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb
index 998b05f565..8484413950 100644
--- a/activemodel/lib/active_model/validations/acceptance.rb
+++ b/activemodel/lib/active_model/validations/acceptance.rb
@@ -15,58 +15,58 @@ module ActiveModel
 
       private
 
-      def setup!(klass)
-        klass.include(LazilyDefineAttributes.new(AttributeDefinition.new(attributes)))
-      end
+        def setup!(klass)
+          klass.include(LazilyDefineAttributes.new(AttributeDefinition.new(attributes)))
+        end
 
-      def acceptable_option?(value)
-        Array(options[:accept]).include?(value)
-      end
+        def acceptable_option?(value)
+          Array(options[:accept]).include?(value)
+        end
 
-      class LazilyDefineAttributes < Module
-        def initialize(attribute_definition)
-          define_method(:respond_to_missing?) do |method_name, include_private=false|
-            super(method_name, include_private) || attribute_definition.matches?(method_name)
-          end
+        class LazilyDefineAttributes < Module
+          def initialize(attribute_definition)
+            define_method(:respond_to_missing?) do |method_name, include_private=false|
+              super(method_name, include_private) || attribute_definition.matches?(method_name)
+            end
 
-          define_method(:method_missing) do |method_name, *args, &block|
-            if attribute_definition.matches?(method_name)
-              attribute_definition.define_on(self.class)
-              send(method_name, *args, &block)
-            else
-              super(method_name, *args, &block)
+            define_method(:method_missing) do |method_name, *args, &block|
+              if attribute_definition.matches?(method_name)
+                attribute_definition.define_on(self.class)
+                send(method_name, *args, &block)
+              else
+                super(method_name, *args, &block)
+              end
             end
           end
         end
-      end
 
-      class AttributeDefinition
-        def initialize(attributes)
-          @attributes = attributes.map(&:to_s)
-        end
+        class AttributeDefinition
+          def initialize(attributes)
+            @attributes = attributes.map(&:to_s)
+          end
 
-        def matches?(method_name)
-          attr_name = convert_to_reader_name(method_name)
-          attributes.include?(attr_name)
-        end
+          def matches?(method_name)
+            attr_name = convert_to_reader_name(method_name)
+            attributes.include?(attr_name)
+          end
 
-        def define_on(klass)
-          attr_readers = attributes.reject { |name| klass.attribute_method?(name) }
-          attr_writers = attributes.reject { |name| klass.attribute_method?("#{name}=") }
-          klass.send(:attr_reader, *attr_readers)
-          klass.send(:attr_writer, *attr_writers)
-        end
+          def define_on(klass)
+            attr_readers = attributes.reject { |name| klass.attribute_method?(name) }
+            attr_writers = attributes.reject { |name| klass.attribute_method?("#{name}=") }
+            klass.send(:attr_reader, *attr_readers)
+            klass.send(:attr_writer, *attr_writers)
+          end
 
-        protected
+          protected
 
-        attr_reader :attributes
+            attr_reader :attributes
 
-        private
+          private
 
-        def convert_to_reader_name(method_name)
-          method_name.to_s.chomp("=")
+            def convert_to_reader_name(method_name)
+              method_name.to_s.chomp("=")
+            end
         end
-      end
     end
 
     module HelperMethods
diff --git a/activemodel/lib/active_model/validations/clusivity.rb b/activemodel/lib/active_model/validations/clusivity.rb
index 868c519229..a869dba672 100644
--- a/activemodel/lib/active_model/validations/clusivity.rb
+++ b/activemodel/lib/active_model/validations/clusivity.rb
@@ -16,7 +16,7 @@ module ActiveModel
 
       def include?(record, value)
         members = if delimiter.respond_to?(:call)
-                    delimiter.call(record)
+          delimiter.call(record)
                   elsif delimiter.respond_to?(:to_sym)
                     record.send(delimiter)
                   else
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index 8f8ade90bb..dcd0317f64 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -17,23 +17,23 @@ module ActiveModel
       end
 
       private
-      def setup!(klass)
-        klass.send(:attr_reader, *attributes.map do |attribute|
-          :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
-        end.compact)
+        def setup!(klass)
+          klass.send(:attr_reader, *attributes.map do |attribute|
+            :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
+          end.compact)
 
-        klass.send(:attr_writer, *attributes.map do |attribute|
-          :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation=")
-        end.compact)
-      end
+          klass.send(:attr_writer, *attributes.map do |attribute|
+            :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation=")
+          end.compact)
+        end
 
-      def confirmation_value_equal?(record, attribute, value, confirmed)
-        if !options[:case_sensitive] && value.is_a?(String)
-          value.casecmp(confirmed) == 0
-        else
-          value == confirmed
+        def confirmation_value_equal?(record, attribute, value, confirmed)
+          if !options[:case_sensitive] && value.is_a?(String)
+            value.casecmp(confirmed) == 0
+          else
+            value == confirmed
+          end
         end
-      end
     end
 
     module HelperMethods
diff --git a/activemodel/lib/active_model/validations/format.rb b/activemodel/lib/active_model/validations/format.rb
index 910d6c2d17..e4ea42f8f4 100644
--- a/activemodel/lib/active_model/validations/format.rb
+++ b/activemodel/lib/active_model/validations/format.rb
@@ -24,33 +24,33 @@ module ActiveModel
 
       private
 
-      def option_call(record, name)
-        option = options[name]
-        option.respond_to?(:call) ? option.call(record) : option
-      end
+        def option_call(record, name)
+          option = options[name]
+          option.respond_to?(:call) ? option.call(record) : option
+        end
 
-      def record_error(record, attribute, name, value)
-        record.errors.add(attribute, :invalid, options.except(name).merge!(value: value))
-      end
+        def record_error(record, attribute, name, value)
+          record.errors.add(attribute, :invalid, options.except(name).merge!(value: value))
+        end
 
-      def check_options_validity(name)
-        if option = options[name]
-          if option.is_a?(Regexp)
-            if options[:multiline] != true && regexp_using_multiline_anchors?(option)
-              raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
-              "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
-              ":multiline => true option?"
+        def check_options_validity(name)
+          if option = options[name]
+            if option.is_a?(Regexp)
+              if options[:multiline] != true && regexp_using_multiline_anchors?(option)
+                raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
+                "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
+                ":multiline => true option?"
+              end
+            elsif !option.respond_to?(:call)
+              raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
             end
-          elsif !option.respond_to?(:call)
-            raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
           end
         end
-      end
 
-      def regexp_using_multiline_anchors?(regexp)
-        source = regexp.source
-        source.start_with?("^") || (source.end_with?("$") && !source.end_with?("\\$"))
-      end
+        def regexp_using_multiline_anchors?(regexp)
+          source = regexp.source
+          source.start_with?("^") || (source.end_with?("$") && !source.end_with?("\\$"))
+        end
     end
 
     module HelperMethods
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index 257ea2e979..25a51c89cf 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -80,20 +80,20 @@ module ActiveModel
       end
 
       private
-      def tokenize(record, value)
-        tokenizer = options[:tokenizer]
-        if tokenizer && value.kind_of?(String)
-          if tokenizer.kind_of?(Proc)
-            tokenizer.call(value)
-          elsif record.respond_to?(tokenizer)
-            record.send(tokenizer, value)
-          end
-        end || value
-      end
+        def tokenize(record, value)
+          tokenizer = options[:tokenizer]
+          if tokenizer && value.kind_of?(String)
+            if tokenizer.kind_of?(Proc)
+              tokenizer.call(value)
+            elsif record.respond_to?(tokenizer)
+              record.send(tokenizer, value)
+            end
+          end || value
+        end
 
-      def skip_nil_check?(key)
-        key == :maximum && options[:allow_nil].nil? && options[:allow_blank].nil?
-      end
+        def skip_nil_check?(key)
+          key == :maximum && options[:allow_nil].nil? && options[:allow_blank].nil?
+        end
     end
 
     module HelperMethods
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index 9a0a0655de..21e6603ba4 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -99,10 +99,10 @@ module ActiveModel
 
       private
 
-      def record_attribute_changed_in_place?(record, attr_name)
-        record.respond_to?(:attribute_changed_in_place?) &&
-          record.attribute_changed_in_place?(attr_name.to_s)
-      end
+        def record_attribute_changed_in_place?(record, attr_name)
+          record.respond_to?(:attribute_changed_in_place?) &&
+            record.attribute_changed_in_place?(attr_name.to_s)
+        end
     end
 
     module HelperMethods
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 4ea369e005..9ee38c1239 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -175,8 +175,8 @@ module ActiveModel
 
     private
 
-    def validate_each(record, attribute, value)
-      @block.call(record, attribute, value)
-    end
+      def validate_each(record, attribute, value)
+        @block.call(record, attribute, value)
+      end
   end
 end