ultra_settings 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90728a492b4f4d48193caf10b5a963160b9ff01e6e084541eb571ac3776ddf72
-  data.tar.gz: 98d035433486540669bd8a68d64e1c1f236a35a09567c77bfb59322ae538d94d
+  metadata.gz: 2675de07815b6ed0bdf20e8a94c6eef6cb9a8a54e98940a27a2b2997537e6e9e
+  data.tar.gz: b51695a82e8eb135da697e12271d81d705f7a915cc56c279ceb420de542b0234
 SHA512:
-  metadata.gz: 154b003680b751f2137696ed7b7e489c8cd8c205f002c89a45f61ad25dd7c2c44151cd3e67bb64df4438b0cb08056b295f25da4ad4333340bbd6e5817bba64dc
-  data.tar.gz: 558fd5cbbf34f9dda4b9ec93d49bb13b1123291a1bdea625fdb4e314c76d28b0b8f63c12655ab86afbe77a63c72349c719c5d547ace4e5d927093876f4938607
+  metadata.gz: 7755825b6e17372447237c99063eb87084c79e15317e80a76f0d6ec55d88931284c51143095bf3a87b2e3b4fc7b4d7e271223329ef19a6618f91033d7da67065
+  data.tar.gz: d660fec7954015f97433b2ff8446d3688381311b5f927c827c9dab7d0ec8c6311578ab0fec53f2794b09014d6b5659d0332dc684155541c3ac25702d4dda0124

data/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.4.2
+
+### Changed
+
+- Configuration setup set prior to loading the railtie will no longer be overridden by the railtie default setup.
+
+## 2.4.1
+
+### Changed
+
+- Ignore base configuration classes that don't have any fields defined in the web UI.
+- Allow overriding values on static fields in tests.
+- Changed Web UI CSS variable scope to apply to all application elements.
+
 ## 2.4.0
 
 ### Added

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.4.2

data/app/application.css

@@ -62,4 +62,4 @@
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
-}
+}

data/app/application_vars.css.erb

@@ -1,5 +1,5 @@
 <% unless color_scheme == :dark %>
-  .ultra-settings-configuration {
+  .ultra-settings {
     --table-header-bg-color: #fff;
     --table-border-color: #dee2e6;
     --alt-row-color: rgba(0, 0, 0, .05);
@@ -15,7 +15,7 @@
   @media (prefers-color-scheme: dark) {
 <% end %>
 <% if color_scheme == :system || color_scheme == :dark %>
-  .ultra-settings-configuration {
+  .ultra-settings {
     --table-header-bg-color: #333;
     --table-border-color: #555;
     --alt-row-color: rgba(0, 0, 0, .30);

data/app/index.html.erb

@@ -1,20 +1,26 @@
-<div class="ultra-settings-nav">
-  <form onsubmit="return false" style="margin-bottom: 0.5rem;">
-    <select class="<%= html_escape(select_class) %>" size="1" id="config-selector">
-      <% UltraSettings.__configuration_names__.sort.each do |name| %>
-        <option value="config-<%= html_escape(name) %>"><%= html_escape(UltraSettings.send(name).class.name) %></option>
-      <% end %>
-    </select>
-  </form>
-</div>
-
-<% UltraSettings.__configuration_names__.sort.each do |name| %>
-  <% configuration = UltraSettings.send(name) %>
+<div class="ultra-settings">
+  <div class="ultra-settings-nav">
+    <form onsubmit="return false" style="margin-bottom: 0.5rem;">
+      <select class="<%= html_escape(select_class) %>" size="1" id="config-selector">
+        <% UltraSettings.__configuration_names__.sort.each do |name| %>
+          <% configuration = UltraSettings.send(name) %>
+          <% next if configuration.class.fields.empty? %>
 
-  <div class="ultra-settings-configuration" id="config-<%= html_escape(name) %>" style="display:none;">
-    <%= UltraSettings::ConfigurationView.new(configuration).render(table_class: table_class) %>
+          <option value="config-<%= html_escape(name) %>"><%= html_escape(UltraSettings.send(name).class.name) %></option>
+        <% end %>
+      </select>
+    </form>
   </div>
-<% end %>
+
+  <% UltraSettings.__configuration_names__.sort.each do |name| %>
+    <% configuration = UltraSettings.send(name) %>
+    <% next if configuration.class.fields.empty? %>
+
+    <div class="ultra-settings-configuration" id="config-<%= html_escape(name) %>" style="display:none;">
+      <%= UltraSettings::ConfigurationView.new(configuration).render(table_class: table_class) %>
+    </div>
+  <% end %>
+</div>
 
 <script>
   <%= javascript %>

data/lib/ultra_settings/configuration.rb

@@ -533,11 +533,14 @@ module UltraSettings
       field = self.class.send(:defined_fields)[name]
       return nil unless field
 
-      if field.static? && @ultra_settings_memoized_values.include?(name)
+      use_override = @ultra_settings_override_values[Thread.current.object_id]&.include?(name)
+
+      if field.static? && !use_override && @ultra_settings_memoized_values.include?(name)
         return @ultra_settings_memoized_values[name]
       end
 
-      if @ultra_settings_override_values[Thread.current.object_id]&.include?(name)
+      value = nil
+      if use_override
         value = field.coerce(@ultra_settings_override_values[Thread.current.object_id][name])
       else
         env = ENV if field.env_var
@@ -551,7 +554,7 @@ module UltraSettings
         value = field.default
       end
 
-      if field.static?
+      if field.static? && !use_override
         @ultra_settings_mutex.synchronize do
           if @ultra_settings_memoized_values.include?(name)
             value = @ultra_settings_memoized_values[name]

data/lib/ultra_settings/configuration_view.rb

@@ -68,7 +68,7 @@ module UltraSettings
       else
         "Value: #{display_value(value)}"
       end
-      "<dfn title=\"#{html_escape(title)}\">#{html_escape(label)}</dfn>"
+      "<dfn style=\"text-decoration: underline dotted;\" title=\"#{html_escape(title)}\">#{html_escape(label)}</dfn>"
     end
 
     def secret_value(value)

data/lib/ultra_settings/railtie.rb

@@ -7,11 +7,11 @@ module UltraSettings
   # `config.ultra_settings.auto_load_directories` option.
   class Railtie < Rails::Railtie
     config.ultra_settings = ActiveSupport::OrderedOptions.new
-    config.ultra_settings.auto_load_directories = [File.join("app", "configurations")]
+    config.ultra_settings.auto_load_directories ||= [File.join("app", "configurations")]
 
     config.before_configuration do
-      UltraSettings.yaml_config_env = Rails.env
-      UltraSettings.yaml_config_path = Rails.root.join("config")
+      UltraSettings::Configuration.yaml_config_env ||= Rails.env
+      UltraSettings::Configuration.yaml_config_path ||= Rails.root.join("config")
     end
 
     # Automatically register any configuration classes in the app/configurations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultra_settings
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler