sinatra-activerecord 2.0.26 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d537eb2fdbf804368238de55a331b022b726b8dd29b573395250747e2c1266
-  data.tar.gz: 7f40465c790d5d84bbc18ad4fe8e878dd3084a016f17dc22e444e4b2258b7378
+  metadata.gz: 8f3fbe6e520369fb04183ec09a07a3ca70108a7f6bd3f9ecf7a4009862ec30a4
+  data.tar.gz: 310aab0d4d4331f3c28e57ce84862b43046c9a5746275f00488b840a8cb93a32
 SHA512:
-  metadata.gz: 2676fee4da8f0e09628cadf96252c8956fabf1d056dd25f401e63e48c70485b635320eaf1444df9667c9b817f2a736f49ecab685e4819cc247fced932170f8de
-  data.tar.gz: c8564822e0f10cea6350a8e3067116d386f9462d0290abe2a344b7ab7d2df5c1ea2fb398a7441e8c7d5799a26fe61b27bdf0e3baf37aa48312723ad1692ec318
+  metadata.gz: 3e22dd1d45269cd1d7818a9264da656693084a67b144a4bfd8a839ff1f05dc1beb03cf3b9201288881e25daed54d4c77e0a2dec1ea21f8117e806f8f819ac385
+  data.tar.gz: a4abfe0c12ca022a8acf8f34103903ab35cf0056a394cb51529927fd648e9dff32f670dec2d2294f26b826c180b7ffdf765ee04cc102628eb55730658b60aedd

data/lib/sinatra/activerecord.rb

@@ -59,8 +59,18 @@ module Sinatra
       app.helpers ActiveRecordHelper
 
       # re-connect if database connection dropped (Rails 3 only)
-      app.before { ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!) }
-      app.after { ActiveRecord::Base.clear_active_connections! }
+      app.before do
+        if ActiveRecord::VERSION::MAJOR == 3
+          ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!)
+        end
+      end
+      app.after do
+        if ActiveRecord::VERSION::MAJOR < 7
+          ActiveRecord::Base.clear_active_connections!
+        else
+          ActiveRecord::Base.connection_handler.clear_active_connections!
+        end
+      end
     end
 
     def database_file=(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.27
 platform: ruby
 authors:
 - Blake Mizerany
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.