isolator 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529433e0e838e663f335a5fb493f51d10f16fbde2168c89be72e92c968709593
-  data.tar.gz: ef33db058e25204e615fae7ee945c738e516e8ae6d63bb93f9660e6e117cb632
+  metadata.gz: 3f7e62d7f280c06f8ad704770d5ba5f14198006bccec0ce69e0e1aa99a8b32c7
+  data.tar.gz: 4c4aabcfad57d3ba2da54b5e75b7ee057bf25a10d382094d05a04fec2f371c85
 SHA512:
-  metadata.gz: 5cb63aa9a96f5931425267193590550cac0614dd15d272bd7d33f7e2aeaad0b7b37a19f5a6f7d8617dce992e946b92c42c3df5829177cbd51b41d8919abdc8c5
-  data.tar.gz: b4997855a9d813a961491235097a42eee75d55598fb7d33d53bb4f7e3828f486ea0a2fb788edd028237e39518a2d8e962824b08a3f4cbed2ce3ac22acdfee9c3
+  metadata.gz: 565c283a6ddebe9e7d39472094f44f346a1ea1b49afc5ad9fe7aee1ecb98e5910fd5cdc4c0804c581132363338e39465faadab3f51eccbddaea8f731225fd364
+  data.tar.gz: ab01a1494c0fac2c1920bced02ae86c6b6b26a6e420f3ef6e43fdd1bd300e14e259c3353b9af08b14787b5ebe499d816222998e837d0af4e16006d9c77a9f5d1

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 0.10.0 (2023-08-15)
+
+- Support multiple databases with DatabaseCleaner. ([@palkan][])
+
+- Fix query having invalid characters. ([@tagirahmad][])
+
+  Fixes [#43](https://github.com/palkan/isolator/issues/43).
+
 ## 0.9.0 (2023-05-18)
 
 - Support keyword arguments to isolated method in Ruby 3.0. ([@Mange][])
@@ -109,3 +117,5 @@ This, for example, makes Isolator compatible with Rails multi-database apps.
 [@mquan]: https://github.com/mquan
 [@bobbymcwho]: https://github.com/bobbymcwho
 [@Mange]: https://github.com/Mange
+[@tomgi]: https://github.com/tomgi
+[@tagirahmad]: https://github.com/tagirahmad

data/lib/isolator/adapter_builder.rb

@@ -33,7 +33,8 @@ module Isolator
 
         Module.new do
           define_method method_name do |*args, **kwargs, &block|
-            adapter.notify(caller, self, *args, **kwargs)
+            # check if we are even notifying before calling `caller`, which is well known to be slow
+            adapter.notify(caller, self, *args, **kwargs) if adapter.notify?(*args, **kwargs)
             super(*args, **kwargs, &block)
           end
         end

data/lib/isolator/adapters/http/webmock.rb

@@ -7,5 +7,6 @@ adapter = Isolator.isolate :webmock,
                    }
 
 WebMock.after_request do |*args|
-  adapter.notify(caller, *args)
+  # check if we are even notifying before calling `caller`, which is well known to be slow
+  adapter.notify(caller, *args) if adapter.notify?(*args)
 end

data/lib/isolator/database_cleaner_support.rb

@@ -1,16 +1,23 @@
 # frozen_string_literal: true
 
 require "database_cleaner/active_record/transaction"
-
 ::DatabaseCleaner::ActiveRecord::Transaction.prepend(
   Module.new do
     def start
       super
-      Isolator.transactions_threshold += 1
+      connection_id = connection_class.connection.object_id
+      Isolator.set_connection_threshold(
+        Isolator.transactions_threshold(connection_id) + 1,
+        connection_id
+      )
     end
 
     def clean
-      Isolator.transactions_threshold -= 1
+      connection_id = connection_class.connection.object_id
+      Isolator.set_connection_threshold(
+        Isolator.transactions_threshold(connection_id) - 1,
+        connection_id
+      )
       super
     end
   end

data/lib/isolator/orm_adapters/active_support_subscriber.rb

@@ -10,8 +10,10 @@ module Isolator
     def self.subscribe!(event)
       ::ActiveSupport::Notifications.subscribe(event) do |_name, _start, _finish, _id, query|
         connection_id = query[:connection_id] || query[:connection]&.object_id || 0
-        Isolator.incr_transactions!(connection_id) if START_PATTERN.match?(query[:sql])
-        Isolator.decr_transactions!(connection_id) if FINISH_PATTERN.match?(query[:sql])
+        # Prevents "ArgumentError: invalid byte sequence in UTF-8" by replacing invalid byte sequence with "?"
+        sanitized_query = query[:sql].encode("UTF-8", "binary", invalid: :replace, undef: :replace, replace: "?")
+        Isolator.incr_transactions!(connection_id) if START_PATTERN.match?(sanitized_query)
+        Isolator.decr_transactions!(connection_id) if FINISH_PATTERN.match?(sanitized_query)
       end
     end
   end

data/lib/isolator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isolator
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isolator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sniffer