combustion 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4eecc61f64900b28416b12bdf1a10732233c945a
-  data.tar.gz: c273b82455f6e3c05d08de860ecdaa32d4302990
+SHA256:
+  metadata.gz: 6fe7aab6e68f602f2b368bc8fa1b0bdeadc34a72eacd4b9d3c30ce6f6dfd6d9c
+  data.tar.gz: 7342be839ec93b552be92ba789f8dc1d102b8ceeb301fe9e0ad820724dfd4ebf
 SHA512:
-  metadata.gz: f2ba1f8bcd5c49c1f3424fa8107b27df888c681e13e155b16ec5b8a918752cd0da972ea9f86e960a86efff4fe67d36c2dd333f89a77a5424c98457c1e4f25327
-  data.tar.gz: 63145f149be8fae43c84fd0c6af4f706e07a74bf8dae2e76e0cc813eaa6bfa16a479093caef8fbf58fa57f6607b42edbfa1fbfd9f024e29d0a380c007c46f30c
+  metadata.gz: 04bba0ac0ac7d86e114549ff9e59e9f35098238b2dc1774254bcfab367938467c9b88790d3a45f17ff50d8c0865d7b9691da25b1b8fdcf6489bebd260880b241
+  data.tar.gz: 8bce1e790cd64eb3c9fc24cfa83d53c1a2627b7fcf82b6ea8759bc856247b92c22a18cd3820b8b41d9f37cc957c6816875991d80c2681baf59bd1a7709cea2ca

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,31 @@
+inherit_from:
+  - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.2
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Metrics/BlockLength:
+  Exclude:
+    - 'combustion.gemspec'
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+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.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 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,46 @@
+# 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 "pg", "< 1.0"
   end
 end
 
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.2"
+  gem "pg", "< 1.0"
 end
 
 appraise "rails-5.1" do
   gem "rails", "~> 5.1.0"
+  gem "pg", "< 1.0"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0.rc1"
 end

data/Gemfile

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

data/HISTORY

@@ -1,3 +1,8 @@
+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.8.0'
 
 # Gemfile
-gem 'combustion', '~> 0.7.0', :group => :test
+gem 'combustion', '~> 0.8.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:

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.8.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.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.50.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_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

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

data/gemfiles/rails_5.2.gemfile

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

data/lib/combustion.rb

@@ -1,38 +1,49 @@
-require 'rails'
-require 'active_support/dependencies'
+# frozen_string_literal: true
+
+require "rails"
+require "active_support/dependencies"
 
 module Combustion
-  mattr_accessor :path, :schema_format
-  mattr_reader :setup_environment
+  module Configurations
+    #
+  end
+
+  mattr_accessor :path, :schema_format, :setup_environment
 
-  self.path          = '/spec/internal'
+  self.path          = "/spec/internal"
   self.schema_format = :ruby
 
-  if Rails.version.to_s > '3.1'
-    Modules = %w( active_record action_controller action_view action_mailer
-      sprockets )
+  MODULES = if Rails.version.to_f >= 3.1
+    %w[ active_record action_controller action_view action_mailer sprockets ]
   else
-    Modules = %w( active_record action_controller action_view action_mailer )
+    %w[ active_record action_controller action_view action_mailer ]
   end
 
   def self.initialize!(*modules, &block)
-    @@setup_environment = block if block_given?
+    self.setup_environment = block if block_given?
 
     options = modules.extract_options!
-    modules = Modules if modules == [:all]
+    modules = MODULES if modules == [:all]
     modules.each { |mod| require "#{mod}/railtie" }
 
     Bundler.require :default, Rails.env
 
     Combustion::Application.configure_for_combustion
+    include_database modules, options
+    Combustion::Application.initialize!
+    include_rspec
+  end
 
-    if modules.map(&:to_s).include? 'active_record'
-      Combustion::Application.config.to_prepare do
-        Combustion::Database.setup(options)
-      end
+  def self.include_database(modules, options)
+    return unless modules.map(&:to_s).include? "active_record"
+
+    Combustion::Application.config.to_prepare do
+      Combustion::Database.setup(options)
     end
+  end
 
-    Combustion::Application.initialize!
+  def self.include_rspec
+    return unless defined?(RSpec) && RSpec.respond_to?(:configure)
 
     RSpec.configure do |config|
       include_capybara_into config
@@ -41,7 +52,7 @@ module Combustion
       if Combustion::Application.routes.respond_to?(:mounted_helpers)
         config.include Combustion::Application.routes.mounted_helpers
       end
-    end if defined?(RSpec) && RSpec.respond_to?(:configure)
+    end
   end
 
   def self.include_capybara_into(config)
@@ -49,12 +60,14 @@ module Combustion
 
     config.include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
     config.include Capybara::DSL           if defined?(Capybara::DSL)
+    return if defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
 
-    unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
-      config.include Capybara
-    end
+    config.include Capybara
   end
 end
 
-require 'combustion/application'
-require 'combustion/database'
+require "combustion/application"
+require "combustion/configurations/action_controller"
+require "combustion/configurations/action_mailer"
+require "combustion/configurations/active_record"
+require "combustion/database"

data/lib/combustion/application.rb

@@ -1,15 +1,22 @@
-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
     # 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'
+
+    if Rails.version.to_f >= 4.0
+      config.secret_key_base = SecureRandom.hex
+    else
+      config.whiny_nils = true
+    end
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr
@@ -20,31 +27,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.rb

@@ -1,25 +1,35 @@
+# frozen_string_literal: true
+
 module Combustion
   module Databases
     #
   end
 
   class Database
+    DEFAULT_OPTIONS = {
+      :database_reset   => true,
+      :load_schema      => true,
+      :database_migrate => true
+    }.freeze
+
     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)
+      options = DEFAULT_OPTIONS.merge options
+
+      Combustion::Database::Reset.call      if options[:database_reset]
+      Combustion::Database::LoadSchema.call if options[:load_schema]
+      Combustion::Database::Migrate.call    if options[:database_migrate]
     end
   end
 end
 
-require 'combustion/database/load_schema'
-require 'combustion/database/migrate'
-require 'combustion/database/reset'
+require "combustion/databases/base"
+require "combustion/databases/firebird"
+require "combustion/databases/mysql"
+require "combustion/databases/oracle"
+require "combustion/databases/postgresql"
+require "combustion/databases/sql_server"
+require "combustion/databases/sqlite"
 
-require 'combustion/databases/base'
-require 'combustion/databases/firebird'
-require 'combustion/databases/mysql'
-require 'combustion/databases/oracle'
-require 'combustion/databases/postgresql'
-require 'combustion/databases/sql_server'
-require 'combustion/databases/sqlite'
+require "combustion/database/load_schema"
+require "combustion/database/migrate"
+require "combustion/database/reset"

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,31 @@
+# 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
+
   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
+    ActiveRecord::Base.configurations.each_value do |configuration|
+      adapter = configuration["adapter"] ||
+                configuration["url"].split("://").first
 
       operator_class(adapter).new(configuration).reset
     end
@@ -22,23 +33,17 @@ 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
 end

data/lib/combustion/databases/base.rb

@@ -1,4 +1,6 @@
-require 'active_support/core_ext/module/delegation'
+# frozen_string_literal: true
+
+require "active_support/core_ext/module/delegation"
 
 class Combustion::Databases::Base
   def initialize(configuration)

data/lib/combustion/databases/firebird.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::Firebird < Combustion::Databases::Base
   def reset
     establish_connection :test

data/lib/combustion/databases/mysql.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::MySQL < Combustion::Databases::Base
-  ACCESS_DENIED_ERROR = 10145
+  ACCESS_DENIED_ERROR = 10_145
 
   def reset
-    establish_connection(configuration.merge('database' => nil))
+    establish_connection(configuration.merge("database" => nil))
 
     super
   end
@@ -10,34 +12,36 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   private
 
   def charset
-    configuration['charset'] || ENV['CHARSET'] || 'utf8'
+    configuration["charset"] || ENV["CHARSET"] || "utf8"
+  end
+
+  def charset_error
+    return "" unless config["charset"]
+
+    "(if you set the charset manually, make sure you have a matching collation)"
   end
 
   def collation
-    configuration['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
+    configuration["collation"] || ENV["COLLATION"] || "utf8_unicode_ci"
   end
 
   def create
-    connection.create_database configuration['database'], creation_options
+    connection.create_database configuration["database"], creation_options
     establish_connection configuration
   rescue error_class => error
-    if error.errno == ACCESS_DENIED_ERROR
-      create_as_root
-    else
-      $stderr.puts error.error
-      $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}"
-      $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-    end
+    rescue_create_from error
   end
 
-  def create_as_root
-    print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-    root_password = $stdin.gets.strip
+  def create_as_root(error)
     establish_connection configuration.merge(
-      'database' => nil, 'username' => 'root', 'password' => root_password
+      "database" => nil,
+      "username" => "root",
+      "password" => request_password(error)
     )
-    connection.create_database config['database'], creation_options
+
+    connection.create_database config["database"], creation_options
     connection.execute grant_statement
+
     establish_connection configuration
   end
 
@@ -46,24 +50,49 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def drop
-    connection.drop_database configuration['database']
+    connection.drop_database configuration["database"]
   end
 
   def error_class
-    if configuration['adapter'] =~ /jdbc/
-      #FIXME After Jdbcmysql gives this class
-      require 'active_record/railties/jdbcmysql_error'
-      error_class = ArJdbcMySQL::Error
+    if configuration["adapter"][/jdbc/]
+      # FIXME: After Jdbcmysql gives this class
+      require "active_record/railties/jdbcmysql_error"
+      ArJdbcMySQL::Error
+    elsif config["adapter"][/mysql2/] && defined?(Mysql2)
+      Mysql2::Error
     else
-      error_class = config['adapter'] =~ /mysql2/ && defined?(Mysql2) ? Mysql2::Error : Mysql::Error
+      Mysql::Error
     end
   end
 
   def grant_statement
     <<-SQL
-GRANT ALL PRIVILEGES ON #{configuration['database']}.*
-TO '#{configuration['username']}'@'localhost'
-IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON #{configuration["database"]}.*
+TO '#{configuration["username"]}'@'localhost'
+IDENTIFIED BY '#{configuration["password"]}' WITH GRANT OPTION;
     SQL
   end
+
+  def request_password(error)
+    print <<-TXT.strip
+#{error.error}.
+Please provide the root password for your mysql installation
+>
+    TXT
+
+    $stdin.gets.strip
+  end
+
+  def rescue_create_from(error)
+    if error.errno == ACCESS_DENIED_ERROR
+      create_as_root(error)
+      return
+    end
+
+    $stderr.puts <<-TXT
+#{error.error}
+Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}
+#{charset_error}
+    TXT
+  end
 end

data/lib/combustion/databases/oracle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::Oracle < Combustion::Databases::Base
   def reset
     establish_connection :test

data/lib/combustion/databases/postgresql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   def reset
     base.clear_active_connections!
@@ -10,31 +12,30 @@ class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
 
   def create
     connection.create_database(
-      configuration['database'],
-      configuration.merge('encoding' => encoding)
+      configuration["database"],
+      configuration.merge("encoding" => encoding)
     )
-
-  rescue Exception => error
-    $stderr.puts error, *(error.backtrace)
+  rescue StandardError => error
+    $stderr.puts error, *error.backtrace
     $stderr.puts "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop
-    connection.drop_database(configuration['database'])
+    connection.drop_database(configuration["database"])
   end
 
   def encoding
-    configuration['encoding'] || ENV['CHARSET'] || 'utf8'
+    configuration["encoding"] || ENV["CHARSET"] || "utf8"
   end
 
   def postgres_configuration
     configuration.merge(
-      'database'           => 'postgres',
-      'schema_search_path' => schema_search_path
+      "database"           => "postgres",
+      "schema_search_path" => schema_search_path
     )
   end
 
   def schema_search_path
-    configuration['adapter'][/postgis/] ? 'public, postgis' : 'public'
+    configuration["adapter"][/postgis/] ? "public, postgis" : "public"
   end
 end

data/lib/combustion/databases/sql_server.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::SQLServer < Combustion::Databases::Base
   def reset
-    establish_connection configuration.merge('database' => 'master')
-    connection.recreate_database! configuration['database']
+    establish_connection configuration.merge("database" => "master")
+    connection.recreate_database! configuration["database"]
   end
 end

data/lib/combustion/databases/sqlite.rb

@@ -1,19 +1,21 @@
-require 'fileutils'
-require 'pathname'
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
 
 class Combustion::Databases::SQLite < Combustion::Databases::Base
   private
 
   def create
     if exists?
-      $stderr.puts "#{config['database']} already exists"
+      $stderr.puts "#{config["database"]} already exists"
       return
     end
 
     establish_connection configuration
     connection
-  rescue Exception => error
-    $stderr.puts error, *(error.backtrace)
+  rescue StandardError => error
+    $stderr.puts error, *error.backtrace
     $stderr.puts "Couldn't create database for #{configuration.inspect}"
   end
 
@@ -30,6 +32,6 @@ class Combustion::Databases::SQLite < Combustion::Databases::Base
   end
 
   def path
-    @path ||= Pathname.new configuration['database']
+    @path ||= Pathname.new configuration["database"]
   end
 end

data/lib/combustion/generator.rb

@@ -1,29 +1,31 @@
-require 'thor/group'
+# frozen_string_literal: true
+
+require "thor/group"
 
 module Combustion
   class Generator < Thor::Group
     include Thor::Actions
 
     def self.source_root
-      File.expand_path File.join(File.dirname(__FILE__), '..', '..')
+      File.expand_path File.join(File.dirname(__FILE__), "..", "..")
     end
 
     def create_directories
-      empty_directory 'spec/internal'
-      empty_directory 'spec/internal/config'
-      empty_directory 'spec/internal/db'
-      empty_directory 'spec/internal/log'
-      empty_directory 'spec/internal/public'
+      empty_directory "spec/internal"
+      empty_directory "spec/internal/config"
+      empty_directory "spec/internal/db"
+      empty_directory "spec/internal/log"
+      empty_directory "spec/internal/public"
     end
 
     def create_files
-      template 'templates/routes.rb',    'spec/internal/config/routes.rb'
-      template 'templates/database.yml', 'spec/internal/config/database.yml'
-      template 'templates/schema.rb',    'spec/internal/db/schema.rb'
-      template 'templates/config.ru',    'config.ru'
-      create_file                        'spec/internal/public/favicon.ico'
-      create_file                        'spec/internal/log/.gitignore' do
-        '*.log'
+      template "templates/routes.rb",    "spec/internal/config/routes.rb"
+      template "templates/database.yml", "spec/internal/config/database.yml"
+      template "templates/schema.rb",    "spec/internal/db/schema.rb"
+      template "templates/config.ru",    "config.ru"
+      create_file                        "spec/internal/public/favicon.ico"
+      create_file                        "spec/internal/log/.gitignore" do
+        "*.log"
       end
     end
   end

data/spec/database_spec.rb

@@ -1,28 +1,32 @@
+# frozen_string_literal: true
+
 module Combustion
   describe Database do
     before(:all) do
-      Dir.chdir(File.expand_path('../dummy', __FILE__)) do
+      Dir.chdir(File.expand_path("../dummy", __FILE__)) do
         Combustion.initialize! :active_record
       end
     end
 
-    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
+    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
-
+    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/
+    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/
+    it "returns test_another 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/20150717075542_create_dummy_test_table.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 superclass = ActiveRecord::VERSION::MAJOR < 5 ?
   ActiveRecord::Migration : ActiveRecord::Migration[4.2]
 class CreateDummyTestTable < superclass
   def change
-    create_table 'dummy_table'
+    create_table "dummy_table"
   end
 end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 superclass = ActiveRecord::VERSION::MAJOR < 5 ?
   ActiveRecord::Migration : ActiveRecord::Migration[4.2]
 class CreateDummyTestTableInAnotherDb < superclass
   def change
-    create_table 'dummy_in_another_db'
+    create_table "dummy_in_another_db"
   end
 
   def connection

data/spec/dummy/lib/engine.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Dummy
   class Engine < ::Rails::Engine
-    initializer :dummy,  before: :load_init_rb do |app|
+    initializer :dummy,  :before => :load_init_rb do |app|
       app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded)
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Model < ActiveRecord::Base
-  self.table_name = 'dummy_table'
+  self.table_name = "dummy_table"
 end

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class ModelInAnotherDb < ActiveRecord::Base
-  self.table_name = 'dummy_in_another_db'
+  self.table_name = "dummy_in_another_db"
 
   establish_connection :test_another
 end

data/spec/dummy/spec/internal/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   #
 end

data/spec/dummy/spec/internal/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   #
 end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
-# coding: utf-8
-require 'bundler/setup'
-require 'combustion'
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "combustion"
 
 if Rails::VERSION::STRING.to_f < 4.1
-  require 'active_record'
-  require 'active_record/connection_adapters/mysql2_adapter'
+  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"

data/templates/config.ru

@@ -1,5 +1,7 @@
-require 'rubygems'
-require 'bundler'
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
 
 Bundler.require :default, :development
 

data/templates/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   #
 end

data/templates/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   #
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -153,7 +168,6 @@ files:
 - LICENCE
 - README.md
 - Rakefile
-- bin/literals
 - combustion.gemspec
 - exe/combust
 - gemfiles/rails_3.1.gemfile
@@ -163,9 +177,13 @@ files:
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5_0.gemfile
 - lib/combustion.rb
 - lib/combustion/application.rb
+- lib/combustion/configurations/action_controller.rb
+- lib/combustion/configurations/action_mailer.rb
+- lib/combustion/configurations/active_record.rb
 - lib/combustion/database.rb
 - lib/combustion/database/load_schema.rb
 - lib/combustion/database/migrate.rb
@@ -213,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing

data/bin/literals

@@ -1,9 +0,0 @@
-if (ruby -e "exit RUBY_VERSION.to_f >= 2.4")
-then
-  echo "Automatic frozen string literals are supported"
-  gem install pragmater -v 4.0.0
-  pragmater --add lib --comments "# frozen_string_literal: true" --whitelist "**/*.rb"
-  pragmater --add spec --comments "# frozen_string_literal: true" --whitelist "**/*.rb"
-else
-  echo "Automatic frozen string literals are not supported."
-fi