database_cleaner-core 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c8581390417b7c13ced7c7c1eb2523c59781da7af79895123f8dce59fd3300
-  data.tar.gz: c49e269f3076f76844de409a8eb3204f56c2d6642827ed94df4b870a05e1ffc3
+  metadata.gz: fae4c60d221b4cfe90b67d2a8d23882be2c9a5e6001604d58f747f8738106bc1
+  data.tar.gz: 36a358ad3e8e12ec27295191f946f2db05ff1a262ce33d587de638ed513adb99
 SHA512:
-  metadata.gz: fb77117488c70781ac3a2a15006d3230de50ac3b99ca76050fc9b3e198774d64f084d9bf5346ebfb2a9ecb9ae3ca97951a7b7b23029b6fc46c6b136bb7e4018f
-  data.tar.gz: 9458f5f9bf76bd766e294a2cee7c53779ea03782913215a3a89d4aade7c604d454437717bef53a52c2fc32a36f805e5c03cfa9c4bd981204b0d06a0ee206d33c
+  metadata.gz: 73da7682fac422e5388a641adec17ea902e0f95c49c9bfc6cbb9e882b0dc17cf8fc758eed25a99db06705fb54a85cb20c078c864c4b576036edabc5bc6273428
+  data.tar.gz: 0c33ac598b9f762e821e3d0a23051b66decdb4aa9342019d4fa0f75865137b8e564024d87a82abebb5637aec25e5619bff635be4d8516e992a5bc5261eab063b

data/.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '3.3'
+          - '3.2'
+          - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rake

data/CONTRIBUTE.markdown

@@ -12,10 +12,10 @@ upstream:
 
 - `bundle install`
 - Copy `spec/support/sample.config.yml` to `spec/support/config.yml` and edit it
-- Run the tests with `bundle exec rspec`
+- Run the tests with `bundle exec rspec` and `bundle exec cucumber`
 
-Note that if you don't have all the supported databases installed and running,
-some tests will fail.
+Note that the Cucumber specs require `redis` to be running, you can either run it globally
+on your system or use the provided `docker-compose.yml` file and run `docker compose up`.
 
 ## 3. Prepare your contribution
 

data/History.rdoc

@@ -1,5 +1,23 @@
 == Development (unreleased)
 
+== Chores
+  * Update CONTRIBUTE.md to mention Cucumber specs and Redis dependency https://github.com/DatabaseCleaner/database_cleaner/pull/721
+
+== 2.1.0 2024-10-24
+
+=== Changes
+  * Add support for trilogy: https://github.com/DatabaseCleaner/database_cleaner/pull/707
+=== Chores
+  * Start testing with Ruby 3.3 in CI: https://github.com/DatabaseCleaner/database_cleaner/pull/710
+  * Point CI badge to GitHub Actions: https://github.com/DatabaseCleaner/database_cleaner/pull/706
+=== Breaking changes
+  * Skip conventional sqlite:// URLs from safeguards: https://github.com/DatabaseCleaner/database_cleaner/pull/715
+
+== 2.0.2 2023-03-10
+
+== Bugfixes
+  * Dependency configuration -- relax dependencies with database_cleaner-active_record: https://github.com/DatabaseCleaner/database_cleaner/pull/699
+
 == 2.0.1 2021-02-04
 
 == Bugfixes

data/README.markdown

@@ -1,8 +1,8 @@
 # Database Cleaner
 
-[![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner)
+[![Build Status](https://github.com/DatabaseCleaner/database_cleaner/actions/workflows/ci.yml/badge.svg)](https://github.com/DatabaseCleaner/database_cleaner/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner)
-[![codecov](https://codecov.io/gh/DatabaseCleaner/database_cleaner/branch/master/graph/badge.svg)](https://codecov.io/gh/DatabaseCleaner/database_cleaner)
+[![codecov](https://codecov.io/gh/DatabaseCleaner/database_cleaner/branch/main/graph/badge.svg)](https://codecov.io/gh/DatabaseCleaner/database_cleaner)
 ![Gem Version](https://badge.fury.io/rb/database_cleaner.svg)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)
 
@@ -75,11 +75,11 @@ DatabaseCleaner.clean
 With the `:truncation` strategy you can also pass in options, for example:
 
 ```ruby
-DatabaseCleaner.strategy = :truncation, {:only => %w[widgets dogs some_other_table]}
+DatabaseCleaner.strategy = [:truncation, only: %w[widgets dogs some_other_table]]
 ```
 
 ```ruby
-DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+DatabaseCleaner.strategy = [:truncation, except: %w[widgets]]
 ```
 
 (I should point out the truncation strategy will never truncate your schema_migrations table.)
@@ -300,10 +300,10 @@ DatabaseCleaner[:active_record].strategy = :transaction
 DatabaseCleaner[:mongo_mapper].strategy = :truncation
 
 # How to specify particular databases
-DatabaseCleaner[:active_record, { db: :two }]
+DatabaseCleaner[:active_record, db: :two]
 
 # You may also pass in the model directly:
-DatabaseCleaner[:active_record, { db: ModelWithDifferentConnection }]
+DatabaseCleaner[:active_record, db: ModelWithDifferentConnection]
 ```
 
 Usage beyond that remains the same with `DatabaseCleaner.start` calling any setup on the different configured databases, and `DatabaseCleaner.clean` executing afterwards.
@@ -353,6 +353,10 @@ DatabaseCleaner.url_allowlist = [
 ]
 ```
 
+## CHANGELOG
+
+See [HISTORY](History.rdoc) for details.
+
 ## COPYRIGHT
 
 See [LICENSE](LICENSE) for details.

data/database_cleaner.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
   spec.homepage    = "https://github.com/DatabaseCleaner/database_cleaner"
   spec.license     = "MIT"
 
-  spec.metadata["changelog_uri"] = "https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc"
+  spec.metadata["changelog_uri"] = "https://github.com/DatabaseCleaner/database_cleaner/blob/main/History.rdoc"
 
   spec.files       = ["lib/database_cleaner.rb"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "database_cleaner-active_record", "~>2.0.0"
+  spec.add_dependency "database_cleaner-active_record", ">= 2", "< 3"
 end

data/docker-compose.yml

@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis:6.2-alpine
+    restart: always
+    ports:
+      - '127.0.0.1:6379:6379'
+    command: redis-server --save 20 1 --loglevel warning

data/lib/database_cleaner/cleaner.rb

@@ -86,7 +86,7 @@ module DatabaseCleaner
     end
 
     def orm_strategy(strategy)
-      strategy_module_name = strategy.to_s.capitalize
+      strategy_module_name = camelize(strategy)
       orm_module.const_get(strategy_module_name)
     rescue NameError
       available_strategies = self.class.available_strategies(orm_module)

data/lib/database_cleaner/cleaners.rb

@@ -13,6 +13,25 @@ module DatabaseCleaner
       fetch([orm, opts]) { add_cleaner(orm, **opts) }
     end
 
+    # It returns a hash with all the strategies associated with
+    # all the cleaners.
+    #
+    # For example:
+    #
+    # ```
+    # cleaners.strategy
+    # => {
+    #      :active_record_1 => :truncation,
+    #      :active_record_2 => :truncation,
+    #      :data_mapper_1 => :truncation
+    # }
+    # ```
+    #
+    # @return [Hash]
+    def strategy
+      transform_values(&:strategy)
+    end
+
     def strategy=(strategy)
       values.each { |cleaner| cleaner.strategy = strategy }
       remove_duplicates

data/lib/database_cleaner/core.rb

@@ -7,6 +7,7 @@ module DatabaseCleaner
     extend Forwardable
     delegate [
       :[],
+      :strategy,
       :strategy=,
       :start,
       :clean,

data/lib/database_cleaner/deprecation.rb

@@ -1,6 +1,6 @@
 module DatabaseCleaner
   def deprecate message
-    method = caller.first[/\d+:in `(.*)'$/, 1].to_sym
+    method = caller.first[/\d+:in [`'](.*)'$/, 1].to_sym
     @@deprecator ||= Deprecator.new
     @@deprecator.deprecate method, message
   end

data/lib/database_cleaner/safeguard.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 module DatabaseCleaner
   class Safeguard
     class Error < Exception
@@ -42,7 +44,8 @@ module DatabaseCleaner
       LOCAL = %w(localhost 127.0.0.1)
 
       def run
-        raise Error::RemoteDatabaseUrl if !skip? && given?
+        return if skip?
+        raise Error::RemoteDatabaseUrl if given?
       end
 
       private
@@ -53,12 +56,11 @@ module DatabaseCleaner
 
         def remote?(url)
           return false unless url
-
           parsed = URI.parse(url)
-          return false if parsed.scheme == 'sqlite3:'
+          return false if parsed.scheme == 'sqlite' || parsed.scheme == 'sqlite3'
 
           host = parsed.host
-          return false unless host
+          return false if host.nil? || host.empty?
           return false if LOCAL.include?(host)
           return false if host.end_with? '.local'
           true

data/lib/database_cleaner/spec/database_helper.rb

@@ -4,7 +4,7 @@ module DatabaseCleaner
   module Spec
     class DatabaseHelper < Struct.new(:db)
       def self.with_all_dbs &block
-        %w[mysql2 sqlite3 postgres].map(&:to_sym).each do |db|
+        %w[mysql2 sqlite3 postgres trilogy].map(&:to_sym).each do |db|
           yield new(db)
         end
       end
@@ -43,7 +43,7 @@ module DatabaseCleaner
         id_column = case db
           when :sqlite3
             "id INTEGER PRIMARY KEY AUTOINCREMENT"
-          when :mysql2
+          when :mysql2, :trilogy
             "id INTEGER PRIMARY KEY AUTO_INCREMENT"
           when :postgres
             "id SERIAL PRIMARY KEY"

data/lib/database_cleaner/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatabaseCleaner
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Mabey
 - Ernesto Tagwerker
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,10 +159,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version.sample"
-- ".travis.yml"
 - ADAPTERS.md
 - CONTRIBUTE.markdown
 - Gemfile
@@ -175,6 +175,7 @@ files:
 - cucumber.yml
 - database_cleaner-core.gemspec
 - database_cleaner.gemspec
+- docker-compose.yml
 - lib/database_cleaner-core.rb
 - lib/database_cleaner/cleaner.rb
 - lib/database_cleaner/cleaners.rb
@@ -193,7 +194,7 @@ homepage: https://github.com/DatabaseCleaner/database_cleaner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,8 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.10
+signing_key:
 specification_version: 4
 summary: Strategies for cleaning databases. Can be used to ensure a clean slate for
   testing.

data/.travis.yml

@@ -1,13 +0,0 @@
-dist: bionic
-language: ruby
-services:
-  - redis
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_script:
-  - bin/setup
-cache:
-  bundler: true
-