applies remaining conventions across the project

27 files changed, 9 insertions, 37 deletions

diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index 010eaeb170..291a545528 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -20,7 +20,6 @@ module ActiveModel
     # to <tt>to_model</tt>. It is perfectly fine for <tt>to_model</tt> to return
     # +self+.
     module Tests
-
       # Passes if the object's model responds to <tt>to_key</tt> and if calling
       # this method returns +nil+ when the object is not persisted.
       # Fails otherwise.
diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb
index dac8d549a7..f5765c0c54 100644
--- a/activemodel/lib/active_model/model.rb
+++ b/activemodel/lib/active_model/model.rb
@@ -1,5 +1,4 @@
 module ActiveModel
-
   # == Active \Model \Basic \Model
   #
   # Includes the required interface for an object to interact with
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 8470915abb..75509b0588 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -1,5 +1,4 @@
 module ActiveModel
-
   # == Active \Model \Translation
   #
   # Provides integration between your object and the Rails internationalization
diff --git a/activemodel/lib/active_model/type/decimal.rb b/activemodel/lib/active_model/type/decimal.rb
index 273798593b..6266933636 100644
--- a/activemodel/lib/active_model/type/decimal.rb
+++ b/activemodel/lib/active_model/type/decimal.rb
@@ -17,16 +17,16 @@ module ActiveModel
 
         def cast_value(value)
           casted_value = case value
-          when ::Float
-            convert_float_to_big_decimal(value)
-          when ::Numeric, ::String
-            BigDecimal(value, precision.to_i)
+                         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
-            else
-              cast_value(value.to_s)
-            end
+                           if value.respond_to?(:to_d)
+                             value.to_d
+                           else
+                             cast_value(value.to_s)
+                           end
           end
 
           apply_scale(casted_value)
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 86f1418843..df6d3f2bcb 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -3,7 +3,6 @@ require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/hash/except"
 
 module ActiveModel
-
   # == Active \Model \Validations
   #
   # Provides a full validation framework to your objects.
diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb
index 8484413950..4fadc795cd 100644
--- a/activemodel/lib/active_model/validations/acceptance.rb
+++ b/activemodel/lib/active_model/validations/acceptance.rb
@@ -1,5 +1,4 @@
 module ActiveModel
-
   module Validations
     class AcceptanceValidator < EachValidator # :nodoc:
       def initialize(options)
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index dcd0317f64..33ca6f6946 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -1,5 +1,4 @@
 module ActiveModel
-
   module Validations
     class ConfirmationValidator < EachValidator # :nodoc:
       def initialize(options)
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb
index 6f4276cc2a..82a1893823 100644
--- a/activemodel/lib/active_model/validations/exclusion.rb
+++ b/activemodel/lib/active_model/validations/exclusion.rb
@@ -1,7 +1,6 @@
 require "active_model/validations/clusivity"
 
 module ActiveModel
-
   module Validations
     class ExclusionValidator < EachValidator # :nodoc:
       include Clusivity
diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 03e0ef56d8..0ea6012a5d 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -1,7 +1,6 @@
 require "active_model/validations/clusivity"
 
 module ActiveModel
-
   module Validations
     class InclusionValidator < EachValidator # :nodoc:
       include Clusivity
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index 25a51c89cf..c924c8d2f8 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -97,7 +97,6 @@ module ActiveModel
     end
 
     module HelperMethods
-
       # Validates that the specified attributes match the length restrictions
       # supplied. Only one constraint option can be used at a time apart from
       # +:minimum+ and +:maximum+ that can be combined together:
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index 21e6603ba4..af27955554 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -1,5 +1,4 @@
 module ActiveModel
-
   module Validations
     class NumericalityValidator < EachValidator # :nodoc:
       CHECKS = { greater_than: :>, greater_than_or_equal_to: :>=,
diff --git a/activemodel/lib/active_model/validations/presence.rb b/activemodel/lib/active_model/validations/presence.rb
index 5d593274eb..0c11cf4265 100644
--- a/activemodel/lib/active_model/validations/presence.rb
+++ b/activemodel/lib/active_model/validations/presence.rb
@@ -1,6 +1,5 @@
 
 module ActiveModel
-
   module Validations
     class PresenceValidator < EachValidator # :nodoc:
       def validate_each(record, attr_name, value)
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 9ee38c1239..9c6065f61f 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -1,7 +1,6 @@
 require "active_support/core_ext/module/anonymous"
 
 module ActiveModel
-
   # == Active \Model \Validator
   #
   # A simple base class that can be used along with
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index a0686c7561..2b1c8d0eb7 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -1,7 +1,6 @@
 require "cases/helper"
 
 class CallbacksTest < ActiveModel::TestCase
-
   class CallbackValidator
     def around_create(model)
       model.callbacks << :before_around_create
@@ -131,5 +130,4 @@ class CallbacksTest < ActiveModel::TestCase
   test "after_create callbacks with both callbacks declared in different lines" do
     assert_equal ["callback1", "callback2"], Violin2.new.create.history
   end
-
 end
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index 37d68de014..1717e0c7ce 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "models/person"
 
 class ActiveModelI18nTests < ActiveModel::TestCase
-
   def setup
     I18n.backend = I18n::Backend::Simple.new
   end
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 99f3ed3c2a..55ab213498 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -5,7 +5,6 @@ require "models/reply"
 require "models/person"
 
 class AcceptanceValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 06b22f0e06..99913be752 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -73,7 +73,6 @@ end
 
 
 class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
-
   def test_if_condition_is_respected_for_before_validation
     d = DogValidatorWithIfCondition.new
     d.valid?
@@ -144,5 +143,4 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
     assert_equal ["before_validation_marker"], d.history
     assert_equal false, output
   end
-
 end
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index d92aa74e2a..8c2f656838 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -3,7 +3,6 @@ require "cases/helper"
 require "models/topic"
 
 class ConditionalValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index b1c4d42065..a980628765 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -4,7 +4,6 @@ require "models/topic"
 require "models/person"
 
 class ConfirmationValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 42e99091fb..06ae4fbecd 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -5,7 +5,6 @@ require "models/topic"
 require "models/person"
 
 class ExclusionValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 5c4a1863cd..d7e6bf3707 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -4,7 +4,6 @@ require "models/topic"
 require "models/person"
 
 class PresenceValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 06ce91f838..9c0071fad7 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "models/person"
 
 class I18nValidationTest < ActiveModel::TestCase
-
   def setup
     Person.clear_validators!
     @person = Person.new
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 96d55c1352..732a8d362a 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -5,7 +5,6 @@ require "models/topic"
 require "models/person"
 
 class InclusionValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 56127f9286..71ef449503 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -7,7 +7,6 @@ require "bigdecimal"
 require "active_support/core_ext/big_decimal"
 
 class NumericalityValidationTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 639a443632..feda817698 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -5,7 +5,6 @@ require "models/person"
 require "models/custom_reader"
 
 class PresenceValidationTest < ActiveModel::TestCase
-
   teardown do
     Topic.clear_validators!
     Person.clear_validators!
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 4932ce1d9a..6b2c998ba4 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -3,7 +3,6 @@ require "cases/helper"
 require "models/topic"
 
 class ValidatesWithTest < ActiveModel::TestCase
-
   def teardown
     Topic.clear_validators!
   end
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 287fee0523..3924741acc 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -40,5 +40,4 @@ class Topic
   def my_word_tokenizer(str)
     str.scan(/\w+/)
   end
-
 end