semian 0.19.1 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bae2b0df6fceb44b91a57900ba40be6b53588866025c269627b08c2ccfa193
-  data.tar.gz: f11b8fb67e10cfbb5f1fe393225a45ba0836324768e5fa01366f760151b635b3
+  metadata.gz: bf43c5c57553b9262a1c1c4ef782fe92483480c1793604c9d0c7b328b907de53
+  data.tar.gz: c8d73c47247f10cdac57053356f61e65bdb5f38c134b2122f030e42dc175b26d
 SHA512:
-  metadata.gz: b39cc0bfcf4341bd0a008f50109abb77f27b75021c28245d4c8e4b2af3bb78ca4611deef872c3b40714d4047a8ede6bcfc88cd426a8866f2e51249f3606aefb4
-  data.tar.gz: 89829e6fb002b9d96c2b96ede7339e10e7d3e1c6fee8d8d023b831747e969622d08342e07d7e0cd7ce31f433239e984b881417140e15a9a736501a62c941c79b
+  metadata.gz: e6c96130e5c56f963e7ab63f1d561c843a8d3ff93593981bfe819d034dcf3c3e88a4a3a00b35c8779b8529629ea8fa29cd06e73acec0233ec1b909bd32184057
+  data.tar.gz: 589794eedc49e355705f82271743346a289f10aba2089d80a89a9eade0fa4a221d5476142e3c20aee3a501139ceb6c82217bed378842e6f91cc6f5cb54fc5636

data/ext/semian/extconf.rb

@@ -15,6 +15,8 @@ end
 
 require "mkmf"
 
+dir_config("openssl")
+
 abort "openssl is missing. please install openssl." unless find_header("openssl/sha.h")
 abort "openssl is missing. please install openssl." unless find_library("crypto", "SHA1")
 

data/ext/semian/resource.c

@@ -359,12 +359,6 @@ ms_to_timespec(long ms, struct timespec *ts)
   ts->tv_nsec = (ms % 1000) * 1000000;
 }
 
-static void
-semian_resource_mark(void *ptr)
-{
-  /* noop */
-}
-
 static void
 semian_resource_free(void *ptr)
 {
@@ -386,7 +380,7 @@ static const rb_data_type_t
 semian_resource_type = {
   "semian_resource",
   {
-    semian_resource_mark,
+    NULL,
     semian_resource_free,
     semian_resource_memsize
   },

data/lib/semian/activerecord_trilogy_adapter.rb

@@ -9,7 +9,7 @@ module ActiveRecord
     class TrilogyAdapter
       ActiveRecord::ActiveRecordError.include(::Semian::AdapterError)
 
-      class SemianError < StatementInvalid
+      class SemianError < ConnectionNotEstablished
         def initialize(semian_identifier, *args)
           super(*args)
           @semian_identifier = semian_identifier
@@ -82,26 +82,16 @@ module Semian
 
     private
 
-    def acquire_semian_resource(**)
-      super
-    rescue ActiveRecord::StatementInvalid => error
-      if error.cause.is_a?(Trilogy::TimeoutError)
-        semian_resource.mark_failed(error)
-        error.semian_identifier = semian_identifier
-      end
-      raise
-    end
-
     def resource_exceptions
-      [ActiveRecord::ConnectionNotEstablished]
+      [
+        ActiveRecord::AdapterTimeout,
+        ActiveRecord::ConnectionFailed,
+        ActiveRecord::ConnectionNotEstablished,
+      ]
     end
 
     # TODO: share this with Mysql2
-    QUERY_ALLOWLIST = Regexp.union(
-      %r{\A(?:/\*.*?\*/)?\s*ROLLBACK}i,
-      %r{\A(?:/\*.*?\*/)?\s*COMMIT}i,
-      %r{\A(?:/\*.*?\*/)?\s*RELEASE\s+SAVEPOINT}i,
-    )
+    QUERY_ALLOWLIST = %r{\A(?:/\*.*?\*/)?\s*(ROLLBACK|COMMIT|RELEASE\s+SAVEPOINT)}i
 
     def query_allowlisted?(sql, *)
       QUERY_ALLOWLIST.match?(sql)

data/lib/semian/mysql2.rb

@@ -22,8 +22,8 @@ module Semian
     include Semian::Adapter
 
     CONNECTION_ERROR = Regexp.union(
-      /Can't connect to MySQL server on/i,
-      /Lost connection to MySQL server/i,
+      /Can't connect to (?:MySQL )?server on/i,
+      /Lost connection to (?:MySQL )?server/i,
       /MySQL server has gone away/i,
       /Too many connections/i,
       /closed MySQL connection/i,
@@ -37,11 +37,7 @@ module Semian
     DEFAULT_HOST = "localhost"
     DEFAULT_PORT = 3306
 
-    QUERY_WHITELIST = Regexp.union(
-      %r{\A(?:/\*.*?\*/)?\s*ROLLBACK}i,
-      %r{\A(?:/\*.*?\*/)?\s*COMMIT}i,
-      %r{\A(?:/\*.*?\*/)?\s*RELEASE\s+SAVEPOINT}i,
-    )
+    QUERY_ALLOWLIST = %r{\A(?:/\*.*?\*/)?\s*(ROLLBACK|COMMIT|RELEASE\s+SAVEPOINT)}i
 
     class << self
       # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
@@ -114,7 +110,7 @@ module Semian
     end
 
     def query_whitelisted?(sql, *)
-      QUERY_WHITELIST =~ sql
+      QUERY_ALLOWLIST =~ sql
     rescue ArgumentError
       # The above regexp match can fail if the input SQL string contains binary
       # data that is not recognized as a valid encoding, in which case we just

data/lib/semian/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.1
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores