combustion 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6757c9291746515078aa689da7f819b5a3679546b55cd9f2d64d6a2d4ac66f5
-  data.tar.gz: 2b1b3e0f92d8e8b07c1fa8678f88e36b5ceb5cda01246ef4528c95b5d4022429
+  metadata.gz: '08458ed30f386ac27b19a50f31ebfa268b27cd2851f5e784ab9c9684e5e8591e'
+  data.tar.gz: 53410691043777b5fcb81b06ddf0d415e17bdcd81f1e0382db354fb3a8002b4a
 SHA512:
-  metadata.gz: ec5405a6b9a3219ee33cba45ced79b68850bf6a0d29738af684c94586d6bb6ee3826be5042780cfb131a9f1b3ce38cf11ab3597965c7991f05c0560f1d69aa68
-  data.tar.gz: 736d397893838938051ca0a58c199ea595500adeb9bc40a115c42c2f930020a49ecf31267374286db081974a226e3f178527aa9a2ba318d694e745dacd145542
+  metadata.gz: 7fb571edaf37a71657c218d57600c56faf2e5bfaabb0b90155cfb10716073ee11f9044eda12b2808819ba8c0a7ed85a5a5446f209a99c6d1fc347607fc145e13
+  data.tar.gz: 9d5667930b7bde63172f2a2accb24ca2e09ddb7ae88c33548d8eec0b9cfb6fc16870ddf9c3558de0c9e9a815929ebfe6d3099467cb19458459259b5915ba5877

data/Appraisals

@@ -37,21 +37,23 @@ if RUBY_VERSION.to_f <= 2.3
   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 < 3.0
+  appraise "rails-5.0" do
+    gem "rails", "~> 5.0.2"
+    gem "mysql2", "~> 0.4.4"
+    gem "pg", "< 1.0"
+  end
 
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "mysql2", "~> 0.4.4"
-  gem "pg", "< 1.0"
-end
+  appraise "rails-5.1" do
+    gem "rails", "~> 5.1.0"
+    gem "mysql2", "~> 0.4.4"
+    gem "pg", "< 1.0"
+  end
 
-appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0"
-  gem "mysql2", "~> 0.5.0"
+  appraise "rails-5.2" do
+    gem "rails", "~> 5.2.0"
+    gem "mysql2", "~> 0.5.0"
+  end
 end
 
 if RUBY_VERSION.to_f >= 2.5
@@ -61,9 +63,22 @@ if RUBY_VERSION.to_f >= 2.5
     gem "sqlite3", "~> 1.4"
   end
 
+  appraise "rails-6.1" do
+    gem "rails", "~> 6.1.0"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 1.4"
+  end
+end
+
+if RUBY_VERSION.to_f >= 2.7
+  appraise "rails-7.0" do
+    gem "rails", "~> 7.0.0.alpha2"
+    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 "rails", :git => "https://github.com/rails/rails.git", :branch => "main"
     gem "mysql2", "~> 0.5.0"
     gem "sqlite3", "~> 1.4"
   end

data/Gemfile

@@ -4,7 +4,11 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "sqlite3", "~> 1.3.13"
+if RUBY_VERSION.to_f < 3.0
+  gem "sqlite3", "~> 1.3.13"
+else
+  gem "sqlite3", "~> 1.4"
+end
 
 if RUBY_VERSION.to_f < 2.3
   gem "i18n",     "< 1.6"

data/README.md

@@ -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
@@ -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/configurations/active_record.rb

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

data/lib/combustion.rb

@@ -12,30 +12,39 @@ module Combustion
   self.path          = "/spec/internal"
   self.schema_format = :ruby
 
-  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
+  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
+    version = Rails.version.to_f
+
+    keys.delete(:sprockets) unless (3.1..6.1).include?(version)
+    keys.delete(:active_job) unless version >= 4.2
+    keys.delete(:action_cable) unless version >= 5.0
+    keys.delete(:active_storage) unless version >= 5.2
+    keys.delete(:action_text) unless version >= 6.0
+    keys.delete(:action_mailbox) unless version >= 6.0
+
+    keys
   end.freeze
 
   def self.initialize!(*modules, &block)
     self.setup_environment = block if block_given?
 
     options = modules.extract_options!
-    modules = MODULES.keys if modules == [:all]
+    modules = AVAILABLE_MODULES if modules == [:all]
     modules.each { |mod| require MODULES.fetch(mod, "#{mod}/railtie") }
 
     Bundler.require :default, Rails.env

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

@@ -9,6 +9,10 @@ test: &defaults
   username: <%= ENV["DB_USERNAME"] %>
   <% end %>
 
+  <% if ENV["DB_PASSWORD"] %>
+  password: <%= ENV["DB_PASSWORD"] %>
+  <% end %>
+
 
 test_another:
   <<: *defaults

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-11-25 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.81'
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.81'
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -193,10 +193,6 @@ files:
 - 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/development.log
-- spec/dummy/spec/internal/log/test.log
-- spec/dummy/spec/internal/test
-- spec/dummy/spec/internal/test_another
 - spec/spec_helper.rb
 - templates/config.ru
 - templates/database.yml
@@ -206,8 +202,9 @@ files:
 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
@@ -222,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files:
@@ -231,13 +228,9 @@ test_files:
 - spec/dummy/spec/internal/app/models/model.rb
 - spec/dummy/spec/internal/app/models/model_in_another_db.rb
 - spec/dummy/spec/internal/app/assets/config/manifest.js
-- spec/dummy/spec/internal/test
 - spec/dummy/spec/internal/config/routes.rb
 - spec/dummy/spec/internal/config/database.yml
 - spec/dummy/spec/internal/db/schema.rb
-- spec/dummy/spec/internal/log/test.log
-- spec/dummy/spec/internal/log/development.log
-- spec/dummy/spec/internal/test_another
 - spec/dummy/lib/engine.rb
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
 - spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb

data/spec/dummy/spec/internal/log/development.log

@@ -1,52 +0,0 @@
-   (215.8ms)  DROP DATABASE IF EXISTS "test"
-   (481.0ms)  CREATE DATABASE "test" ENCODING = 'utf8'
-   (214.9ms)  DROP DATABASE IF EXISTS "test_another"
-   (487.9ms)  CREATE DATABASE "test_another" ENCODING = 'utf8'
-   (6.6ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  ActiveRecord::InternalMetadata Load (0.8ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-  SQL (0.9ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2018-02-10 01:18:56.230481"], ["updated_at", "2018-02-10 01:18:56.230481"]]
-   (0.4ms)  COMMIT
-   (4.1ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY)
-   (0.2ms)  SELECT pg_try_advisory_lock(7458657555131878620);
-   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to CreateDummyTestTable (20150717075542)
-   (0.1ms)  BEGIN
-   (3.3ms)  CREATE TABLE "dummy_table" ("id" serial NOT NULL PRIMARY KEY)
-  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20150717075542"]]
-   (0.5ms)  COMMIT
-Migrating to CreateDummyTestTableInAnotherDb (20150717075543)
-   (0.3ms)  BEGIN
-   (8.3ms)  CREATE TABLE "dummy_in_another_db" ("id" serial NOT NULL PRIMARY KEY)
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20150717075543"]]
-   (0.4ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.3ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(7458657555131878620)
-   (212.2ms)  DROP DATABASE IF EXISTS "test"
-   (456.5ms)  CREATE DATABASE "test" ENCODING = 'utf8'
-   (195.0ms)  DROP DATABASE IF EXISTS "test_another"
-   (476.9ms)  CREATE DATABASE "test_another" ENCODING = 'utf8'
-   (6.7ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-  SQL (0.5ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2018-02-10 01:20:13.372972"], ["updated_at", "2018-02-10 01:20:13.372972"]]
-   (0.5ms)  COMMIT
-   (4.7ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY)
-   (0.2ms)  SELECT pg_try_advisory_lock(7458657555131878620);
-   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to CreateDummyTestTable (20150717075542)
-   (0.2ms)  BEGIN
-   (3.2ms)  CREATE TABLE "dummy_table" ("id" serial NOT NULL PRIMARY KEY)
-  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20150717075542"]]
-   (0.7ms)  COMMIT
-Migrating to CreateDummyTestTableInAnotherDb (20150717075543)
-   (0.2ms)  BEGIN
-   (8.1ms)  CREATE TABLE "dummy_in_another_db" ("id" serial NOT NULL PRIMARY KEY)
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20150717075543"]]
-   (0.4ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.1ms)  BEGIN
-   (0.1ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(7458657555131878620)