combustion 1.0.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e770c8fcc3c15a6918486de7f5dbb93091bb457f28df2cb0123f0d0853f44c
-  data.tar.gz: 4efd8db0a68d99e752f431b0f6d2da7fbc34092c11db254af93b038480811a34
+  metadata.gz: 022c30e0d3b5dd020d5765951897e91fd4d33725c87b54ce0370e2fdcaea67c8
+  data.tar.gz: 5f53fd6cef1a7c7c92f9618d37b852d446d565edc3019a2cd0a96f244c08c2e2
 SHA512:
-  metadata.gz: d089a752fd8bc317d4add3cc6da88b648b4bb13feb25b7dabaea4f0a6e31bc042198c3aa7d52fb8206091f2db337ee75f9303fce7fc284cd7aea316727075a2d
-  data.tar.gz: 0c6c9b3e94d5ec4f376f8d2b784b00dcb3e2f247e8b27ed175dbebf88c373141f6dee0b128f4520c2dce5f90841dbaee2dd5ceb903900204a1f6441c1a5a388e
+  metadata.gz: 3bacc58fd39c3708d26623631bb021f0a8c912e64ea9733cc6426dddeba9861e0a1af8fa75f7de18ebd6b3d567a873460d633976e263ce7f500c2224831546eb
+  data.tar.gz: de2cfdd55a3169eb14c89f3db2090f12b6df84dbeed539b13627c20eb7b696ff1ebef2be6b76c7bdbe2b4e609d2c6a727eabec142e9e9020859e34a91dd979d6

data/Appraisals

@@ -1,50 +1,63 @@
 # 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"
+if RUBY_VERSION.to_f < 3.0
+  appraise "rails-5.0" do
+    gem "rails", "~> 5.0.2"
+    gem "mysql2", "~> 0.4.4"
     gem "pg", "< 1.0"
   end
 
-  appraise "rails-3.2" do
-    gem "rails", "~> 3.2.22.5"
-    gem "mysql2", "~> 0.3.10"
+  appraise "rails-5.1" do
+    gem "rails", "~> 5.1.0"
+    gem "mysql2", "~> 0.4.4"
     gem "pg", "< 1.0"
   end
 
-  appraise "rails-4.0" do
-    gem "rails", "~> 4.0.13"
-    gem "mysql2", "~> 0.3.10"
-    gem "pg", "< 1.0"
+  appraise "rails-5.2" do
+    gem "rails", "~> 5.2.0"
+    gem "mysql2", "~> 0.5.0"
   end
+end
 
-  appraise "rails-4.1" do
-    gem "rails", "~> 4.1.16"
-    gem "mysql2", "~> 0.3.13"
-    gem "pg", "< 1.0"
+if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f < 3.1
+  appraise "rails-6.0" do
+    gem "rails", "~> 6.0.0"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4", "< 1.5.0"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
   end
+end
 
-  appraise "rails-4.2" do
-    gem "rails", "~> 4.2.8"
-    gem "mysql2", "~> 0.4.4"
-    gem "pg", "< 1.0"
+if RUBY_VERSION.to_f >= 2.5
+  appraise "rails-6.1" do
+    gem "rails", "~> 6.1.0"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4", "< 1.6.0"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
   end
 end
 
-appraise "rails-5.0" do
-  gem "rails", "~> 5.0.2"
-  gem "mysql2", "~> 0.4.4"
-  gem "pg", "< 1.0"
-end
+if RUBY_VERSION.to_f >= 2.7
+  appraise "rails-7.0" do
+    gem "rails", "~> 7.0.1"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
+  end
 
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "mysql2", "~> 0.4.4"
-  gem "pg", "< 1.0"
+  appraise "rails-7.1" do
+    gem "rails", "~> 7.1.2"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
+    gem "trilogy", "~> 2.7"
+  end
 end
 
-appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0"
-  gem "mysql2", "~> 0.5.0"
+if RUBY_VERSION.to_f >= 3.1
+  appraise "rails-edge" do
+    gem "rails", :git => "https://github.com/rails/rails.git", :branch => "main"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
+    gem "trilogy", "~> 2.7"
+  end
 end

data/Gemfile

@@ -3,3 +3,15 @@
 source "http://rubygems.org"
 
 gemspec
+
+if RUBY_VERSION.to_f < 3.0
+  gem "sqlite3", "~> 1.3.13"
+else
+  gem "sqlite3", "~> 1.4"
+end
+
+gem "rubocop",           "~> 0.92"
+gem "rubocop-packaging", "~> 0.5"
+
+# Required for testing Rails 6.1 on MRI 3.1+
+gem "net-smtp" if RUBY_VERSION.to_f > 3.0

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.0'
+gem.add_development_dependency 'combustion', '~> 1.3'
 
 # Gemfile
-gem 'combustion', '~> 1.0'
+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:
@@ -37,6 +37,8 @@ RSpec.configure do |config|
 end
 ```
 
+Please note that using `:all` as an argument for `Combustion.initialize!` will load all key parts of Rails that are considered essential for that version. For example: ActiveJob is only loaded for Rails 4.2 onwards, and Sprockets is only loaded for Rails 3.1-6.1 (as it is no longer part of the default set in 7.0).
+
 You'll also want to run the generator that creates a minimal set of files expected by Rails - run this in the directory of your engine:
 
 ```shell
@@ -150,13 +152,13 @@ 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!.
 
 ### Using other Rails-focused libraries
 
-Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting `:require` to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryGirl.
+Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting `:require` to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryBot.
 
 ### Environment and Logging
 
@@ -185,7 +187,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.4 to 3.1, and Rails 3.1 to 7.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.
 
@@ -208,4 +210,4 @@ The tests are extremely minimal, and patches to extend the suite are especially
 
 ## Credits
 
-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).
+Copyright (c) 2011-2021, 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/lib/combustion/application.rb

@@ -6,16 +6,32 @@ Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
-    version = Rails.version.to_f
+    CONFIGURERS = [
+      Combustion::Configurations::ActiveRecord,
+      Combustion::Configurations::ActionController,
+      Combustion::Configurations::ActionMailer,
+      Combustion::Configurations::ActiveStorage
+    ].freeze
+
+    rails_gate = VersionGate.new("railties")
+
+    if rails_gate.call(">= 7.2.0.alpha")
+      config.load_defaults Rails::VERSION::STRING.to_f
+    end
 
     # Core Settings
     config.cache_classes               = true
     config.consider_all_requests_local = true
     config.eager_load                  = Rails.env.production?
 
-    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
+    config.secret_key_base = SecureRandom.hex if rails_gate.call(">= 4.0")
+    config.whiny_nils      = true             if rails_gate.call("< 4")
+    if rails_gate.call("< 5.2")
+      config.secret_token = Digest::SHA1.hexdigest Time.now.to_s
+    end
+    if rails_gate.call("~> 7.1.0.alpha")
+      config.active_support.cache_format_version = 7.1
+    end
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr
@@ -26,9 +42,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 +53,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_record.rb

@@ -3,6 +3,11 @@
 class Combustion::Configurations::ActiveRecord
   def self.call(config)
     return unless defined?(ActiveRecord::Railtie)
+
+    if Combustion::VersionGate.call("activerecord", "~> 7.0.0")
+      config.active_record.legacy_connection_handling = false
+    end
+
     return unless ::ActiveRecord.constants.include?(:MassAssignmentSecurity)
 
     # Turn on ActiveRecord attribute whitelisting

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

@@ -6,9 +6,11 @@ class Combustion::Database::Migrate
   end
 
   def call
-    if ActiveRecord::VERSION::STRING.to_f >= 5.2
+    ar_gate = Combustion::VersionGate.new("activerecord")
+
+    if ar_gate.call(">= 5.2")
       migration_context.migrate
-    elsif ActiveRecord::VERSION::STRING.to_f >= 3.1
+    elsif ar_gate.call(">= 3.1")
       migrator.migrate paths, nil
     else
       paths.each { |path| migrator.migrate path, nil }
@@ -44,7 +46,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/, /trilogy/],
     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,12 +62,28 @@ class Combustion::Database::Reset
   # 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 -
+    if Combustion::VersionGate.call("activerecord", ">= 6.1")
+      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) }.
+      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
 
-    ActiveRecord::Base.configurations.select do |name|
-      resettable_environments.include?(name)
-    end
+    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,16 +50,18 @@ 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
+    elsif configuration[:adapter][/trilogy/] && defined?(Trilogy)
+      Trilogy::Error
     else
       Mysql::Error
     end
@@ -68,8 +70,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 +93,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

@@ -2,7 +2,12 @@
 
 class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   def reset
-    base.clear_active_connections!
+    if Combustion::VersionGate.call("activerecord", ">= 7.1.0.alpha")
+      base.connection_handler.clear_active_connections!
+    else
+      base.clear_active_connections!
+    end
+
     establish_connection(postgres_configuration)
 
     super
@@ -12,8 +17,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 +26,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/lib/combustion/version_gate.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "rubygems"
+
+module Combustion
+  class VersionGate
+    def self.call(name, *constraints)
+      new(name).call(*constraints)
+    end
+
+    def initialize(name)
+      @name = name
+    end
+
+    # Using matches_spec? instead of match? because the former returns true
+    # even when the spec has an appropriate _pre-release_ version.
+    def call(*constraints)
+      return false if spec.nil?
+
+      dependency(*constraints).matches_spec?(spec)
+    end
+
+    private
+
+    attr_reader :name
+
+    def dependency(*constraints)
+      Gem::Dependency.new(name, *constraints)
+    end
+
+    def spec
+      Gem.loaded_specs.fetch(name, nil)
+    end
+  end
+end

data/lib/combustion.rb

@@ -3,6 +3,8 @@
 require "rails"
 require "active_support/dependencies"
 
+require "combustion/version_gate"
+
 module Combustion
   module Configurations
   end
@@ -12,18 +14,40 @@ 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 = {
+    :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",
+    :sprockets         => "sprockets/railtie",
+    :active_job        => "active_job/railtie",
+    :action_cable      => "action_cable/engine",
+    :active_storage    => "active_storage/engine",
+    :action_text       => "action_text/engine",
+    :action_mailbox    => "action_mailbox/engine"
+  }.freeze
+
+  AVAILABLE_MODULES = begin
+    keys = MODULES.keys
+    rails_gate = VersionGate.new("railties")
+
+    keys.delete(:sprockets) unless rails_gate.call(">= 3.1", "< 7.0")
+    keys.delete(:active_job) unless rails_gate.call(">= 4.2")
+    keys.delete(:action_cable) unless rails_gate.call(">= 5.0")
+    keys.delete(:active_storage) unless rails_gate.call(">= 5.2")
+    keys.delete(:action_text) unless rails_gate.call(">= 6.0")
+    keys.delete(:action_mailbox) unless rails_gate.call(">= 6.0")
+
+    keys
+  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 = AVAILABLE_MODULES if modules == [:all]
+    modules.each { |mod| require MODULES.fetch(mod, "#{mod}/railtie") }
 
     Bundler.require :default, Rails.env
 
@@ -65,8 +89,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/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
-      expect(Model.connection_config[:database]).to match(/test/)
+  it "returns test database for model with default connection" do
+    if Combustion::VersionGate.call("activerecord", ">= 6.1")
+      expect(Model.connection_db_config.database).to match(/combustion/)
+    else
+      expect(Model.connection_config[:database]).to match(/combustion/)
     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 Combustion::VersionGate.call("activerecord", ">= 6.1")
+      expect(ModelInAnotherDb.connection_db_config.database).
+        to match(/test_another/)
+    else
       expect(ModelInAnotherDb.connection_config[:database]).
         to match(/test_another/)
     end

data/spec/dummy/spec/internal/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//

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

@@ -1,6 +1,6 @@
 test: &defaults
   adapter: <%= ENV.fetch("DB_ADAPTER") %>
-  database: test
+  database: combustion
   <% if ENV["DB_HOST"] %>
   host: <%= ENV["DB_HOST"] %>
   <% end %>
@@ -9,6 +9,14 @@ test: &defaults
   username: <%= ENV["DB_USERNAME"] %>
   <% end %>
 
+  <% if ENV["DB_PASSWORD"] %>
+  password: <%= ENV["DB_PASSWORD"] %>
+  <% end %>
+
+  <% if ENV["DB_PORT"] %>
+  port: <%= ENV["DB_PORT"] %>
+  <% end %>
+
 
 test_another:
   <<: *defaults

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
 require "combustion"
 
-if Rails::VERSION::STRING.to_f < 4.1
+if Combustion::VersionGate.call("rails", "< 4.1")
   require "active_record"
   require "active_record/connection_adapters/mysql2_adapter"
 
@@ -13,3 +12,7 @@ if Rails::VERSION::STRING.to_f < 4.1
 end
 
 require File.expand_path("dummy/lib/engine.rb", __dir__)
+
+Dir.chdir(File.expand_path("dummy", __dir__)) do
+  Combustion.initialize! :all
+end

data/templates/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -158,32 +158,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
-- HISTORY
 - LICENCE
 - README.md
 - Rakefile
-- combustion.gemspec
 - exe/combust
-- 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.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/configurations/active_storage.rb
 - lib/combustion/database.rb
 - lib/combustion/database/load_schema.rb
 - lib/combustion/database/migrate.rb
@@ -196,26 +183,30 @@ files:
 - lib/combustion/databases/sql_server.rb
 - lib/combustion/databases/sqlite.rb
 - lib/combustion/generator.rb
+- lib/combustion/version_gate.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/assets/config/manifest.js
 - spec/dummy/spec/internal/app/models/model.rb
 - spec/dummy/spec/internal/app/models/model_in_another_db.rb
+- spec/dummy/spec/internal/combustion
 - spec/dummy/spec/internal/config/database.yml
 - spec/dummy/spec/internal/config/routes.rb
 - spec/dummy/spec/internal/db/schema.rb
-- spec/dummy/spec/internal/log/.gitignore
 - spec/spec_helper.rb
 - templates/config.ru
 - templates/database.yml
 - templates/routes.rb
 - templates/schema.rb
+- templates/storage.yml
 homepage: https://github.com/pat/combustion
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,9 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: combustion
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files:
@@ -240,10 +230,15 @@ test_files:
 - 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/assets/config/manifest.js
 - spec/dummy/spec/internal/app/models/model.rb
 - spec/dummy/spec/internal/app/models/model_in_another_db.rb
+- spec/dummy/spec/internal/combustion
 - spec/dummy/spec/internal/config/database.yml
 - spec/dummy/spec/internal/config/routes.rb
 - spec/dummy/spec/internal/db/schema.rb
-- spec/dummy/spec/internal/log/.gitignore
 - spec/spec_helper.rb
+- ".rspec"
+- Appraisals
+- Gemfile
+- Rakefile

data/.gitignore

@@ -1,11 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-gemfiles/*.lock
-pkg/*
-.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

@@ -1,39 +0,0 @@
-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

@@ -1,20 +0,0 @@
-language: ruby
-env:
-  matrix:
-    - "DB_ADAPTER=sqlite3"
-    - "DB_ADAPTER=postgresql"
-    - "DB_ADAPTER=mysql2"
-rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-before_install:
-  - gem update --system
-  - gem install bundler
-before_script:
-  - bundle exec appraisal install
-script: 'bundle exec appraisal rake'
-services:
-  - mysql
-  - postgresql

data/HISTORY

@@ -1,96 +0,0 @@
-1.0.0 - October 3rd 2018
-* No functional changes.
-* Added documentation about database preparation options.
-
-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).
-
-0.6.0 - March 28th 2017
-* Optionally disable database reset, schema loading, migrations (Sergey Kucher).
-* Allow for multiple test databases (Semyon Pupkov).
-
-0.5.5 - July 23rd 2016
-* Add PostGIS support (Roland Koch).
-* MySQL parameter fix (Mathieu Leduc-Hamel).
-
-0.5.4 - January 12th 2016
-* Remove silent_stream call for Rails 5.0 compatability (Bryan Ricker).
-* Fix duplicate migrations error (Semyon Pupkov).
-
-0.5.3 - March 1st 2015
-* Use migrations from dependent gems (Korotaev Danil, Меркушин Михаил).
-
-0.5.2 - July 18th 2014
-* Note MIT licence in gemspec (@ktdreyer).
-* Use local create/drop methods when resetting database (Bryan Ricker).
-* ERB is now supported in config/database.yml, matching Rails (@patorash).
-* The database now is configured before the application is loaded (@patorash).
-* Documentation and generated config.ru now specify explicly loading all Rails libraries by default (Pat Allan).
-
-0.5.1 - July 25th 2013
-* Mass assignment errors raise exceptions instead of just being logged (Pat Allan).
-* whilelist_attributes is only set for Rails 3.2 apps (Philip Arndt).
-* Support ActiveRecord 3.0.x (Philip Arndt).
-* Allow custom application configuration (Pablo Herrero).
-
-0.5.0 - May 1st 2013
-* whitelist_attributes is now set within configure_for_combustion, as it depends on which Railties are loaded.
-* Make sure Rails gems are loaded before the engine's gem (Pablo Herrero).
-* Fixed Rails version comparison (Josh Adam).
-
-0.4.0 - March 16th 2013
-* Don't delete the SQLite test database if it doesn't exist (Michael Gee, Alexander Rozumiy).
-* Support for secret_key_base for Rails 4 apps (Philip Arndt).
-* eager_load is set to true when using the production environment (Philip Arndt).
-* whiny_nils is not set if using Rails 4 (Philip Arndt).
-* Mysql2 can raise Mysql::Error with JRuby (Philip Arndt).
-* Whitelist attributes typo is fixed (Geoff Hodgson).
-* Mass assignment checks are now turned on, so errors are raised. This matches Rails' defaults for test environments (Josh Adams).
-* Combustion no longer loads all of the Rails stack by default, just Railties and ActiveSupport. A combustion-rails gem will be created that uses all of Rails by default (Philip Arndt).
-* Combustion classes now all define the outer module, so each can be required by themselves, should you desire (Philip Arndt).
-
-0.3.3 - December 23rd 2012
-* Removing version file - version number can just live in the gemspec.
-* Load ActionController and ActionMailer via their Railties, not non-existent Engines (Chris Beer).
-* SQL Schema support (Geoff Hodgson).
-* Documentation fixes (Philip Arndt, Inge Jørgensen, Erkan Yilmaz).
-* Include migrations from the internal app when migrating the database (Warren Seen).
-* Correctly drop the test database when using SQLite (Warren Seen).
-* Don't attempt to load sprockets for Rails 3.0.x (Alex Rozumey).
-
-0.3.2 - March 3rd 2012
-* Tentative Rails 3.0 and migrations support.
-* Allow for different internal app directory.
-
-0.3.1 - September 12th 2011
-* Allow for different versions of Capybara (Leo Liang).
-* Including Capybara::DSL instead of Capybara.
-* Require 3.1.0 or better.
-* Allow for JRuby in the database.yml template (Philip Arndt).
-
-0.3.0 - September 2nd 2011
-* Simple generator to create a pretty minimal internal Rails app.
-
-0.2.0 - August 30th 2011
-* Documentation.
-* Allow developers to choose which Rails modules they wish to be loaded.
-* Load Rails routes and Capybara helpers into RSpec examples when appropriate.
-
-0.1.1 - August 24th 2011
-* Support assets properly by loading ActionView and Sprockets railties.
-
-0.1.0 - August 19th 2011
-* First release, extracted from Dobro for HyperTiny.

data/combustion.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |s|
-  s.name        = "combustion"
-  s.version     = "1.0.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.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 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_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/gemfiles/rails_3.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-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

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

data/gemfiles/rails_5_0.gemfile

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

data/spec/dummy/spec/internal/log/.gitignore

@@ -1 +0,0 @@
-*.log