combustion 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f95f799f2c9e43729681f667300ba717cd7bc3
-  data.tar.gz: fb6937839d622b2598efee6145b84467b1fb92f6
+  metadata.gz: 6eb9dd7c152b1c4ef543f6db332e2cc852d8c574
+  data.tar.gz: 8169e2922fd87f725ee476eb2baaea449b3ef066
 SHA512:
-  metadata.gz: 7c47d2876b0e59fd71ecae9da6f395b82d0e1f723a316942c55d15c2bbce8ec76f202b579c665b29aac2cdff0ba02dd9ddd8190a83262a05147c4a94855b82ee
-  data.tar.gz: 9826eeb8a072e75bd175682ac024ceaa819cec191fdaa8b338ecfc9aef95bc7c52791d1a0f379afca7759c31b0de877d0cbdef69c703cf0b020884ce482a7e8c
+  metadata.gz: 63d7dfdd2ee1341c9311360f3d694238530e595c68ffc65ff554a733a4b1d1f3a518144bab5f27b6551ef499fb4544ae18cb92ab0e3812f1b7cfb6da3a05c79b
+  data.tar.gz: f0ca0720b2a0654e0205c43d1e1d1ebfe83e615b0016f4c9341dd86c9976a7780bec4ee9699d7acac891a78374a10b8b4739e47ec25b5563240c2b9a6ad295d0

data/README.md

@@ -10,10 +10,10 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 
 ```ruby
 # gemspec
-gem.add_development_dependency 'combustion', '~> 0.5.2'
+gem.add_development_dependency 'combustion', '~> 0.5.3'
 
 # Gemfile
-gem 'combustion', '~> 0.5.2', :group => :test
+gem 'combustion', '~> 0.5.3', :group => :test
 ```
 
 In your `spec_helper.rb`, get Combustion to set itself up - which has to happen before you introduce `rspec/rails` and - if being used - `capybara/rails`. Here's an example within context:
@@ -172,7 +172,9 @@ end
 
 ## Compatibility
 
-Developed for Rails 3.1 and Ruby 1.9. It should work on any other Ruby, and possibly Rails 3.0, but will not work neatly with earlier versions of Rails.
+Developed for Rails 3.1 or better (including Rails 4) and Ruby 1.9 or better. It should work on any other Ruby, and possibly Rails 3.0, but will not work neatly with earlier versions of Rails.
+
+You can also use Combustion with multiple versions of Rails to test compatibility across them. [Appraisal](https://github.com/thoughtbot/appraisal) is a gem that can help with this, and a good starting reference is the [Thinking Sphinx](https://github.com/pat/thinking-sphinx) test suite, which runs against [multiple versions](https://github.com/pat/thinking-sphinx/blob/master/Appraisals) of Rails.
 
 ## Limitations and Known Issues
 

data/combustion.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.5.2'
+  s.version     = '0.5.3'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/combustion'

data/lib/combustion.rb

@@ -26,7 +26,9 @@ module Combustion
     Combustion::Application.configure_for_combustion
 
     if modules.map(&:to_s).include? 'active_record'
-      Combustion::Database.setup
+      Combustion::Application.config.to_prepare do
+        Combustion::Database.setup
+      end
     end
 
     Combustion::Application.initialize!

data/lib/combustion/database.rb

@@ -57,11 +57,16 @@ module Combustion
 
     def self.migrate
       migrator = ActiveRecord::Migrator
-      paths    = Array('db/migrate/')
 
       if migrator.respond_to?(:migrations_paths)
         paths = migrator.migrations_paths
+      else
+        paths = Array('db/migrate/')
       end
+
+      paths   += Rails.application.paths['db/migrate'].to_a
+      paths.uniq!
+
       # Append the migrations inside the internal app's db/migrate directory
       paths << File.join(Rails.root, 'db/migrate')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,9 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files: []
-has_rdoc: