sinatra-activerecord 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a98cc0e154b28eb92ef5d4aaa1f8df8787ca55e
-  data.tar.gz: 2a2b9152af2c3ad2f7830e0a7b59822d28275fa7
+  metadata.gz: a9cec0899efe87ba343f44b09a0280446fad2d5e
+  data.tar.gz: df50a3b223e4694d6e351ab528a1ca201ba48544
 SHA512:
-  metadata.gz: 8cd76193d5f39e52e44d543dddbd02847f0e608858d571685e78aae400d479e99e37564fa3a6afa6e9258923ae20fb7e8c90706e578a6996ac18a593421493ce
-  data.tar.gz: a54777d8b944b07e78511b1d74562690be17b7446e50a032bb757f348ae7c69337a31899dc52eb21fe9d7039fd8e20e87704ed3d2215131bd699acd48cc4214e
+  metadata.gz: 9716c6c2816151c76bc1e374363d92a204b49eecf6eb06ce58b716ad27294ec252a0a710865e945e1aefa825f41a2b9570a64c058a2bd52745fdfff377b83649
+  data.tar.gz: 752e1302d0e391be203a282eb3b69b8f119e0d0f4598b6b4f9fcf61155828e3fc5e182ca9795723f1462fdff0243be5e8f10d1898aa690288788f501217c5e9b

data/lib/sinatra/activerecord.rb

@@ -16,8 +16,8 @@ module Sinatra
 
   module ActiveRecordExtension
     def self.registered(app)
-      app.set :database, ENV['DATABASE_URL'] if ENV['DATABASE_URL']
       app.set :database_file, "#{Dir.pwd}/config/database.yml" if File.exist?("#{Dir.pwd}/config/database.yml")
+      app.set :database, ENV['DATABASE_URL'] if ENV['DATABASE_URL']
       unless defined?(Rake) || [:test, :production].include?(app.settings.environment)
         ActiveRecord::Base.logger = Logger.new(STDOUT)
       end

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

@@ -1,5 +1,4 @@
-seed_loader = Object.new
-seed_loader.instance_eval do
+seed_loader = Class.new do
   def load_seed
     load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
   end
@@ -11,7 +10,7 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   config.db_dir                 = "db"
   config.migrations_paths       = ["db/migrate"]
   config.fixtures_path          = "test/fixtures"
-  config.seed_loader            = seed_loader
+  config.seed_loader            = seed_loader.new
   config.database_configuration = ActiveRecord::Base.configurations
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra