grape-activerecord 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db11e3967b8ac70e5ee7004d84b1042f2f410ad8
-  data.tar.gz: 95572451c379d669fa4300abbbb9ebbebf172034
+  metadata.gz: d7798a801d0b06bc3c6d9d5ce4963607d194055e
+  data.tar.gz: 80ee2a0e1a22efbbbbcde3f82db262dfad101f4d
 SHA512:
-  metadata.gz: 7773eafa3fcec4a436a98cd6cc6afaa0b823b9683255f141548972b41efa755f8bff244847aa7ac0da797d22d1ba80f014d3167a49df8dde33506a73d910abc3
-  data.tar.gz: 298980ee980a37fa068d63434abfcb64c8c583dbcf8401d9d1629930624abf94e86fb942b0c9d0809383328b1112e9fc175b00d0b2a48d8ba06334397ece3202
+  metadata.gz: d2c9dd61350a7fcd8f10670929f93ee53a45a01c8ffa728103a9bf75411f6c100a468ce9170a957805806acfa9340b22d833db0cbd5167f49b7e9923adf8673e
+  data.tar.gz: 8081033ff7aebc1ec079f30841512da5c18c580f0e6252d25affe5b11a896b7d5a00c53a6eb6896021de7291d1593ddb261c25fc01b5ba936d3f49436b4f3fc5

data/README.md

@@ -34,12 +34,12 @@ This will give you most of the standard `db:` tasks you get in Rails. Run `bundl
     require "bundler/setup"
     require "grape/activerecord/rake"
 
-    # NOTE If you set a custom db config in your app, you'll need to set it in your Rakefile too
-    # Grape::ActiveRecord.database_file = "elsewhere/db.yml"
-
     namespace :db do
       # Some db tasks require your app code to be loaded
       task :environment do
+        # If you set a custom db config in your app, you'll need to set it in your Rakefile too
+        # Grape::ActiveRecord.database_file = "elsewhere/db.yml"
+
         require_relative "app"
       end
     end

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

@@ -1,5 +1,4 @@
-Rake::Task['db:load_config'].clear
-Rake::Task.define_task('db:load_config') do
+Rake::Task.define_task('db:_load_config') do
   require 'grape/activerecord'
   ActiveRecord::Base.logger = nil
 
@@ -19,8 +18,19 @@ Rake::Task.define_task('db:load_config') do
   end
 end
 
+Rake::Task['db:load_config'].clear
+Rake::Task.define_task('db:load_config') do
+  # Run the user's db:environment task first, so they have an opportunity to set a custom db config location
+  Rake::Task['db:environment'].invoke
+end
+
 Rake::Task.define_task('db:environment') do
-  Rake::Task['db:load_config'].invoke
+  # defined by user
+end
+
+# Load db config at the end of user-defined db:environment
+Rake::Task['db:environment'].enhance do
+  Rake::Task['db:_load_config'].invoke
 end
 
 Rake::Task['db:test:deprecated'].clear if Rake::Task.task_defined?('db:test:deprecated')

data/lib/grape/activerecord/rake.rb

@@ -1,4 +1,3 @@
 load "active_record/railties/databases.rake"
-require "grape/activerecord"
 require "grape/activerecord/rake/activerecord_#{ActiveRecord::VERSION::MAJOR}"
 load "grape/activerecord/tasks.rake"

data/lib/grape/activerecord/version.rb

@@ -1,6 +1,6 @@
 module Grape
   module ActiveRecord
     # Gem version
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape