combustion 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3267619b0496c3956bfa0bd994939298763e4aed
-  data.tar.gz: ef5c03a4638db69326a76bd2aa949a20f321ab84
+  metadata.gz: 370934f0403896862f880b43c60514bdc55b7d74
+  data.tar.gz: f2aa52b1378141afc13f172bd1fc6176d7ac893d
 SHA512:
-  metadata.gz: 14fa5db249addbd51fee818b3bc8954ba455313e93388e8e9b044a931d9d9c1276605dfb50b59fe4f603e3a180a8b6533fdbface66ff247d94a64d886ca63cb3
-  data.tar.gz: 43b4c7cc7b9e35c5a2e1d8d772c5924b54e732580ab6b7cba5cddc1771d0124ce6f668bf9cca68f744c7d6b30f8d7edcbf512239d6e3698d0079163b73e719dc
+  metadata.gz: 3e1a3c1385e5187986589547b9104787e3cc2766dba79e3baba3f1ca0d6fa958ee916e44c47ae9d989d8604108bd965b0c9edc1124b5a1fb7a705366dbe01328
+  data.tar.gz: 8373fdee44ece6491d8391199873eeb516585a210210b1f5eb54ad657cb24443d09a6a841226666bc6c177bdaff327b15f8c8f36d33ccbf881941331e51ff573

data/.gitignore

@@ -1,7 +1,10 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 .rvmrc
 .ruby-version
-spec/dummy/spec/internal/db/combustion_test.sqlite
+spec/dummy/spec/internal/db/*.sqlite
+spec/dummy/spec/internal/test
+spec/dummy/spec/internal/test_another

data/.rspec

@@ -0,0 +1,4 @@
+--color
+--tty
+--order random
+--require spec_helper.rb

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+env:
+  matrix:
+    - "DB_ADAPTER=sqlite3"
+    - "DB_ADAPTER=postgresql"
+    - "DB_ADAPTER=mysql2"
+rvm:
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+before_install:
+  - gem update --system
+  - gem install bundler
+before_script:
+  - bundle exec appraisal install
+script: 'bundle exec appraisal rspec'
+services:
+  - mysql
+  - postgresql

data/Appraisals

@@ -0,0 +1,29 @@
+if RUBY_VERSION.to_f <= 2.3
+  appraise "rails-3.1" do
+    gem "rails", "~> 3.1.12"
+    gem "mysql2", "~> 0.3.10"
+  end
+
+  appraise "rails-3.2" do
+    gem "rails", "~> 3.2.22.5"
+    gem "mysql2", "~> 0.3.10"
+  end
+
+  appraise "rails-4.0" do
+    gem "rails", "~> 4.0.13"
+    gem "mysql2", "~> 0.3.10"
+  end
+
+  appraise "rails-4.1" do
+    gem "rails", "~> 4.1.16"
+    gem "mysql2", "~> 0.3.13"
+  end
+
+  appraise "rails-4.2" do
+    gem "rails", "~> 4.2.8"
+  end
+end
+
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.2"
+end

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.5'
+gem.add_development_dependency 'combustion', '~> 0.6.0'
 
 # Gemfile
-gem 'combustion', '~> 0.5.5', :group => :test
+gem 'combustion', '~> 0.6.0', :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:
@@ -46,6 +46,7 @@ combust
 bundle exec combust
 ```
 
+Minitest support is considered to be experimental, but it's certainly working [for some](https://github.com/pat/combustion/issues/78). Comments on others' experiences are welcome!
 
 What Combustion is doing is setting up a Rails application at `spec/internal` - but you only need to add the files within that directory that you're going to use. Read on for some detail about what that involves.
 
@@ -174,13 +175,13 @@ end
 
 ## Compatibility
 
-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.
+The current test matrix covers MRI 2.2 to 2.4, and Rails 3.1 to 5.0. It will possibly work on older versions and other Ruby implementations as well.
 
 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
 
-Combustion is currently written with the expectation it'll be used with RSpec. I'd love to make this more flexible - if you want to give it a shot before I get around to it, patches are very much welcome.
+Combustion is currently written with the expectation it'll be used with RSpec, but others have got it working with [Minitest](https://github.com/pat/combustion/issues/78). I'd love to make this more flexible - if you want to give it a shot before I get around to it, patches are very much welcome.
 
 I've not tried using this with Cucumber, but it should work in theory without too much hassle. Let me know if I'm wrong!
 
@@ -193,8 +194,8 @@ Contributions are very much welcome - but keep in mind the following:
 * Keep patches in a separate branch
 * Don't mess with the version or history file. I'll take care of that when the patch is merged in.
 
-There are no tests - partly because Combustion was extracted out from the tests of HyperTiny's Dobro, and partly because there's not much code. Still, if you can find a clean way of testing this, that'd be fantastic.
+The tests are extremely minimal, and patches to extend the suite are especially welcome.
 
 ## Credits
 
-Copyright (c) 2011, Combustion is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to HyperTiny for encouraging its development, and [all who have contributed patches](https://github.com/pat/combustion/contributors).
+Copyright (c) 2011-2017, Combustion is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to HyperTiny for encouraging its development, and [all who have contributed patches](https://github.com/pat/combustion/contributors).

data/combustion.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.5.5'
+  s.version     = '0.6.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/combustion'
@@ -20,7 +20,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'railties', '>= 3.0.0'
   s.add_runtime_dependency 'thor',  '>= 0.14.6'
 
+  s.add_development_dependency 'appraisal', '~> 2.1.0'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'rails'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'sqlite3'
 end

data/gemfiles/rails_3.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.1.12"
+gem "mysql2", "~> 0.3.10"
+
+gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2.22.5"
+gem "mysql2", "~> 0.3.10"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.13"
+gem "mysql2", "~> 0.3.10"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.1.16"
+gem "mysql2", "~> 0.3.13"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.8"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.2"
+
+gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.2"
+
+gemspec :path => "../"

data/lib/combustion.rb

@@ -18,6 +18,7 @@ module Combustion
   def self.initialize!(*modules, &block)
     @@setup_environment = block if block_given?
 
+    options = modules.extract_options!
     modules = Modules if modules == [:all]
     modules.each { |mod| require "#{mod}/railtie" }
 
@@ -27,7 +28,7 @@ module Combustion
 
     if modules.map(&:to_s).include? 'active_record'
       Combustion::Application.config.to_prepare do
-        Combustion::Database.setup
+        Combustion::Database.setup(options)
       end
     end
 

data/lib/combustion/database.rb

@@ -4,10 +4,10 @@ module Combustion
   end
 
   class Database
-    def self.setup(adapter = nil)
-      Combustion::Database::Reset.call adapter
-      Combustion::Database::LoadSchema.call
-      Combustion::Database::Migrate.call
+    def self.setup(options = {})
+      Combustion::Database::Reset.call if options.fetch(:database_reset, true)
+      Combustion::Database::LoadSchema.call if options.fetch(:load_schema, true)
+      Combustion::Database::Migrate.call if options.fetch(:database_migrate, true)
     end
   end
 end

data/lib/combustion/database/reset.rb

@@ -1,32 +1,26 @@
 class Combustion::Database::Reset
   UnsupportedDatabase = Class.new StandardError
 
-  def self.call(adapter = nil)
-    new(adapter).call
+  def self.call
+    new.call
   end
 
-  def initialize(adapter = nil)
-    @adapter = adapter
-
-    set_configurations
+  def initialize
+    ActiveRecord::Base.configurations = YAML.load(
+      ERB.new(File.read("#{Rails.root}/config/database.yml")).result
+    )
   end
 
   def call
-    operator.reset
+    ActiveRecord::Base.configurations.values.each do |conf|
+      operator_class(conf['adapter']).new(conf).reset
+    end
   end
 
   private
 
-  def configuration
-    @configuration ||= ActiveRecord::Base.configurations['test']
-  end
-
-  def operator
-    operator_class.new configuration
-  end
-
-  def operator_class
-    @operator ||= case configuration['adapter']
+  def operator_class(adapter)
+    @operator ||= case adapter
     when /mysql/
       Combustion::Databases::MySQL
     when /postgresql/, /postgis/
@@ -41,13 +35,7 @@ class Combustion::Database::Reset
       Combustion::Databases::Firebird
     else
       raise UnsupportedDatabase,
-        "Unsupported database type: #{configuration['adapter']}"
+        "Unsupported database type: #{adapter}"
     end
   end
-
-  def set_configurations
-    ActiveRecord::Base.configurations = YAML.load(
-      ERB.new(File.read("#{Rails.root}/config/database.yml")).result
-    )
-  end
 end

data/lib/combustion/databases/base.rb

@@ -8,6 +8,8 @@ class Combustion::Databases::Base
   def reset
     drop
     create
+
+    establish_connection(:test)
   end
 
   private

data/lib/combustion/databases/mysql.rb

@@ -2,9 +2,9 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   ACCESS_DENIED_ERROR = 10145
 
   def reset
-    super
+    establish_connection(configuration.merge('database' => nil))
 
-    establish_connection :test
+    super
   end
 
   private
@@ -18,7 +18,6 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def create
-    establish_connection configuration.merge('database' => nil)
     connection.create_database configuration['database'], creation_options
     establish_connection configuration
   rescue error_class => error
@@ -47,7 +46,6 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def drop
-    establish_connection configuration
     connection.drop_database configuration['database']
   end
 

data/lib/combustion/databases/postgresql.rb

@@ -1,6 +1,7 @@
 class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   def reset
     base.clear_active_connections!
+    establish_connection(postgres_configuration)
 
     super
   end
@@ -8,18 +9,18 @@ class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   private
 
   def create
-    establish_connection postgres_configuration
-    connection.create_database configuration['database'],
+    connection.create_database(
+      configuration['database'],
       configuration.merge('encoding' => encoding)
-    establish_connection configuration
+    )
+
   rescue Exception => error
     $stderr.puts error, *(error.backtrace)
     $stderr.puts "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop
-    establish_connection postgres_configuration
-    connection.drop_database configuration['database']
+    connection.drop_database(configuration['database'])
   end
 
   def encoding

data/spec/database_spec.rb

@@ -1,17 +1,28 @@
-require 'spec_helper'
-require File.expand_path("../dummy/lib/engine.rb", __FILE__)
-
 module Combustion
   describe Database do
-    before do
+    before(:all) do
       Dir.chdir(File.expand_path('../dummy', __FILE__)) do
         Combustion.initialize! :active_record
       end
     end
 
-    it 'run migration from dummy engine' do
-      expect(ActiveRecord::Base.connection.table_exists?('dummy_table')).to eq true
+    it 'creates dummy table from migration in base database' do
+      expect(Model.connection.table_exists?('dummy_table')).to eq true
+      expect(Model.connection.table_exists?('dummy_in_another_db')).to eq false
+    end
+
+    it 'creates another dummy table from another database' do
+      expect(ModelInAnotherDb.connection.table_exists?('dummy_table')).to eq false
+      expect(ModelInAnotherDb.connection.table_exists?('dummy_in_another_db')).to eq true
+
+    end
+
+    it 'returns test databse for model with default connection' do
+      expect(Model.connection_config[:database]).to match /test/
+    end
+
+    it 'returns test_another databse for model with connection to second database' do
+      expect(ModelInAnotherDb.connection_config[:database]).to match /test_another/
     end
   end
 end
-

data/spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb

@@ -0,0 +1,9 @@
+class CreateDummyTestTableInAnotherDb < ActiveRecord::Migration
+  def change
+    create_table 'dummy_in_another_db'
+  end
+
+  def connection
+    ModelInAnotherDb.connection
+  end
+end

data/spec/dummy/spec/internal/app/models/model.rb

@@ -0,0 +1,3 @@
+class Model < ActiveRecord::Base
+  self.table_name = 'dummy_table'
+end

data/spec/dummy/spec/internal/app/models/model_in_another_db.rb

@@ -0,0 +1,5 @@
+class ModelInAnotherDb < ActiveRecord::Base
+  self.table_name = 'dummy_in_another_db'
+
+  establish_connection :test_another
+end

data/spec/dummy/spec/internal/config/database.yml

@@ -1,3 +1,15 @@
-test:
-  adapter:  sqlite3
-  database: db/combustion_test.sqlite
+test: &defaults
+  adapter: <%= ENV.fetch("DB_ADAPTER") %>
+  database: test
+  <% if ENV["DB_HOST"] %>
+  host: <%= ENV["DB_HOST"] %>
+  <% end %>
+
+  <% if ENV["DB_USERNAME"] %>
+  username: <%= ENV["DB_USERNAME"] %>
+  <% end %>
+
+
+test_another:
+  <<: *defaults
+  database: test_another

data/spec/spec_helper.rb

@@ -1,3 +1,14 @@
 # coding: utf-8
 require 'bundler/setup'
 require 'combustion'
+
+if Rails::VERSION::STRING.to_f < 4.1
+  require 'active_record'
+  require 'active_record/connection_adapters/mysql2_adapter'
+
+  class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+  end
+end
+
+require File.expand_path("../dummy/lib/engine.rb", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Test your Rails Engines without needing a full Rails app
 email:
 - pat@freelancing-gods.com
@@ -103,6 +145,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - HISTORY
 - LICENCE
@@ -110,6 +155,13 @@ files:
 - Rakefile
 - bin/combust
 - combustion.gemspec
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5_0.gemfile
 - lib/combustion.rb
 - lib/combustion/application.rb
 - lib/combustion/database.rb
@@ -126,7 +178,10 @@ files:
 - lib/combustion/generator.rb
 - spec/database_spec.rb
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
+- spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb
 - spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/app/models/model.rb
+- spec/dummy/spec/internal/app/models/model_in_another_db.rb
 - spec/dummy/spec/internal/config/database.yml
 - spec/dummy/spec/internal/config/routes.rb
 - spec/dummy/spec/internal/db/schema.rb
@@ -156,14 +211,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files:
 - spec/database_spec.rb
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
+- spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb
 - spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/app/models/model.rb
+- spec/dummy/spec/internal/app/models/model_in_another_db.rb
 - spec/dummy/spec/internal/config/database.yml
 - spec/dummy/spec/internal/config/routes.rb
 - spec/dummy/spec/internal/db/schema.rb