system_settings 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2036203e28d2865ae3f3e30c35f5edb3df4b0521
-  data.tar.gz: f29b50d3c8ec75d7132d1101300aa2bdea5e43bb
+SHA256:
+  metadata.gz: afe9ba8b4637175f7d2640470fb5b76f1b3571adcb372665e526cba396005185
+  data.tar.gz: bed30ae08b20275af2fd92bf477a9d71ca2b39bb9b53ace4a7beb2453af74da6
 SHA512:
-  metadata.gz: 61485716578503ff6f5248fc4dbc90aafac5d7e555e83d174ea8ea5b8b0f978e22bdcbf2065685b56c0e4bfff5666227e1674c899d165a6217b9b3a133469854
-  data.tar.gz: abce6f1eee8d79749d13ed8eac27f8862e6ac778263f7647d618cbe4b4120eb33207638af86809775a2dd8034e98d8766ba22c38b69c26eb22a2d599dfbf9f89
+  metadata.gz: 71f7750c242feaf7c10968bfda2f9379c8cd99b683da19db0174ba41823694b384283974a134ae0f5e567782f5d963d4bc015cf7d0017bea26c1e8befca684a3
+  data.tar.gz: 70d9f8b6b6e52c66f24a1c4ed36658be555f96416c01a3f32f23251c4fb3f0e9d2e782484e609099a425764776c91b5d7eae69c449eea7b352080929d6a69ac6

data/app/models/system_settings/configurator.rb

@@ -1,14 +1,14 @@
 module SystemSettings
   class Configurator
     class << self
-      def from_file(file_name)
+      def from_file(file_name, kernel_class: Kernel)
         file_name = file_name.to_path if file_name.respond_to?(:to_path)
         raise Errors::SettingsReadError, "The file name must either be a String or implement #to_path" unless file_name.is_a?(String)
         raise Errors::SettingsReadError, "#{file_name} file does not exist" unless File.exist?(file_name)
         raise Errors::SettingsReadError, "#{file_name} file not readable" unless File.readable?(file_name)
         SystemSettings.instrument("system_settings.from_file", path: file_name) do |payload|
           file_content = File.read(file_name)
-          new.tap do |obj|
+          new(kernel_class: kernel_class).tap do |obj|
             obj.instance_eval(file_content, file_name, 1)
             payload[:items] = obj.items
           end
@@ -22,8 +22,9 @@ module SystemSettings
 
     attr_reader :items
 
-    def initialize(&block)
+    def initialize(kernel_class: Kernel, &block)
       @items = []
+      @kernel_class = kernel_class
       return unless block_given?
       if block.arity == 1
         yield self
@@ -57,9 +58,13 @@ module SystemSettings
         if settings_table_exists?
           SystemSettings::Setting.transaction do
             @items.each do |entry|
-              persisted_record = entry[:class].find_by(name: entry[:name])
+              persisted_record = SystemSettings::Setting.find_by(name: entry[:name])
               if persisted_record
-                persisted_record.update!(description: entry[:description])
+                if persisted_record.class == entry[:class]
+                  persisted_record.update!(description: entry[:description])
+                else
+                  warn "SystemSettings: Type mismatch detected! Previously #{entry[:name]} had type #{persisted_record.class.name} but you are loading #{entry[:class].name}"
+                end
               else
                 entry[:class].create!(name: entry[:name], value: entry[:value], description: entry[:description])
               end
@@ -86,6 +91,10 @@ module SystemSettings
 
     private
 
+    def warn(*args)
+      @kernel_class.warn(*args)
+    end
+
     def settings_table_exists?
       SystemSettings::Setting.table_exists?
     end

data/frontend/build/asset-manifest.json

@@ -1,11 +1,11 @@
 {
   "files": {
     "main.css": "/system_settings/static/css/main.92b62519.chunk.css",
-    "main.js": "/system_settings/static/js/main.3240d6b4.chunk.js",
+    "main.js": "/system_settings/static/js/main.127b4c25.chunk.js",
     "runtime~main.js": "/system_settings/static/js/runtime~main.a09e9b82.js",
-    "static/js/2.3fd64734.chunk.js": "/system_settings/static/js/2.3fd64734.chunk.js",
+    "static/js/2.3891b1da.chunk.js": "/system_settings/static/js/2.3891b1da.chunk.js",
     "index.html": "/system_settings/index.html",
-    "precache-manifest.0e020e029f3aadbe0b26621b84010585.js": "/system_settings/precache-manifest.0e020e029f3aadbe0b26621b84010585.js",
+    "precache-manifest.9a5e0d0daf376c08f5a7b80b49b88371.js": "/system_settings/precache-manifest.9a5e0d0daf376c08f5a7b80b49b88371.js",
     "service-worker.js": "/system_settings/service-worker.js"
   }
 }

data/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="/system_settings/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><title>System Settings</title><link href="/system_settings/static/css/main.92b62519.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/system_settings/static/js/runtime~main.a09e9b82.js"></script><script src="/system_settings/static/js/2.3fd64734.chunk.js"></script><script src="/system_settings/static/js/main.3240d6b4.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="/system_settings/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><title>System Settings</title><link href="/system_settings/static/css/main.92b62519.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/system_settings/static/js/runtime~main.a09e9b82.js"></script><script src="/system_settings/static/js/2.3891b1da.chunk.js"></script><script src="/system_settings/static/js/main.127b4c25.chunk.js"></script></body></html>

data/frontend/build/{precache-manifest.0e020e029f3aadbe0b26621b84010585.js → precache-manifest.9a5e0d0daf376c08f5a7b80b49b88371.js}

@@ -1,19 +1,19 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "992f4780889b7b5d8cb84042a0e994c6",
+    "revision": "cbe97afd60ae091779221d8d269d3186",
     "url": "/system_settings/index.html"
   },
   {
-    "revision": "7a76831de683d940339e",
+    "revision": "1aff74f8dd7cf841b97d",
     "url": "/system_settings/static/css/main.92b62519.chunk.css"
   },
   {
-    "revision": "78fcb78c6fb9ed311d5f",
-    "url": "/system_settings/static/js/2.3fd64734.chunk.js"
+    "revision": "cb5e14f25e489e1305c3",
+    "url": "/system_settings/static/js/2.3891b1da.chunk.js"
   },
   {
-    "revision": "7a76831de683d940339e",
-    "url": "/system_settings/static/js/main.3240d6b4.chunk.js"
+    "revision": "1aff74f8dd7cf841b97d",
+    "url": "/system_settings/static/js/main.127b4c25.chunk.js"
   },
   {
     "revision": "1b52e032205e59a9e84f",

data/frontend/build/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/system_settings/precache-manifest.0e020e029f3aadbe0b26621b84010585.js"
+  "/system_settings/precache-manifest.9a5e0d0daf376c08f5a7b80b49b88371.js"
 );
 
 self.addEventListener('message', (event) => {