sinatra-activerecord 2.0.21 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b662752481c4940600cb421378b4dd447e549ea11a876c86a36d250f473e706
-  data.tar.gz: ac0a9176f4e2b0abd115664db78ba1bfeb7ed043dd190c3ed5251a794555a360
+  metadata.gz: bbf1bdfb5b4d0cd2e37a4ede129988d22bfbeb3735db2286208212f67ef95443
+  data.tar.gz: f2acbe1309ee18f23fe201584be53e499306246a7e676c5fa84ec3a2cb14d395
 SHA512:
-  metadata.gz: 6b6bb226f78cc9fd45e928625b3c062077101fb0e8a9f58ad47fd8f374ab316e96cee7366872346c02bfb411306e997a8a2848b433b8103abba9643f2f8f2f48
-  data.tar.gz: 7c2b8cd35e0dc75e9ac1045c8a1074cdaa75eedadc6ce607fd8e99a30ba6f3b3e0abae2f0bfeab8276a38c840da529dc9f1cb5d689108c191cd29a36332958ce
+  metadata.gz: 5671059aac55202a024f58c1f96ecc7b10f371a513d80031e8542cc9c41be5bddf191b365529db191523a438aeccbbb149902e9811e28d46b5abb7ea14e9612d
+  data.tar.gz: 7fa63a69a728758271a9f82a50cdeb0cd6d382258fef5784521018ff6c1db7813f5064692b0229b5771d8f88c2804bfca54c8c57df2cfe64a18f26a3e2d66932

data/README.md

@@ -37,6 +37,10 @@ will automatically be read as the database (if you haven't specified otherwise).
 
 If both `config/database.yml` and `$DATABASE_URL` are present, the database configuration of this two will be merged, with $DATABASE_URL's variable taking precedence over database.yml (for the same variable / key).
 
+
+Note: If you are using ActiveRecord 6.0 and above, and have [defined multiple databases](https://guides.rubyonrails.org/active_record_multiple_databases.html#setting-up-your-application) for the database.yml, the $DATABASE_URL configuration will be discarded, following [Active Record convention here](https://github.com/rails/rails/blob/main/activerecord/lib/active_record/database_configurations.rb#L169).
+
+
 Note that in **modular** Sinatra applications you will need to first register
 the extension:
 

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

@@ -7,6 +7,8 @@ require 'pathname'
 require 'yaml'
 require 'erb'
 
+require 'active_record/database_configurations/connection_url_resolver' if Gem.loaded_specs["activerecord"].version >= Gem::Version.create('6.1')
+
 module Sinatra
   module ActiveRecordHelper
     def database
@@ -20,12 +22,29 @@ module Sinatra
         path = "#{Dir.pwd}/config/database.yml"
         url = ENV['DATABASE_URL']
         file_path = File.join(root, path) if Pathname(path).relative? and root
-        file_spec = YAML.load(ERB.new(File.read(path)).result) || {}
-
-        url_spec = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
+        source = ERB.new(File.read(path)).result
+        file_spec = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(source) : YAML.load(source)
+        file_spec ||= {}
 
-        # url_spec will override the same key, if exist
-        final_spec = file_spec.keys.map{ |env| [env, file_spec[env].merge(url_spec)] }.to_h
+        # ActiveRecord 6.1+ has moved the connection url resolver to another module
+        if Gem.loaded_specs["activerecord"].version >= Gem::Version.create('6.1')
+          url_spec = ActiveRecord::DatabaseConfigurations::ConnectionUrlResolver.new(url).to_hash
+        else
+          url_spec = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
+        end
+        
+        # if the configuration concerns only one database, and url_spec exist, url_spec will override the same key
+        # if the configuration has multiple databases (Rails 6.0+ feature), url_spec is discarded
+        # Following Active Record config convention
+        # https://github.com/rails/rails/blob/main/activerecord/lib/active_record/database_configurations.rb#L169
+        final_spec = file_spec.keys.map do |env|
+          config = file_spec[env]
+          if config.is_a?(Hash) && config.all? { |_k, v| v.is_a?(Hash) }
+            [env, config]
+          else
+            [env, config.merge(url_spec)]
+          end
+        end.to_h
 
         app.set :database, final_spec
       elsif ENV['DATABASE_URL']
@@ -47,7 +66,9 @@ module Sinatra
 
     def database_file=(path)
       path = File.join(root, path) if Pathname(path).relative? and root
-      spec = YAML.load(ERB.new(File.read(path)).result) || {}
+      source = ERB.new(File.read(path)).result
+      spec = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(source) : YAML.load(source)
+      spec ||= {}
       set :database, spec
     end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.25
 platform: ruby
 authors:
 - Blake Mizerany
 - Janko Marohnić
 - Axel Kee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -110,12 +110,13 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.
 test_files: []