lato_settings 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41650d6341281014bd726dc82189daebc59dd927be768e97abbe30ad815900f
-  data.tar.gz: 66fe16b506ff92ce3bf8ffeec3fff9b3c2db3f5b6a035fce177077751627fd91
+  metadata.gz: f7846bd6973838754257a88b5bf060b39a4d0935cbaa7aff241b4c168da26471
+  data.tar.gz: d2edd11c94389baf016177ef70abddb461995d0f68741a5bcc11a664b27cf61a
 SHA512:
-  metadata.gz: 2dbfc2621d28ed3ec18c7efdc18939cdf523f63cc80596c872ffb612a301328cfa3bc9893706915dade0d07f6a0055ef9e9d9dd02a031c0a5494e52fd9f93755
-  data.tar.gz: b5fdb1ea4dd6e24f92878814718d4707486bee01163618eb2f5661c874d2a860b5fd0689bf6d04691763afa63852b7474607af84f26cc24fb006a7dbc26051f5
+  metadata.gz: a1c19bd6a38bf6fa666bd4910a555676740e672e60cf1894f7db72686fa448689b56ca6580ad5f328488d41e7289d0dfe204e4708a5b724588ecc20233ea463c
+  data.tar.gz: cb84a9f9e4801a48db34e65f1935388817276e5f7a3f228272cbc785da83a5af5256055ff41b9e23c1540d19d244bdb1477bcab48afd84063e5db799d526096b

data/app/controllers/lato_settings/application_controller.rb

@@ -12,7 +12,7 @@ module LatoSettings
     protected
 
     def authenticate_lato_settings_admin
-      return true if @session.user.lato_settings_admin
+      return true if @session.user&.lato_settings_admin
 
       redirect_to lato.root_path, alert: 'You have not access to this section.'
     end

data/app/controllers/lato_settings/settings_controller.rb

@@ -3,7 +3,7 @@ module LatoSettings
     def index
       @settings = lato_index_collection(
         Setting.all,
-        columns: %i[key label value updated_at actions],
+        columns: %i[label value key updated_at actions],
         searchable_columns: %i[key label value],
         sortable_columns: %i[updated_at],
         pagination: true,

data/app/helpers/lato_settings/settings_helper.rb

@@ -1,5 +1,13 @@
 module LatoSettings
   module SettingsHelper
+    def lato_settings_setting_key(setting)
+      print_content(setting, setting.key, :key)
+    end
+
+    def lato_settings_setting_value(setting)
+      print_content(setting, setting.value_formatted, :value)
+    end
+
     def lato_settings_setting_label(setting)
       content_tag(:div, class: 'd-flex flex-column') do
         concat content_tag(:strong, setting.label)
@@ -18,9 +26,20 @@ module LatoSettings
         concat link_to(I18n.t('lato_settings.cta_edit'), lato_settings.edit_setting_path(setting), class: 'btn btn-primary', data: { lato_action_target: 'trigger', turbo_frame: dom_id(setting, 'form'), action_title: I18n.t('lato_settings.edit_setting') })
 
         unless setting.required
-          concat link_to(I18n.t('lato_settings.cta_delete'), lato_settings.setting_path(setting), class: 'btn btn-danger', data: { turbo_confirm: 'Are you sure?', turbo_method: :delete })
+          concat link_to(I18n.t('lato_settings.cta_delete'), lato_settings.setting_path(setting), class: 'btn btn-danger', data: { turbo_confirm: I18n.t('lato_settings.cta_delete_confirm'), turbo_method: :delete })
         end
       end
     end
+
+    def print_content(setting, content, type)
+      raw "
+        <div class=\"input-group input-group-sm\" data-controller=\"lato-copyclip\">
+          <input type=\"text\" class=\"form-control\" placeholder=\"#{setting.label || setting.key}\" aria-label=\"#{setting.label || setting.key}\" aria-describedby=\"#{type}_#{setting.id}\" value=\"#{content}\" data-lato-copyclip-target=\"input\" readonly>
+          <button class=\"btn btn-primary\" type=\"button\" id=\"#{type}_#{setting.id}\" data-lato-copyclip-target=\"button\" data-action=\"lato-copyclip#onButtonClick\" title=\"#{I18n.t('lato_settings.cta_copy')}\" aria-label=\"#{I18n.t('lato_settings.cta_copy')}\" data-copy-text=\"<i class='bi bi-clipboard-check'></i>\">
+            <i class=\"bi bi-clipboard\"></i>
+          </button>
+        </div>
+      "
+    end
   end
 end

data/app/models/lato_settings/setting.rb

@@ -7,6 +7,7 @@ module LatoSettings
       number: 1,
       date: 2,
       select: 3,
+      integer: 4,
     }, prefix: true
 
     validates :key, presence: true, uniqueness: true, format: { with: /\A[a-zA-Z0-9_]+\z/ }
@@ -30,13 +31,31 @@ module LatoSettings
     after_save :reload_cache
     after_destroy :reload_cache
     def reload_cache
-      Rails.cache.delete('LatoSettings::Setting/cache')
-      @@cache = nil
+      LatoSettings.reset_cache
     end
 
     # Helpers
     ##
     
+    def value_formatted
+      return nil if value.nil?
+
+      case typology
+      when 'string'
+        value.to_s
+      when 'number'
+        value.to_f
+      when 'date'
+        Date.parse(value)
+      when 'select'
+        option_values.include?(value) ? value : nil
+      when 'integer'
+        value.to_i
+      else
+        value.to_s
+      end
+    end
+    
     def option_min
       options&.dig('min') || nil
     end
@@ -56,27 +75,16 @@ module LatoSettings
     # Class
     ##
     
+    # DEPRECATED METHOD: TO BE REMOVED IN FUTURE VERSIONS
     def self.get(key, default = nil)
-      load_cache
-
-      @@cache[key] || default
+      Rails.logger.warn "LatoSettings::Setting.get is deprecated. Use LatoSettings.get instead."
+      LatoSettings.get(key, default)
     end
 
+    # DEPRECATED METHOD: TO BE REMOVED IN FUTURE VERSIONS
     def self.load_cache
-      return true if defined?(@@cache) && @@cache
-
-      @@cache = Rails.cache.fetch('LatoSettings::Setting/cache') do
-        cache = {}
-        LatoSettings::Setting.all.select(:key, :value, :typology).each do |setting|
-          cache[setting.key] = setting.value
-          cache[setting.key] = setting.value.to_f if setting.typology_number?
-        end
-
-        cache
-      end
-
-      true
+      Rails.logger.warn "LatoSettings::Setting.load_cache is deprecated. Use LatoSettings.reset_cache instead."
+      LatoSettings.reset_cache
     end
-
   end
 end

data/app/views/lato_settings/settings/_form.html.erb

@@ -12,9 +12,16 @@ setting ||= LatoSettings::Setting.new
     <% if setting.typology %>
       <%= form.hidden_field :typology %>
 
-      <div class="mb-3">
-        <%= lato_form_item_label form, :key %>
-        <%= lato_form_item_input_text form, :key, required: true, disabled: setting.persisted? %>
+      <div class="row">
+        <div class="col col-12 col-md-6 mb-3">
+          <%= lato_form_item_label form, :key %>
+          <%= lato_form_item_input_text form, :key, required: true, disabled: setting.persisted? %>
+        </div>
+
+        <div class="col col-12 col-md-6 mb-3">
+          <%= lato_form_item_label form, :label %>
+          <%= lato_form_item_input_text form, :label, required: true %>
+        </div>
       </div>
 
       <% if setting.typology == 'number' %>
@@ -22,6 +29,11 @@ setting ||= LatoSettings::Setting.new
           <%= lato_form_item_label form, :value %>
           <%= lato_form_item_input_number form, :value, required: true, min: setting.option_min, max: setting.option_max, step: setting.option_step %>
         </div>
+      <% elsif setting.typology == 'integer' %>
+        <div class="mb-3">
+          <%= lato_form_item_label form, :value %>
+          <%= lato_form_item_input_number form, :value, required: true, min: setting.option_min, max: setting.option_max, step: 1 %>
+        </div>
       <% elsif setting.typology == 'date' %>
         <div class="mb-3">
           <%= lato_form_item_label form, :value %>
@@ -39,11 +51,6 @@ setting ||= LatoSettings::Setting.new
         </div>
       <% end %>
 
-      <div class="mb-3">
-        <%= lato_form_item_label form, :label %>
-        <%= lato_form_item_input_text form, :label, required: true %>
-      </div>
-
       <div class="mb-3">
         <%= lato_form_item_label form, :description %>
         <%= lato_form_item_input_textarea form, :description %>

data/config/locales/en.yml

@@ -6,4 +6,6 @@ en:
     cta_edit: Edit
     cta_update: Update
     cta_delete: Delete
-    cta_confirm: Confirm
+    cta_confirm: Confirm
+    cta_copy: Copy
+    cta_delete_confirm: Are you sure you want to delete this setting?

data/config/locales/it.yml

@@ -7,6 +7,8 @@ it:
     cta_update: Aggiorna
     cta_delete: Cancella
     cta_confirm: Conferma
+    cta_copy: Copia
+    cta_delete_confirm: Sei sicuro di voler cancellare questa impostazione?
   activerecord:
     attributes:
       lato_settings/setting:

data/lib/lato_settings/version.rb

@@ -1,3 +1,3 @@
 module LatoSettings
-  VERSION = "3.0.2"
+  VERSION = "3.0.4"
 end

data/lib/lato_settings.rb

@@ -11,5 +11,31 @@ module LatoSettings
     def configure
       yield config
     end
+
+    def get(key, default = nil)
+      load_cache
+
+      @cache[key] || default
+    end
+
+    def load_cache
+      return true if defined?(@cache) && @cache
+
+      @cache = Rails.cache.fetch('LatoSettings/cache') do
+        cache = {}
+        LatoSettings::Setting.all.select(:key, :value, :typology).each do |setting|
+          cache[setting.key] = setting.value_formatted
+        end
+
+        cache
+      end
+
+      @cache
+    end
+
+    def reset_cache
+      @cache = nil
+      Rails.cache.delete('LatoSettings/cache')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lato_settings
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Gregorio Galante
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails