sinatra-activerecord 2.0.16 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88ba7fc804c9d45c3761d20076e29736c09a7c052cdfbb511307b237e5219036
-  data.tar.gz: 3efec8a225c7fe78778e1765f4d7c2a122553c86e1de6dd2440e6a5984e10276
+  metadata.gz: 9b662752481c4940600cb421378b4dd447e549ea11a876c86a36d250f473e706
+  data.tar.gz: ac0a9176f4e2b0abd115664db78ba1bfeb7ed043dd190c3ed5251a794555a360
 SHA512:
-  metadata.gz: f568c2dbf32e4b654ac95f1c045fe7db6ffd841e14377d29f12e3f461da857621e8417e1be7c6b88cefcfc78c1a04c463bceaeb0cccb4931b31ce048ef9878f9
-  data.tar.gz: dd0016fe5c627cbfdf9fddce90b387d9be9738731ee197d8e05e6ad8514faf78f2b61911e3c18d25564389cff89915a400a3a4fb9ea0bf129d7bc24d263f3dd6
+  metadata.gz: 6b6bb226f78cc9fd45e928625b3c062077101fb0e8a9f58ad47fd8f374ab316e96cee7366872346c02bfb411306e997a8a2848b433b8103abba9643f2f8f2f48
+  data.tar.gz: 7c2b8cd35e0dc75e9ac1045c8a1074cdaa75eedadc6ce607fd8e99a30ba6f3b3e0abae2f0bfeab8276a38c840da529dc9f1cb5d689108c191cd29a36332958ce

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

@@ -16,7 +16,19 @@ 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) || {}
+
+        url_spec = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
+
+        # 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
+
+        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"
@@ -43,13 +55,21 @@ module Sinatra
       if spec.is_a?(Hash) and spec.symbolize_keys[environment.to_sym]
         ActiveRecord::Base.configurations = spec.stringify_keys
         ActiveRecord::Base.establish_connection(environment.to_sym)
-      elsif spec.is_a?(Hash)
-        ActiveRecord::Base.configurations[environment.to_s] = spec.stringify_keys
+      elsif spec.is_a?(Hash)     
+        ActiveRecord::Base.configurations = {
+          environment.to_s => spec.stringify_keys
+        }
+
         ActiveRecord::Base.establish_connection(spec.stringify_keys)
       else
+        if Gem.loaded_specs["activerecord"].version >= Gem::Version.create('6.0')
+          ActiveRecord::Base.configurations ||= ActiveRecord::DatabaseConfigurations.new({}).resolve(spec)
+        else
+          ActiveRecord::Base.configurations ||= {}
+          ActiveRecord::Base.configurations[environment.to_s] = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(spec).to_hash
+        end
+
         ActiveRecord::Base.establish_connection(spec)
-        ActiveRecord::Base.configurations ||= {}
-        ActiveRecord::Base.configurations[environment.to_s] = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(spec).to_hash
       end
     end
 

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"

data/lib/sinatra/activerecord/tasks.rake

@@ -5,6 +5,14 @@ require "fileutils"
 namespace :db do
   desc "Create a migration (parameters: NAME, VERSION)"
   task :create_migration do
+    ARGV.each do |a| 
+      # when we run 'rake db:create_migration create_users v1',
+      # rake will also run 'rake create_users' and 'rake v1'
+      # to avoid rake abort, we define an empty method for these (ie: "task :create_users do ; end")
+      next if a.nil?
+      task a.to_sym do ; end 
+    end
+
     unless ENV["NAME"] || ARGV[1]
       puts "No NAME specified. Example usage: `rake db:create_migration NAME=create_users`"
       exit

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.21
 platform: ruby
 authors:
 - Blake Mizerany
 - Janko Marohnić
+- Axel Kee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-10-24 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.