sinatra-activerecord 2.0.18 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc810f00cad9c2ea25e192e3561b105d86b59470b74f1ed87989956516582a07
-  data.tar.gz: 6ed1bf13fb1bf569ecd6f13c2e30e733f46f479b78b09202dba084498c7f0788
+  metadata.gz: c1985ef88a83eccdcf4ad4db78ced061a9398fd54cd01a0444816f4b83c661da
+  data.tar.gz: e449fdc9807e75b4d9994545d08107473b618712b870b37edfb5d84de317aef3
 SHA512:
-  metadata.gz: '090c13e2217b2ca868a6224422211a4c22ae95f7a6d2b36819714e0f866153cc05f05b9b6d557a99e3aa1ab69a4c3f62dc57022d9c1c0439c3d07d0cb6474a9b'
-  data.tar.gz: dc906d8a9fcbc2118f743aaba8c1a19ac0816ed7b5353d0a21fe7308a4e500fbe09ef328d640555600ce5f93ffcb4a2ebfd9890d9e983a520c9c52596a117138
+  metadata.gz: b6e0d9905eb59b73e06cb57d9e69f1351c34ffa17a386bac9bc4a520fd9950d28cb5c58d68e09dcb261a9550ed8a58194f72257f466e793c540f664fc0edc945
+  data.tar.gz: 60ff2c30ffb5b65b6cb6f9d4a9b9d0aaf39af210ff7c3fcea6a04365b9573b67864d3d4b9331e6193986b499ba6c06ea4d512173114a183442f8a6d30d0e9bea

data/README.md

@@ -35,6 +35,8 @@ If you have a `config/database.yml`, it will automatically be loaded, no need
 to specify it. Also, in production, the `$DATABASE_URL` environment variable
 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 that in **modular** Sinatra applications you will need to first register
 the extension:
 
@@ -147,8 +149,9 @@ This gem was made in 2009 by Blake Mizerany, creator of Sinatra.
 
 ## Social
 
-You can follow me on Twitter, I'm [@jankomarohnic](http://twitter.com/jankomarohnic).
+You can follow Janko on Twitter, [@jankomarohnic](http://twitter.com/jankomarohnic).
+You can follow Axel on Twitter, [@soulchildpls](http://twitter.com/soulchildpls).
 
 ## License
 
-[MIT](https://github.com/janko-m/sinatra-activerecord/blob/master/LICENSE)
+[MIT](https://github.com/sinatra-activerecord/sinatra-activerecord/blob/master/LICENSE)

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
@@ -16,7 +18,34 @@ module Sinatra
 
   module ActiveRecordExtension
     def self.registered(app)
-      if ENV['DATABASE_URL']
+      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
+        file_spec = YAML.load(ERB.new(File.read(path)).result) || {}
+
+        # 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']
         app.set :database, ENV['DATABASE_URL']
       elsif File.exist?("#{Dir.pwd}/config/database.yml")
         app.set :database_file, "#{Dir.pwd}/config/database.yml"

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

@@ -8,7 +8,7 @@ module Rails
   end
 
   def env
-    ActiveSupport::StringInquirer.new(ENV["RACK_ENV"] || "development")
+    ActiveSupport::StringInquirer.new(ENV["APP_ENV"] || ENV["RACK_ENV"] || "development")
   end
 
   def application

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

@@ -6,7 +6,7 @@ end
 
 ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   config.root                   = Rake.application.original_dir
-  config.env                    = ENV["RACK_ENV"] || "development"
+  config.env                    = ENV["APP_ENV"] || ENV["RACK_ENV"] || "development"
   config.db_dir                 = "db"
   config.migrations_paths       = ["db/migrate"]
   config.fixtures_path          = "test/fixtures"

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

@@ -6,7 +6,7 @@ end
 
 ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   config.root                   = Rake.application.original_dir
-  config.env                    = ENV["RACK_ENV"] || "development"
+  config.env                    = ENV["APP_ENV"] || ENV["RACK_ENV"] || "development"
   config.db_dir                 = "db"
   config.migrations_paths       = ["db/migrate"]
   config.fixtures_path          = "test/fixtures"

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

@@ -6,7 +6,7 @@ end
 
 ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   config.root                   = Rake.application.original_dir
-  config.env                    = ENV["RACK_ENV"] || "development"
+  config.env                    = ENV["APP_ENV"] || ENV["RACK_ENV"] || "development"
   config.db_dir                 = "db"
   config.migrations_paths       = ["db/migrate"]
   config.fixtures_path          = "test/fixtures"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.23
 platform: ruby
 authors:
 - Blake Mizerany
 - Janko Marohnić
+- Axel Kee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -96,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Extends Sinatra with ActiveRecord helpers.
-email: janko.marohnic@gmail.com
+email: axel@rubyyagi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -110,7 +111,7 @@ files:
 - lib/sinatra/activerecord/rake/activerecord_5.rb
 - lib/sinatra/activerecord/rake/activerecord_6.rb
 - lib/sinatra/activerecord/tasks.rake
-homepage: http://github.com/janko-m/sinatra-activerecord
+homepage: http://github.com/sinatra-activerecord/sinatra-activerecord
 licenses:
 - MIT
 metadata: {}
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.