super_settings 0.0.1.rc3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9562c88fa68bb2d609f007ed31371870706ab0e12a772857caefc7d4f84fb89
-  data.tar.gz: f434c13622fe523791b543d9c04f5023cbdcee3d265dcbd2b2d9da0947780c64
+  metadata.gz: f58b7aa08a4a6082168ff9fa1487f79ff84bf9374b9463d9ba3ebe4e188b6a47
+  data.tar.gz: b4bf73f87885acacc091e3f455a8a33a8b0baa770dd00db42a1fac6b468e5427
 SHA512:
-  metadata.gz: b13fa738e17df5bd4693939e4c182b4b81b668e0b113a6067e63d436f118e9362438f2503b40c7f6de05f5675653f00fae571c96195d55b3c56b6f557243a29e
-  data.tar.gz: 2bbc6ee2b3059a136e134f4204c94cc4ca0437380ca132de5275be7b3a8c7623c9ae4e2b42f8aa268ea814c74b3ecf12b9fc6a370252eaa65501599b8a3da5f5
+  metadata.gz: 973a1ac38488a2cdc4d4cc639f9057d8a1cfd24e216cd7b8cfe4b034af5085b3e0245999b918f3aac7a95416d47fcba46f099d8312afaa2406f63bd5a17f1d25
+  data.tar.gz: e1922327a1c8965dd72d8b11826f398b7dd0cd4f3a3f27be7cc3aa5a81f44da925a159ae2321a122267a9605dd7fbb5fa6af909d4daeeae3cf371087b4df7a7f

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## [1.0.1]
+
+### Added
+- Optimize object shapes for the Ruby interpreter by declaring instance variables in constructors.
+
 ## [1.0.0]
 
 ### Added

data/README.md

@@ -1,6 +1,7 @@
 # SuperSettings
 
 [![Continuous Integration](https://github.com/bdurand/super_settings/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/bdurand/super_settings/actions/workflows/continuous_integration.yml)
+[![Regression Test](https://github.com/bdurand/super_settings/actions/workflows/regression_test.yml/badge.svg)](https://github.com/bdurand/super_settings/actions/workflows/regression_test.yml)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
 This gem provides a framework for maintaining runtime application settings. Settings are persisted in a database but cached in memory for quick, efficient access. The settings are designed so they can be updated dynamically without requiring code deployment or restarting processes. The code scales very well and can easily handle very high throughput environments.
@@ -19,6 +20,10 @@ SuperSettings provides a simple interface for accessing settings backed by a thr
 
 There is also an out of the box Web UI and REST API for managing settings. You can specify data types for your settings (string, integer, float, boolean, datetime, or array) to ensure that values will be valid. You can also supply documentation for each setting so that it's clear what each one does and how it is used.
 
+Changes to settings are stored whenever a setting is changed to give you an audit trail if you need it for compliance reasons. In addition, you can provide your own callbacks to execute whenever a setting is changed.
+
+There is a companion gem [ultra_settings](https://github.com/bdurand/ultra_settings) that can be used to integrate SuperSettings into a combined configuration system alongside YAML files and environment variables.
+
 ## Usage
 
 - [Getting Value](#getting-values)
@@ -51,65 +56,6 @@ SuperSettings.datetime("key") # -> returns a `Time` object
 SuperSettings.array("key") # -> returns an array of strings
 ```
 
-#### Hashes
-There is also a method to get multiple settings at once structured as a hash.
-
-```ruby
-SuperSettings.structured("parent") # -> returns an hash
-```
-
-The key provided to the `SuperSettings.structured` method indicates the key prefix and constructs the hash from settings that have keys beginning with that prefix. Keys are also broken down by a delimiter so you can create nested hashes. The delimiter defaults to `"."`, but you can specify a different one with the `delimiter` keyword argument.
-
-You can also set a maximum depth to the returned hash with the `max_depth` keyword argument.
-
-So, if you have the following settings:
-
-```
-vendors.company_1.path = "/co1"
-vendors.company_1.timeout = 5
-vendors.company_2.path = "/co2"
-page_size = 20
-```
-
-You would get these results:
-
-```ruby
-SuperSettings.structured("vendors")
-# {
-#   "company_1" => {
-#     "path" => "/co1",
-#     "timeout" => 5
-#   },
-#   "company_2" => {
-#     "path" => "/co2"
-#    }
-# }
-
-SuperSettings.structured("vendors.company_1")
-# {"path" => "/co1", "timeout" => 5}
-
-SuperSettings.structured("vendors.company_2")
-# {"path" => "/co2"}
-
-# Get all the settings by omitting the key
-SuperSettings.structured
-# {
-#   "vendors" => {
-#     "company_1" => {"path" => "/co1", "timeout" => 5},
-#     "company_2" => {"path" => "/co2"}
-#   },
-#   "page_size" => 20
-# }
-
-# Limit the nesting depth of the returned hash to one level
-SuperSettings.structured(max_depth: 1)
-# {
-#   "vendors.company_1.path => "/co1",
-#   "vendors.company_1.timeout" => 5,
-#   "vendors.company_2.path" => "/co2",
-#   "page_size" => 20
-# }
-```
 
 #### Defaults
 
@@ -132,13 +78,38 @@ SuperSettings.enabled?("enabled_users.#{id}")
 
 # GOOD: use an array if there are a limited number of values
 SuperSettings.array("enabled_users", []).include?(id)
-
-# GOOD: use a hash if you need to scale to any number of values
-SuperSettings.structured("enabled_users", {})["id"]
 ```
 
 The cache will scale without issue to handle hundreds of settings. However, you should avoid creating thousands of settings. Because all settings are read into memory, having too many settings records can lead to performance or memory issues.
 
+#### Request Context
+
+You can ensure that settings won't change in a block of code by surrounding it with a `SuperSettings.context` block. Inside a `context` block, a setting will always return the same value. This can prevent race conditions where you code may branch based on a setting value.
+
+```ruby
+# This code could be unsafe since the value of the "threshold" setting could
+# change after the if statement is checked.
+if SuperSettings.integer("threshold") > 0
+  do_something(SuperSettings.integer("threshold"))
+end
+
+# With a context block, the value for the "threshold setting will always
+# return the same value
+SuperSettings.context do
+  if SuperSettings.integer("threshold") > 0
+    do_something(SuperSettings.integer("threshold"))
+  end
+end
+```
+
+It's a good idea to add a `context` block around your main unit of work:
+
+- Rack application: add `SuperSettings::Context::RackMiddleware` to your middleware stack
+- Sidekiq: add `SuperSettings::Context::SidekiqMiddleware` to your server middleware
+- ActiveJob: add an `around_perform` callback that calls `SuperSettings.context`
+
+In a Rails application all of these will be done automatically.
+
 ### Data Model
 
 Each setting has a key, value, value type, and optional description. The key must be unique. The value type can be one of "string", "integer", "float", "boolean", "datetime", or "array". The array value type will always return an array of strings.
@@ -149,6 +120,16 @@ It is not possible to store an empty string in a setting; empty strings will be
 
 A history of all settings changes is updated every time the value is changed in the `histories` association. You can also record who made the changes.
 
+#### Callbacks
+
+You can define custom callbacks on the `SuperSettings::Setting` model that will be called whenever a setting is changed. For example, if you needed to log all changes to you settings in your application logs, you could do something like this:
+
+```ruby
+SuperSettings::Setting.after_save do |setting|
+  Application.logger.info("Setting #{setting.key} changed: #{setting.changes.inspect})
+end
+```
+
 #### Storage Engines
 
 This gem abstracts out the storage engine and can support multiple storage mechanisms. It has built in support for ActiveRecord, Redis, and HTTP storage.
@@ -220,7 +201,7 @@ The gem ships with a Rails engine that provides easy integration with a Rails ap
 The default storage engine for a Rails application will be the ActiveRecord storage. You need to install the database migrations first with:
 
 ```bash
-rails app:super_settings:install:migrations
+rails super_settings:install:migrations
 ```
 
 You also need to mount the engine routes in your application's `config/routes.rb` file. The routes can be mounted under any prefix you'd like.
@@ -270,10 +251,15 @@ SuperSettings.configure do |config|
     end
   end
 
-  # Define a method that returns the value that will be stored in the settings history in
+  # Define a block that returns the value that will be stored in the settings history in
   # the `changed_by` column.
   config.controller.define_changed_by do
-    current_user.name
+    current_user.id
+  end
+
+  # Define a block that determines how to display the `changed_by`` value in the setting history.
+  config.model.define_changed_by_display do |changed_by_id|
+    User.find_by(id: changed_by_id)&.name
   end
 
   # You can define the storage engine for the model. This can be either done either with a Class
@@ -284,6 +270,11 @@ SuperSettings.configure do |config|
   # You can also specify a cache implementation to use to cache the last updated timestamp
   # for model changes. By default this will use `Rails.cache`.
   # config.model.cache = Rails.cache
+
+  # You can define after_save callbacks for the model.
+  # config.model.after_save do |setting|
+  #   Rail.logger.info("Setting #{setting.key} changed to #{setting.value.inspect}")
+  # end
 end
 ```
 

data/VERSION

@@ -1 +1 @@
-0.0.1.rc3
+1.0.1

data/app/helpers/super_settings/settings_helper.rb

@@ -19,7 +19,7 @@ module SuperSettings
     def super_settings_application_header
       config = Configuration.instance.controller
       content = "#{super_settings_application_name} Settings"
-      if config.application_logo.present?
+      if Coerce.present?(config.application_logo)
         content = image_tag(config.application_logo, alt: "").concat(content)
       end
       if config.application_link

data/lib/super_settings/application/api.js

@@ -35,13 +35,19 @@
 
     params = options.params
     let queryParams = null;
-    const fetchOptions = {credentials: "same-origin"};
+    const headers = new Headers();
+    const fetchOptions = {credentials: "same-origin", headers: headers};
     const accessToken = window.sessionStorage.getItem("super_settings_access_token");
-    const headers = {"Accept": "application/json"};
+
+    headers.set("Accept", "application/json");
     if (accessToken) {
-      headers["Authorization"] = "Bearer " + accessToken;
+      headers.set("Authorization", "Bearer " + accessToken);
     }
-    Object.assign(headers, SuperSettingsAPI.headers);
+    Object.entries(SuperSettingsAPI.headers).forEach(function(entry) {
+      const [key, value] = entry;
+      headers.set(key, value);
+    });
+
     if (method === "POST") {
       queryParams = Object.assign({}, SuperSettingsAPI.queryParams);
       csrfParam = document.querySelector("meta[name=csrf-param]");
@@ -52,11 +58,10 @@
       }
       fetchOptions["method"] = "POST";
       fetchOptions["body"] = JSON.stringify(params);
-      headers["Content-Type"] = "application/json";
+      headers.set("Content-Type", "application/json");
     } else {
       queryParams = Object.assign({}, SuperSettingsAPI.queryParams, params);
     }
-    fetchOptions["headers"] = new Headers(headers);
     const url = apiURL(path, queryParams);
 
     fetch(url, fetchOptions)

data/lib/super_settings/configuration.rb

@@ -22,8 +22,14 @@ module SuperSettings
       # since it will be compatible with class reloading in a development environment.
       attr_writer :superclass
 
+      def initialize
+        @superclass = nil
+        @web_ui_enabled = true
+        @changed_by_block = nil
+      end
+
       def superclass
-        if defined?(@superclass) && @superclass.is_a?(String)
+        if @superclass.is_a?(String)
           @superclass.constantize
         else
           @superclass
@@ -54,9 +60,6 @@ module SuperSettings
       attr_writer :web_ui_enabled
 
       def web_ui_enabled?
-        unless defined?(@web_ui_enabled)
-          @web_ui_enabled = true
-        end
         !!@web_ui_enabled
       end
 
@@ -87,7 +90,7 @@ module SuperSettings
       #
       # @api private
       def changed_by(controller)
-        if defined?(@changed_by_block) && @changed_by_block
+        if @changed_by_block
           controller.instance_eval(&@changed_by_block)
         end
       end
@@ -101,15 +104,19 @@ module SuperSettings
 
       attr_writer :storage
 
+      attr_reader :after_save_blocks, :changed_by_display
+
+      def initialize
+        @storage = :active_record
+        @after_save_blocks = []
+        @changed_by_display = nil
+      end
+
       # Specify the storage engine to use for persisting settings. The value can either be specified
       # as a full class name or an underscored class name for a storage classed defined in the
       # SuperSettings::Storage namespace. The default storage engine is +SuperSettings::Storage::ActiveRecord+.
       def storage
-        if defined?(@storage) && @storage
-          @storage
-        else
-          :active_record
-        end
+        @storage || :active_record
       end
 
       # @return [Class]
@@ -126,6 +133,27 @@ module SuperSettings
           end
         end
       end
+
+      # Add an after_save callback to the setting model. The block will be called with the
+      # setting object after it is saved.
+      #
+      # @yieldparam setting [SuperSettings::Setting]
+      def after_save(&block)
+        after_save_blocks << block
+      end
+
+      # Define how the changed_by attibute on the setting history will be displayed. The block
+      # will be called with the changed_by attribute and should return a string to display.
+      # The block will not be called if the changed_by attribute is nil.
+      #
+      # @example
+      #   define_changed_by_display { |changed_by| User.find_by(id: changed_by)&.name }
+      #
+      # @yield Block of code to call on the controller at request time
+      # @yieldparam changed_by [String] The value of the changed_by attribute
+      def define_changed_by_display(&block)
+        @changed_by_display = block
+      end
     end
 
     # Return the model specific configuration object.
@@ -141,6 +169,7 @@ module SuperSettings
     def initialize
       @model = Model.new
       @controller = Controller.new
+      @deferred_configs = []
     end
 
     # Defer the execution of a block that will be yielded to with the config object. This
@@ -149,15 +178,16 @@ module SuperSettings
     #
     # @api private
     def defer(&block)
-      @block = block
+      @deferred_configs << block
     end
 
     # Call the block deferred during initialization.
     #
     # @api private
     def call
-      @block&.call(self)
-      @block = nil
+      while (block = @deferred_configs.shift)
+        block&.call(self)
+      end
     end
   end
 end

data/lib/super_settings/context/rack_middleware.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SuperSettings
+  module Context
+    # Rack middleware you can use to add a context to your requests so that
+    # settings are not changed during request execution.
+    #
+    # This middleware is automatically added to Rails applications.
+    class RackMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        SuperSettings.context do
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/super_settings/context/sidekiq_middleware.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module SuperSettings
+  module Context
+    # Sidekiq middleware you can use to add a context to your jobs so that
+    # settings are not changed during job execution.
+    #
+    # @example
+    #   require "super_settings/context/sidekiq_middleware"
+    #
+    #   Sidekiq.configure_server do |config|
+    #     config.server_middleware do |chain|
+    #       chain.add SuperSettings::Context::SidekiqMiddleware
+    #     end
+    #   end
+    #
+    # You can disable the context by setting the `super_settings_context` key
+    # to `false` in the job payload.
+    #
+    # @example
+    #   class MyWorker
+    #     include Sidekiq::Worker
+    #     sidekiq_options super_settings_context: false
+    #   end
+    class SidekiqMiddleware
+      if defined?(Sidekiq::ServerMiddleware)
+        include Sidekiq::ServerMiddleware
+      end
+
+      def call(job_instance, job_payload, queue)
+        if job_payload["super_settings_context"] == false
+          yield
+        else
+          SuperSettings.context do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/super_settings/context.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module SuperSettings
+  module Context
+  end
+end

data/lib/super_settings/engine.rb

@@ -7,6 +7,26 @@ module SuperSettings
   class Engine < Rails::Engine
     isolate_namespace ::SuperSettings
 
+    initializer("SuperSettings") do
+      Rails.configuration.middleware.unshift(SuperSettings::Context::RackMiddleware)
+
+      if defined?(ActiveJob::Base.around_perform)
+        ActiveJob::Base.around_perform do |job, block|
+          SuperSettings.context(&block)
+        end
+      end
+
+      if defined?(Sidekiq.server?) && Sidekiq.server?
+        require_relative "context/sidekiq_middleware"
+
+        Sidekiq.configure_server do |sidekiq_config|
+          sidekiq_config.server_middleware do |chain|
+            chain.prepend(SuperSettings::Context::SidekiqMiddleware)
+          end
+        end
+      end
+    end
+
     config.after_initialize do
       # Call the deferred initialization block.
       configuration = Configuration.instance
@@ -46,6 +66,10 @@ module SuperSettings
         Setting.cache = (configuration.model.cache || Rails.cache)
         Setting.storage = configuration.model.storage_class
 
+        configuration.model.after_save_blocks.each do |block|
+          Setting.after_save(&block)
+        end
+
         if !SuperSettings.loaded?
           begin
             SuperSettings.load_settings

data/lib/super_settings/history_item.rb

@@ -9,26 +9,30 @@ module SuperSettings
     attr_accessor :key, :value, :changed_by, :created_at
     attr_writer :deleted
 
+    def initialize(*)
+      @deleted = false
+      super
+    end
+
     def deleted?
-      # Stupid strict mode...
-      !!(defined?(@deleted) && @deleted)
+      !!@deleted
     end
 
-    # The method could be overriden to change how the changed_by attribute is displayed.
-    # For instance, you could store a user id in the changed_by column and add an association
-    # on this model.
+    # The display value for the changed_by attribute. This method can be overridden
+    # in the configuration by calling `model.define_changed_by_display` with the block to use
+    # to get the display value for the changed_by attribute. The default value is
+    # the changed_by attribute itself.
     #
-    # @example
-    #   class SuperSettings::HistoryItem
-    #     def changed_by_display
-    #       user = User.find_by(id: changed_by) if changed_by
-    #       user ? user.name : changed_by
-    #     end
-    #   end
-    #
-    # @return [String]
+    # @return [String, nil]
     def changed_by_display
-      changed_by
+      return changed_by if changed_by.nil?
+
+      display_proc = Configuration.instance.model.changed_by_display
+      if display_proc && !changed_by.nil?
+        display_proc.call(changed_by) || changed_by
+      else
+        changed_by
+      end
     end
   end
 end

data/lib/super_settings/local_cache.rb

@@ -54,7 +54,6 @@ module SuperSettings
             @lock.synchronize do
               # For case where one thread could be iterating over the cache while it's updated causing an error
               @cache = @cache.merge(key => value).freeze
-              @hashes = {}
             end
           end
         end
@@ -64,53 +63,6 @@ module SuperSettings
       value
     end
 
-    # Return the setting as structured data. The keys will be split by the specified delimiter
-    # to create a nested hash.
-    #
-    # @example
-    #   Setting with key "a.b.c" and value 1 becomes
-    #
-    #   {
-    #     "a" => {
-    #       "b" => {
-    #         "c" => 1
-    #       }
-    #     }
-    #   }
-    #
-    # See SuperSettings.structured for more details.
-    def structured(key = nil, delimiter: ".", max_depth: nil)
-      key = key.to_s
-      cache_key = [key, delimiter, max_depth]
-      cached_value = @hashes[cache_key]
-      return cached_value if cached_value
-
-      flattened = to_h
-      root_key = ""
-      if Coerce.present?(key)
-        root_key = "#{key}#{delimiter}"
-        reduced_hash = {}
-        flattened.each do |k, v|
-          if k.start_with?(root_key)
-            reduced_hash[k[root_key.length, k.length]] = v
-          end
-        end
-        flattened = reduced_hash
-      end
-
-      structured_hash = {}
-      flattened.each do |key, value|
-        set_nested_hash_value(structured_hash, key, value, 0, delimiter: delimiter, max_depth: max_depth)
-      end
-
-      deep_freeze_hash(structured_hash)
-      @lock.synchronize do
-        @hashes[cache_key] = structured_hash
-      end
-
-      structured_hash
-    end
-
     # Check if the cache includes a key. Note that this will return true if you have tried
     # to fetch a non-existent key since the cache will store that as undefined. This method
     # is provided for testing purposes.
@@ -217,7 +169,6 @@ module SuperSettings
     def reset
       @lock.synchronize do
         @cache = {}.freeze
-        @hashes = {}
         @last_refreshed = nil
         @next_check_at = Time.now + @refresh_interval
         @refreshing = false
@@ -240,7 +191,6 @@ module SuperSettings
       return if Coerce.blank?(setting.key)
       @lock.synchronize do
         @cache = @cache.merge(setting.key => setting.value)
-        @hashes = {}
       end
     end
 
@@ -277,7 +227,7 @@ module SuperSettings
         end
         load_settings(Setting.storage.load_asynchronous?)
       elsif Time.now >= @next_check_at
-        refresh
+        refresh(Setting.storage.load_asynchronous?)
       end
     end
 
@@ -287,7 +237,6 @@ module SuperSettings
         @last_refreshed = refreshed_at_time
         @refreshing = false
         @cache = block.call.freeze
-        @hashes = {}
       end
     end
 

data/lib/super_settings/rack_application.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rack"
-
 module SuperSettings
   # Rack middleware for serving the REST API. See SuperSettings::RestAPI for more details on usage.
   #
@@ -39,6 +37,13 @@ module SuperSettings
     #     end
     #   end
     def initialize(app = nil, path_prefix = "/", &block)
+      # Requiring rack here so that the gem does not have a hard dependency on it.
+      begin
+        require "rack"
+      rescue LoadError
+        raise LoadError, "SuperSettings::RackApplication requires the rack gem"
+      end
+
       @app = app
       @path_prefix = path_prefix.to_s.chomp("/")
       instance_eval(&block) if block

data/lib/super_settings/setting.rb

@@ -22,6 +22,9 @@ module SuperSettings
 
     ARRAY_DELIMITER = /[\n\r]+/.freeze
 
+    NOT_SET = Object.new.freeze
+    private_constant :NOT_SET
+
     # Exception raised if you try to save with invalid data.
     class InvalidRecordError < StandardError
     end
@@ -33,6 +36,9 @@ module SuperSettings
     # and is cleared after the record is saved.
     attr_accessor :changed_by
 
+    @storage = NOT_SET
+    @after_save_blocks = []
+
     class << self
       # Set a cache to use for caching values. This feature is optional. The cache must respond
       # to +delete(key)+ and +fetch(key, &block)+. If you are running in a Rails environment,
@@ -42,18 +48,31 @@ module SuperSettings
       # Set the storage class to use for persisting data.
       attr_writer :storage
 
+      attr_reader :after_save_blocks
+
       # @return [Class] The storage class to use for persisting data.
       # @api private
       def storage
-        if defined?(@storage)
-          @storage
-        elsif defined?(::SuperSettings::Storage::ActiveRecordStorage)
-          ::SuperSettings::Storage::ActiveRecordStorage
+        if @storage == NOT_SET
+          if defined?(::SuperSettings::Storage::ActiveRecordStorage)
+            ::SuperSettings::Storage::ActiveRecordStorage
+          else
+            raise ArgumentError.new("No storage class defined for #{name}")
+          end
         else
-          raise ArgumentError.new("No storage class defined for #{name}")
+          @storage
         end
       end
 
+      # Add a block of code that will be called when a setting is saved. The block will be
+      # called with a Setting object. The object will have been saved, but the `changes`
+      # hash will still be set indicating what was changed. You can define multiple after_save blocks.
+      #
+      # @yieldparam setting [SuperSetting::Setting]
+      def after_save(&block)
+        after_save_blocks << block
+      end
+
       # Create a new setting with the specified attributes.
       #
       # @param attributes [Hash] hash of attribute names and values
@@ -433,6 +452,7 @@ module SuperSettings
 
         begin
           self.class.clear_last_updated_cache
+          call_after_save_callbacks
         ensure
           clear_changes
         end
@@ -508,6 +528,15 @@ module SuperSettings
       as_json.to_json(options)
     end
 
+    # Get hash of attribute changes. The hash keys are the names of attributes that
+    # have changed and the values are an array with [old value, new value]. The keys
+    # will be one of key, raw_value, value_type, description, deleted, created_at, or updated_at.
+    #
+    # @return [Hash<String, Array>]
+    def changes
+      @changes.dup
+    end
+
     private
 
     # Coerce a value for the appropriate value type.
@@ -618,5 +647,11 @@ module SuperSettings
       end
       attribute_errors << "#{attribute.tr("_", " ")} #{message}"
     end
+
+    def call_after_save_callbacks
+      self.class.after_save_blocks.each do |block|
+        block.call(self)
+      end
+    end
   end
 end

data/lib/super_settings/storage/http_storage.rb

@@ -14,6 +14,9 @@ module SuperSettings
       DEFAULT_HEADERS = {"Accept" => "application/json"}.freeze
       DEFAULT_TIMEOUT = 5.0
 
+      @headers = {}
+      @query_params = {}
+
       attr_reader :key, :raw_value, :description, :value_type, :updated_at, :created_at
 
       class Error < StandardError
@@ -36,12 +39,17 @@ module SuperSettings
 
         attr_accessor :key, :value, :changed_by, :deleted
 
+        def initialize(*)
+          @deleted = false
+          super
+        end
+
         def created_at=(val)
           @created_at = SuperSettings::Coerce.time(val)
         end
 
         def deleted?
-          !!(defined?(@deleted) && @deleted)
+          !!@deleted
         end
       end
 
@@ -75,13 +83,9 @@ module SuperSettings
 
         attr_accessor :timeout
 
-        def headers
-          @headers ||= {}
-        end
+        attr_reader :headers
 
-        def query_params
-          @query_params ||= {}
-        end
+        attr_reader :query_params
 
         protected
 
@@ -178,6 +182,12 @@ module SuperSettings
         end
       end
 
+      def initialize(*)
+        @persisted = false
+        @deleted = false
+        super
+      end
+
       def save!
         payload = {key: key}
         if deleted?
@@ -248,11 +258,11 @@ module SuperSettings
       end
 
       def deleted?
-        !!(defined?(@deleted) && @deleted)
+        !!@deleted
       end
 
       def persisted?
-        !!(defined?(@persisted) && @persisted)
+        !!@persisted
       end
 
       private

data/lib/super_settings/storage/redis_storage.rb

@@ -65,6 +65,11 @@ module SuperSettings
           end
         end
 
+        def initialize(*)
+          @deleted = false
+          super
+        end
+
         def created_at=(val)
           @created_at = SuperSettings::Coerce.time(val)
         end
@@ -77,7 +82,7 @@ module SuperSettings
         end
 
         def deleted?
-          !!(defined?(@deleted) && @deleted)
+          !!@deleted
         end
 
         private
@@ -184,6 +189,12 @@ module SuperSettings
         end
       end
 
+      def initialize(*)
+        @deleted = false
+        @persisted = false
+        super
+      end
+
       def history(limit: nil, offset: 0)
         HistoryStorage.find_all_by_key(key: key, limit: limit, offset: offset).collect do |record|
           HistoryItem.new(key: key, value: record.value, changed_by: record.changed_by, created_at: record.created_at, deleted: record.deleted?)
@@ -242,11 +253,11 @@ module SuperSettings
       end
 
       def deleted?
-        !!(defined?(@deleted) && @deleted)
+        !!@deleted
       end
 
       def persisted?
-        !!(defined?(@persisted) && @persisted)
+        !!@persisted
       end
 
       private

data/lib/super_settings/storage/test_storage.rb

@@ -13,13 +13,13 @@ module SuperSettings
       attr_reader :key, :raw_value, :description, :value_type, :updated_at, :created_at
       attr_accessor :changed_by
 
+      @settings = {}
+      @history = {}
+
       class << self
-        def settings
-          @settings ||= {}
-        end
+        attr_reader :settings
 
         def history(key)
-          @history ||= {}
           items = @history[key]
           unless items
             items = []
@@ -68,6 +68,18 @@ module SuperSettings
         end
       end
 
+      def initialize(*)
+        @original_key = nil
+        @raw_value = nil
+        @created_at = nil
+        @updated_at = nil
+        @description = nil
+        @value_type = nil
+        @deleted = false
+        @persisted = false
+        super
+      end
+
       def history(limit: nil, offset: 0)
         items = self.class.history(key)
         items[offset, limit || items.length].collect do |attributes|
@@ -121,11 +133,11 @@ module SuperSettings
       end
 
       def deleted?
-        !!(defined?(@deleted) && @deleted)
+        !!@deleted
       end
 
       def persisted?
-        !!(defined?(@persisted) && @persisted)
+        !!@persisted
       end
 
       private

data/lib/super_settings/storage.rb

@@ -10,6 +10,8 @@ module SuperSettings
     def self.included(base)
       base.extend(ClassMethods)
       base.include(Attributes) unless base.instance_methods.include?(:attributes=)
+
+      base.instance_variable_set(:@load_asynchronous, nil)
     end
 
     module ClassMethods
@@ -76,7 +78,7 @@ module SuperSettings
       #
       # @return [Boolean]
       def load_asynchronous?
-        !!((defined?(@load_asynchronous) && !@load_asynchronous.nil?) ? @load_asynchronous : default_load_asynchronous?)
+        !!(@load_asynchronous.nil? ? default_load_asynchronous? : @load_asynchronous)
       end
 
       # Set to true to force loading setting asynchronously in a background thread.

data/lib/super_settings.rb

@@ -3,6 +3,8 @@
 require_relative "super_settings/application"
 require_relative "super_settings/coerce"
 require_relative "super_settings/configuration"
+require_relative "super_settings/context"
+require_relative "super_settings/context/rack_middleware"
 require_relative "super_settings/local_cache"
 require_relative "super_settings/rest_api"
 require_relative "super_settings/rack_application"
@@ -21,6 +23,8 @@ end
 module SuperSettings
   DEFAULT_REFRESH_INTERVAL = 5.0
 
+  @local_cache = LocalCache.new(refresh_interval: DEFAULT_REFRESH_INTERVAL)
+
   class << self
     # Get a setting value cast to a string.
     #
@@ -28,7 +32,7 @@ module SuperSettings
     # @param default [String] value to return if the setting value is nil
     # @return [String]
     def get(key, default = nil)
-      val = local_cache[key]
+      val = context_setting(key)
       val.nil? ? default : val.to_s
     end
 
@@ -46,7 +50,7 @@ module SuperSettings
     # @param default [Integer] value to return if the setting value is nil
     # @return [Integer]
     def integer(key, default = nil)
-      val = local_cache[key]
+      val = context_setting(key)
       (val.nil? ? default : val)&.to_i
     end
 
@@ -56,7 +60,7 @@ module SuperSettings
     # @param default [Numeric] value to return if the setting value is nil
     # @return [Float]
     def float(key, default = nil)
-      val = local_cache[key]
+      val = context_setting(key)
       (val.nil? ? default : val)&.to_f
     end
 
@@ -66,7 +70,7 @@ module SuperSettings
     # @param default [Boolean] value to return if the setting value is nil
     # @return [Boolean]
     def enabled?(key, default = false)
-      val = local_cache[key]
+      val = context_setting(key)
       Coerce.boolean(val.nil? ? default : val)
     end
 
@@ -85,7 +89,7 @@ module SuperSettings
     # @param default [Time] value to return if the setting value is nil
     # @return [Time]
     def datetime(key, default = nil)
-      val = local_cache[key]
+      val = context_setting(key)
       Coerce.time(val.nil? ? default : val)
     end
 
@@ -95,36 +99,12 @@ module SuperSettings
     # @param default [Array] value to return if the setting value is nil
     # @return [Array]
     def array(key, default = nil)
-      val = local_cache[key]
+      val = context_setting(key)
       val = default if val.nil?
       return nil if val.nil?
       Array(val).collect { |v| v&.to_s }
     end
 
-    # Get setting values cast to a hash. This method can be used to cast the flat setting key/value
-    # store into a structured data store. It uses a delimiter to define how keys are nested which
-    # defaults to a dot.
-    #
-    # If, for example, you have three keys in you settings +A.B1.C1 = 1+, +A.B1.C2 = 2+, and +A.B2.C3 = 3+, the
-    # nested structure will be:
-    #
-    # +{"A" => {"B1" => {"C1" => 1, "C2" => 2}, "B2" => {"C3" => 3}}}+
-    #
-    # This whole hash would be returned if you called +hash+ without any key. If you called it with the
-    # key "A.B1", it would return
-    #
-    # +{"C1" => 1, "C2" => 2}+
-    #
-    # @param key [String, Symbol] the prefix patter to fetch keys for; default to returning all settings
-    # @param default [Hash] value to return if the setting value is nil
-    # @param delimiter [String] the delimiter to use to define nested keys in the hash; defaults to "."
-    # @return [Hash]
-    def structured(key = nil, default = nil, delimiter: ".", max_depth: nil)
-      value = local_cache.structured(key, delimiter: delimiter, max_depth: max_depth)
-      return (default || {}) if value.empty?
-      value
-    end
-
     # Create settings and update the local cache with the values. If a block is given, then the
     # value will be reverted at the end of the block. This method can be used in tests when you
     # need to inject a specific value into your settings.
@@ -148,6 +128,7 @@ module SuperSettings
         setting.save!
         local_cache.load_settings unless local_cache.loaded?
         local_cache.update_setting(setting)
+
         if block_given?
           yield
         end
@@ -161,6 +142,19 @@ module SuperSettings
       end
     end
 
+    # Define a block where settings will remain unchanged. This is useful to
+    # prevent settings from changing while you are in the middle of a block of
+    # code that depends on the settings.
+    def context(&block)
+      reset_context = Thread.current[:super_settings_context].nil?
+      begin
+        Thread.current[:super_settings_context] ||= {}
+        yield
+      ensure
+        Thread.current[:super_settings_context] = nil if reset_context
+      end
+    end
+
     # Load the settings from the database into the in memory cache.
     #
     # @return [void]
@@ -227,8 +221,23 @@ module SuperSettings
 
     private
 
-    def local_cache
-      @local_cache ||= LocalCache.new(refresh_interval: DEFAULT_REFRESH_INTERVAL)
+    attr_reader :local_cache
+
+    def current_context
+      Thread.current[:super_settings_context]
+    end
+
+    def context_setting(key)
+      key = key.to_s
+      context = current_context
+      if context
+        unless context.include?(key)
+          context[key] = local_cache[key]
+        end
+        context[key]
+      else
+        local_cache[key]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_settings
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc3
+  version: 1.0.1
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,9 @@ files:
 - lib/super_settings/attributes.rb
 - lib/super_settings/coerce.rb
 - lib/super_settings/configuration.rb
+- lib/super_settings/context.rb
+- lib/super_settings/context/rack_middleware.rb
+- lib/super_settings/context/sidekiq_middleware.rb
 - lib/super_settings/controller_actions.rb
 - lib/super_settings/engine.rb
 - lib/super_settings/history_item.rb
@@ -85,11 +88,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Fast access runtime settings for a Rails application with an included UI