combustion 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08458ed30f386ac27b19a50f31ebfa268b27cd2851f5e784ab9c9684e5e8591e'
-  data.tar.gz: 53410691043777b5fcb81b06ddf0d415e17bdcd81f1e0382db354fb3a8002b4a
+  metadata.gz: 8736ae93f4eac4f43a47ebdd063f4ad227f307dd973536ab710a5584ed29976d
+  data.tar.gz: 880e055549466b9c7203a2f34fd437addc3b580b0a100ca4b5aa2cef7ba4bce8
 SHA512:
-  metadata.gz: 7fb571edaf37a71657c218d57600c56faf2e5bfaabb0b90155cfb10716073ee11f9044eda12b2808819ba8c0a7ed85a5a5446f209a99c6d1fc347607fc145e13
-  data.tar.gz: 9d5667930b7bde63172f2a2accb24ca2e09ddb7ae88c33548d8eec0b9cfb6fc16870ddf9c3558de0c9e9a815929ebfe6d3099467cb19458459259b5915ba5877
+  metadata.gz: ade36f7e179e4ba4743a75ba8de7f7223a2651a2d1c9f008775a0895f91eb8cec96b8cd94a47768964d1927edfe0af8b5d05bbd6f90295276117fedbd34c5793
+  data.tar.gz: b0320150a0db6dc3b66292392abf45efb54c26aea963810479143f43ed4dae2cf4799c2118567c9dc4ccf4ae807bee3531c3f41f78eccf635c2d85e89b4d753f

data/Appraisals

@@ -56,13 +56,15 @@ if RUBY_VERSION.to_f < 3.0
   end
 end
 
-if RUBY_VERSION.to_f >= 2.5
+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"
   end
+end
 
+if RUBY_VERSION.to_f >= 2.5
   appraise "rails-6.1" do
     gem "rails", "~> 6.1.0"
     gem "mysql2", "~> 0.5.0"
@@ -72,7 +74,7 @@ end
 
 if RUBY_VERSION.to_f >= 2.7
   appraise "rails-7.0" do
-    gem "rails", "~> 7.0.0.alpha2"
+    gem "rails", "~> 7.0.1"
     gem "mysql2", "~> 0.5.0"
     gem "sqlite3", "~> 1.4"
   end

data/Gemfile

@@ -20,3 +20,6 @@ if RUBY_VERSION.to_f > 2.4
   gem "rubocop",           "~> 0.92"
   gem "rubocop-packaging", "~> 0.5"
 end
+
+# Required for testing Rails 6.1 on MRI 3.1+
+gem "net-smtp" if RUBY_VERSION.to_f > 3.0

data/README.md

@@ -158,7 +158,7 @@ Parameters defined in, for instance, `spec/internals/config/environments/test.rb
 
 ### Using other Rails-focused libraries
 
-Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting `:require` to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryGirl.
+Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting `:require` to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryBot.
 
 ### Environment and Logging
 
@@ -187,7 +187,7 @@ end
 
 ## Compatibility
 
-The current test matrix covers MRI 2.2 to 2.6, and Rails 3.1 to 6.0. It will possibly work on older versions and other Ruby implementations as well.
+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.
 
 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.
 

data/lib/combustion/application.rb

@@ -13,16 +13,18 @@ module Combustion
       Combustion::Configurations::ActiveStorage
     ].freeze
 
-    version = Rails.version.to_f
+    rails_gate = VersionGate.new("rails")
 
     # Core Settings
     config.cache_classes               = true
     config.consider_all_requests_local = true
     config.eager_load                  = Rails.env.production?
 
-    config.secret_key_base = SecureRandom.hex if version >= 4.0
-    config.whiny_nils      = true             if version < 4.0
-    config.secret_token = Digest::SHA1.hexdigest Time.now.to_s if version < 5.2
+    config.secret_key_base = SecureRandom.hex if rails_gate.call(">= 4.0")
+    config.whiny_nils      = true             if rails_gate.call("< 4")
+    if rails_gate.call("< 5.2")
+      config.secret_token = Digest::SHA1.hexdigest Time.now.to_s
+    end
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr

data/lib/combustion/configurations/active_record.rb

@@ -4,7 +4,7 @@ class Combustion::Configurations::ActiveRecord
   def self.call(config)
     return unless defined?(ActiveRecord::Railtie)
 
-    if ActiveRecord::VERSION::MAJOR >= 7
+    if Combustion::VersionGate.call("activerecord", "~> 7.0.0")
       config.active_record.legacy_connection_handling = false
     end
 

data/lib/combustion/database/migrate.rb

@@ -6,9 +6,11 @@ class Combustion::Database::Migrate
   end
 
   def call
-    if ActiveRecord::VERSION::STRING.to_f >= 5.2
+    ar_gate = Combustion::VersionGate.new("activerecord")
+
+    if ar_gate.call(">= 5.2")
       migration_context.migrate
-    elsif ActiveRecord::VERSION::STRING.to_f >= 3.1
+    elsif ar_gate.call(">= 3.1")
       migrator.migrate paths, nil
     else
       paths.each { |path| migrator.migrate path, nil }

data/lib/combustion/database/reset.rb

@@ -62,7 +62,7 @@ class Combustion::Database::Reset
   # All database configs except Rails default environments
   # that are not currently in use
   def resettable_db_configs
-    if ActiveRecord::VERSION::STRING.to_f > 6.0
+    if Combustion::VersionGate.call("activerecord", ">= 6.1")
       return resettable_db_configs_for_6_1
     end
 

data/lib/combustion/version_gate.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "rubygems"
+
+module Combustion
+  class VersionGate
+    def self.call(name, *constraints)
+      new(name).call(*constraints)
+    end
+
+    def initialize(name)
+      @name = name
+    end
+
+    # Using matches_spec? instead of match? because the former returns true
+    # even when the spec has an appropriate _pre-release_ version.
+    def call(*constraints)
+      return false if spec.nil?
+
+      dependency(*constraints).matches_spec?(spec)
+    end
+
+    private
+
+    attr_reader :name
+
+    def dependency(*constraints)
+      Gem::Dependency.new(name, *constraints)
+    end
+
+    def spec
+      Gem.loaded_specs.fetch(name, nil)
+    end
+  end
+end

data/lib/combustion.rb

@@ -3,6 +3,8 @@
 require "rails"
 require "active_support/dependencies"
 
+require "combustion/version_gate"
+
 module Combustion
   module Configurations
   end
@@ -28,14 +30,14 @@ module Combustion
 
   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
+    rails_gate = VersionGate.new("rails")
+
+    keys.delete(:sprockets) unless rails_gate.call(">= 3.1", "<= 6.1")
+    keys.delete(:active_job) unless rails_gate.call(">= 4.2")
+    keys.delete(:action_cable) unless rails_gate.call(">= 5.0")
+    keys.delete(:active_storage) unless rails_gate.call(">= 5.2")
+    keys.delete(:action_text) unless rails_gate.call(">= 6.0")
+    keys.delete(:action_mailbox) unless rails_gate.call(">= 6.0")
 
     keys
   end.freeze

data/spec/database_spec.rb

@@ -14,15 +14,15 @@ RSpec.describe Combustion::Database do
   end
 
   it "returns test database for model with default connection" do
-    if ActiveRecord::VERSION::STRING.to_f > 6.0
-      expect(Model.connection_db_config.database).to match(/test/)
+    if Combustion::VersionGate.call("activerecord", ">= 6.1")
+      expect(Model.connection_db_config.database).to match(/combustion/)
     else
-      expect(Model.connection_config[:database]).to match(/test/)
+      expect(Model.connection_config[:database]).to match(/combustion/)
     end
   end
 
   it "returns test_another for model with connection to second database" do
-    if ActiveRecord::VERSION::STRING.to_f > 6.0
+    if Combustion::VersionGate.call("activerecord", ">= 6.1")
       expect(ModelInAnotherDb.connection_db_config.database).
         to match(/test_another/)
     else

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

@@ -1,6 +1,6 @@
 test: &defaults
   adapter: <%= ENV.fetch("DB_ADAPTER") %>
-  database: test
+  database: combustion
   <% if ENV["DB_HOST"] %>
   host: <%= ENV["DB_HOST"] %>
   <% end %>
@@ -13,6 +13,10 @@ test: &defaults
   password: <%= ENV["DB_PASSWORD"] %>
   <% end %>
 
+  <% if ENV["DB_PORT"] %>
+  port: <%= ENV["DB_PORT"] %>
+  <% end %>
+
 
 test_another:
   <<: *defaults

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require "combustion"
 
-if Rails::VERSION::STRING.to_f < 4.1
+if Combustion::VersionGate.call("rails", "< 4.1")
   require "active_record"
   require "active_record/connection_adapters/mysql2_adapter"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -183,6 +183,7 @@ files:
 - lib/combustion/databases/sql_server.rb
 - lib/combustion/databases/sqlite.rb
 - lib/combustion/generator.rb
+- lib/combustion/version_gate.rb
 - 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
@@ -190,6 +191,7 @@ 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
@@ -219,22 +221,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files:
-- spec/spec_helper.rb
+- 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
+- spec/dummy/lib/engine.rb
+- 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/app/assets/config/manifest.js
-- spec/dummy/spec/internal/config/routes.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/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
-- spec/database_spec.rb
+- spec/spec_helper.rb
 - ".rspec"
 - Appraisals
 - Gemfile