sinatra-activerecord 2.0.26 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d537eb2fdbf804368238de55a331b022b726b8dd29b573395250747e2c1266
-  data.tar.gz: 7f40465c790d5d84bbc18ad4fe8e878dd3084a016f17dc22e444e4b2258b7378
+  metadata.gz: f2a5b91b9bc498894eb844fbd5f13bdc9431ac6d1df8b6ddd6cc2c210415ece8
+  data.tar.gz: b476e1a91a1a3bc50e8f5cf25d96d367e107aafaa6854e8ec689b672b79e599f
 SHA512:
-  metadata.gz: 2676fee4da8f0e09628cadf96252c8956fabf1d056dd25f401e63e48c70485b635320eaf1444df9667c9b817f2a736f49ecab685e4819cc247fced932170f8de
-  data.tar.gz: c8564822e0f10cea6350a8e3067116d386f9462d0290abe2a344b7ab7d2df5c1ea2fb398a7441e8c7d5799a26fe61b27bdf0e3baf37aa48312723ad1692ec318
+  metadata.gz: 1fbf2d90255d298414ea40b0c2fce51278ec1a0c0af51a52464691bd83ca80e281476edb01368b321448bcc5b09cdbbdb94206466c5fc793f82e59f061297153
+  data.tar.gz: 2997ed845b00645fa05704e5d86bc2abe3dc216037b8e37cbbcf9cae48aa0ee27138aac29af90a3c6c31c572f93a3dc7055b2d5624ea0bfcec277e6e63f07bdd

data/lib/sinatra/activerecord/rake/activerecord_8.rb

@@ -0,0 +1,23 @@
+seed_loader = Class.new do
+  def load_seed
+    load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
+  end
+end
+
+ActiveRecord::Tasks::DatabaseTasks.tap do |config|
+  config.root                   = Rake.application.original_dir
+  config.env                    = ENV["APP_ENV"] || ENV["RACK_ENV"] || "development"
+  config.db_dir                 = "db"
+  config.migrations_paths       = ["db/migrate"]
+  config.fixtures_path          = "test/fixtures"
+  config.seed_loader            = seed_loader.new
+  config.database_configuration = ActiveRecord::Base.configurations
+end
+
+# db:load_config can be overriden manually
+Rake::Task["db:seed"].enhance(["db:load_config"])
+Rake::Task["db:load_config"].clear
+
+# define Rails' tasks as no-op
+Rake::Task.define_task("db:environment")
+Rake::Task["db:test:deprecated"].clear if Rake::Task.task_defined?("db:test:deprecated")

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.28
 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: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -111,6 +111,7 @@ files:
 - lib/sinatra/activerecord/rake/activerecord_5.rb
 - lib/sinatra/activerecord/rake/activerecord_6.rb
 - lib/sinatra/activerecord/rake/activerecord_7.rb
+- lib/sinatra/activerecord/rake/activerecord_8.rb
 - lib/sinatra/activerecord/tasks.rake
 homepage: http://github.com/sinatra-activerecord/sinatra-activerecord
 licenses:
@@ -131,7 +132,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.