combustion 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751fe69f70a0ef16b4517a408b1b1d76b5dcd2aff3c39571c0d3698f05855f25
-  data.tar.gz: e0e7e95955dca33363d5b202516890e48df82b48867a54fdf1e86e7ed5c76653
+  metadata.gz: 0275fd92cc333b6729a5d6e7e02870093863d650984f6404ebebc31fd3267318
+  data.tar.gz: 90127237a18f2c7d76ab833033fc97bc70e600d5b0690aefe9760216f8ea9aea
 SHA512:
-  metadata.gz: d6829ad1bf0d7056a6f88d0dd4370f5c0fd1cfe17598506170ec119c9018c409945746cccd64073f6590a367682f278158a72b3da63f017f12e0b5d1620b2677
-  data.tar.gz: 0b1742af4205b797c8fa67c04a942e8f04e9de58e80297bbd1b81aaa6f943b0e29228320ae108e5f256c733f7577ae5aa2d3c9451931075b872c6efb5cec0b7a
+  metadata.gz: 73039b686308ad1e2b01005338352a184f997c534f50cec4336490d6d087849e6bb2616d145d3e5b9f05b5cd195345b7fa4e749dd02588a683423f0afc90a2d6
+  data.tar.gz: 3410f78c2cfc778e9b2e26573f5a7dbba06315f3284522ce7f77b92540b57aab2b44ea2cd267c1988069e7ebf911f4ef13c44796c2088ea69191c24c40bfb48d

data/Appraisals

@@ -24,35 +24,61 @@ if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f < 3.1
     gem "rails", "~> 6.0.0"
     gem "mysql2", "~> 0.5.0"
     gem "sqlite3", "~> 1.4", "< 1.5.0"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
+    gem "concurrent-ruby", "< 1.3.5"
   end
 end
 
-if RUBY_VERSION.to_f >= 2.5
+if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f < 4.0
   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"
+    gem "concurrent-ruby", "< 1.3.5"
+    gem "mutex_m", "~> 0.3.0" if RUBY_VERSION.to_f >= 3.4
   end
 end
 
-if RUBY_VERSION.to_f >= 2.7
+if RUBY_VERSION.to_f >= 3.0
   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"
+    gem "concurrent-ruby", "< 1.3.5"
+    gem "mutex_m", "~> 0.3.0" if RUBY_VERSION.to_f >= 3.4
   end
 
   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
 
-if RUBY_VERSION.to_f >= 3.1
+if RUBY_VERSION.to_f >= 3.2
+  appraise "rails-8.0" do
+    gem "rails", "~> 8.0.3"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 2.1"
+    gem "trilogy", "~> 2.9"
+  end
+
+  appraise "rails-8.1" do
+    gem "rails", "~> 8.1.1"
+    gem "mysql2", "~> 0.5.0"
+    gem "sqlite3", "~> 2.1"
+    gem "trilogy", "~> 2.9"
+  end
+end
+
+if RUBY_VERSION.to_f >= 3.3
   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 "sqlite3", "~> 2.1"
+    gem "trilogy", "~> 2.9"
   end
 end

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gemspec
 
 if RUBY_VERSION.to_f < 3.0
+  gem "pg", "<= 1.6.2"
   gem "sqlite3", "~> 1.3.13"
 else
   gem "sqlite3", "~> 1.4"
@@ -13,5 +14,7 @@ end
 gem "rubocop",           "~> 0.92"
 gem "rubocop-packaging", "~> 0.5"
 
-# Required for testing Rails 6.1 on MRI 3.1+
+# Gems that are no longer part of stdlib:
 gem "net-smtp" if RUBY_VERSION.to_f > 3.0
+gem "ostruct" if RUBY_VERSION.to_f > 3.4
+gem "stringio" if RUBY_VERSION.to_f > 3.1

data/README.md

@@ -187,9 +187,9 @@ end
 
 ## Compatibility
 
-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.
+The current test matrix covers MRI 2.6 to 4.0, and Rails 5.0 to 8.1 plus the latest in Rails' `main` branch. 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.
+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/develop/Appraisals) of Rails.
 
 ## Limitations and Known Issues
 
@@ -210,4 +210,4 @@ The tests are extremely minimal, and patches to extend the suite are especially
 
 ## Credits
 
-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).
+Copyright (c) 2011-2026, 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

@@ -2,7 +2,6 @@
 
 require "securerandom"
 require "digest"
-Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
@@ -15,6 +14,10 @@ module Combustion
 
     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

data/lib/combustion/database/reset.rb

@@ -7,7 +7,7 @@ class Combustion::Database::Reset
   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/],

data/lib/combustion/databases/mysql.rb

@@ -60,6 +60,8 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
       ArJdbcMySQL::Error
     elsif configuration[:adapter][/mysql2/] && defined?(Mysql2)
       Mysql2::Error
+    elsif configuration[:adapter][/trilogy/] && defined?(Trilogy)
+      Trilogy::Error
     else
       Mysql::Error
     end

data/lib/combustion.rb

@@ -42,15 +42,21 @@ module Combustion
     keys
   end.freeze
 
-  def self.initialize!(*modules, &block)
+  def self.initialize!(*modules, &block) # rubocop:disable Metrics/MethodLength
     self.setup_environment = block if block_given?
 
+    Rails.env = ENV["RAILS_ENV"] || "test"
+
     options = modules.extract_options!
     modules = AVAILABLE_MODULES if modules == [:all]
     modules.each { |mod| require MODULES.fetch(mod, "#{mod}/railtie") }
 
     Bundler.require :default, Rails.env
 
+    # intentionally required only after we load framework, to avoid recent Rails
+    # order-of-load warnings on initializers etc.
+    require "combustion/application"
+
     Combustion::Application.configure_for_combustion
     include_database modules, options
     Combustion::Application.initialize!
@@ -60,8 +66,11 @@ module Combustion
   def self.include_database(modules, options)
     return unless modules.map(&:to_s).include? "active_record"
 
+    # A frozen copy, so Rails can make the block Ractor-shareable
+    # (ActiveSupport::Ractors.unshareable_proc_action in Rails 8.2).
+    database_options = options.dup.freeze
     Combustion::Application.config.to_prepare do
-      Combustion::Database.setup(options)
+      Combustion::Database.setup(database_options)
     end
   end
 
@@ -93,5 +102,7 @@ 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"
+
+# combustion/application is intentionally required lazily in #initialize!, not
+# on boot to avoid recent Rails order-of-load warnings.

data/spec/include_database_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+RSpec.describe Combustion do
+  describe ".include_database" do
+    # Rails 8.2 makes reloader callbacks Ractor-shareable when
+    # ActiveSupport::Ractors.unshareable_proc_action is set, which needs every
+    # value the block refers to to be shareable.
+    it "registers a prepare block that can be made Ractor-shareable" do
+      unless defined?(Ractor) && Ractor.respond_to?(:make_shareable)
+        skip "needs Ractor.make_shareable"
+      end
+
+      block = nil
+      allow(Combustion::Application.config).
+        to receive(:to_prepare) { |&hook| block = hook }
+
+      Combustion.include_database [:active_record], :database_reset => false
+
+      expect { Ractor.make_shareable(block) }.not_to raise_error
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '0.92'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '0.92'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -191,10 +190,10 @@ files:
 - 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/include_database_spec.rb
 - spec/spec_helper.rb
 - templates/config.ru
 - templates/database.yml
@@ -206,7 +205,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,11 +219,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files:
+- ".rspec"
+- Appraisals
+- Gemfile
+- Rakefile
 - 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
@@ -233,12 +234,8 @@ test_files:
 - 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/include_database_spec.rb
 - spec/spec_helper.rb
-- ".rspec"
-- Appraisals
-- Gemfile
-- Rakefile