ultra_settings 2.7.0 → 2.8.1

data/app/configuration.html.erb

@@ -1,28 +1,28 @@
 <div class="ultra-settings-block">
-  <% if !configuration.class.yaml_config_disabled? && configuration.class.configuration_file.is_a?(Pathname) %>
-    <div class="ultra-settings-config-file">
-      <span class="ultra-settings-config-file-label">Configuration File:</span>
-      <code class="ultra-settings-config-file-path"><%= html_escape(relative_path(configuration.class.configuration_file)) %></code>
-      <% unless configuration.class.configuration_file&.exist? %>
-        <span class="ultra-settings-file-not-found">(File does not exist)</span>
-      <% end %>
-    </div>
-  <% end %>
+  <%= render_partial "config_description", configuration: configuration %>
 
   <div class="ultra-settings-fields">
     <% configuration.class.fields.each do |field| %>
       <% source = configuration.__source__(field.name) %>
+
       <div class="ultra-settings-field">
         <div class="ultra-settings-field-header">
           <div class="ultra-settings-field-name">
             <code><%= html_escape(field.name) %></code>
+
             <% if field.secret? %>
-              <span class="ultra-settings-field-badge ultra-settings-badge-secret">secret</span>
+              <span class="ultra-settings-field-badge ultra-settings-badge-secret">
+                secret
+              </span>
             <% end %>
+
             <% if field.static? %>
-              <span class="ultra-settings-field-badge ultra-settings-badge-static">static</span>
+              <span class="ultra-settings-field-badge ultra-settings-badge-static">
+                static
+              </span>
             <% end %>
           </div>
+
           <div class="ultra-settings-field-type">
             <%= html_escape(field.type) %>
           </div>
@@ -32,15 +32,20 @@
           <% if configuration[field.name].nil? %>
             <span class="ultra-settings-nil-value">nil</span>
           <% elsif field.secret? %>
-            <code class="ultra-settings-field-data-value"><%= html_escape(secret_value(configuration[field.name])) %></code>
+            <code class="ultra-settings-field-data-value">
+              <%= html_escape(secret_value(configuration[field.name])) %>
+            </code>
           <% else %>
-            <code class="ultra-settings-field-data-value"><%= html_escape(display_value(configuration[field.name])) %></code>
+            <code class="ultra-settings-field-data-value">
+              <%= html_escape(display_value(configuration[field.name])) %>
+            </code>
           <% end %>
         </div>
 
         <% unless field.description.to_s.empty? %>
           <div class="ultra-settings-field-description">
             <%= info_icon %>
+
             <div class="ultra-settings-description-text">
               <%= html_escape(field.description) %>
             </div>
@@ -48,62 +53,30 @@
         <% end %>
 
         <div class="ultra-settings-field-sources">
-          <% if field.env_var && !configuration.class.environment_variables_disabled? %>
-            <div class="ultra-settings-source <%= 'ultra-settings-source-active' if source == :env %>">
-              <span class="ultra-settings-source-type">
-                Environment Variable
-              </span>
-              <code class="ultra-settings-source-value">
-                <%= field.env_var %>
-                <%= show_defined_value(field.env_var, configuration.__value_from_source__(field.name, :env), field.secret?) %>
-              </code>
-              <% if source == :env %>
-                <span class="ultra-settings-source-indicator">Currently active</span>
-              <% end %>
-            </div>
+          <% sources = configuration.__available_sources__(field.name) %>
+          <% if sources.include?(:env) %>
+            <%= render_partial "data_source", configuration: configuration, field: field, source: :env, current_source: source, source_type: "Environment Variable", source_name: field.env_var %>
           <% end %>
 
-          <% if field.runtime_setting && !configuration.class.runtime_settings_disabled? %>
-            <div class="ultra-settings-source <%= 'ultra-settings-source-active' if source == :settings %>">
-              <span class="ultra-settings-source-type">Runtime Setting</span>
-              <code class="ultra-settings-source-value">
-                <%= field.runtime_setting %>
-                <%= show_defined_value(field.runtime_setting, configuration.__value_from_source__(field.name, :settings), field.secret?) %>
-              </code>
-              <% if source == :settings %>
-                <span class="ultra-settings-source-indicator">Currently active</span>
-              <% end %>
-              <% edit_url = UltraSettings.runtime_settings_url(name: field.runtime_setting, type: field.type, description: field.description) %>
-              <% if edit_url %>
-                <a href="<%= html_escape(edit_url) %>" class="ultra-settings-edit-link" title="Edit <%= html_escape(field.runtime_setting) %>">
-                  <%= edit_icon %>
-                </a>
-              <% end %>
-            </div>
+          <% if sources.include?(:settings) %>
+            <%= render_partial "data_source", configuration: configuration, field: field, source: :settings, current_source: source, source_type: "Runtime Setting", source_name: field.runtime_setting %>
           <% end %>
 
-          <% if field.yaml_key && !configuration.class.yaml_config_disabled? %>
-            <div class="ultra-settings-source <%= 'ultra-settings-source-active' if source == :yaml %>">
-              <span class="ultra-settings-source-type">Configuration File</span>
-              <code class="ultra-settings-source-value">
-                <%= field.yaml_key %>
-                <%= show_defined_value(field.yaml_key, configuration.__value_from_source__(field.name, :yaml), field.secret?) %>
-              </code>
-              <% if source == :yaml %>
-                <span class="ultra-settings-source-indicator">Currently active</span>
-              <% end %>
-            </div>
+          <% if sources.include?(:yaml) %>
+            <%= render_partial "data_source", configuration: configuration, field: field, source: :yaml, current_source: source, source_type: "Configuration File", source_name: field.yaml_key %>
+          <% end %>
+
+          <% if sources.include?(:default) %>
+            <%= render_partial "data_source", configuration: configuration, field: field, source: :default, current_source: source, source_type: "Default Value", source_name: nil %>
           <% end %>
 
-          <% if !field.default.nil? || source == :default %>
-            <div class="ultra-settings-source <%= 'ultra-settings-source-active' if source == :default %>">
-              <span class="ultra-settings-source-type">Default Value</span>
-              <code class="ultra-settings-source-value">
-                <%= show_defined_value("Default Value", field.default, field.secret?) %>
-              </code>
-              <% if source == :default %>
-                <span class="ultra-settings-source-indicator">Currently active</span>
-              <% end %>
+          <% if source == :default && configuration[field.name].nil? %>
+            <div class="ultra-settings-source ultra-settings-source-active">
+              <span class="ultra-settings-source-type">Not Set</span>
+
+              <span class="ultra-settings-source-indicator">
+                Currently active
+              </span>
             </div>
           <% end %>
         </div>
@@ -114,10 +87,15 @@
   <dialog class="ultra-settings-dialog" closedby="any">
     <div class="ultra-settings-dialog-header">
       <div class="ultra-settings-dialog-title"></div>
-      <button class="ultra-settings-dialog-close" onclick="this.closest('.ultra-settings-dialog').close();">
+
+      <button
+        class="ultra-settings-dialog-close"
+        onclick="this.closest('.ultra-settings-dialog').close();"
+      >
         <%= close_icon %>
       </button>
     </div>
+
     <div class="ultra-settings-dialog-body">
       <code class="ultra-settings-field-data-value ultra-settings-dialog-value"></code>
     </div>

data/app/index.html.erb

@@ -2,25 +2,30 @@
 
 <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? %>
+    <% configurations = UltraSettings.__configurations__.reject { |config| config.class.fields.empty? }.sort_by { |config| config.class.name.downcase } %>
 
-          <option value="config-<%= html_escape(name) %>"><%= html_escape(UltraSettings.send(name).class.name) %></option>
-        <% end %>
-      </select>
-    </form>
+    <% if configurations.size == 1 %>
+      <h2 class="ultra-settings-title">
+        <%= html_escape(configurations.first.class.name) %>
+      </h2>
+    <% else %>
+      <%= render_partial "select_menu", configurations: configurations %>
+    <% end %>
   </div>
 
-  <% 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>
+  <% if configurations.size == 1 %>
+    <%= UltraSettings::ConfigurationView.new(configurations.first).render(table_class: table_class) %>
+  <% else %>
+    <%= render_partial "config_list", configurations: configurations %>
+    <% configurations.each do |configuration| %>
+      <div
+        class="ultra-settings-configuration"
+        id="config-<%= html_escape(configuration.class.name) %>"
+        style="display:none;"
+      >
+        <%= UltraSettings::ConfigurationView.new(configuration).render(table_class: table_class) %>
+      </div>
+    <% end %>
   <% end %>
 </div>
 

data/lib/ultra_settings/application_view.rb

@@ -4,15 +4,15 @@ 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 element
-  # showing each configuration. You can specify the CSS class for the select element by passing
-  # the `select_class` option to the `render` method. By default the select element has
-  # the class `ultra-settings-select`.
+  # The output will be a simple HTML drop down menu that can be used to select the configuration
+  # you want to see.
   #
   # @example
   #  <h1>Application Configuration</h1>
-  #  <%= UltraSettings::ApplicationView.new.render(select_class: 'form-control') %>
+  #  <%= UltraSettings::ApplicationView.new.render %>
   class ApplicationView
+    include RenderHelper
+
     attr_reader :css
 
     # Initialize the application view with a color scheme.
@@ -25,10 +25,10 @@ module UltraSettings
 
     # Render the HTML for the configuration settings UI.
     #
-    # @param select_class [String] CSS class for the select element.
-    # @param table_class [String] CSS class for the table element (for backwards compatibility).
+    # @param select_class [String] Deprecated; no longer used.
+    # @param table_class [String] Deprecated; no longer used.
     # @return [String] The rendered HTML.
-    def render(select_class: "ultra-settings-select", table_class: "")
+    def render(select_class: nil, table_class: nil)
       html = ViewHelper.erb_template("index.html.erb").result(binding)
       html = html.html_safe if html.respond_to?(:html_safe)
       html
@@ -52,10 +52,6 @@ module UltraSettings
 
     private
 
-    def html_escape(value)
-      ERB::Util.html_escape(value)
-    end
-
     def javascript
       ViewHelper.read_app_file("application.js")
     end

data/lib/ultra_settings/audit_data_sources.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module UltraSettings
+  class AuditDataSources
+    class << self
+      # Find environment variables that are set but have the same value as their default.
+      # These environment variables could potentially be removed since they're not changing behavior.
+      #
+      # @return [Array<Array<(String, Object)>>] An array of tuples containing environment variable names and their default values
+      def unnecessary_env_vars
+        env_vars_at_default = []
+        each_configuration do |config|
+          each_field_using_source(config, :env) do |field|
+            value = config[field.name]
+            default_value = default_config_value(config, field)
+            env_vars_at_default << [field.env_var, default_value] if default_value == value
+          end
+        end
+        env_vars_at_default
+      end
+
+      # Find runtime settings that are set but have the same value as their default.
+      # These runtime settings could potentially be removed since they're not changing behavior.
+      #
+      # @return [Array<Array<(String, Object)>>] An array of tuples containing runtime setting names and their default values
+      def unnecessary_runtime_settings
+        unnecessary_runtime_settings = []
+        each_configuration do |config|
+          each_field_using_source(config, :settings) do |field|
+            value = config[field.name]
+            default_value = default_config_value(config, field)
+            unnecessary_runtime_settings << [field.runtime_setting, default_value] if default_value == value
+          end
+        end
+        unnecessary_runtime_settings
+      end
+
+      # Find environment variables that could be moved to runtime settings.
+      # These are non-default environment variable values where a runtime setting is also available.
+      #
+      # @return [Array<Array<(String, String, Object)>>] An array of tuples containing environment variable name, runtime setting name, and current value
+      def env_vars_can_be_runtime_setting
+        env_vars_can_be_runtime = []
+        each_configuration do |config|
+          each_field_using_source(config, :env) do |field|
+            value = config[field.name]
+            default_value = default_config_value(config, field)
+            next unless field.runtime_setting && value != default_value
+
+            env_vars_can_be_runtime << [field.env_var, field.runtime_setting, value]
+          end
+        end
+        env_vars_can_be_runtime
+      end
+
+      # Find environment variables being used that don't have default values defined.
+      # These configurations require an environment variable to be set.
+      #
+      # @return [Array<Array<(String, Symbol, String, Object)>>] An array of tuples containing class name, field name, environment variable name, and current value
+      def env_vars_without_default
+        no_default_env_var_fields = []
+        each_configuration do |config|
+          each_field_using_source(config, :env) do |field|
+            value = default_config_value(config, field)
+            if value.nil?
+              no_default_env_var_fields << [config.class.name, field.name, field.env_var, config[field.name]]
+            end
+          end
+        end
+        no_default_env_var_fields
+      end
+
+      private
+
+      def each_configuration(&_block)
+        UltraSettings::Configuration.descendant_configurations.each do |config_class|
+          config = config_class.instance
+          yield config
+        end
+      end
+
+      def each_field_using_source(config, source, &_block)
+        config.class.fields.each do |field|
+          next if field.secret?
+          next unless config.__source__(field.name) == source
+
+          yield field
+        end
+      end
+
+      def default_config_value(config, field)
+        yaml_value = config.__value_from_source__(field.name, :yaml)
+        default_value = config.__value_from_source__(field.name, :default)
+        yaml_value || default_value
+      end
+    end
+  end
+end

data/lib/ultra_settings/configuration.rb

@@ -9,8 +9,21 @@ module UltraSettings
 
     @env_var_prefix = nil
     @runtime_setting_prefix = nil
+    @description = nil
+    @descendants = []
 
     class << self
+      # Set a description for the configuration. This is optional. It will be displayed
+      # in the web UI if provided. On large projects with many configurations, this can
+      # help identify the purpose of each configuration.
+      #
+      # @param text [String] The description text.
+      # @return [void]
+      def description(text = nil)
+        @description = text.to_s.strip unless text.nil?
+        @description
+      end
+
       # Define a field on the configuration. This will create a getter method for the field.
       # The field value will be read from the environment, runtime settings, or a YAML file
       # and coerced to the specified type. Empty strings will be converted to nil.
@@ -27,14 +40,19 @@ module UltraSettings
       # @param static [Boolean] If true, the field value should never be changed. This is useful for
       #   fields that are used at startup to set static values in the application. Static field cannot
       #   be read from runtime settings.
-      # @param runtime_setting [String, Symbol] The name of the runtime setting to use for the field.
+      # @param secret [Boolean, Proc] If true, the field value will be obscured in the output of
+      #   to_hash. If a proc is provided, it will be called to determine if the field is secret.
+      # @param runtime_setting [String, Symbol, Boolean] The name of the runtime setting to use for the field.
       #   By default this will be the underscored name of the class plus a dot plus the field name
-      #   (i.e. MyServiceConfiguration#foo becomes "my_service.foo").
-      # @param env_var [String, Symbol] The name of the environment variable to use for the field.
+      #   (i.e. MyServiceConfiguration#foo becomes "my_service.foo"). If set to false, runtime settings
+      #   will be ignored for this field. This can be set to true to use the default name.
+      # @param env_var [String, Symbol, Boolean] The name of the environment variable to use for the field.
       #   By default this will be the underscored name of the class plus an underscore plus the field name
-      #   all in uppercase (i.e. MyServiceConfiguration#foo becomes "MY_SERVICE_FOO").
-      # @param yaml_key [String, Symbol] The name of the YAML key to use for the field. By default
-      #   this is the name of the field.
+      #   all in uppercase (i.e. MyServiceConfiguration#foo becomes "MY_SERVICE_FOO"). If set to false,
+      #   environment variables will be ignored for this field. This can be set to true to use the default name.
+      # @param yaml_key [String, Symbol, Boolean] The name of the YAML key to use for the field. By default
+      #   this is the name of the field. If set to false, YAML configuration will be ignored for this field.
+      #   This can be set to true to use the default name.
       # @return [void]
       def field(name, type: :string, description: nil, default: nil, default_if: nil, static: nil, secret: nil, runtime_setting: nil, env_var: nil, yaml_key: nil)
         name = name.to_s
@@ -67,7 +85,8 @@ module UltraSettings
           secret: secret
         )
 
-        class_eval <<~RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Security/Eval
+        caller_location = caller_locations(1, 1).first
+        class_eval <<~RUBY, caller_location.path, caller_location.lineno # rubocop:disable Security/Eval, Style/EvalWithLocation
           def #{name}
             __get_value__(#{name.inspect})
           end
@@ -93,7 +112,7 @@ module UltraSettings
         name = name.to_s
         return true if defined_fields.include?(name)
 
-        if superclass <= Configuration
+        if superclass < Configuration
           superclass.include_field?(name)
         else
           false
@@ -145,7 +164,7 @@ module UltraSettings
       # directory (i.e. MyServiceConfiguration has a default config path of
       # "my_service.yml").
       #
-      # @param value [String, Pathname]
+      # @param value [String, Pathname, false, nil]
       # @return [void]
       def configuration_file=(value)
         value = nil if value == false
@@ -352,12 +371,30 @@ module UltraSettings
         YamlConfig.new(configuration_file, yaml_config_env).to_h
       end
 
+      # Get all descendant configuration classes (subclasses and their subclasses, recursively).
+      #
+      # @return [Array<Class>] All classes that inherit from this class.
+      def descendant_configurations
+        @descendants ||= []
+        @descendants.flat_map { |subclass| [subclass] + subclass.descendant_configurations }
+      end
+
       private
 
+      # Hook called when this class is inherited. Tracks all descendant classes.
+      #
+      # @param subclass [Class] The subclass that is inheriting from this class.
+      # @return [void]
+      def inherited(subclass)
+        super
+        @descendants ||= []
+        @descendants << subclass
+      end
+
       def defined_fields
         unless defined?(@defined_fields)
           fields = {}
-          if superclass <= Configuration
+          if superclass < Configuration
             fields = superclass.send(:defined_fields).dup
           end
           @defined_fields = fields
@@ -513,6 +550,22 @@ module UltraSettings
       end
     end
 
+    # Returns an array of the available data sources for the field.
+    #
+    # @param name [String, Symbol] the name of the field.
+    # @return [Array<Symbol>] The available sources (:env, :settings, :yaml, :default).
+    def __available_sources__(name)
+      field = self.class.send(:defined_fields)[name.to_s]
+      raise ArgumentError.new("Unknown field: #{name.inspect}") unless field
+
+      sources = []
+      sources << :env if field.env_var
+      sources << :settings if field.runtime_setting && UltraSettings.__runtime_settings__
+      sources << :yaml if field.yaml_key && self.class.configuration_file
+      sources << :default unless field.default.nil?
+      sources
+    end
+
     # Output the current state of the configuration as a hash. If the field is marked as a secret,
     # then the value will be a secure hash of the value instead of the value itself.
     #

data/lib/ultra_settings/configuration_view.rb

@@ -11,6 +11,8 @@ module UltraSettings
   #  <h1>Service Configuration</h1>
   #  <%= UltraSettings::ConfigurationView.new(ServiceConfiguration.instance).render %>
   class ConfigurationView
+    include RenderHelper
+
     # Initialize the configuration view with a configuration instance.
     #
     # @param configuration [UltraSettings::Configuration] The configuration instance to display.
@@ -38,10 +40,6 @@ module UltraSettings
 
     private
 
-    def html_escape(value)
-      ERB::Util.html_escape(value)
-    end
-
     def display_value(value)
       case value
       when Time
@@ -147,8 +145,6 @@ module UltraSettings
       HTML
     end
 
-    private
-
     def open_dialog_script
       <<~JAVASCRIPT.gsub(/\s+/, " ").tr('"', "'")
         this.closest('.ultra-settings-configuration').querySelector('.ultra-settings-dialog-title').textContent = this.dataset.label;
@@ -157,5 +153,44 @@ module UltraSettings
         this.closest('.ultra-settings-configuration').querySelector('.ultra-settings-dialog-close').blur();
       JAVASCRIPT
     end
+
+    def source_priority
+      [:env, :settings, :yaml, :default]
+    end
+
+    def source_overridden_by(current_source, active_source)
+      return nil if current_source == active_source
+
+      current_index = source_priority.index(current_source)
+      active_index = source_priority.index(active_source)
+
+      return nil if current_index.nil? || active_index.nil?
+      return nil if current_index < active_index
+
+      active_source
+    end
+
+    def override_indicator(overridden_by_source)
+      source_names = {
+        env: "environment variable",
+        settings: "runtime setting",
+        yaml: "configuration file",
+        default: "default value"
+      }
+      <<~HTML
+        <span class="ultra-settings-source-override" title="Overridden by #{source_names[overridden_by_source]}">
+          #{warning_icon(14)}
+          <span class="ultra-settings-source-override-text">Overridden by #{source_names[overridden_by_source]}</span>
+        </span>
+      HTML
+    end
+
+    def warning_icon(size = 16)
+      <<~HTML
+        <svg width="#{size}" height="#{size}" fill="currentColor" viewBox="0 0 16 16">
+          <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
+        </svg>
+      HTML
+    end
   end
 end

data/lib/ultra_settings/field.rb

@@ -16,12 +16,12 @@ module UltraSettings
     # @param type [Symbol] The type of the field.
     # @param description [String] The description of the field.
     # @param default [Object] The default value of the field.
-    # @param default_if [Proc] A proc that returns true if the default value should be used.
+    # @param default_if [Proc, Symbol] A proc that returns true if the default value should be used.
     # @param env_var [String, Symbol] The name of the environment variable to use for the field.
     # @param runtime_setting [String, Symbol] The name of the setting to use for the field.
     # @param yaml_key [String, Symbol] The name of the YAML key to use for the field.
     # @param static [Boolean] Whether or not the field is static and cannot be changed at runtime.
-    # @param secret [Boolean] Whether or not the field contains a value that should be kept secret.
+    # @param secret [Boolean, Proc] Whether or not the field contains a value that should be kept secret.
     def initialize(
       name:,
       type: :string,

data/lib/ultra_settings/railtie.rb

@@ -23,6 +23,8 @@ module UltraSettings
 
         app_config_dir = Rails.root.join(directory)
         app_config_dir.glob("**/*_configuration.rb").each do |file_path|
+          next unless file_path.file? && file_path.readable?
+
           relative_path = file_path.relative_path_from(app_config_dir).to_s
           class_name = relative_path.chomp(".rb").classify
           unless UltraSettings.added?(class_name)
@@ -32,5 +34,11 @@ module UltraSettings
         end
       end
     end
+
+    rake_tasks do
+      Dir.glob(File.expand_path("tasks/*.rake", __dir__)).each do |rake_file|
+        load rake_file
+      end
+    end
   end
 end

data/lib/ultra_settings/render_helper.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module UltraSettings
+  # Helper methods for rendering views.
+  module RenderHelper
+    # HTML escape a value.
+    #
+    # @param value [String] The value to escape.
+    # @return [String] The escaped value.
+    def html_escape(value)
+      ERB::Util.html_escape(value)
+    end
+
+    # Render a partial template with the given locals.
+    #
+    # @param partial_name [String] The name of the partial template (without the leading underscore and file extension).
+    # @param locals [Hash] A hash of local variables to pass to the template.
+    # @return [String] The rendered HTML of the partial.
+    def render_partial(partial_name, locals = {})
+      template = ViewHelper.erb_template("_#{partial_name}.html.erb")
+      b = binding
+      locals.each do |key, value|
+        b.local_variable_set(key, value)
+      end
+      template.result(b)
+    end
+  end
+end