symphonia 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f034a817b0bd541952d88dc3cba25f070c3cae9f1b41b3af8bca9fde726e5619
-  data.tar.gz: 73f459bc41f83962e7d4cae3025d0b14a73d8cacf7a213b657da2c481aa287b1
+  metadata.gz: 24d7848d1bca3b518accb57564e9c07c7b4650e5a02e5bd9c3bd33fbe60c5d72
+  data.tar.gz: '078af52f5b5c5efe3fd4ac6bf2935250e25a83e98bfc842f8878413d21ec86a9'
 SHA512:
-  metadata.gz: 791777de872efd8f029e91ba45840d783b82be97e184d046f6becbef28317d2de307a75d8013f69c256fafc4f15ee93c56409135278fd5f18f5b816263644585
-  data.tar.gz: 67aceb9801e3acf318c4227d7bf41046d0a3304533493a649d80cb187369725d710aa18bd4ebdbd7c477bed5afbba64377d0b65e27b207549d2e23ad75eb3e00
+  metadata.gz: 85b194d20074685cd3f206e06be37240876fd805892180e60c38060d366efeb48b662c1296f5b277042778c997588d363224697e2c545f475dc970caae447962
+  data.tar.gz: b23fad9e94c8d44c72feb31d42666f8bbdc610d9a598830d223a8784b32a1856464596af5ac651cc44a485bd7bf0ea341c5e310d4f9e5e86451209f4bb4fbdca

data/app/helpers/symphonia/application_helper.rb

@@ -3,31 +3,27 @@ module Symphonia
 
     include FormHelper
 
-    def bootstrap_class_for(flash_type)
-      case flash_type.to_sym
-      when :notice
-        'alert-success'
-      when :error, :alert
-        'alert-danger'
-      when :warning
-        'alert-warning'
-      when :info
-        'alert-info'
-      else
-        flash_type.to_s
-      end
+    def bootstrap_flash_map
+      {
+        "notice" => { class_name: "alert-success", icon: "check-circle" },
+        "error" => { class_name: "alert-danger", icon: "circle-exclamation" },
+        "warning" => { class_name: "alert-warning", icon: "circle-exclamation" },
+        "info" => { class_name: "alert-info", icon: "info-circle" },
+      }
     end
 
     # Renders flash messages
     def render_flash_messages(flash_messages = nil)
-      s = ''
+      s = ""
       Array(flash_messages || flash).each do |type, message|
-        s << tag.div(class: "d-print-none alert #{bootstrap_class_for(type)}") do
-          tag.button('', class: 'fa fa-circle-xmark close', data: { dismiss: 'alert' }) + Array.wrap(message).collect { |m| icon(type, text: m) }.join("<br>").html_safe
+        bootstrap_flash = bootstrap_flash_map[type]
+        s << tag.div(class: "d-print-none alert #{bootstrap_flash[:class_name]} alert-dismissible fade show", role: "alert") do
+          icon(bootstrap_flash[:icon], text: message) +
+            tag.button("", class: "btn-close close", data: { "bs-dismiss" => "alert" }, "aria-label" => t(:button_close))
         end
       end
 
-      s.html_safe
+      s
     end
 
     def render_menu(menu, options = {})

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = '6.0.1'
+  VERSION = '6.0.2'
 
 end

data/spec/helpers/symphonia/application_helper_spec.rb

@@ -24,19 +24,19 @@ RSpec.describe Symphonia::ApplicationHelper do
 
   describe "#render_flash_messages" do
     it "render error" do
-      r = helper.render_flash_messages(error: "flash message")
+      r = helper.render_flash_messages("error" => "flash message")
       expect(r).to include "danger"
     end
     it "render notice" do
-      r = helper.render_flash_messages(notice: "flash message")
+      r = helper.render_flash_messages("notice" => "flash message")
       expect(r).to include "success"
     end
     it "render warning" do
-      r = helper.render_flash_messages(warning: "flash message")
+      r = helper.render_flash_messages("warning" => "flash message")
       expect(r).to include "warning"
     end
     it "render info" do
-      r = helper.render_flash_messages(info: "flash message")
+      r = helper.render_flash_messages("info" => "flash message")
       expect(r).to include "info"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement