sinatra-activerecord 2.0.25 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbf1bdfb5b4d0cd2e37a4ede129988d22bfbeb3735db2286208212f67ef95443
-  data.tar.gz: f2acbe1309ee18f23fe201584be53e499306246a7e676c5fa84ec3a2cb14d395
+  metadata.gz: 8f3fbe6e520369fb04183ec09a07a3ca70108a7f6bd3f9ecf7a4009862ec30a4
+  data.tar.gz: 310aab0d4d4331f3c28e57ce84862b43046c9a5746275f00488b840a8cb93a32
 SHA512:
-  metadata.gz: 5671059aac55202a024f58c1f96ecc7b10f371a513d80031e8542cc9c41be5bddf191b365529db191523a438aeccbbb149902e9811e28d46b5abb7ea14e9612d
-  data.tar.gz: 7fa63a69a728758271a9f82a50cdeb0cd6d382258fef5784521018ff6c1db7813f5064692b0229b5771d8f88c2804bfca54c8c57df2cfe64a18f26a3e2d66932
+  metadata.gz: 3e22dd1d45269cd1d7818a9264da656693084a67b144a4bfd8a839ff1f05dc1beb03cf3b9201288881e25daed54d4c77e0a2dec1ea21f8117e806f8f819ac385
+  data.tar.gz: a4abfe0c12ca022a8acf8f34103903ab35cf0056a394cb51529927fd648e9dff32f670dec2d2294f26b826c180b7ffdf765ee04cc102628eb55730658b60aedd

data/lib/sinatra/activerecord.rb

@@ -21,7 +21,6 @@ module Sinatra
       if ENV['DATABASE_URL'] && File.exist?("#{Dir.pwd}/config/database.yml")
         path = "#{Dir.pwd}/config/database.yml"
         url = ENV['DATABASE_URL']
-        file_path = File.join(root, path) if Pathname(path).relative? and root
         source = ERB.new(File.read(path)).result
         file_spec = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(source) : YAML.load(source)
         file_spec ||= {}
@@ -60,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.25
+  version: 2.0.27
 platform: ruby
 authors:
 - Blake Mizerany
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -124,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.