semian 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f1c9a991cd16ae1da354babc364364cf1aac75f07b1fb3d694f75c94f33411
-  data.tar.gz: 51585c1ccf8aa6f02c45b1da9da58753e91ce45a92f99c3880c5fb46c6b82aa5
+  metadata.gz: 540294c5a9ecdfdcbafcdc1485afd1314a94fd869501bc6795ee327606d3e799
+  data.tar.gz: 5855959232d25ea3c2da1f7ca7096c18afb15161ac8116e8f1ece9792fd456e4
 SHA512:
-  metadata.gz: 6b8f18a662e05dbedb5dec96ed1c740a40d1a644a098d01e0b82440aa6a877b9f3d67611cb38293699fb2a19bd4cf7aa9b0fa02c03babaa9063856d8cfabcd25
-  data.tar.gz: 32546169e572cacd1cb85b63dd8b01164ba4eb15858394c9163d9de3d2ffdb258418f2dac7ebcb51e7ad8bd6ff592973c81f7758e8085a855b31011ce13c47e2
+  metadata.gz: c7549cd0c6dc515733612fcd7b200c23467104c5616ff9501b65a554712e0449d07d8d2d479b45962cffb87c8e6cd2fc82d695a1d9f399a5724b3b4c241c59a8
+  data.tar.gz: cf31ff975016b22e101db10813d73ab8288584657c9f7319ef222790dcd052d3ab45caedcca2639140d2199be87d1f790f0c82edf918d388c669f9be68b467f2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# v0.13.2
+
+* Fix: Update AbstractAdapter patch to accomodate recent Rails changes. (#364)
+
 # v0.13.1
 
 * Fix: Raise `Redis::OutOfMemoryError` for messages that match `OOM command not allowed when used memory > 'maxmemory'` rather than checking `start_with?("OOM ")`. (#367)

data/lib/semian/rails.rb

@@ -2,14 +2,35 @@
 
 require "active_record/connection_adapters/abstract_adapter"
 
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-      def semian_resource
-        # support for https://github.com/rails/rails/commit/d86fd6415c0dfce6fadb77e74696cf728e5eb76b
-        connection = instance_variable_defined?(:@raw_connection) ? @raw_connection : @connection
-        connection.semian_resource
+module Semian
+  module Rails
+    def semian_resource
+      @semian_resource ||= client_connection.semian_resource
+    end
+
+    def reconnect
+      @semian_resource = nil
+      super
+    end
+
+    private
+
+    # client_connection is an instance of a Mysql2::Client
+    #
+    # The conditionals here support multiple Rails versions.
+    #   - valid_raw_connection is for 7.1.x and above
+    #   - @raw_connection is for 7.0.x
+    #   - @connection is for versions below 6.1.x and below
+    def client_connection
+      if respond_to?(:valid_raw_connection)
+        valid_raw_connection
+      elsif instance_variable_defined?(:@raw_connection)
+        @raw_connection
+      else
+        @connection
       end
     end
   end
 end
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(Semian::Rails)

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources