combustion 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487efa718a0c0a0dc7bccb6199ab9aa22330fd54
-  data.tar.gz: 67f17279b60d5e1ea508b5638ef61b50ba32fcd4
+  metadata.gz: d6f95f799f2c9e43729681f667300ba717cd7bc3
+  data.tar.gz: fb6937839d622b2598efee6145b84467b1fb92f6
 SHA512:
-  metadata.gz: b44177fef4256791333fc3d0674c242f932242f5428dc4cd26a1d309508e5c41466d7c143d80f7e9eb88de1c2cb7aaea147e4621232c06fd2b4641cb947e477d
-  data.tar.gz: c260e84e10d0082e5c86983a0c0be5e3b1f8e2831467313cd0f343daddacdca1ec49b33cf48f0bd6ebbb110a159e833489af7df8be515a55ce67d46bed633b3c
+  metadata.gz: 7c47d2876b0e59fd71ecae9da6f395b82d0e1f723a316942c55d15c2bbce8ec76f202b579c665b29aac2cdff0ba02dd9ddd8190a83262a05147c4a94855b82ee
+  data.tar.gz: 9826eeb8a072e75bd175682ac024ceaa819cec191fdaa8b338ecfc9aef95bc7c52791d1a0f379afca7759c31b0de877d0cbdef69c703cf0b020884ce482a7e8c

data/HISTORY

@@ -1,3 +1,10 @@
+0.5.2 - July 18th 2014
+* Note MIT licence in gemspec (@ktdreyer).
+* Use local create/drop methods when resetting database (Bryan Ricker).
+* ERB is now supported in config/database.yml, matching Rails (@patorash).
+* The database now is configured before the application is loaded (@patorash).
+* Documentation and generated config.ru now specify explicly loading all Rails libraries by default (Pat Allan).
+
 0.5.1 - July 25th 2013
 * Mass assignment errors raise exceptions instead of just being logged (Pat Allan).
 * whilelist_attributes is only set for Rails 3.2 apps (Philip Arndt).

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.1'
+gem.add_development_dependency 'combustion', '~> 0.5.2'
 
 # Gemfile
-gem 'combustion', '~> 0.5.1', :group => :test
+gem 'combustion', '~> 0.5.2', :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:
@@ -25,7 +25,7 @@ require 'bundler/setup'
 require 'combustion'
 require 'capybara/rspec'
 
-Combustion.initialize!
+Combustion.initialize! :all
 
 require 'rspec/rails'
 require 'capybara/rails'
@@ -55,7 +55,7 @@ If you want your app to be located somewhere other than `spec/internal`, then ma
 
 ```ruby
 Combustion.path = 'spec/dummy'
-Combustion.initialize!
+Combustion.initialize! :all
 ```
 
 
@@ -108,7 +108,7 @@ Name the file structure.sql and configure Combustion to use it before initialisi
 
 ```ruby
 Combustion.schema_format = :sql
-Combustion.initialize!
+Combustion.initialize! :all
 ```
 
 Any models that aren't provided by your engine should be located at `spec/internal/app/models`.

data/combustion.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.5.1'
+  s.version     = '0.5.2'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/combustion'
   s.summary     = 'Elegant Rails Engine Testing'
   s.description = 'Test your Rails Engines without needing a full Rails app'
+  s.license     = 'MIT'
 
   s.rubyforge_project = 'combustion'
 

data/lib/combustion.rb

@@ -24,12 +24,13 @@ module Combustion
     Bundler.require :default, Rails.env
 
     Combustion::Application.configure_for_combustion
-    Combustion::Application.initialize!
 
     if modules.map(&:to_s).include? 'active_record'
       Combustion::Database.setup
     end
 
+    Combustion::Application.initialize!
+
     RSpec.configure do |config|
       include_capybara_into config
 

data/lib/combustion/database.rb

@@ -9,12 +9,12 @@ module Combustion
     end
 
     def self.reset_database
+      ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read("#{Rails.root}/config/database.yml")).result)
       abcs = ActiveRecord::Base.configurations
       case abcs['test']['adapter']
       when /mysql/
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.recreate_database(abcs['test']['database'],
-          mysql_creation_options(abcs['test']))
+        drop_database(abcs['test']['database'])
+        create_database(abcs['test'])
         ActiveRecord::Base.establish_connection(:test)
       when /postgresql/
         ActiveRecord::Base.clear_active_connections!

data/templates/config.ru

@@ -3,5 +3,5 @@ require 'bundler'
 
 Bundler.require :default, :development
 
-Combustion.initialize!
+Combustion.initialize! :all
 run Combustion::Application

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
 description: Test your Rails Engines without needing a full Rails app
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - HISTORY
 - LICENCE
@@ -77,7 +77,8 @@ files:
 - templates/routes.rb
 - templates/schema.rb
 homepage: https://github.com/pat/combustion
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -85,18 +86,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.0.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files: []
+has_rdoc: