combustion 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e781b7922d6b720d76b442ca930f1e8341e297afd9d677656b24e7a4265e85
-  data.tar.gz: 1b21ce6080deed68c828303b92b1131d822714f1e905c29d97be76753bf82843
+  metadata.gz: d6757c9291746515078aa689da7f819b5a3679546b55cd9f2d64d6a2d4ac66f5
+  data.tar.gz: 2b1b3e0f92d8e8b07c1fa8678f88e36b5ceb5cda01246ef4528c95b5d4022429
 SHA512:
-  metadata.gz: 2edf04f8a1f865ad131bfe324d8258824f03e415fdfef986d310d6e47663f6055cf182d5aa757cefd7563261ada0d70c64c45dff70caba90999fbcb1cababbf9
-  data.tar.gz: b140df7dddbb1960f3a567a1d2987bca21826efeb7be031d612d742888fb67e9c2f50068278925e8a80150e1c1b509cc1412df604c042f6537846003e46daee8
+  metadata.gz: ec5405a6b9a3219ee33cba45ced79b68850bf6a0d29738af684c94586d6bb6ee3826be5042780cfb131a9f1b3ce38cf11ab3597965c7991f05c0560f1d69aa68
+  data.tar.gz: 736d397893838938051ca0a58c199ea595500adeb9bc40a115c42c2f930020a49ecf31267374286db081974a226e3f178527aa9a2ba318d694e745dacd145542

data/Appraisals

@@ -56,7 +56,15 @@ end
 
 if RUBY_VERSION.to_f >= 2.5
   appraise "rails-6.0" do
-    gem "rails", "~> 6.0.0.beta1"
+    gem "rails", "~> 6.0.0"
     gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
+  end
+
+  appraise "rails-edge" do
+    gem "rails", :git => "https://github.com/rails/rails.git"
+    gem "arel", :git => "https://github.com/rails/arel.git"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
   end
 end

data/Gemfile

@@ -4,4 +4,15 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "sqlite3", "~> 1.3.13", :platform => :ruby
+gem "sqlite3", "~> 1.3.13"
+
+if RUBY_VERSION.to_f < 2.3
+  gem "i18n",     "< 1.6"
+  gem "nio4r",    "< 2.4"
+  gem "nokogiri", "< 1.10.3"
+end
+
+if RUBY_VERSION.to_f > 2.4
+  gem "rubocop",           "~> 0.92"
+  gem "rubocop-packaging", "~> 0.5"
+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', '~> 1.1'
+gem.add_development_dependency 'combustion', '~> 1.3'
 
 # Gemfile
-gem 'combustion', '~> 1.1'
+gem 'combustion', '~> 1.3'
 ```
 
 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:
@@ -150,7 +150,7 @@ Combustion.initialize! :all do
 end
 ```
 
-Values given through the initialize! block will be set during Rails initialization proccess, exactly before the corresponding environment file inside `spec/internals/config/enviroments` is loaded (when that file exists), overriding Combustion's defaults.
+Values given through the initialize! block will be set during Rails initialization process, exactly before the corresponding environment file inside `spec/internals/config/enviroments` is loaded (when that file exists), overriding Combustion's defaults.
 
 Parameters defined in, for instance, `spec/internals/config/environments/test.rb`, would override Combustion's defaults and also config settings passed to initialize!.
 
@@ -185,7 +185,7 @@ end
 
 ## Compatibility
 
-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.
+The current test matrix covers MRI 2.2 to 2.6, and Rails 3.1 to 6.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.
 

data/lib/combustion.rb

@@ -12,18 +12,31 @@ module Combustion
   self.path          = "/spec/internal"
   self.schema_format = :ruby
 
-  MODULES = if Rails.version.to_f >= 3.1
-    %w[ active_record action_controller action_view action_mailer sprockets ]
-  else
-    %w[ active_record action_controller action_view action_mailer ]
-  end
+  MODULES = begin
+    hash = {
+      :active_model      => "active_model/railtie",
+      :active_record     => "active_record/railtie",
+      :action_controller => "action_controller/railtie",
+      :action_mailer     => "action_mailer/railtie",
+      :action_view       => "action_view/railtie"
+    }
+
+    hash[:sprockets]      = "sprockets/railtie"     if Rails.version.to_f >= 3.1
+    hash[:active_job]     = "active_job/railtie"    if Rails.version.to_f >= 4.2
+    hash[:action_cable]   = "action_cable/engine"   if Rails.version.to_f >= 5.0
+    hash[:active_storage] = "active_storage/engine" if Rails.version.to_f >= 5.2
+    hash[:action_text]    = "action_text/engine"    if Rails.version.to_f >= 6.0
+    hash[:action_mailbox] = "action_mailbox/engine" if Rails.version.to_f >= 6.0
+
+    hash
+  end.freeze
 
   def self.initialize!(*modules, &block)
     self.setup_environment = block if block_given?
 
     options = modules.extract_options!
-    modules = MODULES if modules == [:all]
-    modules.each { |mod| require "#{mod}/railtie" }
+    modules = MODULES.keys if modules == [:all]
+    modules.each { |mod| require MODULES.fetch(mod, "#{mod}/railtie") }
 
     Bundler.require :default, Rails.env
 
@@ -65,8 +78,9 @@ module Combustion
   end
 end
 
-require "combustion/application"
 require "combustion/configurations/action_controller"
 require "combustion/configurations/action_mailer"
 require "combustion/configurations/active_record"
+require "combustion/configurations/active_storage"
+require "combustion/application"
 require "combustion/database"

data/lib/combustion/application.rb

@@ -6,6 +6,13 @@ Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
+    CONFIGURERS = [
+      Combustion::Configurations::ActiveRecord,
+      Combustion::Configurations::ActionController,
+      Combustion::Configurations::ActionMailer,
+      Combustion::Configurations::ActiveStorage
+    ].freeze
+
     version = Rails.version.to_f
 
     # Core Settings
@@ -26,9 +33,7 @@ module Combustion
     def self.configure_for_combustion
       config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
-      Combustion::Configurations::ActiveRecord.call config
-      Combustion::Configurations::ActionController.call config
-      Combustion::Configurations::ActionMailer.call config
+      CONFIGURERS.each { |configurer| configurer.call config }
 
       config.assets.enabled = true if defined?(Sprockets)
     end
@@ -39,6 +44,7 @@ module Combustion
       :group  => :all
     ) do
       next unless Combustion.setup_environment
+
       Combustion::Application.class_eval(&Combustion.setup_environment)
     end
   end

data/lib/combustion/configurations/active_storage.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Combustion::Configurations::ActiveStorage
+  def self.call(config)
+    return unless defined?(ActiveStorage::Engine)
+
+    config.active_storage.service = :test
+  end
+end

data/lib/combustion/database/migrate.rb

@@ -44,7 +44,13 @@ class Combustion::Database::Migrate
   end
 
   def migration_context
-    ActiveRecord::MigrationContext.new paths
+    if ActiveRecord::MigrationContext.instance_method(:initialize).arity <= 1
+      ActiveRecord::MigrationContext.new paths
+    else
+      ActiveRecord::MigrationContext.new(
+        paths, ActiveRecord::Base.connection.schema_migration
+      )
+    end
   end
 
   def migrator

data/lib/combustion/database/reset.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 class Combustion::Database::Reset
+  # https://github.com/ruby/psych/pull/358/files#diff-fcdbfb11714f576f58ba9f866052bc79R322
+  RUBY_VERSION_WITH_NEW_SAFE_LOAD_METHOD_SIGNATURE = "2.6.0"
+
   UnsupportedDatabase = Class.new StandardError
 
   OPERATOR_PATTERNS = {
-    Combustion::Databases::MySQL => [/mysql/],
+    Combustion::Databases::MySQL      => [/mysql/],
     Combustion::Databases::PostgreSQL => [/postgres/, /postgis/],
     Combustion::Databases::SQLite     => [/sqlite/],
     Combustion::Databases::SQLServer  => [/sqlserver/],
@@ -19,15 +22,22 @@ class Combustion::Database::Reset
   end
 
   def initialize
-    ActiveRecord::Base.configurations = YAML.safe_load(
-      ERB.new(database_yaml).result, [], [], true
-    )
+    # TODO: remove when no longer support 2.5.8
+    if RUBY_VERSION >= RUBY_VERSION_WITH_NEW_SAFE_LOAD_METHOD_SIGNATURE
+      ActiveRecord::Base.configurations = YAML.safe_load(
+        ERB.new(database_yaml).result, :aliases => true
+      )
+    else
+      ActiveRecord::Base.configurations = YAML.safe_load(
+        ERB.new(database_yaml).result, [], [], true
+      )
+    end
   end
 
   def call
-    resettable_db_configs.each_value do |configuration|
-      adapter = configuration["adapter"] ||
-                configuration["url"].split("://").first
+    resettable_db_configs.each do |configuration|
+      adapter = configuration[:adapter] ||
+                configuration[:url].split("://").first
 
       operator_class(adapter).new(configuration).reset
     end
@@ -52,10 +62,28 @@ class Combustion::Database::Reset
   # All database configs except Rails default environments
   # that are not currently in use
   def resettable_db_configs
+    if ActiveRecord::VERSION::STRING.to_f > 6.0
+      return resettable_db_configs_for_6_1
+    end
+
     all_configurations      = ActiveRecord::Base.configurations.to_h
     unused_environments     = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
     resettable_environments = all_configurations.keys - unused_environments
 
-    all_configurations.select { |name| resettable_environments.include?(name) }
+    all_configurations.
+      select { |name| resettable_environments.include?(name) }.
+      values.
+      collect(&:with_indifferent_access)
+  end
+
+  def resettable_db_configs_for_6_1
+    all_configurations      = ActiveRecord::Base.configurations.configurations
+    unused_environments     = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
+    resettable_environments = all_configurations.collect(&:env_name).uniq -
+                              unused_environments
+
+    all_configurations.
+      select { |config| resettable_environments.include?(config.env_name) }.
+      collect(&:configuration_hash)
   end
 end

data/lib/combustion/databases/mysql.rb

@@ -4,7 +4,7 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   ACCESS_DENIED_ERROR = 10_145
 
   def reset
-    establish_connection(configuration.merge("database" => nil))
+    establish_connection(configuration.merge(:database => nil))
 
     super
   end
@@ -12,21 +12,21 @@ 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"]
+    return "" unless configuration[: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
     rescue_create_from error
@@ -34,12 +34,12 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
 
   def create_as_root(error)
     establish_connection configuration.merge(
-      "database" => nil,
-      "username" => "root",
-      "password" => request_password(error)
+      :database => nil,
+      :username => "root",
+      :password => request_password(error)
     )
 
-    connection.create_database config["database"], creation_options
+    connection.create_database configuration[:database], creation_options
     connection.execute grant_statement
 
     establish_connection configuration
@@ -50,15 +50,15 @@ 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/]
+    if configuration[:adapter][/jdbc/]
       # FIXME: After Jdbcmysql gives this class
       require "active_record/railties/jdbcmysql_error"
       ArJdbcMySQL::Error
-    elsif config["adapter"][/mysql2/] && defined?(Mysql2)
+    elsif configuration[:adapter][/mysql2/] && defined?(Mysql2)
       Mysql2::Error
     else
       Mysql::Error
@@ -68,8 +68,8 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   def grant_statement
     <<-SQL
 GRANT ALL PRIVILEGES ON #{configuration["database"]}.*
-TO '#{configuration["username"]}'@'localhost'
-IDENTIFIED BY '#{configuration["password"]}' WITH GRANT OPTION;
+TO '#{configuration[:username]}'@'localhost'
+IDENTIFIED BY '#{configuration[:password]}' WITH GRANT OPTION;
     SQL
   end
 
@@ -91,7 +91,7 @@ Please provide the root password for your mysql installation
 
     warn <<-TXT
 #{error.error}
-Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}
+Couldn't create database for #{configuration.inspect}, charset: #{charset}, collation: #{collation}
 #{charset_error}
     TXT
   end

data/lib/combustion/databases/postgresql.rb

@@ -12,8 +12,8 @@ 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 StandardError => error
     warn error, *error.backtrace
@@ -21,21 +21,21 @@ class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   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

@@ -2,7 +2,7 @@
 
 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

@@ -8,7 +8,7 @@ class Combustion::Databases::SQLite < Combustion::Databases::Base
 
   def create
     if exists?
-      warn "#{config["database"]} already exists"
+      warn "#{config[:database]} already exists"
       return
     end
 
@@ -32,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

@@ -23,8 +23,11 @@ module Combustion
       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
+      template "templates/storage.yml", "spec/internal/config/storage.yml"
+
+      create_file "spec/internal/app/assets/config/manifest.js"
+      create_file "spec/internal/public/favicon.ico"
+      create_file "spec/internal/log/.gitignore" do
         "*.log"
       end
     end

data/spec/database_spec.rb

@@ -1,30 +1,31 @@
 # frozen_string_literal: true
 
-module Combustion
-  describe Database do
-    before(:all) do
-      Dir.chdir(File.expand_path("dummy", __dir__)) 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
-    end
+RSpec.describe Combustion::Database do
+  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 "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 database for model with default connection" do
+  it "returns test database for model with default connection" do
+    if ActiveRecord::VERSION::STRING.to_f > 6.0
+      expect(Model.connection_db_config.database).to match(/test/)
+    else
       expect(Model.connection_config[:database]).to match(/test/)
     end
+  end
 
-    it "returns test_another for model with connection to second database" do
+  it "returns test_another for model with connection to second database" do
+    if ActiveRecord::VERSION::STRING.to_f > 6.0
+      expect(ModelInAnotherDb.connection_db_config.database).
+        to match(/test_another/)
+    else
       expect(ModelInAnotherDb.connection_config[:database]).
         to match(/test_another/)
     end