Upgrade RuboCop

.rubocop.yml

@@ -25,6 +25,9 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -55,11 +58,17 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
+Style/EmptyLineAfterMagicComment:
+  Enabled: false
+
 Style/EmptyLines:
   Exclude:
     - 'lib/active_record_shards-3-2.rb'
     - 'lib/active_record_shards-5-0.rb'
 
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
 Style/FileName:
   Exclude:
     - 'lib/active_record_shards-3-2.rb'
@@ -75,17 +84,14 @@ Style/FormatString:
 Style/GuardClause:
   Enabled: false
 
-Style/HashSyntax:
-  EnforcedStyle: ruby19
-
 Style/IfUnlessModifier:
   Enabled: false
 
 Style/IndentHash:
   EnforcedStyle: consistent
 
-Style/IndentationWidth:
-  Width: 2
+Style/IndentHeredoc:
+  Enabled: false
 
 Style/NumericLiterals:
   Enabled: false
@@ -96,5 +102,8 @@ Style/SingleLineBlockParams:
 Style/StringLiterals:
   Enabled: false
 
+Style/SymbolArray:
+  Enabled: false
+
 Style/WordArray:
   Enabled: false

active_record_shards.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new "active_record_shards", "3.9.1" do |s|
   s.add_development_dependency("rake", '~> 12.0')
   s.add_development_dependency("mysql2")
   s.add_development_dependency("bump")
-  s.add_development_dependency("rubocop", "0.42.0")
+  s.add_development_dependency("rubocop", "0.48.1")
   s.add_development_dependency("minitest")
   s.add_development_dependency("minitest-rg")
   s.add_development_dependency("mocha")

test/configuration_parser_test.rb

@@ -4,7 +4,7 @@
 describe ActiveRecordShards::ConfigurationParser do
   describe "exploding the database.yml" do
     before do
-      @exploded_conf = ActiveRecordShards::ConfigurationParser.explode(YAML.load(IO.read(File.dirname(__FILE__) + '/database_parse_test.yml')))
+      @exploded_conf = ActiveRecordShards::ConfigurationParser.explode(YAML.safe_load(IO.read(File.dirname(__FILE__) + '/database_parse_test.yml')))
     end
 
     describe "main slave" do

test/connection_switching_test.rb

@@ -340,8 +340,8 @@ class ShardedModel < ActiveRecord::Base
         Account.create!
         assert_using_master_db
 
-        assert_equal Account.count, ActiveRecord::Base.on_slave { Account.count }
-        assert_equal Account.count, Account.on_slave { Account.count }
+        assert_equal(Account.count, ActiveRecord::Base.on_slave { Account.count })
+        assert_equal(Account.count, Account.on_slave { Account.count })
       end
     end
 

test/models.rb

@@ -12,7 +12,7 @@ class AccountThing < ActiveRecord::Base
   not_sharded
 
   if respond_to?(:where)
-    scope :enabled, -> { where(enabled: true) }
+    scope(:enabled, -> { where(enabled: true) })
   else
     named_scope :enabled, conditions: { enabled: true }
   end