Subclass strategies from the new DC::Strategy base class from database_cleaner-core, instead of including the DC::Generic::* family of modules.

Author: botandrose-machine

lib/database_cleaner/redis.rb

@@ -2,4 +2,12 @@
 require "database_cleaner/core"
 require "database_cleaner/redis/truncation"
 
+module DatabaseCleaner
+  module Redis
+    def self.available_strategies
+      [:truncation]
+    end
+  end
+end
+
 DatabaseCleaner[:redis].strategy = :truncation

lib/database_cleaner/redis/truncation.rb

@@ -1,52 +1,42 @@
-require "database_cleaner/generic/base"
-require "database_cleaner/generic/truncation"
+require "database_cleaner/strategy"
 
 module DatabaseCleaner
   module Redis
-    def self.available_strategies
-      %i[truncation]
-    end
-
-    def self.default_strategy
-      available_strategies.first
-    end
-
-    class Truncation
-      include DatabaseCleaner::Generic::Base
-      include DatabaseCleaner::Generic::Truncation
-
-      def db
-        @db ||= :default
+    class Truncation < Strategy
+      def initialize only: [], except: []
+        @only = only
+        @except = except
       end
-      attr_writer :db
-
-      alias_method :url, :db
 
       def clean
-        if @only
-          @only.each do |term|
-            connection.keys(term).each { |k| connection.del k }
-          end
-        elsif @tables_to_exclude
-          keys_except = []
-          @tables_to_exclude.each { |term| keys_except += connection.keys(term) }
-          connection.keys.each { |k| connection.del(k) unless keys_except.include?(k) }
-        else
+        only = expand_keys(@only)
+        except = expand_keys(@except)
+
+        if only.none? && except.none?
           connection.flushdb
+        else
+          tables_to_clean(connection.keys, only: only, except: except).each do |key|
+            connection.del key
+          end
         end
-        connection.quit unless url == :default
+
+        connection.quit unless db == :default
       end
 
       private
 
+      def expand_keys keys
+        keys.flat_map { |key| connection.keys(key) }
+      end
+
       def connection
         @connection ||= begin
-          if url == :default
+          if db == :default
             ::Redis.new
           elsif db.is_a?(::Redis) # pass directly the connection
             db
           else
-            ::Redis.new(url: url)
+            ::Redis.new(url: db)
           end
         end
       end

spec/database_cleaner/redis_spec.rb

@@ -5,10 +5,6 @@
 module DatabaseCleaner
   RSpec.describe Redis do
     it_behaves_like "a database_cleaner adapter"
-
-    it "has a default_strategy of truncation" do
-      expect(described_class.default_strategy).to eq(:truncation)
-    end
   end
 end