sinatra-activerecord 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bfc3f65a8360584831ad8e60029eaba8180b1c3
-  data.tar.gz: e1ef87235e5610ed3954a09aca6ad1a99e7ff6d4
+  metadata.gz: f9f35412ead63cc7812e937078db617305178393
+  data.tar.gz: 008b321248242e5de22deabd356ba43049e6a5b3
 SHA512:
-  metadata.gz: cbf759344df1482aa2183016e352386ddfba1e2c4ab16992f291ed24b97d42a28beab9aa78bcb349e35045a5e32ecbcea061b4163d9e51877c6d12512d419598
-  data.tar.gz: ca63f1b7c6585264fbe22744d1eb5b14a06cbb793ddbaa431dff07b503fcf556a7b53faaa371dec982af09c53abef9819d1279507990c7174c6aa1828dcb4feb
+  metadata.gz: 7c2092ccaade8606b0408b98aa47d4eb87bf2f90d8478739244ee58c8ee3c825c4a0066a863603cecec1cd1193e8d8047d5b2f8bd547f221f448233e9616ab92
+  data.tar.gz: ff27ba48f1f6cda7b71bcc8de6b254769ffcf4f541bc6d1b9c92dfe0478a3baeeca92761a571fb02e04196e3326ab3b0a2738900b227102f5084c312bd2d4627

data/README.md

@@ -44,7 +44,12 @@ Now require the rake tasks and your app in your `Rakefile`:
 ```ruby
 # Rakefile
 require "sinatra/activerecord/rake"
-require "./app"
+
+namespace :db do
+  task :load_config do
+    require "./app"
+  end
+end
 ```
 
 In case you're using tools like SimpleCov, where the application needs to be
@@ -64,7 +69,7 @@ end
 In the Terminal test that it works:
 
 ```sh
-$ rake -T
+$ bundle exec rake -T
 rake db:create            # Create the database from DATABASE_URL or config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)
 rake db:create_migration  # Create a migration (parameters: NAME, VERSION)
 rake db:drop              # Drops the database using DATABASE_URL or the current Rails.env (use db:drop:all to drop all databases)
@@ -87,7 +92,7 @@ And that's it, you're all set :)
 You can create a migration:
 
 ```sh
-$ rake db:create_migration NAME=create_users
+$ bundle exec rake db:create_migration NAME=create_users
 ```
 
 This will create a migration file in your migrations directory (`./db/migrate`
@@ -106,7 +111,7 @@ end
 Now migrate the database:
 
 ```sh
-$ rake db:migrate
+$ bundle exec rake db:migrate
 ```
 
 You can also write models:

data/lib/sinatra/activerecord.rb

@@ -18,7 +18,7 @@ module Sinatra
     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")
-      ActiveRecord::Base.logger = Logger.new(STDOUT) unless defined?(Rake)
+      ActiveRecord::Base.logger = Logger.new(STDOUT) unless defined?(Rake) || app.settings.production?
 
       app.helpers ActiveRecordHelper
 

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

@@ -22,6 +22,10 @@ module Rails
   end
 end
 
-Rake::Task.define_task("db:environment")
+# 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.define_task("db:rails_env")

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

@@ -15,6 +15,10 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -57,16 +57,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.