ultra_settings 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03ea6a74f391d7955bf6091ed6573e306d49120a01652740fb3c279297bac1c1
-  data.tar.gz: bda3d1a00eee06b8e2d306862134010461c3703a841d44cfcc0df782a9174e7a
+  metadata.gz: 0ff5c5961b5070a9234049d2588bd59150e82d2cf87b46c0686067c6d72dd815
+  data.tar.gz: 8df668372d8f6c7dd4c72ad55a789c8bd854bf0bfa0509a5e4a1da69bc74e93e
 SHA512:
-  metadata.gz: 7adbf8dce11f66cee346f74bf74a58730c509163bc4cc5dddb574d73fb8668b29639d3af5a20c3a1612208fa209161b56cfee99231ad909fbb68e6b52d1e9c05
-  data.tar.gz: 8d5b5e32d41b9a9b9aa79729e7b2f5e04ea8a00b4a5e65961ba4a4470d084d495fbb6f97e1862d2772ed75c58d33af2637488a283a2c52ac0d02b6453ef5cf41
+  metadata.gz: 7734298e87bd1fa4b7649ee5ddc64a0ef50f0e6e439bda7eb2042af055141ad5147ee07187ea53bbafbd5372430674a442f77e8c0277099cc8ff9ad7e1b20429
+  data.tar.gz: 565fc7f9071292490d41a634c1b0c89530cbc065f925d52c3dcc25d8e1009bf8fe45ed84aa809fe6ab150d20d79bd9f90f47524ee2a161dfc9d90fc60ae5fb65

data/CHANGELOG.md

@@ -4,6 +4,23 @@ 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.0.0
+
+### Fixed
+
+- **Breaking Change:** Fix conflict with overridding the standard `include?` method on configuration classes. These methods are now defined as `UltraSettings.added?` and `UltraSettings::Configuration.include_field?`.
+- **Breaking Change:** Include namespace in autoloaded configuration names for Rails applications to avoid conflicts on classes in different namespaces.
+
+### Changed
+
+- Use configuration class in in web UI dropdown menu.
+
+## 1.1.2
+
+### Added
+
+- Added `UltraSettings::ApplicationView` which can be used to embed the web UI application showing the configuration inside your own templates. So now you can more seamlessly integrate the settings UI into your own admin tools.
+
 ## 1.1.1
 
 ### Added
@@ -20,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Revamped web UI that can now display setting values.
 - Added option to specify fields as a secret in the configuration to prevent exposing sensitive information in the web interface. By default all fields are considered secrets. This can be changed per configuration by setting the `fields_secret_by_default` property to `false`.
-- Added `UltraSettings::ConfigurationView` which can be used to embed the HTML table showing the configuration options and values other admin views. So now you can integrate the settings view into your own admin tools.
+- Added `UltraSettings::ConfigurationView` which can be used to embed the HTML table showing the configuration options and values inside other admin views. So now you can more seamlessly integrate the settings view into your own admin tools.
 - Add `__to_hash__` method to `UltraSettings::Configuration` which can to serialize the current configuration values as a hash. This value can be used for comparing configuration between environments.
 
 ## 1.0.1

data/README.md

@@ -348,15 +348,23 @@ end, at: "/ultra_settings"
 
 #### Embedding the Settings View in Admin Tools
 
-If you prefer to embed the settings view directly into your own admin tools or dashboard, you can use the `UltraSettings::ConfigurationView` class to render the settings interface within your existing views:
+If you prefer to embed the settings view directly into your own admin tools or dashboard, you can use the `UltraSettings::ApplicationView` class to render the settings interface within your existing views:
 
 ```erb
-<h1>My Service Settings</h1>
+<h1>Configuration</h1>
 
-<%= UltraSettings::ConfigurationView.new(MyServiceConfiguration.instance).render %>
+<%= UltraSettings::ApplicationView.new.render(select_class: "form-select", table_class: "table table-striped") %>
 ```
 
-This approach allows for seamless integration of the settings UI into your application's admin interface, leveraging your existing authentication and authorization mechanisms. The settings are rendered in an HTML table which you can format with your own CSS.
+This approach allows for seamless integration of the settings UI into your application's admin interface, leveraging your existing authentication and authorization mechanisms. The settings are rendered in an HTML table with navigation handled by an HTML select element. You can specify the CSS classes for these elements and use your own stylesheets to customize the appearance.
+
+You can also embed the view for individual configurations within your own views using the `UltraSettings::ConfigurationView` class if you want more customization:
+
+```erb
+<h1>My Service Settings</h1>
+
+<%= UltraSettings::ConfigurationView.new(MyServiceConfiguration.instance).render(table_class: "table table-striped") %>
+```
 
 ### Testing With UltraSettings
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+2.0.0

data/app/index.html.erb

@@ -1,8 +1,8 @@
 <div class="ultra-settings-nav">
-  <form onsubmit="return false">
-    <select class="ultra-settings-select" size="1" id="config-selector">
+  <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-<%= name %>"><%= name %></option>
+        <option value="config-<%= html_escape(name) %>"><%= html_escape(UltraSettings.send(name).class.name) %></option>
       <% end %>
     </select>
   </form>
@@ -11,11 +11,11 @@
 <% UltraSettings.__configuration_names__.sort.each do |name| %>
   <% configuration = UltraSettings.send(name) %>
 
-  <div class="ultra-settings-configuration" id="config-<%= name %>" style="display:none;">
-    <%= UltraSettings::ConfigurationView.new(configuration) %>
+  <div class="ultra-settings-configuration" id="config-<%= html_escape(name) %>" style="display:none;">
+    <%= UltraSettings::ConfigurationView.new(configuration).render(table_class: table_class) %>
   </div>
 <% end %>
 
 <script>
-  <%= @javascript %>
+  <%= javascript %>
 </script>

data/lib/ultra_settings/application_view.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module UltraSettings
+  # This class can render information about all configurations. It is used by the bundled
+  # web UI, but you can use it to embed the configuration information in your own web pages.
+  #
+  # The output will be a simple HTML drop down list that can be used to display an HTML table
+  # showing each configuration. You can specify the CSS class for the select element and the tables
+  # by passing the `select_class` and `table_class` option to the `render` method. By default the
+  # select elewment have the class `ultra-settings-select` and the table will have the class
+  # `ultra-settings-table`.
+  #
+  # @example
+  #  <h1>Application Configuration</h1>
+  #  <%= UltraSettings::ApplicationView.new.render(select_class: 'form-control', table_class: "table table-striped") %>
+  class ApplicationView
+    @template = nil
+
+    class << self
+      def template
+        @template ||= ERB.new(read_app_file("index.html.erb"))
+      end
+
+      def javascript
+        @javascript = read_app_file("application.js")
+      end
+
+      private
+
+      def read_app_file(path)
+        File.read(File.join(app_dir, path))
+      end
+
+      def app_dir
+        File.expand_path(File.join("..", "..", "app"), __dir__)
+      end
+    end
+
+    def render(select_class: "ultra-settings-select", table_class: "ultra-settings-table")
+      html = self.class.template.result(binding)
+      html = html.html_safe if html.respond_to?(:html_safe)
+      html
+    end
+
+    def to_s
+      render
+    end
+
+    private
+
+    def html_escape(value)
+      ERB::Util.html_escape(value)
+    end
+
+    def javascript
+      self.class.javascript
+    end
+  end
+end

data/lib/ultra_settings/configuration.rb

@@ -86,12 +86,12 @@ module UltraSettings
       #
       # @param name [Symbol, String] The name of the field.
       # @return [Boolean]
-      def include?(name)
+      def include_field?(name)
         name = name.to_s
         return true if defined_fields.include?(name)
 
         if superclass <= Configuration
-          superclass.include?(name)
+          superclass.include_field?(name)
         else
           false
         end
@@ -446,7 +446,7 @@ module UltraSettings
     end
 
     def include?(name)
-      self.class.include?(name.to_s)
+      self.class.include_field?(name.to_s)
     end
 
     def override!(values, &block)

data/lib/ultra_settings/railtie.rb

@@ -23,9 +23,12 @@ module UltraSettings
 
         app_config_dir = Rails.root.join(directory)
         app_config_dir.glob("**/*_configuration.rb").each do |file_path|
-          config_name = file_path.basename("_configuration.rb")
-          class_name = file_path.relative_path_from(app_config_dir).to_s.chomp(".rb").classify
-          UltraSettings.add(config_name, class_name)
+          relative_path = file_path.relative_path_from(app_config_dir).to_s
+          class_name = relative_path.chomp(".rb").classify
+          unless UltraSettings.added?(class_name)
+            config_name = class_name.delete_suffix("Configuration").underscore.tr("/", "_")
+            UltraSettings.add(config_name, class_name)
+          end
         end
       end
     end

data/lib/ultra_settings/web_view.rb

@@ -6,11 +6,9 @@ module UltraSettings
     attr_reader :css
 
     def initialize
-      @index_template = erb_template("index.html.erb")
       @layout_template = erb_template("layout.html.erb")
       @layout_css = read_app_file("layout.css")
       @css = read_app_file("application.css")
-      @javascript = read_app_file("application.js")
     end
 
     def render_settings
@@ -18,7 +16,7 @@ module UltraSettings
     end
 
     def content
-      @index_template.result(binding)
+      UltraSettings::ApplicationView.new.render
     end
 
     private

data/lib/ultra_settings.rb

@@ -12,6 +12,7 @@ require_relative "ultra_settings/coerce"
 require_relative "ultra_settings/field"
 require_relative "ultra_settings/rack_app"
 require_relative "ultra_settings/web_view"
+require_relative "ultra_settings/application_view"
 require_relative "ultra_settings/configuration_view"
 require_relative "ultra_settings/yaml_config"
 require_relative "ultra_settings/version"
@@ -45,7 +46,7 @@ module UltraSettings
     def add(name, klass = nil)
       name = name.to_s
       unless name.match?(VALID_NAME__PATTERN)
-        raise ArgementError.new("Invalid configuration name: #{name.inspect}")
+        raise ArgumentError.new("Invalid configuration name: #{name.inspect}")
       end
 
       class_name = klass&.to_s
@@ -66,7 +67,7 @@ module UltraSettings
     #
     # @param class_name [Class, String] The name of the configuration class.
     # @return [Boolean]
-    def include?(class_name)
+    def added?(class_name)
       @configurations.values.collect(&:to_s).include?(class_name.to_s)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultra_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,6 +42,7 @@ files:
 - app/layout.css
 - app/layout.html.erb
 - lib/ultra_settings.rb
+- lib/ultra_settings/application_view.rb
 - lib/ultra_settings/coerce.rb
 - lib/ultra_settings/configuration.rb
 - lib/ultra_settings/configuration_view.rb