symphonia 6.0.6 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a34cf37cfed1df365d494cafd6f213807e896f0305d031a53c7919d56d41fa
-  data.tar.gz: 46383d23222548091c11b01dda86ed1ba3ae207316b320864f0586a548b7b1bd
+  metadata.gz: f40862fbc205758764087baab8cd515b3e9d8151bd94dfd6f5b16d6749d6c08c
+  data.tar.gz: '0919daa814b36e912b01f0f1850356476c2d608e6f0d2ccec9c40748f7077fbe'
 SHA512:
-  metadata.gz: 39c6ac12189497b6b15d3baf601ae45a0c5169fd1f690a5301f11047004d67be009f7821fea7f9b11967cc0fa144ba7946954c42589d8577fbe60ee62b335b17
-  data.tar.gz: f4d5cff4e7ec2e1449b5261c65905c4193b4396c849d12a6e6bb9ce2adf6bdbd884dacf911d7fd7c23de1aa160eeb4e44c468a889d61d3778e153b0a1b682a29
+  metadata.gz: aff32cf78e520189ca9bf05c441316ca0f202e0ca5c37a115f3dda2c3b50a44583f76eeb43be7fb47fc92b429602352fa8f77df0bc5ba3315a68391d828d30a2
+  data.tar.gz: fe5d80693602fa81ac9f3b2afb0329849c12baf336ab7ac8fe3fc10a3dd2441ef3f07a248bb89225a7d19f5015dd03dd1aade020787d0a6938b6ea68d2278118

data/CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [6.1.0] - 2025-07-01
+### Changed
+- use Rails 7.2 as default
+### Removed
+- deprecations
+### Fixed
+- Rails 7.2 syntax
+
 ## [6.0.6] - 2025-01-19
 ### Removed
 - gemspec dependencies lock version

data/app/helpers/symphonia/application_helper.rb

@@ -19,7 +19,7 @@ module Symphonia
         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))
+            tag.button("", :class => "btn-close close", :data => { "bs-dismiss" => "alert" }, "aria-label" => t(:button_close))
         end
       end
 
@@ -27,13 +27,13 @@ module Symphonia
     end
 
     def render_menu(menu, options = {})
-      s = ''
+      s = ""
       Symphonia::MenuManager.menu(menu).each do |name, item|
         s << render_menu_node(name, item).to_s
       end
-      options[:container_class] ||= 'mr-auto'
+      options[:container_class] ||= "mr-auto"
 
-      tag.ul(s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      tag.ul(s.html_safe, itemscope: "", itemtype: "http://schema.org/BreadcrumbList", class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
     end
 
     def render_menu_node(menu, item, options = {})
@@ -42,13 +42,13 @@ module Symphonia
 
       selected = @menu_item.to_sym == menu
       label = case item[:label].class.name
-              when 'NilClass'
-                '&nbsp;'.html_safe
-              when 'String'
+              when "NilClass"
+                "&nbsp;".html_safe
+              when "String"
                 item[:label]
-              when 'Symbol'
+              when "Symbol"
                 t(item[:label])
-              when 'Proc'
+              when "Proc"
                 item[:label].call(controller)
               else
                 raise "MenuManager error: Label is unknown type: #{item[:label].class}"
@@ -56,14 +56,14 @@ module Symphonia
       if item[:children].blank?
         tag.li(render_menu_link(item, label, options), class: "nav-item #{menu} #{'active' if selected} #{options[:class]}", id: item[:id])
       else
-        children = ''
-        item[:children].each do |child, subitem|
-          children << render_menu_node(menu, subitem, class: 'dropdown-item').to_s
+        children = ""
+        item[:children].each_value do |subitem|
+          children << render_menu_node(menu, subitem, class: "dropdown-item").to_s
         end
         if children.present?
           tag.li(class: "nav-item dropdown #{menu}") do
-            concat render_menu_link(item.merge({ class: 'dropdown-toggle', data: { toggle: 'dropdown' } }), label, { is_submenu: true })
-            concat tag.ul(children.html_safe, class: 'dropdown-menu')
+            concat render_menu_link(item.merge({ class: "dropdown-toggle", data: { toggle: "dropdown" } }), label, { is_submenu: true })
+            concat tag.ul(children.html_safe, class: "dropdown-menu")
           end
         end
       end
@@ -71,25 +71,25 @@ module Symphonia
 
     def render_menu_link(item, label, _options = {})
       url = case item[:url].class.name
-            when 'Symbol'
-              if item[:url].to_s.include?('.')
-                endpoint, path = item[:url].to_s.split('.')
+            when "Symbol"
+              if item[:url].to_s.include?(".")
+                endpoint, path = item[:url].to_s.split(".")
                 send(endpoint).send(path)
               else
                 main_app.send item[:url]
               end
-            when 'Proc'
+            when "Proc"
               item[:url].call(self)
             else
               item[:url]
             end
       link_to(
-        (tag.i('', class: "#{item[:icon]}") + "\n" + tag.span(label, itemprop: 'title')).html_safe,
+        "#{tag.i('', class: item[:icon].to_s)}\n#{tag.span(label, itemprop: 'title')}".html_safe,
         url,
         class: "nav-link #{item[:class]}",
         data: item[:data],
         method: item[:method],
-        itemprop: 'url'
+        itemprop: "url"
       )
     end
 
@@ -97,7 +97,7 @@ module Symphonia
       if args.empty?
         title = @html_title || []
         title << t(:meta_title)
-        title.reject(&:blank?).join(' — ')
+        title.compact_blank.join(" — ")
       else
         @html_title ||= []
         @html_title += args
@@ -118,27 +118,27 @@ module Symphonia
     def title(*args, &block)
       options = args.extract_options!
       header = args.shift
-      small = args.shift || ''
+      small = args.shift || ""
       header_text = if header.is_a?(Symbol)
                       t(header, default: header.to_s.humanize)
                     else
                       header.to_s.dup
                     end
       if @symphonia_modal_dialog
-        ActiveSupport::Deprecation.warn "@symphonia_modal_dialog is no used anymore !"
+        ActiveSupport::Deprecation.new.warn "@symphonia_modal_dialog is no used anymore !"
         @symphonia_modal_dialog.title ||= header_text
-        ''
+        ""
       else
         html_title(header_text.dup)
-        header_text << ("\n" << tag.small(small, class: 'text-muted')) if small.present?
-        s = ''
+        header_text << ("\n" << tag.small(small, class: "text-muted")) if small.present?
+        s = ""
         if options[:back] && !request.xhr?
           back_url = options[:back] unless options[:back].is_a? TrueClass
           s << link_to_back(back_url)
         end
         s << capture(&block).to_s if block_given?
         header_class = (s.present? && "col-6") || nil
-        header_tag = content_tag(((request.xhr? && :h5) || :h1), id: 'page_header', class: header_class) do
+        header_tag = content_tag((request.xhr? && :h5) || :h1, id: "page_header", class: header_class) do
           header_text.html_safe
         end
         return header_tag if s.blank?
@@ -149,16 +149,16 @@ module Symphonia
       end
     end
 
-    alias_method :page_header, :title
+    alias page_header title
 
     def render_no_data(message = nil)
-      tag.div(icon("circle-info", text: message || t(:text_no_data)), class: 'alert alert-info text-center nodata')
+      tag.div(icon("circle-info", text: message || t(:text_no_data)), class: "alert alert-info text-center nodata")
     end
 
-    def content_for(name, content = nil, &block)
+    def content_for(name, content = nil, &)
       @has_content ||= {}
       @has_content[name] = true
-      super(name, content, &block)
+      super
     end
 
     def has_content?(name)
@@ -166,14 +166,14 @@ module Symphonia
     end
 
     def format_text(text, _options = {})
-      return '' if text.nil?
+      return "" if text.nil?
 
       markdown = RDiscount.new(text, :smart, :filter_html)
       markdown.to_html.html_safe
     end
 
     def format_html(text)
-      tag.div((defined?(Ckeditor) ? text.html_safe : format_text(text)), class: 'formatted-text')
+      tag.div((defined?(Ckeditor) ? text.html_safe : format_text(text)), class: "formatted-text")
     end
 
     def format_price(value, options = {})
@@ -181,46 +181,45 @@ module Symphonia
     end
 
     def multiselect_toggler(id = nil)
-      link_to(icon('plus'), 'javascript:void(0);', onclick: "toggleMultiSelect(#{id || 'this'});return false", class: 'btn fa fa-border')
+      link_to(icon("plus"), "javascript:void(0);", onclick: "toggleMultiSelect(#{id || 'this'});return false", class: "btn fa fa-border")
     end
 
     def link_to_back(url = nil)
-      link_to(icon(:back, t(:button_back)), (params[:back_url] || url || :back), class: 'btn btn-link back')
+      link_to(icon(:back, t(:button_back)), params[:back_url] || url || :back, class: "btn btn-link back")
     end
 
     def link_to_new_entity(options = {})
-      anchor = options.has_key?(:anchor) ? options.delete(:anchor) : 'page_header'
+      anchor = options.key?(:anchor) ? options.delete(:anchor) : "page_header"
       label = options.delete(:label) || t("label_#{controller_name.singularize}_new")
       model = controller.try(:model) || controller_name.singularize
       url = options.delete(:url) || new_polymorphic_path(model, anchor: anchor)
 
-      link_to(icon('square-plus', text: label), url, { class: 'btn btn-primary' }.merge(options))
+      link_to(icon("square-plus", text: label), url, { class: "btn btn-primary" }.merge(options))
     end
 
     # change the default link renderer for will_paginate
     def will_paginate(collection_or_options = nil, options = {})
       if collection_or_options.is_a? Hash
-        options, collection_or_options = collection_or_options, nil
+        options = collection_or_options
+        collection_or_options = nil
       end
       unless options[:renderer]
         options = options.merge renderer: Symphonia::BootstrapLinkRender
       end
       options[:query] ||= @query if @query
-      super *[collection_or_options, options].compact
+      super(*[collection_or_options, options].compact)
     end
 
     def ckeditor_for(field_id, options = {})
-      return '' unless !!defined?(Ckeditor)
+      return "" if defined?(Ckeditor).nil?
 
       inline = options.delete(:inline)
-      opts = options.inject({}) do |mem, var|
+      opts = options.each_with_object({}) do |var, mem|
         key = var[0].to_s.camelcase(:lower)
         key[0].downcase!
         mem[key] = var[1]
-
-        mem
       end
-      opts['toolbar'] ||= 'Basic'
+      opts["toolbar"] ||= "Basic"
       # opts['customConfig'] ||= 'Basic'
       js = if inline
              "CKEDITOR.inline('#{field_id}', {toolbar: 'Basic'});"
@@ -242,24 +241,19 @@ module Symphonia
       end
 
       text_content = if text
-                       tag.span(text, class: 'd-none d-sm-inline')
+                       tag.span(text, class: "d-none d-sm-inline")
                      elsif html_options[:text]
                        html_options.delete(:text)
                      end
       html_options[:title] ||= text
       html_options[:class] = "fa-solid fa-#{icon}"
-      html_options['aria-hidden'] ||= true
+      html_options["aria-hidden"] ||= true
 
       html = tag.i(nil, **html_options)
-      html << ' ' << text_content.to_s if text_content.present?
+      html << " " << text_content.to_s if text_content.present?
       html
     end
 
-    def fa_icon(fa, options = {})
-      ActiveSupport::Deprecation.warn "use `icon` instead"
-      icon(fa, options.delete(:text), options)
-    end
-
     # Render original template from engine
     #   Useful for override part of engine view
     #
@@ -277,23 +271,23 @@ module Symphonia
       render template: template
     end
 
-    def render_symphonia_dialog(*args, &block)
-      ActiveSupport::Deprecation.warn "Use `render_modal` instead"
+    def render_symphonia_dialog(*args)
+      ActiveSupport::Deprecation.new.warn "Use `render_modal` instead"
       options = args.extract_options!
       title = options[:title] || args.shift # first arg possible `title`
       body = args.shift
       options[:form_disabled] = true
       size = options.delete(:size)
-      size ||= '90%' if options.delete(:large)
-      if size.to_s.match(%r(^\d+$))
-        size = size.to_s + '%'
+      size ||= "90%" if options.delete(:large)
+      if size.to_s.match(/^\d+$/)
+        size = "#{size}%"
       end
       @symphonia_modal_dialog = SymphoniaModalDialog.new(self, options)
       @symphonia_modal_dialog.size = size
       if block_given?
         yield @symphonia_modal_dialog
-      else
-        raise ArgumentError if body.nil?
+      elsif body.nil?
+        raise ArgumentError
       end
       @symphonia_modal_dialog.title ||= title
       if @symphonia_modal_dialog.body.blank?
@@ -308,7 +302,7 @@ module Symphonia
       if options[:render_only]
         html
       else
-        js = %Q(
+        js = %(
         $('##{@symphonia_modal_dialog.modal_id}').modal('hide').remove();
         $('body').append('#{j html}');
         showModal('##{@symphonia_modal_dialog.modal_id}');
@@ -332,16 +326,14 @@ module Symphonia
     # end
 
     class SymphoniaModalDialog
-
-      attr_writer :title, :body, :footer
-      attr_reader :modal_id, :title
-
-      attr_accessor :size
+      attr_writer :body, :footer
+      attr_accessor :title, :size
+      attr_reader :modal_id
 
       def initialize(controller, options = {})
         @c = controller
         @title = options.delete(:title)
-        @modal_id = options.delete(:id) || 'modal-dialog'
+        @modal_id = options.delete(:id) || "modal-dialog"
         @form_options = options.delete(:form_options) || {}
         @options = options
       end
@@ -350,47 +342,47 @@ module Symphonia
 
       def to_html
         html = "<div id='#{@modal_id}' style='' class='modal fade' role='dialog'><div class='modal-dialog #{'modal-lg' if size.present?}'><div class='modal-content'>"
-        html << @c.tag.div(class: 'modal-header') do
-          @c.tag.button('', class: 'close fa fa-times', data: { dismiss: 'modal' }, 'aria-hidden' => true) + @c.tag.h4(@title, class: 'modal-title') + @header.to_s
+        html << @c.tag.div(class: "modal-header") do
+          @c.tag.button("", :class => "close fa fa-times", :data => { dismiss: "modal" }, "aria-hidden" => true) + @c.tag.h4(@title, class: "modal-title") + @header.to_s
         end
-        content = @c.tag.div(@c.tag.div(body.html_safe, class: 'modal-content-inner-container container-fluid'), class: 'modal-body')
-        content << @c.tag.div(footer.html_safe, class: 'modal-footer')
+        content = @c.tag.div(@c.tag.div(body.html_safe, class: "modal-content-inner-container container-fluid"), class: "modal-body")
+        content << @c.tag.div(footer.html_safe, class: "modal-footer")
 
         html << content.html_safe
-        html << '</div></div></div>'
+        html << "</div></div></div>"
         html.html_safe
       end
 
-      def header(&block)
-        if block_given?
-          @header = @c.capture(&block)
-        else
-          @header = (@header.is_a?(Proc) ? @header.call.to_s : @header.to_s)
-        end
+      def header(&)
+        @header = if block_given?
+                    @c.capture(&)
+                  else
+                    (@header.is_a?(Proc) ? @header.call.to_s : @header.to_s)
+                  end
       end
 
-      def body(&block)
-        if block_given?
-          @body = @c.capture(&block)
-        else
-          @body = (@body.is_a?(Proc) ? @body.call.to_s : @body.to_s)
-        end
+      def body(&)
+        @body = if block_given?
+                  @c.capture(&)
+                else
+                  (@body.is_a?(Proc) ? @body.call.to_s : @body.to_s)
+                end
       end
 
-      def footer(&block)
-        if block_given?
-          @footer = @c.capture(&block)
-        else
-          @footer = (@footer.is_a?(Proc) ? @footer.call.to_s : @footer.to_s)
-        end
+      def footer(&)
+        @footer = if block_given?
+                    @c.capture(&)
+                  else
+                    (@footer.is_a?(Proc) ? @footer.call.to_s : @footer.to_s)
+                  end
       end
 
       def submit(name = nil, options = {})
         name ||= @c.t(:button_save)
-        @footer = footer.to_s + @c.link_to(name, 'javascript:void(0)', { onclick: "$('##{@modal_id}').find('form').submit()", class: 'btn btn-primary' }.merge(options)).html_safe
+        @footer = footer.to_s + @c.link_to(name, "javascript:void(0)", { onclick: "$('##{@modal_id}').find('form').submit()", class: "btn btn-primary" }.merge(options)).html_safe
       end
 
     end
+
   end
 end
-

data/app/models/symphonia/user.rb

@@ -6,7 +6,7 @@ module Symphonia
 
     register_query do
       add_attribute :login, :link
-      add_attribute :name, :link, sort: %i(first_name last_name), default: true
+      add_attribute :name, :link, sort: %i[first_name last_name], default: true
       add_attribute :first_name
       add_attribute :last_name
       add_attribute :email, :mail, default: true

data/app/views/symphonia/accounts/_detail.html.erb

@@ -1,4 +1,4 @@
-<%= ActiveSupport::Deprecation.warn "View 'accounts/_detail' partial should not use anymore" %>
+<%= ActiveSupport::Deprecation.new.warn "View 'accounts/_detail' partial should not use anymore" %>
 <div class="buttons contextual">
   <% if Symphonia::User.current.admin? %>
     <% controller = account.class.name.underscore.pluralize %>

data/lib/symphonia/model_attributes/attribute.rb

@@ -2,7 +2,6 @@ module Symphonia
   module ModelAttributes
 
     class Attribute
-
       attr_reader :name, :options, :format_options, :sort_column
       attr_accessor :filter
 
@@ -39,10 +38,10 @@ module Symphonia
           @sort = false
         when Symbol, Array
           sort = Array(sort_options).collect { |i| t[i] }
-          asc_desc = { asc: sort.map { |i| i.asc.to_sql }.join(','), desc: sort.map { |i| i.desc.to_sql }.join(',') }
+          asc_desc = { asc: sort.map { |i| i.asc.to_sql }.join(","), desc: sort.map { |i| i.desc.to_sql }.join(",") }
           @sort_column = SortableTable::SortColumnCustomDefinition.new(@name, asc_desc)
         when String
-          asc_desc = { asc: sort_options + ' ASC', desc: sort_options + ' DESC' }
+          asc_desc = { asc: "#{sort_options} ASC", desc: "#{sort_options} DESC" }
           @sort_column = SortableTable::SortColumnCustomDefinition.new(@name, asc_desc)
         else
           raise "Undefined `sort_options` type: #{sort_options.class.name}"
@@ -61,9 +60,7 @@ module Symphonia
         !!@options[:default]
       end
 
-      def required?
-
-      end
+      def required?; end
 
       def input_field
         :text_field
@@ -81,7 +78,6 @@ module Symphonia
 
     end
 
-
     class TextAttribute < Attribute
 
       def format_value(view, value, _entity)
@@ -143,7 +139,6 @@ module Symphonia
         else
           super
         end
-
       end
 
       def format_value(view, value, _entity)
@@ -164,9 +159,9 @@ module Symphonia
 
       def format_value(view, value, _entity)
         if value.to_s == "true"
-          view.icon('true', view.t(:true))
+          view.icon("true", view.t(true))
         else
-          view.icon('false', view.t(:false))
+          view.icon("false", view.t(false))
         end
       end
 

data/lib/symphonia/model_filters/base.rb

@@ -8,7 +8,7 @@ module Symphonia
       # @param [Hash] options
       def initialize(attribute, query, options = {})
         if attribute.is_a? String
-          ActiveSupport::Deprecation.warn("name as argument is no longer supported - use Attribute")
+          ActiveSupport::Deprecation.new.warn("name as argument is no longer supported - use Attribute")
           @name = attribute
         else
           @name = attribute.name

data/lib/symphonia/model_filters/select_filter.rb

@@ -45,7 +45,7 @@ module Symphonia
             context.select_tag("#{form_field_name}[]", context.options_for_select(available_values, selected),
                                class: 'form-control', include_blank: true, multiple: selected.size > 1) +
             context.content_tag(:div,
-                                context.link_to(context.fa_icon('plus-square-o'), 'javascript:void(0)', onclick: "toggleMultiSelect($(this).closest('.input-group').find('select'))", title: I18n.t(:title_toggle_multiselect), class: "input-group-text"), class: 'input-group-append')
+                                context.link_to(context.icon('plus-square-o'), 'javascript:void(0)', onclick: "toggleMultiSelect($(this).closest('.input-group').find('select'))", title: I18n.t(:title_toggle_multiselect), class: "input-group-text"), class: 'input-group-append')
         end
       end
 

data/lib/symphonia/query.rb

@@ -18,13 +18,13 @@ module Symphonia
     # @param [nil, Array] columns
     def initialize(c = nil, sort: "", filters: {}, columns: nil, **options)
       if c
-        ActiveSupport::Deprecation.warn("initialize allow only hash. #{c} - update your controller:")
+        raise("initialize allow only hash. #{c} - update your controller:")
         #
         # model.query.new sort: "default sort", filters: {default: filter}, columns: [columns, names]
         # @query.from_params params
         #
       end
-      ActiveSupport::Deprecation.warn("default_order is deprecated, use just `sort`") if options[:default_order]
+      raise("default_order is deprecated, use just `sort`") if options[:default_order]
       @active_filters = {}
       @default_sort = sort
       @default_filters = filters

data/lib/symphonia/user_management.rb

@@ -5,7 +5,7 @@ module Symphonia
 
     included do
 
-      enum status: { active: 1, pending: 5, archived: 9 }
+      enum :status, { active: 1, pending: 5, archived: 9 }
 
       scope :sorted, -> { order(:first_name, :last_name) }
 

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = "6.0.6"
+  VERSION = "6.1.0"
 
 end

data/spec/models/query/symphonia_query_spec.rb

@@ -28,10 +28,6 @@ RSpec.describe Symphonia::Query do
       expect(filter.value).to eq "cip"
     end
 
-    it "legacy fallback" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).twice
-      described_class.new(spy("Controller"), default_order: "cip")
-    end
   end
 
   describe "#from_params" do

data/spec/support/query.rb

@@ -24,7 +24,7 @@ class DummyQueryEntity
   end
 
   register_query do
-    add_attribute :name, :link, sort: %i[first_name last_name], default: true, filter: "string"
+    add_attribute :name, :link, sort: "first_name ASC, last_name DESC", default: true, filter: "string"
     add_attribute :status, :enum, default: true, filter: "select"
     add_attribute :author, sort: false, default: true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-19 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -396,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: My administration