database_cleaner 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2014e2b6a88fc052138027fe636b0832e1e82ed0da858fdfc6b4c57e25b4c640
-  data.tar.gz: 27a439c3e5fe70c98c49bd79be9c534ec35695a6f36ab5eba6fd272fc0a30e39
+  metadata.gz: 542128460dcf57ee3cbb1abb9600c6f71c94e76a00d0e56b2ef1cd9d03eb301e
+  data.tar.gz: 9448f484a16c73734c838eaa52b09b26cbe7cca4ded33fc0a42cc64f38b378d0
 SHA512:
-  metadata.gz: 68441f1d78a2dec098872b0d0cf37823c853ff6b2377229b5e81396ff31b4927f48c567b4ab163dd583d6b455050c312d555c87b0ff870c9e5494c9ac06146cb
-  data.tar.gz: 0ddef43b158cc15263307bbf5bae0c92363fa6e882b5f7cc1ccb5cf7831d092c4da8549cd21c8bfca0be955299105b4023e333cc68c5c3180206ff3b79e6aea0
+  metadata.gz: 1ebe87490fea5226d40c7afae00971818ebaeda43a90cd4d1bd2551cbb755f1a4206db28221639ad3184034db3c3fc60d3be96062e84d3e974a11dd6300f29bd
+  data.tar.gz: 288b78f19d594b92ce5001ee3750b64ffd78da3e7b5cc66cd07dfd68d8e4555738d5895581ed99eaaf6c8660b2882057457dd8ed35086c8404affaed2b85dcf2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    database_cleaner (1.8.3)
+    database_cleaner (1.8.4)
 
 PATH
   remote: adapters

data/History.rdoc

@@ -1,5 +1,10 @@
 == Development (master)
 
+== 1.8.4 2020-04-02
+
+=== Bug Fixes
+  * Fix false positive deprecation warnings on Windows: https://github.com/DatabaseCleaner/database_cleaner/pull/633
+
 == 1.8.3 2020-02-18
 
 === Bug Fixes

data/lib/database_cleaner/base.rb

@@ -87,14 +87,14 @@ module DatabaseCleaner
     # TODO privatize the following methods in 2.0
 
     def strategy_db=(desired_db)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].strategy_db=` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].db=` instead."
       end
       set_strategy_db(strategy, desired_db)
     end
 
     def set_strategy_db(strategy, desired_db)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].set_strategy_db=` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].db=` instead."
       end
       if strategy.respond_to? :db=
@@ -105,7 +105,7 @@ module DatabaseCleaner
     end
 
     def create_strategy(*args)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].create_strategy` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].strategy=` instead."
       end
       strategy, *strategy_args = args
@@ -149,9 +149,5 @@ module DatabaseCleaner
     rescue LoadError
       raise UnknownStrategySpecified, "The '#{strategy}' strategy does not exist for the #{orm} ORM!  Available strategies: #{orm_module.available_strategies.join(', ')}"
     end
-
-    def called_externally?(caller)
-      __FILE__ != caller.first.split(":").first
-    end
   end
 end

data/lib/database_cleaner/configuration.rb

@@ -109,7 +109,7 @@ module DatabaseCleaner
     end
 
     def connections
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner.connections` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner.cleaners`, instead."
       end
       add_cleaner(:autodetect) if @cleaners.none?
@@ -119,23 +119,17 @@ module DatabaseCleaner
     # TODO privatize the following methods in 2.0
 
     def add_cleaner(orm, opts = {})
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner.add_cleaner` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner.[]`, instead."
       end
       @cleaners.add_cleaner(orm, opts = {})
     end
 
     def remove_duplicates
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner.remove_duplicates` is deprecated, and will be removed in database_cleaner 2.0 with no replacement."
       end
       @cleaners.remove_duplicates
     end
-
-    private
-
-    def called_externally?(caller)
-      __FILE__ != caller.first.split(":").first
-    end
   end
 end

data/lib/database_cleaner/deprecation.rb

@@ -6,6 +6,11 @@ module DatabaseCleaner
   end
   module_function :deprecate
 
+  def called_externally?(file, caller)
+    file != caller.first[/^(.+\.rb):\d+/, 1]
+  end
+  module_function :called_externally?
+
   class Deprecator
     def initialize
       @methods_already_warned = {}

data/lib/database_cleaner/version.rb

@@ -1,3 +1,3 @@
 module DatabaseCleaner
-  VERSION = "1.8.3"
+  VERSION = "1.8.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Ben Mabey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake