grape-activerecord 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43c454c0c8e5230e134d511464e14c2a4c062cc
-  data.tar.gz: 1e20319511f7e845eba87ee9b4c094edf97efc5f
+  metadata.gz: 9d00ef2f533d9024567eb6a5d47eb1fe438b4bed
+  data.tar.gz: b570d2561ed6e6892c94c1360e4ae31890991d2e
 SHA512:
-  metadata.gz: 7c66769c829618a12fe5f451b21e624b13675c90f02f305b136ecc6c60635b069500a561bd71a878063976c64307b3b953c3fe2e1966059fde51060849038afc
-  data.tar.gz: 266665d7de890be4d804296ff2eb9396da0fa1478d54a7d6d769c5b9343a979b61244ee7a227993ad7bb343addf96497c73a7c7c7fdbea9ae45f53b5c9fa7e90
+  metadata.gz: a0bd46dddaba9b5a42b92638bd3f41b000b0b49065b21f5a141839d0fb7ac90cb61dcb8ee4e79902e849b57006dacd790dce6159eb199131364ea6ece8376ef9
+  data.tar.gz: 46a6ecb3873c69fe447f4764d5abd14a13bec5156f5fb337b57fc47d9540e4a5810392f05f96ce9d2a8e2937cfd9a398edcc6b4466aeda54d61a2269858cd5cf

data/README.rdoc

@@ -30,25 +30,23 @@ If you don't specify any configuration, grape-activerecord will first look in DA
 This will establish the database connections and correctly return used connections to the pool after each request.
 NOTE If you're mounting sub Grape apps, you need only include grape-activerecord in the root app.
 
-=== Add ActiveRecord tasks to your Rakefile
+=== Example Rakefile with ActiveRecord tasks
 
-   # Add at the bottom of your Rakefile
-   require 'grape/activerecord/rake'
+  require 'bundler/setup'
+  require 'grape/activerecord/rake'
+
+  namespace :db
+    # Some db tasks require your app code to be loaded
+    task :environment do
+      require_relative 'app'
+    end
+  end
 
 This will give you most of the standard "db:" tasks you get in Rails. Run "bundle exec rake -T" to get a full list.
 Note that unlike in Rails, creating a new migration is also a rake task:
 
   bundle exec rake db:create_migration NAME=create_widgets
 
-=== Customize ActiveRecord rake tasks config
-
-  # The defaults are the same as Rails'
-  ActiveRecord::Tasks::DatabaseTasks.tap do |config|
-    config.db_dir = 'db'
-    config.migrations_paths = ['db/migrate']
-    config.fixtures_path = 'test/fixtures'
-  end
-
 === Example app
 
 Look under /examples for some example apps.

data/lib/grape/activerecord/rake.rb

@@ -1,7 +1,3 @@
 load "active_record/railties/databases.rake"
-
-Grape::ActiveRecord.setup!
 require "grape/activerecord/rake/activerecord_#{ActiveRecord::VERSION::MAJOR}"
 load "grape/activerecord/tasks.rake"
-
-ActiveRecord::Base.logger = nil

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

@@ -1,18 +1,27 @@
-ActiveRecord::Tasks::DatabaseTasks.tap do |config|
-  config.root = Rake.application.original_dir
-  config.env = Grape::ActiveRecord::RACK_ENV.to_s
-  config.db_dir = 'db'
-  config.migrations_paths = ['db/migrate']
-  config.fixtures_path = 'test/fixtures'
-  config.database_configuration = ActiveRecord::Base.configurations
-  config.seed_loader = Object.new
-  config.seed_loader.instance_eval do
-    def load_seed
-      load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
+Rake::Task['db:load_config'].clear
+Rake::Task.define_task('db:load_config') do
+  require 'grape/activerecord'
+  Grape::ActiveRecord.setup!
+  ActiveRecord::Base.logger = nil
+
+  ActiveRecord::Tasks::DatabaseTasks.tap do |config|
+    config.root = Rake.application.original_dir
+    config.env = Grape::ActiveRecord::RACK_ENV
+    config.db_dir = 'db'
+    config.migrations_paths = ['db/migrate']
+    config.fixtures_path = 'test/fixtures'
+    config.database_configuration = ActiveRecord::Base.configurations
+    config.seed_loader = Object.new
+    config.seed_loader.instance_eval do
+      def load_seed
+        load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
+      end
     end
   end
 end
 
-Rake::Task['db:load_config'].clear
-Rake::Task.define_task('db:environment')
+Rake::Task.define_task('db:environment') 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape