combustion 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97053abef57625a082cfc03848c5822384541e7badc99ad7eda77729eca45e11
-  data.tar.gz: 69afc4e110cc230359c021ee0ed7820241af3bfeaeff0229c441594225c4d732
+  metadata.gz: 7b3fd4577536b234e2a725161ea56238351c54784104bd7a69e484a5b1f33706
+  data.tar.gz: e390892995d4c40a4fbf786021f7512f93c4e12a0fc1e34fdc51223aa18a0d85
 SHA512:
-  metadata.gz: b4e662dede67e6e44ba8fc570277190e330948f2b73dd1b71067a5caee84d6171a63a54967a56246d06544c6458dbb57c0c2b28ef15401a173fe0f917b47debb
-  data.tar.gz: 1035a1e6b7c2b8b6a4b4d4d1e7bf95838b76a9720db2f240d42abd5c8a55e0318cd54360ccf689118138155254f60fc7ded4cde6cb5437f7f132b233b24753c1
+  metadata.gz: d8b096fde78139237376b4495b992ea4f1ec63b07bc3974e94481f781e06e724b5a9b15bba014ed98abcf8a436a45b0f908fefb26cb62f284befe6ef7f45138c
+  data.tar.gz: 0cb0f385fe230abc83b7b90bbe2eb4f19725885203d0061ad36b99a35f250f4683e12412b270fe75d1fbeff2fdf9f3535f6b92fadf7308ea181caac7fe5e849a

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

data/lib/combustion/configurations/active_record.rb

@@ -3,12 +3,13 @@
 class Combustion::Configurations::ActiveRecord
   def self.call(config)
     return unless defined?(ActiveRecord::Railtie)
-    return unless ::ActiveRecord.constants.include?(:MassAssignmentSecurity)
 
     if ActiveRecord::VERSION::MAJOR >= 7
       config.active_record.legacy_connection_handling = false
     end
 
+    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

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(:active_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,7 +202,8 @@ files:
 homepage: https://github.com/pat/combustion
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Elegant Rails Engine Testing