sinatra-activerecord 2.0.24 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 915ee68564f8c6e934250b72f2953da682a4f83093e6ec2faaa69c2f646fe753
-  data.tar.gz: e53038e87fd52df06156caf21fdfb3d9dc60ddf9de91abc3e79a5c431655237c
+  metadata.gz: 05d537eb2fdbf804368238de55a331b022b726b8dd29b573395250747e2c1266
+  data.tar.gz: 7f40465c790d5d84bbc18ad4fe8e878dd3084a016f17dc22e444e4b2258b7378
 SHA512:
-  metadata.gz: ca0a40e61bded7ea250e26c44004e6ec22ca8849efa4a4349acc0ff8cc9d1364dfe6d9c36484a52a2c306fbe039dfc32321b0434c4afe78436b1958a74957e57
-  data.tar.gz: 9d3f855a19210f1e72b674f41c3d686b837bd722d1393a86a688752da00b493c49f7ad81e68f91ef8fcdb91e25163c307aaa4a7859c3b3f126f740ed9cd6e638
+  metadata.gz: 2676fee4da8f0e09628cadf96252c8956fabf1d056dd25f401e63e48c70485b635320eaf1444df9667c9b817f2a736f49ecab685e4819cc247fced932170f8de
+  data.tar.gz: c8564822e0f10cea6350a8e3067116d386f9462d0290abe2a344b7ab7d2df5c1ea2fb398a7441e8c7d5799a26fe61b27bdf0e3baf37aa48312723ad1692ec318

data/lib/sinatra/activerecord/rake/activerecord_7.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

@@ -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 ||= {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.26
 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: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -110,6 +110,7 @@ files:
 - lib/sinatra/activerecord/rake/activerecord_4.rb
 - lib/sinatra/activerecord/rake/activerecord_5.rb
 - lib/sinatra/activerecord/rake/activerecord_6.rb
+- lib/sinatra/activerecord/rake/activerecord_7.rb
 - lib/sinatra/activerecord/tasks.rake
 homepage: http://github.com/sinatra-activerecord/sinatra-activerecord
 licenses:
@@ -123,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.2.32
 signing_key:
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.