combustion 1.3.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1711b9227a3380ca45ec3ef61bad5c51d4c4b1a9cec64ac3ae625053e7d0b2
-  data.tar.gz: 4f32ad94b89241916ce2b1d7beeacbb90989f91c51c05f9ba60fb4baaf0ace11
+  metadata.gz: 022c30e0d3b5dd020d5765951897e91fd4d33725c87b54ce0370e2fdcaea67c8
+  data.tar.gz: 5f53fd6cef1a7c7c92f9618d37b852d446d565edc3019a2cd0a96f244c08c2e2
 SHA512:
-  metadata.gz: 37fadb5aff4c5c40321bed3dc1f86a62b5fa1aed07e0355c6ace3bc5e86b153ae447622b6f2edf20ac91849a67add27b49ae9d7a13783f9d383499f193efed59
-  data.tar.gz: 0ad2471f15f830383ef469c093701818c08d151958ee5e51b92ec4615c1d775d9ee198baf92c8e92ec772ff8cc019dca603378311c3cc081c08d790c279325da
+  metadata.gz: 3bacc58fd39c3708d26623631bb021f0a8c912e64ea9733cc6426dddeba9861e0a1af8fa75f7de18ebd6b3d567a873460d633976e263ce7f500c2224831546eb
+  data.tar.gz: de2cfdd55a3169eb14c89f3db2090f12b6df84dbeed539b13627c20eb7b696ff1ebef2be6b76c7bdbe2b4e609d2c6a727eabec142e9e9020859e34a91dd979d6

data/Appraisals

@@ -1,42 +1,5 @@
 # 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"
-    gem "pg", "< 1.0"
-    gem "bundler", "~> 1.17"
-  end
-
-  appraise "rails-3.2" do
-    gem "rails", "~> 3.2.22.5"
-    gem "mysql2", "~> 0.3.10"
-    gem "pg", "< 1.0"
-    gem "bundler", "~> 1.17"
-  end
-
-  appraise "rails-4.0" do
-    gem "rails", "~> 4.0.13"
-    gem "mysql2", "~> 0.3.10"
-    gem "pg", "< 1.0"
-    gem "bundler", "~> 1.17"
-  end
-
-  appraise "rails-4.1" do
-    gem "rails", "~> 4.1.16"
-    gem "mysql2", "~> 0.3.13"
-    gem "pg", "< 1.0"
-    gem "bundler", "~> 1.17"
-  end
-
-  appraise "rails-4.2" do
-    gem "rails", "~> 4.2.8"
-    gem "mysql2", "~> 0.4.4"
-    gem "pg", "< 1.0"
-    gem "bundler", "~> 1.17"
-  end
-end
-
 if RUBY_VERSION.to_f < 3.0
   appraise "rails-5.0" do
     gem "rails", "~> 5.0.2"
@@ -60,7 +23,8 @@ 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"
+    gem "sqlite3", "~> 1.4", "< 1.5.0"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
   end
 end
 
@@ -68,7 +32,8 @@ 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"
+    gem "sqlite3", "~> 1.4", "< 1.6.0"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
   end
 end
 
@@ -77,11 +42,22 @@ if RUBY_VERSION.to_f >= 2.7
     gem "rails", "~> 7.0.1"
     gem "mysql2", "~> 0.5.0"
     gem "sqlite3", "~> 1.4"
+    gem "activerecord-trilogy-adapter", "~> 3.1"
+  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
   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

@@ -10,16 +10,8 @@ else
   gem "sqlite3", "~> 1.4"
 end
 
-if RUBY_VERSION.to_f < 2.3
-  gem "i18n",     "< 1.6"
-  gem "nio4r",    "< 2.4"
-  gem "nokogiri", "< 1.10.3"
-end
-
-if RUBY_VERSION.to_f > 2.4
-  gem "rubocop",           "~> 0.92"
-  gem "rubocop-packaging", "~> 0.5"
-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/lib/combustion/application.rb

@@ -13,7 +13,11 @@ module Combustion
       Combustion::Configurations::ActiveStorage
     ].freeze
 
-    rails_gate = VersionGate.new("rails")
+    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
@@ -25,6 +29,9 @@ module Combustion
     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

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/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

data/lib/combustion.rb

@@ -30,7 +30,7 @@ module Combustion
 
   AVAILABLE_MODULES = begin
     keys = MODULES.keys
-    rails_gate = VersionGate.new("rails")
+    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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport