active_record_proxy_adapters 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca625e0a728907c505db941a4398b5aa144dcdd5f6866ac9a3969f0b783c4d0
-  data.tar.gz: 3ab824330a83e8309b31763b24fe7c74ba0efff2a1eff28505d2a8216442f557
+  metadata.gz: 70250167498af840cadd4a35c83be8d093566e414c84c44b821c9d2e23dea3ca
+  data.tar.gz: '093ec59b4123dc6b695eff81f124fca929619cc9ed33709b2167fb01863fa3fb'
 SHA512:
-  metadata.gz: 1bc0567abfff9e1877abe107074a7e3f35f574ecefc2584f188809a0940c37a9192c88f3ae71f0e682d7115de75cd8b82ef827874e75195dc635572a8a8c7173
-  data.tar.gz: 6ee734e3da7c41d458403e10589d3edd8126862ddcfa2d63034d75c884ec98e383c58e0877166c25155c44ef3a2c13e307378df850b47b0da77d103ff31d57c2
+  metadata.gz: a782b3dea740b91f81c5f57a97cb9116343cbb990a41a80757d713e7893b5fa9d1565c730ed0eab8f55902a248551abcc5c8bfa6579ed51c3d5ae4d6e435eca5
+  data.tar.gz: 9fa48c67ac8da9ee1f9e4b1bacff13847eec8d1b8c3956bc6de822096b343e1d4ac2a65740ecf3525682e0d380fa6f928e0cdcd6c7255d101fcb03912392ed5b

data/lib/active_record/connection_adapters/trilogy_proxy_adapter.rb

@@ -15,7 +15,7 @@ module ActiveRecord
 
       ADAPTER_NAME = "TrilogyProxy"
 
-      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods, :exec_insert)
+      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
 
       def initialize(...)
         @proxy = ActiveRecordProxyAdapters::TrilogyProxy.new(self)

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -18,7 +18,7 @@ module ActiveRecordProxyAdapters
     end
 
     def hijackable_methods
-      %i[execute exec_query internal_exec_query]
+      %i[exec_delete exec_insert exec_query exec_update execute select]
     end
 
     def active_record_v7?

data/lib/active_record_proxy_adapters/middleware.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rack"
+require "rack/events"
 require "json"
 require "active_record_proxy_adapters/context"
 require "active_record_proxy_adapters/contextualizer"
@@ -43,6 +44,16 @@ module ActiveRecordProxyAdapters
       Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, cookie)
     end.freeze
 
+    class EventHandler # rubocop:disable Style/Documentation
+      include Rack::Events::Abstract
+      include Mixin::Configuration
+      include Contextualizer
+
+      def on_finish(_request, _response)
+        self.current_context = context_store.new({})
+      end
+    end
+
     def initialize(app, cookie_options = {})
       @app = app
       @cookie_options = cookie_options

data/lib/active_record_proxy_adapters/railtie.rb

@@ -2,21 +2,17 @@
 
 require "active_support"
 require "active_record_proxy_adapters/core"
-require "active_record_proxy_adapters/railties/postgresql"
 require "active_record_proxy_adapters/railties/mysql2"
-require "active_record_proxy_adapters/railties/trilogy"
+require "active_record_proxy_adapters/railties/postgresql"
+require "active_record_proxy_adapters/railties/rack_middleware"
 require "active_record_proxy_adapters/railties/sqlite3"
+require "active_record_proxy_adapters/railties/trilogy"
 
 module ActiveRecordProxyAdapters
   # Hooks into rails boot process to extend ActiveRecord with the proxy adapter.
   class Railtie < Rails::Railtie
-    require "active_record_proxy_adapters/middleware"
     require "active_record_proxy_adapters/rake"
 
-    initializer "active_record_proxy_adapters.configure_rails_initialization" do |app|
-      app.middleware.use ActiveRecordProxyAdapters::Middleware
-    end
-
     rake_tasks do
       ActiveRecordProxyAdapters::Rake.load_tasks
       ActiveRecordProxyAdapters::Rake.enhance_db_tasks

data/lib/active_record_proxy_adapters/railties/rack_middleware.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "active_support"
+require "active_record_proxy_adapters/middleware"
+
+module ActiveRecordProxyAdapters
+  # Hooks into rails boot process to add the rack middleware for stickiness cookies.
+  class RackMiddleware < Rails::Railtie
+    initializer "active_record_proxy_adapters.add_middleware_to_rack_stack" do |app|
+      app.middleware.use ActiveRecordProxyAdapters::Middleware
+      app.middleware.use Rack::Events, [ActiveRecordProxyAdapters::Middleware::EventHandler.new]
+    end
+  end
+end

data/lib/active_record_proxy_adapters/trilogy_proxy.rb

@@ -5,6 +5,5 @@ require "active_record_proxy_adapters/mysql2_proxy"
 module ActiveRecordProxyAdapters
   # Proxy to the Mysql2Proxy, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
   class TrilogyProxy < Mysql2Proxy
-    hijack_method :exec_insert
   end
 end

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Matt Cruz
@@ -138,6 +138,7 @@ files:
 - lib/active_record_proxy_adapters/railtie.rb
 - lib/active_record_proxy_adapters/railties/mysql2.rb
 - lib/active_record_proxy_adapters/railties/postgresql.rb
+- lib/active_record_proxy_adapters/railties/rack_middleware.rb
 - lib/active_record_proxy_adapters/railties/sqlite3.rb
 - lib/active_record_proxy_adapters/railties/trilogy.rb
 - lib/active_record_proxy_adapters/rake.rb