super_settings 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c245924ff453f5cd0bde098003e6dc05d54b21aba4a42ddaf7c614c63233a542
-  data.tar.gz: fb8672624d5c688794f8492be263534ed4e46ac49684f76d9bbf3bd120b62579
+  metadata.gz: 967d15a431f463f295d1585a1db0f7891e1eca3e16096890d829559b232d3870
+  data.tar.gz: 241ee0184528a02900ed05f2d21ac734bbfd635411fbe398bf694392d057cb08
 SHA512:
-  metadata.gz: 605db9f00bbd1865203caaf7515c3d5f1ad83911653dd9410c69344dda0b21b8e58167806186969a6d2b27d4867a61d97b29333715c3f139741f16a3d3b0a635
-  data.tar.gz: b1565e3ace970a26a8d126ec27e3bee6786b5da85e33e25bbde5a947af12e8067a23d143870b7012dd449b86ab5658fbeb99fb365bc8f738276cf8672ffc318d
+  metadata.gz: 682426a9592f6aa9bc2694dc38de649f4f31a714866298b59930c0ae81f1381eeafcd7faeb81e22288c71a0ba5edca4eb660c1f2bd04dd87cb872c5e434be0d3
+  data.tar.gz: ac71245f56b5b4694906a8d8d36528a9b814b2af15ac544a11f8a009636d62aa1c235b22700bfdb1f73283fa9cdaad3bcd335e590ddbac228669794f7267e61c

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.2.0
+
+### Changed
+
+- After save callbacks are now called only after the transaction is committed and settings have been persisted to the data store. When updating multiple records the callbacks will be called after all changes have been persisted rather than immediatly after calling `save!` on each record.
+
+## 2.1.2
+
+### Fixed
+
+- Fixed ActiveRecord code ensure there are connections to the database before attempting to checkout a connection to avoid errors when the database is not available.
+
 ## 2.1.1
 
 ### Fixed

data/README.md

@@ -393,12 +393,10 @@ bundle exec rackup
 
 By default this will use Redis for storage using the default Redis URL. You can change the storage engine with the `STORAGE` environment variable.
 
-- `active_record` - Use the ActiveRecord storage engine.
 - `redis` - Use the Redis storage engine. The Redis URL can be set with the `REDIS_URL` environment variable.
 - `http` - Use the HTTP storage engine. The URL for the REST API can be set with the `REST_API_URL` environment variable.
 - `s3` - Use the S3 storage engine. The S3 URL can be set with the `S3_URL` environment variable.
 - `mongodb` - Use the MongoDB storage engine. The MongoDB URL can be set with the `MONGODB_URL` environment variable.
-- `null` - Use the null storage engine. This storage engine does not store settings at all.
 
 You can bring up all of these storage engines locally with the included docker-compose configuration.
 

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.2.0

data/lib/super_settings/setting.rb

@@ -164,7 +164,7 @@ module SuperSettings
         all_valid, settings = update_settings(params, changed_by)
         if all_valid
           storage.with_connection do
-            storage.transaction do
+            transaction do |_changes|
               settings.each do |setting|
                 setting.save!
               end
@@ -202,6 +202,38 @@ module SuperSettings
         cache&.delete(Setting::LAST_UPDATED_CACHE_KEY)
       end
 
+      # Wrap a block of code in a transaction.
+      #
+      # @api private
+      def transaction(&block)
+        changes = Thread.current[:super_settings_transaction]
+        return yield if changes
+
+        changes = []
+        Thread.current[:super_settings_transaction] = changes
+
+        begin
+          @storage.transaction(&block)
+
+          clear_last_updated_cache
+
+          changes.each do |setting|
+            setting.send(:call_after_save_callbacks)
+            setting.send(:clear_changes)
+          end
+        ensure
+          Thread.current[:super_settings_transaction] = nil
+        end
+      end
+
+      # Add a record to the current transaction.
+      #
+      # @api private
+      def add_record_to_transaction(record)
+        changes = Thread.current[:super_settings_transaction]
+        changes << record if changes
+      end
+
       private
 
       # Updates settings in memory from an array of parameters.
@@ -454,17 +486,13 @@ module SuperSettings
       self.created_at ||= timestamp
       self.updated_at = timestamp if updated_at.nil? || !changed?(:updated_at)
 
+      return if @changes.empty?
+
       self.class.storage.with_connection do
-        self.class.storage.transaction do
+        self.class.transaction do
           record_value_change
           @record.save!
-        end
-
-        begin
-          self.class.clear_last_updated_cache
-          call_after_save_callbacks
-        ensure
-          clear_changes
+          self.class.add_record_to_transaction(self)
         end
       end
       nil

data/lib/super_settings/storage/active_record_storage.rb

@@ -57,15 +57,23 @@ module SuperSettings
         end
 
         def with_connection(&block)
-          Model.connection_pool.with_connection(&block)
+          if Model.available?
+            Model.connection_pool.with_connection(&block)
+          else
+            yield
+          end
         end
 
         def transaction(&block)
-          Model.transaction(&block)
+          if Model.available?
+            Model.transaction(&block)
+          else
+            yield
+          end
         end
 
         def destroy_all
-          ApplicationRecord.transaction do
+          Model.transaction do
             Model.delete_all
             HistoryModel.delete_all
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_settings
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler