sinatra-activerecord 2.0.15 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d67085a10064adfededc08eda8ccc64b995827241f7a397c8fac43f6c5b615d
-  data.tar.gz: 781a0e1eb138e705021b37eb73892e2efa2d00176d97d908a5ef61f09cee54c2
+  metadata.gz: 536a528576f9a003de9a0f910ee935d5028e7ec10652bb5ca43bcd23e9cd5e25
+  data.tar.gz: d08f1ee914093a0918d31be3435961e863b497b869326dd7e1d05de5480212ce
 SHA512:
-  metadata.gz: 6e21b386700b45220639c6dcee8d49a077995718bb00cf6d43ba3a4a0f0952452eb6aa5f914fd1941a2374efe96843518eda024af9cbbde45b1639d9ab844ca1
-  data.tar.gz: 0d0f23e9f7352e6333e785af312a83c594c179bbde29008818cf5f9d71cf44ba1f819f23a03fe572252e0e5221b6622c67b2da94250bf1270a803332507480ac
+  metadata.gz: f1c964a3b55958eafc132f9caa8b74f4b5a57905244ec13b7fcf1374a9887c062b6556480133d9d3a802b12e00da273a706c2945aeb533160e1fdbb09805ceff
+  data.tar.gz: 5f13ff25c06d4c2bbb0136d266327d3b9a0da08e69bbf372e2a1798308999d2f90e00aa494a8597b93c9faa36079b466e98dd1ed9368e63cd0fe12950ba556ee

data/README.md

@@ -4,6 +4,11 @@ Extends [Sinatra](http://www.sinatrarb.com/) with extension methods and Rake
 tasks for dealing with an SQL database using the
 [ActiveRecord ORM](https://github.com/rails/rails/tree/master/activerecord).
 
+![test badge](https://github.com/sinatra-activerecord/sinatra-activerecord/workflows/rspec/badge.svg)
+
+## Requirement
+ActiveRecord >= 4.1
+
 ## Setup
 
 Put it in your `Gemfile`, along with the adapter of your database. For

data/lib/sinatra/activerecord.rb

@@ -43,13 +43,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,13 +5,21 @@ require "fileutils"
 namespace :db do
   desc "Create a migration (parameters: NAME, VERSION)"
   task :create_migration do
-    unless ENV["NAME"]
+    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
     end
 
-    name    = ENV["NAME"]
-    version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
+    name    = ENV["NAME"] || ARGV[1]
+    version = ENV["VERSION"] || ARGV[2] || Time.now.utc.strftime("%Y%m%d%H%M%S")
 
     ActiveRecord::Migrator.migrations_paths.each do |directory|
       next unless File.exist?(directory)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.20
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,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.