database_rewinder 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79ac7f52a4377e3b0991fc87a7e0ae0fe50cfc5af519a009d5470e6d8d7e5e3
-  data.tar.gz: 1fc00b427798e7bb7a573bd13818da4b8a41abe99182b1da7cebc92d938db931
+  metadata.gz: b151e420c4e1985e5674d1781dceae421a9e3d9e19c3486cf87529ac14399008
+  data.tar.gz: e1ad8090d602a4db4d71626b765c6f932ac8690ae8dfeee40d429f8071465812
 SHA512:
-  metadata.gz: 65a551ce2bbe957514861dd56e0e4f758ea4f0c93e7ca6052efb24b2033b68c200228253dfafe6f9737214edaf870087c48300d15be854849f7a5a6d0c797a0d
-  data.tar.gz: 841d80ce6639746df70f78b728b5498a117e4f7cfca84e4e8de7de4bc1c2c393f5cfb60c4827e9b551d9a49bd67ecbc30ecf27ad4042cd38d457c23a09e7614c
+  metadata.gz: acca967b5d15e66623e5767fcc9304d56e0d19074f5c02619e77c50f6dacfb51bf0289e6ef64252884f2b2fb88ae198b6abde6b152d0beaf7c13e2c4df290552
+  data.tar.gz: 9be584317f373acaa2797ff723b4e0a2e7e8121a0aecad1920ecb01b06307224e35238e10ede1a5ec43a3a4eb74511b760b132711c4cbf8dfb55d52700626d26

data/.travis.yml

@@ -20,11 +20,12 @@ env:
     - DB=postgresql
 
 rvm:
-  - 2.6.3
+  - 2.7.3
 
 gemfile:
   - gemfiles/rails_52.gemfile
   - gemfiles/rails_60.gemfile
+  - gemfiles/rails_61.gemfile
 
 sudo: false
 
@@ -32,16 +33,22 @@ dist: xenial
 
 matrix:
   include:
-    - rvm: 2.7.1
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=postgresql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_61.gemfile
+      env: DB=postgresql
+    - rvm: 2.6.7
       gemfile: gemfiles/rails_60.gemfile
       env: DB=postgresql
-    - rvm: 2.6.3
-      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.6.7
+      gemfile: gemfiles/rails_52.gemfile
       env: DB=postgresql
-    - rvm: 2.5.5
+    - rvm: 2.5.9
       gemfile: gemfiles/rails_51.gemfile
       env: DB=postgresql
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       gemfile: gemfiles/rails_50.gemfile
       env: DB=postgresql
     - rvm: 2.3.8

data/README.md

@@ -23,9 +23,9 @@ This strategy was originally devised and implemented by Shingo Morita (@eudoxa)
 
 ## Supported versions
 
-* ActiveRecord 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0 (edge)
+* ActiveRecord 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0 (edge)
 
-* Ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 (trunk)
+* Ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1 (trunk)
 
 ## Installation
 
@@ -98,7 +98,7 @@ In cases of this situation, bundle database\_rewinder and add the following conf
 
 ```ruby
 RSpec.configure do |config|
-  config.use_transactional_examples = false
+  config.use_transactional_tests = false
 
   ...
 end

data/database_rewinder.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.9.4'
+  spec.version       = '0.9.5'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.0'
+gem 'selenium-webdriver'
+
+gemspec path: '../'

data/gemfiles/rails_edge.gemfile

@@ -4,7 +4,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', github: 'rails/rails'
+gem 'rails', github: 'rails/rails', branch: 'main'
 gem 'selenium-webdriver'
 
 gemspec path: '../'

data/lib/database_rewinder.rb

@@ -16,7 +16,7 @@ module DatabaseRewinder
     end
 
     def create_cleaner(connection_name)
-      config = database_configuration[connection_name] or raise %Q[Database configuration named "#{connection_name}" is not configured.]
+      config = configuration_hash_for(connection_name) or raise %Q[Database configuration named "#{connection_name}" is not configured.]
 
       Cleaner.new(config: config, connection_name: connection_name, only: @only, except: @except).tap {|c| @cleaners << c}
     end
@@ -84,14 +84,29 @@ module DatabaseRewinder
 
     def get_cache_key(connection_pool)
       if connection_pool.respond_to?(:db_config) # ActiveRecord >= 6.1
-        connection_pool.db_config.config
+        connection_pool.db_config.configuration_hash
       else
         connection_pool.spec.config
       end
     end
+
+    def configuration_hash_for(connection_name)
+      if database_configuration.respond_to?(:configs_for)
+        hash_config = database_configuration.configs_for(env_name: connection_name).first
+        if hash_config
+          if hash_config.respond_to?(:configuration_hash)
+            hash_config.configuration_hash.stringify_keys
+          else
+            hash_config.config
+          end
+        end
+      else
+        database_configuration[connection_name]
+      end
+    end
   end
 
-  private_class_method :get_cache_key
+  private_class_method :configuration_hash_for, :get_cache_key
 end
 
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/database_rewinder.rb
 - lib/database_rewinder/active_record_monkey.rb
@@ -148,7 +149,7 @@ homepage: https://github.com/amatsuda/database_rewinder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner
 test_files: