web47core 3.2.3.46 → 3.2.3.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb60aaf9b363d9d95a53e02cd2875e60b79f26344d64e08f6ba2ab8dce88e28
-  data.tar.gz: 383b9f556359a6578d06ea3b319c0382016e6638d2c914da04684d34a7c9d933
+  metadata.gz: b460458978fdba54209f884a08fd57d1407bb02e4542ed559f9198aa918eb162
+  data.tar.gz: b3d3c901f101674abe9be6cdafa8e2f866f795826b1a6ce00aedc49ad6802428
 SHA512:
-  metadata.gz: 670ea6d949445923fe1a9ec0f0a9b27d48a9ad6a73ac5dd3050088e1adc13fc9393f7d67991826db3587a864319b112700c8bfd2fa761bcf47437c17c63810ff
-  data.tar.gz: 4565290e61d30d10a39be0584e7b6fe200fe76edfbf769f42e6e0c4af3544218a4be89b7049d6fe4d66237cca637f09e27511b184ef1827baa00d6abfa0fd5e7
+  metadata.gz: 4a6ae3bf153a29041e5bf6b2c1e13f611a7056036dd50729e9c592b89d9015347b7fe9a5d2a5e584cad78fa4757b9f6e0ddd0720f91d233ba5feb27277f1989c
+  data.tar.gz: e5100c2ef32e912f2b7f03afa453f2895f17879805e7dfaf4f17c3ce078de54f87d53e1e4604c5e00b0b82d7f9ed24fca4ffd46dc073b7dc2e1bca1caf8d9206

data/app/controllers/status_controller.rb

@@ -4,14 +4,13 @@
 # Return the status of the server
 #
 class StatusController < ActionController::Base
-  helper SvgIconHelper
   protect_from_forgery with: :exception
   #
   # Main (and only) page
   #
   def index
     components = { mongo: mongo_status,
-                   redis: redis_status,
+                   cache: cache_status,
                    jobs: delayed_jobs_status,
                    cron_job_servers: cron_job_servers_status,
                    workers: workers_status,
@@ -27,10 +26,10 @@ class StatusController < ActionController::Base
   private
 
   #
-  # Return the status of the key components, mongo, redis
+  # Return the status of the key components, mongo, cache
   #
   def db_status(components)
-    components[:mongo][:success] && components[:redis][:success] ? 200 : 500
+    components[:mongo][:success] && components[:cache][:success] ? 200 : 500
   rescue StandardError
     500
   end
@@ -76,18 +75,20 @@ class StatusController < ActionController::Base
   end
 
   #
-  # Redis DB Status
+  # Cache Status
   #
-  def redis_status
+  def cache_status
     value = SecureRandom.hex(32)
-    key = "redis-status-check-#{SecureRandom.hex(16)}"
-    Rails.cache.write key, value, expires_in: 15.seconds
-    cached_value = Rails.cache.fetch(key)
+    key = "cache-status-check-#{SecureRandom.hex(16)}"
+    cache = Rails.cache
+    write_result = cache.write(key, value, expires_in: 15.seconds)
+    cached_value = cache.read(key)
     unless value.eql?(cached_value)
-      raise "Redis not available: Expected: #{value} with key #{key}, but got #{cached_value}"
+      raise "Cache not available (#{cache.class.name}): Expected: #{value} with key #{key}, " \
+            "but got #{cached_value.inspect}; write returned #{write_result.inspect}"
     end
 
-    report_success 'Redis Available', count: 1
+    report_success 'Cache Available', count: 1
   rescue StandardError => error
     report_error(error, count: 0)
   end

data/app/helpers/svg_icon_helper.rb

@@ -3,25 +3,26 @@
 module SvgIconHelper
   # @abstract Render the appropriate icon based on the name and type
   # @return [View]
-  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2, cached: true)
+  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
     return if name.blank?
 
-    unless cached
-      return fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width,
-                            cached: false)
-    end
-
-    key = ['svg_icon', name, size.to_s, type.to_s, classes.to_s, color, stroke_width.to_s].join(':')
-    Rails.cache.fetch(key, expires_in: 15.minutes) do
-      fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width)
-    end
+    fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width)
   end
 
-  def fetch_svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2, cached: true)
+  def fetch_svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
     return if name.blank?
 
     classes = classes.compact.flatten.join(' ')
-    partial, stroke = icon_partial(name, type, color, cached: cached)
+    preferred_path = if I18n.exists?("nav.icons.#{name}")
+                       "icons/#{I18n.t("nav.icons.#{name}")}"
+                     else
+                       "icons/#{type}/#{name}"
+                     end
+    outline_path = "icons/outline/#{name}"
+    filled_path = "icons/filled/#{name}"
+    (partial, stroke) = [preferred_path, outline_path, filled_path].collect do |path|
+      [preferred_path, color] if lookup_context.exists?(path, [], true)
+    end.compact.first
     if partial.blank?
       partial = 'icons/outline/bug'
       stroke = 'red'
@@ -34,15 +35,13 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: stroke,
-            style: "color: #{stroke}",
             'stroke-width': stroke_width,
             'stroke-linecap': 'round',
             'stroke-linejoin': 'round',
             title: name) do
       render partial
     end
-  rescue StandardError => error
-    puts "Error: #{error}"
+  rescue StandardError
     tag.svg(xmlns: 'http://www.w3.org/2000/svg',
             viewBox: '0 0 24 24',
             width: size,
@@ -58,23 +57,4 @@ module SvgIconHelper
       render 'icons/outline/bug'
     end
   end
-
-  def icon_partial(name, type, color, cached:)
-    lookup = lambda do
-      preferred_path = if I18n.exists?("nav.icons.#{name}")
-                         "icons/#{I18n.t("nav.icons.#{name}")}"
-                       else
-                         "icons/#{type}/#{name}"
-                       end
-      outline_path = "icons/outline/#{name}"
-      filled_path = "icons/filled/#{name}"
-
-      [preferred_path, outline_path, filled_path].collect do |path|
-        [preferred_path, color] if lookup_context.exists?(path, [], true)
-      end.compact.first
-    end
-    return lookup.call unless cached
-
-    Rails.cache.fetch("icon_partial_path:#{name}:#{type}", expires_in: 15.minutes, &lookup)
-  end
 end

data/app/views/status/index.html.haml

@@ -31,6 +31,7 @@
                     %td
                       %h4.flow-text=key.to_s.titleize
                     %td.center
-                      = svg_icon(value[:icon_name], size: 32, color: value[:icon_color], cached: false)
+                      %svg{xmlns: 'http://www.w3.org/2000/svg', viewBox: '0 0 24 24', width: 32, height: 32, fill: 'none', stroke: value[:icon_color].to_s, style: "color: #{value[:icon_color]}", 'stroke-width': 2, 'stroke-linecap': 'round', 'stroke-linejoin': 'round', title: value[:icon_name]}
+                        = render "icons/outline/#{value[:icon_name]}"
                     %td.center.hide-on-small-only
                       %h4.flow-text.large=value[:message]

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.3.46'
+  VERSION = '3.2.3.48'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.46
+  version: 3.2.3.48
 platform: ruby
 authors:
 - Chris Schroeder