combustion 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022c30e0d3b5dd020d5765951897e91fd4d33725c87b54ce0370e2fdcaea67c8
-  data.tar.gz: 5f53fd6cef1a7c7c92f9618d37b852d446d565edc3019a2cd0a96f244c08c2e2
+  metadata.gz: 1d2797e2ea24494eaab910d769ebe2261b51798415548227c6eb31b98e3cd69e
+  data.tar.gz: 2febf7d0b905f4cabe6c097a2ca18efa983750cbf1c588b1ea73509a3160a509
 SHA512:
-  metadata.gz: 3bacc58fd39c3708d26623631bb021f0a8c912e64ea9733cc6426dddeba9861e0a1af8fa75f7de18ebd6b3d567a873460d633976e263ce7f500c2224831546eb
-  data.tar.gz: de2cfdd55a3169eb14c89f3db2090f12b6df84dbeed539b13627c20eb7b696ff1ebef2be6b76c7bdbe2b4e609d2c6a727eabec142e9e9020859e34a91dd979d6
+  metadata.gz: acb4a683a993d61a81d372f90fd1a34cef3476b9e8bcc8c9c2255db17d471c1e9885e84a0e629fb4914ab5e7d083c0a420cf04f1be96f0a814f802616b2c625d
+  data.tar.gz: 5a6f4291cee25dda4fd77c132d01077cf93ddc923279fa02a7bf4842285c1fab2b843a53befba776f030346c3f86d76ad73ab09798780a5a60500682bc8eb6ad

data/Appraisals

@@ -25,24 +25,29 @@ if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f < 3.1
     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
@@ -53,11 +58,27 @@ if RUBY_VERSION.to_f >= 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 "trilogy", "~> 2.7"
+    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

data/lib/combustion/databases/mysql.rb

@@ -12,7 +12,7 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   private
 
   def charset
-    configuration[:charset] || ENV["CHARSET"] || "utf8"
+    configuration[:charset] || ENV["CHARSET"]
   end
 
   def charset_error
@@ -22,7 +22,7 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def collation
-    configuration[:collation] || ENV["COLLATION"] || "utf8_unicode_ci"
+    configuration[:collation] || ENV["COLLATION"]
   end
 
   def create
@@ -46,7 +46,7 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def creation_options
-    {:charset => charset, :collation => collation}
+    {:charset => charset, :collation => collation}.compact
   end
 
   def drop

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.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-07 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