Merge pull request #667 from ngan/fix-ruby-2.7-deprecations

Fix Ruby 2.7 deprecation warnings

History.rdoc

@@ -2,6 +2,7 @@
 
 === Changes
   * Rename `url_whitelist` to `url_allowlist`
+  * Fixed Ruby 2.7 deprecation warnings
 
 === Breaking changes
   * Failed checks against the allowlist now raise `UrlNotAllowed` rather than `NotWhitelistedUrl`

lib/database_cleaner/cleaners.rb

@@ -7,9 +7,9 @@ module DatabaseCleaner
     end
 
     # FIXME this method conflates creation with lookup... both a command and a query. yuck.
-    def [](orm, opts = {})
+    def [](orm, **opts)
       raise ArgumentError if orm.nil?
-      fetch([orm, opts]) { add_cleaner(orm, opts) }
+      fetch([orm, opts]) { add_cleaner(orm, **opts) }
     end 
 
     def strategy=(strategy)
@@ -37,8 +37,8 @@ module DatabaseCleaner
 
     private
 
-    def add_cleaner(orm, opts = {})
-      self[[orm, opts]] = Cleaner.new(orm, opts)
+    def add_cleaner(orm, **opts)
+      self[[orm, opts]] = Cleaner.new(orm, **opts)
     end
 
     def remove_duplicates