ui_bibz 3.0.0.beta16 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa18823b220fe50b0aab6b3b25e06d184bc514266edaf8a24e47345e8816001
-  data.tar.gz: c189f21d3f6ad9943f8fc9ce303eb9578d1159366a7fc3340d9a5fed8205d9ad
+  metadata.gz: '08901c79a02f3cdf155c8ebaaabbbeb51ca9f1c288683c9ed7a011f9fd0db79b'
+  data.tar.gz: a6775b311c69081ceaa310231e8a75c1734ee2e5137995dc14a667a88f77555f
 SHA512:
-  metadata.gz: 53ef82ec6ccc0bd9f4036887402fef838f6e206d2ce59282fd3b9571eaa1b960767607e99286bb515e95d801c8c8a4c4f7750c219096bed99b49ccd55cabc37c
-  data.tar.gz: 7e4f7f43e3fb0e1830eafc73b35c6901184586973db3d5964b06de5e27503edbee78d945f8203104effc617c3a4b0263a8903fd5d7cc0193a83a4e6c626b22ea
+  metadata.gz: b0ea16797c341c948a1d249a72e9707368fce3b8547ece6cbde40a5c29932e0871a78247d2e28ef22b74b392eb89913b5e30c73bb0535dd1b6bc79b537cc7a88
+  data.tar.gz: d79f28d50fd11585ec2f798a49a151c9422e240d9573f4ae52502eb13f22a7f4d2a15054e50174e6b41ba629ca663f05336a7c64692c9821c68bff82f73ba020

data/.rubocop.yml

@@ -8,7 +8,6 @@ Layout/LineLength:
   Enabled: false
 
 AllCops:
-  TargetRubyVersion: 2.7
   NewCops: enable
 
 Lint/UselessAssignment:

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.1
+ruby-3.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta16)
+    ui_bibz (3.0.0)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -9,69 +9,73 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.5)
-      actionpack (= 6.0.3.5)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionmailbox (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      actionview (= 6.0.3.5)
-      activejob (= 6.0.3.5)
+    actionmailer (6.1.4)
+      actionpack (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activesupport (= 6.1.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.5)
-      actionview (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actiontext (6.1.4)
+      actionpack (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activerecord (6.0.3.5)
-      activemodel (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activestorage (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.5)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activestorage (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activesupport (= 6.1.4)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
     awesome_print (1.9.2)
     builder (3.2.4)
     byebug (11.1.3)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.8)
+    childprocess (4.1.0)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    docile (1.3.5)
+    docile (1.4.0)
     erubi (1.10.0)
     erubis (2.7.0)
     factory_bot (4.11.1)
@@ -95,93 +99,92 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    loofah (2.9.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.1)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    overcommit (0.57.0)
+    overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
+      rexml (~> 3.2)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.5)
-      actioncable (= 6.0.3.5)
-      actionmailbox (= 6.0.3.5)
-      actionmailer (= 6.0.3.5)
-      actionpack (= 6.0.3.5)
-      actiontext (= 6.0.3.5)
-      actionview (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activemodel (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.5)
+    rails (6.1.4)
+      actioncable (= 6.1.4)
+      actionmailbox (= 6.1.4)
+      actionmailer (= 6.1.4)
+      actionpack (= 6.1.4)
+      actiontext (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activemodel (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
-    rubocop (1.11.0)
+    rexml (3.2.5)
+    rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.3)
-      rubocop (>= 0.87, < 2.0)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.14.0)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.11.4)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.11.3)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
+      rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.2)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
@@ -190,7 +193,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -201,12 +204,11 @@ GEM
     sqlite3 (1.4.2)
     temple (0.8.2)
     thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will-paginate-i18n (0.1.15)
@@ -227,7 +229,7 @@ DEPENDENCIES
   jquery-rails (>= 3.1.0)
   minitest
   overcommit
-  rails (~> 6.0.3, >= 6.0.3.2)
+  rails (~> 6.1.3, >= 6.1.3.2)
   rubocop
   rubocop-ast
   rubocop-minitest
@@ -240,4 +242,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.21

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -16,7 +16,7 @@ module UiBibz::Concerns::Models::Searchable
 
     def self.generate_parameters
       {
-        controller: @params[:controller],
+        controller: @arguments[:controller] || @params[:controller],
         param_id: @params[:id],
         params: @params,
         direction: @params[:direction],
@@ -37,11 +37,13 @@ module UiBibz::Concerns::Models::Searchable
 
     # If there is more one table in html page
     def self.initialize_params
+      @tmp_params = { per_page: @arguments[:per_page] }
+
       return unless good_store_id?
 
       @tmp_params = {
         search: @params[:search],
-        per_page: @params[:per_page],
+        per_page: @params[:per_page] || @arguments[:per_page],
         page: new_search? ? nil : @params[:page],
         sort: @params[:sort],
         direction: @params[:direction]
@@ -119,18 +121,18 @@ module UiBibz::Concerns::Models::Searchable
           if attribute.is_a?(Hash)
             if attribute == :as
               attribute.each_value do |value|
-                sql_subquery << "lower(#{value}) LIKE :#{value}_#{i}"
+                sql_subquery << "lower(CAST(#{value} AS TEXT)) LIKE :#{value}_#{i}"
                 sql_attributes = sql_attributes.merge({ "#{value}_#{i}".to_sym => "%#{pattern}%" })
               end
             else
               key_name = attribute.keys.first.to_s.pluralize
               attribute.each_value do |value|
-                sql_subquery << "lower(#{key_name}.#{value}) LIKE :#{key_name}_#{value}_#{i}"
+                sql_subquery << "lower(CAST(#{key_name}.#{value} AS TEXT)) LIKE :#{key_name}_#{value}_#{i}"
                 sql_attributes = sql_attributes.merge({ "#{key_name}_#{value}_#{i}".to_sym => "%#{pattern}%" })
               end
             end
           else
-            sql_subquery << "lower(#{to_s.underscore.pluralize.split('/').last}.#{attribute}) LIKE :#{attribute}_#{i}"
+            sql_subquery << "lower(CAST(#{to_s.underscore.pluralize.split('/').last}.#{attribute} AS TEXT)) LIKE :#{attribute}_#{i}"
             sql_attributes = sql_attributes.merge({ "#{attribute}_#{i}".to_sym => "%#{pattern}%" })
           end
         end

data/lib/ui_bibz/infos.rb

@@ -3,15 +3,15 @@
 module UiBibz
   NAME                = 'Ui Bibz'
   SLUG                = 'ui_bibz'
-  BOOTSTRAP_VERSION   = '5.0.0.beta2'
+  BOOTSTRAP_VERSION   = '5.0.2'
   DESCRIPTION         = "A Rails Interface Framework using Bootstrap #{BOOTSTRAP_VERSION}."
   SUMMARY             = "Ui Bibz is an Ui Framework that allows you to build an interface very quickly and simply using Bootstrap #{BOOTSTRAP_VERSION}."
   LICENSE             = 'MIT'
-  FONTAWESOME_VERSION = '5.15.2'
+  FONTAWESOME_VERSION = '5.15.3'
   HOMEPAGE            = 'https://hummel.link/ui-bibz/'
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta16'
+  VERSION             = '3.0.0'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder.rb

@@ -20,7 +20,7 @@ module UiBibzForm
       required       = surround_field.required_fields.any?(true)
       wrapper_classes = UiBibz::Utils::Screwdriver.join_classes(('has-error' if errors_text.present?), wrapper_html.try(:[], :class))
       label_classes = UiBibz::Utils::Screwdriver.join_classes(('required' if required), 'control-label')
-      abbr_html     = content_tag('abbr', I18n.t(:"simple_form.required.mark", default: '*'), title: I18n.t(:"simple_form.required.text", default: 'required')) if required
+      abbr_html     = content_tag('abbr', I18n.t(:'simple_form.required.mark', default: '*'), title: I18n.t(:'simple_form.required.text', default: 'required')) if required
 
       wrapper_html[:class] = wrapper_classes
 

data/lib/ui_bibz/inputs/ui_bibz_inputs/collection_input.rb

@@ -60,14 +60,12 @@ module UiBibzInputs
     end
 
     def collection
-      @collection ||= begin
-        if options[:grouped]
-          grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
-        else
-          collection = options.delete(:collection) || self.class.boolean_collection
-          collection.respond_to?(:call) ? collection.call : collection.to_a
-        end
-      end
+      @collection ||= if options[:grouped]
+                        grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
+                      else
+                        collection = options.delete(:collection) || self.class.boolean_collection
+                        collection.respond_to?(:call) ? collection.call : collection.to_a
+                      end
     end
 
     def group_method

data/lib/ui_bibz/ui/concerns/notification_concern.rb

@@ -5,9 +5,9 @@ module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
 
   included do
     def data_attributes
-      self.class.const_get('DATA_ATTRIBUTES').map do |data_attribute|
+      self.class.const_get('DATA_ATTRIBUTES').filter_map do |data_attribute|
         options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
-      end.compact.reduce(&:merge) || {}
+      end.reduce(&:merge) || {}
     end
   end
 end

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Boxes::Components
     # Render html tag
     def pre_render
       if options[:collapse]
-        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], "data-bs-parent": "##{options[:parent_collapse]}" do
+        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], 'data-bs-parent': "##{options[:parent_collapse]}" do
           content_tag :div, @items.join.html_safe, html_options
         end
       else

data/lib/ui_bibz/ui/core/forms/buttons/button.rb

@@ -83,10 +83,10 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-bs-toggle": :collapse,
-        "data-bs-target": "##{options[:collapse]}",
-        "aria-controls": options[:collapse],
-        "aria-expanded": options[:expand_collapse].nil? ? false : options[:expand_collapse]
+        'data-bs-toggle': :collapse,
+        'data-bs-target': "##{options[:collapse]}",
+        'aria-controls': options[:collapse],
+        'aria-expanded': options[:expand_collapse].nil? ? false : options[:expand_collapse]
       }
     end
 

data/lib/ui_bibz/ui/core/forms/buttons/button_link.rb

@@ -78,9 +78,9 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-bs-toggle": :collapse,
-        "aria-controls": options[:collapse],
-        "aria-expanded": options[:expand_collaspe].nil? ? false : options[:expand_collaspe]
+        'data-bs-toggle': :collapse,
+        'aria-controls': options[:collapse],
+        'aria-expanded': options[:expand_collaspe].nil? ? false : options[:expand_collaspe]
       }
     end
   end

data/lib/ui_bibz/ui/core/forms/choices/choice_group.rb

@@ -94,7 +94,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def component_html_data
       super
-      add_html_data 'toggle', value: 'buttons'
+      add_html_data 'toggle', value: 'buttons' if @options[:form].nil?
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb

@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Forms::Numbers
         sf.text_field formula_field_name, nil, text_field_formula_html_options
         sf.addon '=', class: 'formula-field-sign'
         sf.text_field content, nil, text_field_input_html_options
-        sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { "bs-toggle": 'tooltip' } }
+        sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { 'bs-toggle': 'tooltip' } }
         sf.addon @options[:prepend] unless @options[:prepend].nil?
       end.render
     end
@@ -86,7 +86,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def content_formula_name
-      content.to_s.split('').count { |i| i == ']' }.positive? ? content.to_s.gsub(/]$/, '_formula]') : "#{content}_formula"
+      content.to_s.chars.count { |i| i == ']' }.positive? ? content.to_s.gsub(/]$/, '_formula]') : "#{content}_formula"
     end
 
     def state

data/lib/ui_bibz/ui/core/forms/numbers/slider_header.rb

@@ -53,14 +53,14 @@ module UiBibz::Ui::Core::Forms::Numbers
     def header_min
       content_tag :div, class: 'slider-header-min' do
         concat content_tag :label, options[:label_min] || 'Min: ', for: options[:label_for_min]
-        concat content_tag :span, options[:thumb_min], "data-unit": options[:unit] || options[:unit_min]
+        concat content_tag :span, options[:thumb_min], 'data-unit': options[:unit] || options[:unit_min]
       end
     end
 
     def header_max
       content_tag :div, class: 'slider-header-max' do
         concat content_tag :label, options[:label_max] || 'Max: ', for: options[:label_for_max]
-        concat content_tag :span, options[:thumb_max], "data-unit": options[:unit] || options[:unit_max]
+        concat content_tag :span, options[:thumb_max], 'data-unit': options[:unit] || options[:unit_max]
       end
     end
 

data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb

@@ -116,7 +116,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     def dropdown_select_field(content = nil, options = nil, html_options = nil, &block)
-      html_options = (html_options || {}).merge("data-wrapper-classes": 'input-group-btn')
+      html_options = (html_options || {}).merge('data-wrapper-classes': 'input-group-btn')
       @items << UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &block).render
     end
 

data/lib/ui_bibz/ui/core/navigations/breadcrumb.rb

@@ -93,7 +93,7 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def component_html_options
-      super.merge({ "arial-label": 'breadcrumb' })
+      super.merge({ 'arial-label': 'breadcrumb' })
     end
 
     def model_name

data/lib/ui_bibz/ui/core/navigations/components/breadcrumb_link.rb

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Navigations::Components
     private
 
     def component_html_options
-      super.merge(options[:current] ? { "aria-current": 'page' } : {})
+      super.merge(options[:current] ? { 'aria-current': 'page' } : {})
     end
 
     def component_html_classes

data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb

@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Navigations
       when 'nav-tabs'
         html_tag_base
       when 'list-group'
-        html_tag_base.merge("aria-controls": sanitize_text(content).parameterize)
+        html_tag_base.merge('aria-controls': sanitize_text(content).parameterize)
       else
         {}
       end.merge(options[:a_html] || {})

data/lib/ui_bibz/ui/core/navigations/link.rb

@@ -58,7 +58,7 @@ module UiBibz::Ui::Core::Navigations
     def collapse
       {
         role: 'button',
-        data: { "bs-toggle": :collapse },
+        data: { 'bs-toggle': :collapse },
         aria: {
           controls: options[:collapse],
           expanded: options[:active_collapse].nil? ? false : options[:active_collapse]

data/lib/ui_bibz/ui/core/navigations/navbar.rb

@@ -159,7 +159,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def navbar_toggle_button_html
-      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { "bs-toggle": 'collapse', "bs-target": "##{id}" }
+      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { 'bs-toggle': 'collapse', 'bs-target': "##{id}" }
     end
 
     def expand_size

data/lib/ui_bibz/ui/core/notifications/components/bar.rb

@@ -56,7 +56,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def component_html_options
-      { "aria-valuenow": value, "aria-valuemin": min, "aria-valuemax": max, style: "width: #{value}%", role: 'progressbar' }
+      { 'aria-valuenow': value, 'aria-valuemin': min, 'aria-valuemax': max, style: "width: #{value}%", role: 'progressbar' }
     end
 
     def striped

data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def close_button
-      content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-bs-dismiss": 'toast', "aria-label": 'Close'
+      content_tag :button, '', class: 'ml-2 mb-1 btn-close', 'data-bs-dismiss': 'toast', 'aria-label': 'Close'
     end
 
     def component_html_classes

data/lib/ui_bibz/ui/core/notifications/toast.rb

@@ -76,17 +76,33 @@ module UiBibz::Ui::Core::Notifications
 
     # Add Body which is a component
     def body(content = nil, options = nil, html_options = nil, &block)
-      @body = UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+      @body = if @header.nil?
+                content_tag :div, class: 'd-flex' do
+                  concat UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+                  concat close_html if (options || {})[:closable]
+                end
+              else
+                UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+              end
     end
 
     private
 
+    def only_body_html
+      @body = UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+    end
+
+    def close_html
+      content_tag :button, '', type: 'button', class: close_button_classes,
+                               'data-bs-dismiss' => 'toast', 'aria-label' => 'Close'
+    end
+
     def component_html_classes
-      super << ['toast', status, white_text_color]
+      super << ['toast', status, white_text_color, align_items_center]
     end
 
     def component_html_options
-      { role: 'alert', "aria-live": 'assertive', "aria-atomic": true }
+      { role: 'alert', 'aria-live': 'assertive', 'aria-atomic': true }
     end
 
     def component_html_data
@@ -98,10 +114,24 @@ module UiBibz::Ui::Core::Notifications
       "bg-#{options[:status]}" if options[:status]
     end
 
+    def align_items_center
+      'align-items-center' if @header.nil?
+    end
+
     def white_text_color
       return if options[:status].nil?
 
       'text-white' unless %i[info warning info light].include?(options[:status])
     end
+
+    def white_btn_color
+      return if options[:status].nil?
+
+      'btn-close-white' unless %i[info warning info light].include?(options[:status])
+    end
+
+    def close_button_classes
+      UiBibz::Utils::Screwdriver.join_classes('btn-close', 'me-2', 'm-auto', white_btn_color)
+    end
   end
 end

data/lib/ui_bibz/ui/ux/tables/components/actions.rb

@@ -52,7 +52,7 @@ module UiBibz::Ui::Ux::Tables
     def defaults_actions
       [
         UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
-        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.controller, action: 'edit', id: :id }, glyph: 'edit').render,
         UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete } } }).render
       ]
     end

data/lib/ui_bibz/ui/ux/tables/components/store.rb

@@ -57,7 +57,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def columns
-      @columns ||= Columns.new(model.new.attributes.keys.map { |record| Column.new(record, { name: record.humanize }) })
+      @columns ||= Columns.new(model.attribute_names.map { |attribute_name| Column.new(attribute_name, { name: attribute_name.humanize }) })
     end
 
     attr_reader :model

data/lib/ui_bibz/ui/ux/tables/table.rb

@@ -172,12 +172,16 @@ module UiBibz::Ui::Ux::Tables
 
     # Maybe create a class for td_content
     def td_content(record, col)
-      content = col.count ? record.send(col.data_index).count : record.send(col.data_index)
+      begin
+        content = col.count ? record.send(col.data_index).count : record.send(col.data_index)
+      rescue StandardError
+        content = nil
+      end
       unless content.nil?
         content = content.strftime(col.date_format)                    unless col.date_format.nil?
         content = link_to content, action.inject_url(col.link, record) unless col.link.nil?
-        content = col.format.call(@store.records, record)              unless col.format.nil?
       end
+      content = col.format.call(@store.records, record)              unless col.format.nil?
       content = As.new(col, record, content, @options).render unless col.as.nil?
       content
     end

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -42,6 +42,7 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, html_options do
         concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-text')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
+        concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
         concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
         concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-text')
       end

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -37,9 +37,9 @@ module UiBibz::Utils
       if opts.is_a?(Hash)
         @position = opts[:position]
 
-        opts.map do |k, v|
+        opts.filter_map do |k, v|
           send(k, size, v) if POSITIONING.include?(k.to_sym)
-        end.compact.join(' ')
+        end.join(' ')
       else
         send('num', size, opts)
       end

data/lib/ui_bibz/utils/screwdriver.rb

@@ -7,7 +7,7 @@ module UiBibz::Utils
 
     class << self
       def join_classes(*classes)
-        klasses = Array(classes).flatten.map(&:to_s).compact.uniq.reject(&:blank?)
+        klasses = Array(classes).flatten.filter_map(&:to_s).uniq.reject(&:blank?)
         klasses.empty? ? nil : klasses
       end
 

data/test/simple_form_test.rb

@@ -256,7 +256,7 @@ test1</textarea></div></form>"
       end
     end
 
-    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><div class=\"form-check\"><input type=\"checkbox\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_checkbox_field optional form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"user_name_fr\">Name Fr</label></div></div></div></form>"
+    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div class=\"btn-group button-choice btn-group-toggle\"><div class=\"form-check\"><input type=\"checkbox\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_checkbox_field optional form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"user_name_fr\">Name Fr</label></div></div></div></form>"
 
     assert_equal expected, actual
   end

data/test/ui/core/notifications/toast_test.rb

@@ -9,7 +9,7 @@ class ToastTest < ActionView::TestCase
       t.header 'My header toast', glyph: 'eye', time: 'Now', class: 'my-header-toast'
       t.body 'My body toast', class: 'my-body-toast'
     end
-    expected = "<div data-bs-autohide=\"true\" class=\"my-toast toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"my-header-toast toast-header\"><i class=\"me-2 glyph fas fa-eye\"></i><strong class=\"me-auto\">My header toast</strong><small class=\"text-muted\">Now</small><button class=\"ml-2 mb-1 btn-close\" data-bs-dismiss=\"toast\" aria-label=\"Close\"></button></div><div class=\"my-body-toast toast-body\">My body toast</div></div>"
+    expected = "<div data-bs-autohide=\"true\" class=\"my-toast toast align-items-center\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"my-header-toast toast-header\"><i class=\"me-2 glyph fas fa-eye\"></i><strong class=\"me-auto\">My header toast</strong><small class=\"text-muted\">Now</small><button class=\"ml-2 mb-1 btn-close\" data-bs-dismiss=\"toast\" aria-label=\"Close\"></button></div><div class=\"my-body-toast toast-body\">My body toast</div></div>"
 
     assert_equal expected, actual
   end
@@ -18,7 +18,7 @@ class ToastTest < ActionView::TestCase
     actual = ui_toast do
       'My body toast'
     end
-    expected = "<div class=\"toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"toast-body\">My body toast</div></div>"
+    expected = "<div class=\"toast align-items-center\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"d-flex\"><div class=\"toast-body\">My body toast</div></div></div>"
 
     assert_equal expected, actual
   end

data/test/ui/ux/tables/table_test.rb

@@ -129,6 +129,13 @@ class TableTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  test 'table actionable with antoher controller' do
+    @users = User.table_search_pagination(params, session, { controller: "areas" })
+    @store = UiBibz::Ui::Ux::Tables::Store.new @users
+
+    assert_equal("areas", @store.controller)
+  end
+
   test 'table non actionable header' do
     options  = { actionable: false }
     action   = UiBibz::Ui::Ux::Tables::Actionable.new(@store, options)

data/ui_bibz.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.description = UiBibz::DESCRIPTION
   s.license     = UiBibz::LICENSE
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.0.0'
 
   s.files         = `git ls-files`.split
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib vendor]
 
   # Rails gems
-  s.add_development_dependency 'rails', '~> 6.0.3', '>= 6.0.3.2'
+  s.add_development_dependency 'rails', '~> 6.1.3', '>= 6.1.3.2'
 
   # Remove these dependencies after
   s.add_dependency 'will_paginate', '~> 3.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta16
+  version: 3.0.0
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails Interface Framework using Bootstrap 5.0.0.beta2.
+description: A Rails Interface Framework using Bootstrap 5.0.2.
 email: thomas@hummel.link
 executables:
 - test
@@ -671,18 +671,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: Ui Bibz is an Ui Framework that allows you to build an interface very quickly
-  and simply using Bootstrap 5.0.0.beta2.
+  and simply using Bootstrap 5.0.2.
 test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile