sinatra-activerecord 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77049a24680053ccad9e42f401efa5a689b5e45
-  data.tar.gz: ab9a5c361cf36e9782339df3cc4975b540842aef
+  metadata.gz: 6a13239550230a493ce9ccff2522d3388086d015
+  data.tar.gz: a2026e6c361446847cbabbd3ef6175285eba01ce
 SHA512:
-  metadata.gz: 3e129ec7fed328fbb62b279c9711ac63a4d41400b16cd741beb0653d31799cd0dec0ffc285e76c378760b504a2cedfa78e2fa0755f17299e4b043774acb661aa
-  data.tar.gz: c8572d6e5ee580682a97d1e85c17c4dfa6d8482a9ea53aa321324db78187004f5e1266f2d3687feaedffe816943e811e8821b864c21a9e6b4e5edbcc6b3ffc6a
+  metadata.gz: b027e361b09da93519bc9bf7e02ffe14de1dd4a1d5484b5a2a95cc5855c59553e9eb9424221d8bb0b78c0cd89d1aa3719b6c39ad47e512f20def3f8b6fbf1ba1
+  data.tar.gz: 31732cfa6c9acbe83b4072458c79468a7a8384af2c97bcf95fad32f9697dae0caf0d432cfbc07dc329a54dad46a7619ecb574445740e28ced00e8dc33a00b439

data/lib/sinatra/activerecord.rb

@@ -30,7 +30,9 @@ module Sinatra
 
       # re-connect if database connection dropped (Rails 3 only)
       app.before { ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!) }
-      app.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+      if ActiveRecord::ConnectionAdapters.const_defined?(:ConnectionManagement)
+        app.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+      end
     end
 
     def database_file=(path)
@@ -43,10 +45,13 @@ 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
+        ActiveRecord::Base.establish_connection(spec.stringify_keys)
       else
         ActiveRecord::Base.establish_connection(spec)
         ActiveRecord::Base.configurations ||= {}
-        ActiveRecord::Base.configurations[environment.to_s] = ActiveRecord::Base.connection.pool.spec.config
+        ActiveRecord::Base.configurations[environment.to_s] = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(spec).to_hash
       end
     end
 

data/lib/sinatra/activerecord/rake/activerecord_5.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["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/tasks.rake

@@ -23,7 +23,7 @@ namespace :db do
     end
 
     filename = "#{version}_#{name}.rb"
-    dirname  = ActiveRecord::Migrator.migrations_path
+    dirname  = ActiveRecord::Migrator.migrations_paths.first
     path     = File.join(dirname, filename)
 
     FileUtils.mkdir_p(dirname)
@@ -37,3 +37,12 @@ namespace :db do
     puts path
   end
 end
+
+# The `db:create` and `db:drop` command won't work with a DATABASE_URL because
+# the `db:load_config` command tries to connect to the DATABASE_URL, which either
+# doesn't exist or isn't able to drop the database. Ignore loading the configs for
+# these tasks if a `DATABASE_URL` is present.
+if ENV.has_key? "DATABASE_URL"
+  Rake::Task["db:create"].prerequisites.delete("load_config")
+  Rake::Task["db:drop"].prerequisites.delete("load_config")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -107,6 +107,7 @@ files:
 - lib/sinatra/activerecord/rake.rb
 - lib/sinatra/activerecord/rake/activerecord_3.rb
 - lib/sinatra/activerecord/rake/activerecord_4.rb
+- lib/sinatra/activerecord/rake/activerecord_5.rb
 - lib/sinatra/activerecord/tasks.rake
 homepage: http://github.com/janko-m/sinatra-activerecord
 licenses:
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.