combustion 0.7.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4eecc61f64900b28416b12bdf1a10732233c945a
-  data.tar.gz: c273b82455f6e3c05d08de860ecdaa32d4302990
+SHA256:
+  metadata.gz: 0c1a369737ff21b225eee681a7ca0258f87a6141870885bc7cf4ce29ef6fd10c
+  data.tar.gz: 88f61f3c7f3d7f57b71f5be4a351c1bd93c374a81c5fcf76d8f2e6eae299de77
 SHA512:
-  metadata.gz: f2ba1f8bcd5c49c1f3424fa8107b27df888c681e13e155b16ec5b8a918752cd0da972ea9f86e960a86efff4fe67d36c2dd333f89a77a5424c98457c1e4f25327
-  data.tar.gz: 63145f149be8fae43c84fd0c6af4f706e07a74bf8dae2e76e0cc813eaa6bfa16a479093caef8fbf58fa57f6607b42edbfa1fbfd9f024e29d0a380c007c46f30c
+  metadata.gz: c5133bd2a0a3359d5562e0a62cd0561d63f7ce067bcf52773a48e09c1d54e1a7bdf2186683e87f82b98524f129a3e5c29aae792ccb0d1efd2f49abdfe556773f
+  data.tar.gz: 59f5f629ab28a8c6578e03617cedaec720a289917d4a1a37b1b713f63e0caf826aafe6f4addd8d0f78fb213abd173a6657b57cb4a9f87c764bcfd1f8a69571be

data/.gitignore

@@ -3,8 +3,9 @@
 Gemfile.lock
 gemfiles/*.lock
 pkg/*
-.rvmrc
+.rubocop-*-yml
 .ruby-version
+.rvmrc
 spec/dummy/spec/internal/db/*.sqlite
 spec/dummy/spec/internal/test
 spec/dummy/spec/internal/test_another

data/.rubocop.yml

@@ -0,0 +1,39 @@
+inherit_from:
+  - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.2
+
+Bundler/OrderedGems:
+  Exclude:
+    - 'gemfiles/*'
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'combustion.gemspec'
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'gemfiles/*'
+
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'spec/dummy/db/migrate/*.rb'

data/.travis.yml

@@ -5,16 +5,16 @@ env:
     - "DB_ADAPTER=postgresql"
     - "DB_ADAPTER=mysql2"
 rvm:
-  - 2.2.6
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 before_install:
   - gem update --system
   - gem install bundler
 before_script:
-  - ./bin/literals
   - bundle exec appraisal install
-script: 'bundle exec appraisal rspec'
+script: 'bundle exec appraisal rake'
 services:
   - mysql
   - postgresql

data/Appraisals

@@ -1,33 +1,50 @@
+# frozen_string_literal: true
+
 if RUBY_VERSION.to_f <= 2.3
   appraise "rails-3.1" do
     gem "rails", "~> 3.1.12"
     gem "mysql2", "~> 0.3.10"
+    gem "pg", "< 1.0"
   end
 
   appraise "rails-3.2" do
     gem "rails", "~> 3.2.22.5"
     gem "mysql2", "~> 0.3.10"
+    gem "pg", "< 1.0"
   end
 
   appraise "rails-4.0" do
     gem "rails", "~> 4.0.13"
     gem "mysql2", "~> 0.3.10"
+    gem "pg", "< 1.0"
   end
 
   appraise "rails-4.1" do
     gem "rails", "~> 4.1.16"
     gem "mysql2", "~> 0.3.13"
+    gem "pg", "< 1.0"
   end
 
   appraise "rails-4.2" do
     gem "rails", "~> 4.2.8"
+    gem "mysql2", "~> 0.4.4"
+    gem "pg", "< 1.0"
   end
 end
 
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.2"
+  gem "mysql2", "~> 0.4.4"
+  gem "pg", "< 1.0"
 end
 
 appraise "rails-5.1" do
   gem "rails", "~> 5.1.0"
+  gem "mysql2", "~> 0.4.4"
+  gem "pg", "< 1.0"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0"
+  gem "mysql2", "~> 0.5.0"
 end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec

data/HISTORY

@@ -1,3 +1,15 @@
+0.9.1 - April 25th 2018
+* Fix Rails 5.2 compatibility by not setting the deprecated secret_token configuration option.
+
+0.9.0 - March 26th 2018
+* Only reset databases that are either custom or the current one (Moritz Winter).
+* More consistency around environment handling (rather than presuming it's always the test environment).
+
+0.8.0 - February 1st 2018
+* Rails 5.2.0 support.
+* Requiring digest from std-lib directly.
+* Refactoring for cleaner code.
+
 0.7.0 - June 20th 2017
 * Confirm support for MRI frozen string literals.
 * Hide migration output (Michael Grosser).

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.7.0'
+gem.add_development_dependency 'combustion', '~> 0.9.1'
 
 # Gemfile
-gem 'combustion', '~> 0.7.0', :group => :test
+gem 'combustion', '~> 0.9.1'
 ```
 
 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:

data/Rakefile

@@ -1 +1,11 @@
-require 'bundler/gem_tasks'
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
+
+Rake::Task["default"].clear if Rake::Task.task_defined?("default")
+task :default => %i[ rubocop spec ]

data/combustion.gemspec

@@ -1,30 +1,34 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
-  s.name        = 'combustion'
-  s.version     = '0.7.0'
-  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.name        = "combustion"
+  s.version     = "0.9.1"
+  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'
+  s.rubyforge_project = "combustion"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
-  s.bindir        = 'exe'
-  s.require_paths = ['lib']
+  s.executables   = `git ls-files -- exe/*`.split("\n").map do |file|
+    File.basename(file)
+  end
+  s.bindir        = "exe"
+  s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'activesupport', '>= 3.0.0'
-  s.add_runtime_dependency 'railties', '>= 3.0.0'
-  s.add_runtime_dependency 'thor',  '>= 0.14.6'
+  s.add_runtime_dependency "activesupport", ">= 3.0.0"
+  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 'rspec'
-  s.add_development_dependency 'sqlite3'
+  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 "rspec"
+  s.add_development_dependency "rubocop", "~> 0.54.0"
+  s.add_development_dependency "sqlite3"
 end

data/exe/combust

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
+# frozen_string_literal: true
 
-require 'combustion'
-require 'combustion/generator'
+require "combustion"
+require "combustion/generator"
 
 Combustion::Generator.start

data/gemfiles/rails_3.1.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.12"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.22.5"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.0.13"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.1.16"
 gem "mysql2", "~> 0.3.13"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -3,5 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.2.8"
+gem "mysql2", "~> 0.4.4"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -3,5 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.0.2"
+gem "mysql2", "~> 0.4.4"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.1.gemfile

@@ -3,5 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.1.0"
+gem "mysql2", "~> 0.4.4"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.2.gemfile

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

data/lib/combustion/application.rb

@@ -1,15 +1,21 @@
-require 'securerandom'
-Rails.env = ENV['RAILS_ENV'] || 'test'
+# frozen_string_literal: true
+
+require "securerandom"
+require "digest"
+Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
+    version = Rails.version.to_f
+
     # Core Settings
     config.cache_classes               = true
-    config.whiny_nils                  = true if Rails.version.to_s < '4.0.0'
     config.consider_all_requests_local = true
-    config.secret_token                = Digest::SHA1.hexdigest Time.now.to_s
     config.eager_load                  = Rails.env.production?
-    config.secret_key_base             = SecureRandom.hex if Rails.version.to_s >= '4.0.0'
+
+    config.secret_key_base = SecureRandom.hex if version >= 4.0
+    config.whiny_nils      = true             if version < 4.0
+    config.secret_token = Digest::SHA1.hexdigest Time.now.to_s if version < 5.2
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr
@@ -20,31 +26,20 @@ module Combustion
     def self.configure_for_combustion
       config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
-      if defined?(ActiveRecord::Railtie) && ::ActiveRecord.constants.include?(:MassAssignmentSecurity)
-        # Turn on ActiveRecord attribute whitelisting
-        # This way the dummy app matches new rails apps re: this setting
-        config.active_record.whitelist_attributes      = true
-        config.active_record.mass_assignment_sanitizer = :strict
-      end
-
-      if defined?(ActionController::Railtie)
-        config.action_dispatch.show_exceptions            = false
-        config.action_controller.perform_caching          = false
-        config.action_controller.allow_forgery_protection = false
-      end
-
-      if defined?(ActionMailer::Railtie)
-        config.action_mailer.delivery_method     = :test
-        config.action_mailer.default_url_options = {:host => 'www.example.com'}
-      end
-
-      if defined?(Sprockets)
-        config.assets.enabled = true
-      end
+      Combustion::Configurations::ActiveRecord.call config
+      Combustion::Configurations::ActionController.call config
+      Combustion::Configurations::ActionMailer.call config
+
+      config.assets.enabled = true if defined?(Sprockets)
     end
 
-    initializer :load_customized_environment_for_combustion, :before => :load_environment_config, :group => :all do
-      Combustion::Application.class_eval(&Combustion.setup_environment) if Combustion.setup_environment
+    initializer(
+      :load_customized_environment_for_combustion,
+      :before => :load_environment_config,
+      :group  => :all
+    ) do
+      next unless Combustion.setup_environment
+      Combustion::Application.class_eval(&Combustion.setup_environment)
     end
   end
 end

data/lib/combustion/configurations/action_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Combustion::Configurations::ActionController
+  def self.call(config)
+    return unless defined?(ActionController::Railtie)
+
+    config.action_dispatch.show_exceptions            = false
+    config.action_controller.perform_caching          = false
+    config.action_controller.allow_forgery_protection = false
+  end
+end

data/lib/combustion/configurations/action_mailer.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Combustion::Configurations::ActionMailer
+  def self.call(config)
+    return unless defined?(ActionMailer::Railtie)
+
+    config.action_mailer.delivery_method     = :test
+    config.action_mailer.default_url_options = {:host => "www.example.com"}
+  end
+end

data/lib/combustion/configurations/active_record.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Combustion::Configurations::ActiveRecord
+  def self.call(config)
+    return unless defined?(ActiveRecord::Railtie)
+    return unless ::ActiveRecord.constants.include?(:MassAssignmentSecurity)
+
+    # Turn on ActiveRecord attribute whitelisting
+    # This way the dummy app matches new rails apps re: this setting
+    config.active_record.whitelist_attributes      = true
+    config.active_record.mass_assignment_sanitizer = :strict
+  end
+end

data/lib/combustion/database/load_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Combustion::Database::LoadSchema
   UnknownSchemaFormat = Class.new StandardError
 
@@ -10,11 +12,9 @@ class Combustion::Database::LoadSchema
 
     case schema_format
     when :ruby
-      load Rails.root.join('db', 'schema.rb')
+      load_ruby_schema
     when :sql
-      ActiveRecord::Base.connection.execute(
-        File.read(Rails.root.join('db', 'structure.sql'))
-      )
+      load_sql_schema
     else
       raise UnknownSchemaFormat, "Unknown schema format: #{schema_format}"
     end
@@ -22,6 +22,16 @@ class Combustion::Database::LoadSchema
 
   private
 
+  def load_ruby_schema
+    load Rails.root.join("db", "schema.rb")
+  end
+
+  def load_sql_schema
+    ActiveRecord::Base.connection.execute(
+      File.read(Rails.root.join("db", "structure.sql"))
+    )
+  end
+
   def schema_format
     Combustion.schema_format
   end

data/lib/combustion/database/migrate.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 class Combustion::Database::Migrate
   def self.call
     new.call
   end
 
   def call
-    if ActiveRecord::VERSION::STRING >= '3.1.0'
+    if ActiveRecord::VERSION::STRING.to_f >= 5.2
+      migration_context.migrate
+    elsif ActiveRecord::VERSION::STRING.to_f >= 3.1
       migrator.migrate paths, nil
     else
       paths.each { |path| migrator.migrate path, nil }
@@ -17,24 +21,37 @@ class Combustion::Database::Migrate
     if migrator.respond_to?(:migrations_paths)
       migrator.migrations_paths
     else
-      Array('db/migrate/')
+      Array("db/migrate/")
+    end
+  end
+
+  def engine_migration_paths
+    migration_paths = Rails.application.paths["db/migrate"].to_a
+
+    if engine_paths_exist_in?(migration_paths)
+      migration_paths
+    else
+      base_migration_paths + migration_paths
     end
   end
 
+  def engine_path
+    Rails.application.root.sub(::Combustion.path, "")
+  end
+
+  def engine_paths_exist_in?(paths)
+    paths.include?(engine_path.join("db/migrate").to_s)
+  end
+
+  def migration_context
+    ActiveRecord::MigrationContext.new paths
+  end
+
   def migrator
     @migrator ||= ActiveRecord::Migrator
   end
 
   def paths
-    engine_path     = Rails.application.root.sub(::Combustion.path, '')
-    migration_paths = Rails.application.paths['db/migrate'].to_a
-
-    if migration_paths.include?(engine_path.join('db/migrate').to_s)
-      paths = []
-    else
-      paths = base_migration_paths
-    end
-
-    (paths + migration_paths + [File.join(Rails.root, 'db/migrate')]).uniq
+    (engine_migration_paths + [File.join(Rails.root, "db/migrate")]).uniq
   end
 end

data/lib/combustion/database/reset.rb

@@ -1,20 +1,33 @@
+# frozen_string_literal: true
+
 class Combustion::Database::Reset
   UnsupportedDatabase = Class.new StandardError
 
+  OPERATOR_PATTERNS = {
+    Combustion::Databases::MySQL => [/mysql/],
+    Combustion::Databases::PostgreSQL => [/postgres/, /postgis/],
+    Combustion::Databases::SQLite     => [/sqlite/],
+    Combustion::Databases::SQLServer  => [/sqlserver/],
+    Combustion::Databases::Oracle     => %w[ oci oracle ],
+    Combustion::Databases::Firebird   => %w[ firebird ]
+  }.freeze
+
+  RAILS_DEFAULT_ENVIRONMENTS = %w[ development production test ].freeze
+
   def self.call
     new.call
   end
 
   def initialize
-    ActiveRecord::Base.configurations = YAML.load(
-      ERB.new(File.read("#{Rails.root}/config/database.yml")).result
+    ActiveRecord::Base.configurations = YAML.safe_load(
+      ERB.new(database_yaml).result, [], [], true
     )
   end
 
   def call
-    ActiveRecord::Base.configurations.values.each do |configuration|
-      adapter = configuration['adapter'] ||
-                configuration['url'].split('://').first
+    resettable_db_configs.each_value do |configuration|
+      adapter = configuration["adapter"] ||
+                configuration["url"].split("://").first
 
       operator_class(adapter).new(configuration).reset
     end
@@ -22,23 +35,29 @@ class Combustion::Database::Reset
 
   private
 
+  def database_yaml
+    File.read "#{Rails.root}/config/database.yml"
+  end
+
   def operator_class(adapter)
-    @operator ||= case adapter
-    when /mysql/
-      Combustion::Databases::MySQL
-    when /postgres/, /postgis/
-      Combustion::Databases::PostgreSQL
-    when /sqlite/
-      Combustion::Databases::SQLite
-    when /sqlserver/
-      Combustion::Databases::SQLServer
-    when 'oci', 'oracle'
-      Combustion::Databases::Oracle
-    when 'firebird'
-      Combustion::Databases::Firebird
-    else
-      raise UnsupportedDatabase,
-        "Unsupported database type: #{adapter}"
+    klass = nil
+    OPERATOR_PATTERNS.each do |operator, keys|
+      klass = operator if keys.any? { |key| adapter[key] }
+    end
+    return klass if klass
+
+    raise UnsupportedDatabase, "Unsupported database type: #{adapter}"
+  end
+
+  # All database configs except Rails default environments
+  # that are not currently in use
+  def resettable_db_configs
+    unused_environments = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
+    resettable_environments = ActiveRecord::Base.configurations.keys -
+                              unused_environments
+
+    ActiveRecord::Base.configurations.select do |name|
+      resettable_environments.include?(name)
     end
   end
 end