Rubocop

Author: pschambacher

.rubocop.yml

@@ -20,7 +20,7 @@ Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
 # Indentation of when in a case/when/[else/]end.
-Style/CaseIndentation:
+Layout/CaseIndentation:
   EnforcedStyle: end
 
 #

active_record_host_pool.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require './lib/active_record_host_pool/version'
 
 Gem::Specification.new do |s|
@@ -27,12 +25,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("activerecord", ">= 3.2.0", "< 5.2")
 
-  s.add_development_dependency("wwtd")
-  s.add_development_dependency("mysql2")
-  s.add_development_dependency("rake", '>= 12.0.0')
-  s.add_development_dependency("shoulda")
-  s.add_development_dependency("mocha")
   s.add_development_dependency("bump")
+  s.add_development_dependency("mocha")
+  s.add_development_dependency("mysql2")
   s.add_development_dependency("phenix")
+  s.add_development_dependency("rake", '>= 12.0.0')
   s.add_development_dependency('rubocop', '>= 0.48.0')
+  s.add_development_dependency("shoulda")
+  s.add_development_dependency("wwtd")
 end

test/helper.rb

@@ -23,7 +23,7 @@ module ARHPTestSetup
 
   def arhp_create_models
     return if Object.const_defined?('Test1')
-    eval <<-EOL
+    eval <<-CREATE_MODELS
       class Test1 < ActiveRecord::Base
         self.table_name = "tests"
         establish_connection(:test_host_1_db_1)
@@ -53,7 +53,7 @@ class Test5 < ActiveRecord::Base
         self.table_name = "tests"
         establish_connection(:test_host_2_db_5)
       end
-    EOL
+    CREATE_MODELS
   end
 
   def current_database(klass)

test/test_arhp.rb

@@ -46,6 +46,7 @@ def test_connection_proxy_handles_private_methods
     # Relies on connection.class returning the real class
     Test1.connection.class.class_eval do
       private
+
       def test_private_method
         true
       end

test/test_arhp_wrong_db.rb

@@ -16,12 +16,12 @@ def test_connecting_to_wrong_db_first
     reached_second_exception = false
 
     begin
-      eval <<-EOC
+      eval <<-CREATE_WRONG_DB_MODEL
         class TestNotThere < ActiveRecord::Base
           establish_connection(:test_host_1_db_not_there)
           connection
         end
-      EOC
+      CREATE_WRONG_DB_MODEL
     rescue Exception => e
       assert e.message =~ /Unknown database 'arhp_test_no_create'/
       reached_first_exception = true