lato_settings 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41650d6341281014bd726dc82189daebc59dd927be768e97abbe30ad815900f
-  data.tar.gz: 66fe16b506ff92ce3bf8ffeec3fff9b3c2db3f5b6a035fce177077751627fd91
+  metadata.gz: 9f13fef2e4c2fd7f13af8b268f8d4cf7dc61bf61224fbd30f2453ea735e7a2df
+  data.tar.gz: 7183ed20e93e11bb9f9306e7f80017a38831f08d9c4042c0da43ccec3077804c
 SHA512:
-  metadata.gz: 2dbfc2621d28ed3ec18c7efdc18939cdf523f63cc80596c872ffb612a301328cfa3bc9893706915dade0d07f6a0055ef9e9d9dd02a031c0a5494e52fd9f93755
-  data.tar.gz: b5fdb1ea4dd6e24f92878814718d4707486bee01163618eb2f5661c874d2a860b5fd0689bf6d04691763afa63852b7474607af84f26cc24fb006a7dbc26051f5
+  metadata.gz: f1714c04b34ef6b7d7aa7687e0c55e045a6c3cf7a1a868fc319eb05eaf5ea40afd22ee248e0861299604032742767fece921d06f6237da9993063ae3a3a3366b
+  data.tar.gz: 4f36b0730a7e2ec348fa9d840b18751a821924f2ebe616e3571bfeceefd8d64d5b006ab6a510d03d53576de44df029dceaafa7f2f8c78c2db8c651f709dc9900

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/helpers/lato_settings/settings_helper.rb

@@ -1,5 +1,11 @@
 module LatoSettings
   module SettingsHelper
+    def lato_settings_setting_key(setting)
+      content_tag(:span, class: 'font-monospace') do
+        setting.key
+      end
+    end
+
     def lato_settings_setting_label(setting)
       content_tag(:div, class: 'd-flex flex-column') do
         concat content_tag(:strong, setting.label)

data/app/models/lato_settings/setting.rb

@@ -30,8 +30,7 @@ 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
@@ -57,26 +56,13 @@ module LatoSettings
     ##
     
     def self.get(key, default = nil)
-      load_cache
-
-      @@cache[key] || default
+      Rails.logger.warn "LatoSettings.get is deprecated. Use LatoSettings.get instead."
+      LatoSettings.get(key, default)
     end
 
     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.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' %>
@@ -39,11 +46,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/lib/lato_settings/version.rb

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

data/lib/lato_settings.rb

@@ -11,5 +11,32 @@ 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
+          cache[setting.key] = setting.value.to_f if setting.typology_number?
+        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.3
 platform: ruby
 authors:
 - Gregorio Galante
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails