ui_bibz 3.0.0.beta12 → 3.0.0.beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50692a30f39e9110cec4b66aca482aac06b5954f6785350c66e0e3f5b34fb79f
-  data.tar.gz: 1dcf3b39d353062f5ba6e5265339a98474f78e0fa74b7822f1269db13a036c52
+  metadata.gz: 293f9667c9bfae713e8968aedb6fb67bb8f391b0ef8f57663e048be71589e4e5
+  data.tar.gz: 4b15c120616b00753011fd7f58e278dbe249cacd98e1642bac153b80b0e6b5de
 SHA512:
-  metadata.gz: 5ea403acad7678809350b802ebaab7f3c96b13daa26c3637b46c3b40da038930b2a0a921b96efb7f044bc562d4604ab57c0826781d88bb73b0b2b458f3f76b52
-  data.tar.gz: 1b22114c6aaf66f7de20b8dfd80e8e790eea1a07e1695a3ba31f7c26a95fd30d404babc9981332731605c2015733fa03dd570bb719c4689ba7430102efa6f791
+  metadata.gz: a9d3053d5303bd6c9ff0c6de3dde049a08a75f25f94e70f3812031050328dd66dc14e3b6909a35f083993ee09b1782c615d3b00c0c8fd41e224bc50f223b4077
+  data.tar.gz: a167b60e21e64c303227f580ca599b95351ae1b5554a5c611fef8abc199abe9180c5aa44af7654a5b61ef777b21d81cb7e289389d3098bfd10f78a26a5597638

data/.github/workflows/ci.yml

@@ -23,6 +23,6 @@ jobs:
     - name: Test with Rake
       uses: paambaati/codeclimate-action@v2.7.5
       env:
-        CC_TEST_REPORTER_ID: 7e50558afc7a861280e3194a765a159e9ea5bdd22d2ebe6c13e5e23fe914c66b
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       with:
         coverageCommand: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta12)
+    ui_bibz (3.0.0.beta17)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -9,63 +9,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.5)
-      actionpack (= 6.0.3.5)
+    actioncable (6.0.3.6)
+      actionpack (= 6.0.3.6)
       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.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       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.0.3.6)
+      actionpack (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
       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)
+    actionpack (6.0.3.6)
+      actionview (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       rack (~> 2.0, >= 2.0.8)
       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.0.3.6)
+      actionpack (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.0.3.6)
+      activesupport (= 6.0.3.6)
       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.0.3.6)
+      activesupport (= 6.0.3.6)
       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.0.3.6)
+      activesupport (= 6.0.3.6)
+    activerecord (6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activestorage (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.2)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     builder (3.2.4)
     byebug (11.1.3)
     childprocess (4.0.0)
@@ -95,7 +95,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jquery-rails (4.4.0)
@@ -107,15 +107,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    minitest (5.14.4)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     overcommit (0.57.0)
@@ -128,37 +126,37 @@ GEM
     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)
+    rails (6.0.3.6)
+      actioncable (= 6.0.3.6)
+      actionmailbox (= 6.0.3.6)
+      actionmailer (= 6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actiontext (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.5)
+      railties (= 6.0.3.6)
       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.0.3.6)
+      actionpack (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rubocop (1.9.1)
+    rubocop (1.12.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -169,9 +167,9 @@ GEM
       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.9.2)
+    rubocop-minitest (0.11.1)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.10.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)

data/lib/ui_bibz.rb

@@ -78,6 +78,8 @@ module UiBibz
     module Concerns
       autoload :HtmlConcern,         'ui_bibz/ui/concerns/html_concern'
       autoload :CardItemableConcern, 'ui_bibz/ui/concerns/card_itemable_concern'
+      autoload :NavigationConcern,   'ui_bibz/ui/concerns/navigation_concern'
+      autoload :NotificationConcern, 'ui_bibz/ui/concerns/notification_concern'
     end
 
     # Core

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

@@ -119,19 +119,19 @@ 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_attributes = sql_attributes.merge(Hash["#{value}_#{i}".to_sym, "%#{pattern}%"])
+                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_attributes = sql_attributes.merge(Hash["#{key_name}_#{value}_#{i}".to_sym, "%#{pattern}%"])
+                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_attributes = sql_attributes.merge(Hash["#{attribute}_#{i}".to_sym, "%#{pattern}%"])
+            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
         sql_query << "(#{sql_subquery.join(' OR ')})"

data/lib/ui_bibz/infos.rb

@@ -3,7 +3,7 @@
 module UiBibz
   NAME                = 'Ui Bibz'
   SLUG                = 'ui_bibz'
-  BOOTSTRAP_VERSION   = '5.0.0.beta1'
+  BOOTSTRAP_VERSION   = '5.0.0.beta3'
   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'
@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta12'
+  VERSION             = '3.0.0.beta17'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -17,7 +17,7 @@ module UiBibzForm
       wrapper_html   = (options[:input_html] || {}).merge({ class: input_classes })
       surround_field = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(content, opts, html_options).tap(&block)
       errors_text    = surround_field.errors.flatten.to_sentence
-      required       = surround_field.required_fields.any? { |u| u == true }
+      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
@@ -32,19 +32,16 @@ module UiBibzForm
     end
 
     def ui_button_group(content = nil, opts = nil, html_options = nil, &block)
-      content = (options || {}).merge(content || {})
-      content = content.merge(template: @template, form: self)
-
-      input_classes = UiBibz::Utils::Screwdriver.join_classes('button_group', options[:input_html].try(:[], :class))
-      wrapper_html = (options[:input_html] || {}).merge({ class: input_classes })
-
-      content_tag :div, wrapper_html do
-        concat content_tag(:label, content[:label]) unless content[:label].nil?
-        concat UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, opts, html_options).tap(&block).render
-      end
+      ui_component_group_by(UiBibz::Ui::Core::Forms::Buttons::ButtonGroup, content, opts, html_options, &block)
     end
 
     def ui_choice_group(content = nil, opts = nil, html_options = nil, &block)
+      ui_component_group_by(UiBibz::Ui::Core::Forms::Choices::ChoiceGroup, content, opts, html_options, &block)
+    end
+
+    private
+
+    def ui_component_group_by(component_class, content = nil, opts = nil, html_options = nil, &block)
       content = (options || {}).merge(content || {})
       content = content.merge(template: @template, form: self)
 
@@ -53,7 +50,7 @@ module UiBibzForm
 
       content_tag :div, wrapper_html do
         concat content_tag(:label, content[:label]) unless content[:label].nil?
-        concat UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, opts, html_options).tap(&block).render
+        concat component_class.new(content, opts, html_options).tap(&block).render
       end
     end
   end

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/inputs/ui_bibz_inputs/ui_radio_field_input.rb

@@ -1,20 +1,9 @@
 # frozen_string_literal: true
 
 module UiBibzInputs
-  class UiRadioFieldInput < SimpleForm::Inputs::CollectionRadioButtonsInput
-    include UiBibz::Ui::Core::Forms::Choices
-
+  class UiRadioFieldInput < UiCheckboxFieldInput
     def input(_wrapper_options)
-      i = UiBibz::Ui::Core::Forms::Choices::RadioField.new(attribute_name, options, input_html_options)
-      options[:item_wrapper_tag] = :div
-      options[:item_wrapper_class] = i.html_options[:class]
-
-      label_method, value_method = detect_collection_methods
-
-      @builder.send(:collection_radio_buttons,
-                    attribute_name, collection, value_method, label_method,
-                    input_options, i.html_options,
-                    &collection_block_for_nested_boolean_style)
+      UiBibz::Ui::Core::Forms::Choices::RadioField.new(input_attribute_name, new_options, input_html_options).render
     end
   end
 end

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

@@ -1,23 +1,11 @@
 # frozen_string_literal: true
 
 module UiBibzInputs
-  class UiSwitchFieldInput < BaseInput
+  class UiSwitchFieldInput < UiCheckboxFieldInput
     include UiBibz::Ui::Core::Forms::Choices
 
     def input(_wrapper_options)
       UiBibz::Ui::Core::Forms::Choices::SwitchField.new(input_attribute_name, new_options, new_input_html_options).render
     end
-
-    def new_input_html_options
-      input_html_options.merge({ checked: value.nil? ? false : value })
-    end
-
-    def value
-      @value ||= @builder.object.send(attribute_name)
-    end
-
-    def new_options
-      options.merge({ label: attribute_name.to_s.titleize })
-    end
   end
 end

data/lib/ui_bibz/rails/engine.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # to load pagination in rails app
-require 'will_paginate' if system('gem list -i will_paginate', out: File::NULL)
-require 'simple_form' if system('gem list -i simple_form', out: File::NULL)
+require 'will_paginate' if Gem.loaded_specs.key?('will_paginate')
+require 'simple_form' if Gem.loaded_specs.key?('simple_form')
 
 module UiBibz
   module Rails

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NavigationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def spacer(num = 'auto')
+      kls = " me-#{num}"
+      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def data_attributes
+      self.class.const_get('DATA_ATTRIBUTES').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
+  end
+end

data/lib/ui_bibz/ui/core/component.rb

@@ -122,6 +122,10 @@ module UiBibz::Ui::Core
       # To turbolinks
       data_turbolinks = html_options.try(:[], :data).try(:[], :turbolinks) || options.try(:delete, :turbolinks)
       add_html_data(:turbolinks, value: data_turbolinks) unless data_turbolinks.nil?
+
+      # To Turbo
+      data_turbo = html_options.try(:[], :data).try(:[], :turbo) || options.try(:delete, :turbo)
+      add_html_data(:turbo, value: data_turbo) unless data_turbo.nil?
     end
 
     # Override this method to add html Options
@@ -145,7 +149,7 @@ module UiBibz::Ui::Core
     def add_html_data(name, value: true)
       html_options[:data] = {} if html_options[:data].nil?
       value = value.is_a?(String) ? value.strip : value
-      html_options[:data].update(Hash[name, value])
+      html_options[:data].update({ name => value })
     end
 
     def disabled?

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

@@ -65,13 +65,13 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def wrapper_html_options
       (options[:wrapper_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check', inline, options[:wrapper_html].try(:[], :class))
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(wrapper_classes, inline, options[:wrapper_html].try(:[], :class))
       end
     end
 
     def label_html_options
       (options[:label_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check-label', options[:label_html].try(:[], :class))
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(label_classes, options[:label_html].try(:[], :class))
       end
     end
 
@@ -111,5 +111,13 @@ module UiBibz::Ui::Core::Forms::Choices
     def inline
       'form-check-inline' if options[:inline]
     end
+
+    def wrapper_classes
+      'form-check'
+    end
+
+    def label_classes
+      'form-check-label'
+    end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/components/choice.rb

@@ -82,10 +82,14 @@ module UiBibz::Ui::Core::Forms::Choices
       if options[:label]
         content_tag :label, options[:label], html_options.merge(for: input_id)
       else
-        content_tag :label, html_options.merge(for: input_id) do
-          concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
-          concat badge_html unless options[:badge].nil?
-        end
+        generated_label
+      end
+    end
+
+    def generated_label
+      content_tag :label, html_options.merge(for: input_id) do
+        concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
+        concat badge_html unless options[:badge].nil?
       end
     end
 

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

@@ -61,27 +61,8 @@ module UiBibz::Ui::Core::Forms::Choices
 
     private
 
-    def wrapper_html_options
-      (options[:wrapper_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check', inline, options[:wrapper_html].try(:[], :class))
-      end
-    end
-
-    def label_html_options
-      (options[:label_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check-label', options[:label_html].try(:[], :class))
-      end
-    end
-
-    def radio_field_html_tag
-      content_tag :div, html_options.except(:id) do
-        concat radio_button_tag content, options[:value], options[:checked] || false, checkbox_html_options
-        concat label_tag(label_name, label_content, class: 'form-check-label') if options[:label] != false
-      end
-    end
-
     def label_name
-      "#{content}_#{options[:value]}"
+      html_options[:id] || "#{content}_#{options[:value]}"
     end
   end
 end

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

@@ -47,8 +47,8 @@ module UiBibz::Ui::Core::Forms::Choices
       { boolean: true }
     end
 
-    def component_html_classes
-      ['form-check', 'form-switch', inline]
+    def wrapper_classes
+      %w[form-check form-switch]
     end
   end
 end

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

@@ -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/navigations/nav.rb

@@ -67,6 +67,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Nav < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -108,11 +109,6 @@ module UiBibz::Ui::Core::Navigations
       @items << NavDropdown.new(content, options, html_options).tap(&block)
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     protected
 
     def component_html_classes

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

@@ -75,6 +75,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Navbar < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -124,11 +125,6 @@ module UiBibz::Ui::Core::Navigations
       @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &block).render
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     def id
       @id ||= generate_id('navbar-id')
     end

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

@@ -47,6 +47,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", popover: { title: "My content", position: :right})
   #
   class Popover < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/popovers/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.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
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     end

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

@@ -76,13 +76,29 @@ 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
@@ -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/core/notifications/tooltip.rb

@@ -48,6 +48,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", tooltip: { title: "My content", position: :right})
   #
   class Tooltip < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/tooltips/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.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
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     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

@@ -8,6 +8,9 @@ module UiBibz::Ui::Ux::Tables
 
     # Store Use WillPaginate store methods
     def initialize(store)
+      raise 'Store is nil!' if store.nil?
+      raise 'Store can be created only with "table_search_pagination" method!' if store.try(:records).nil?
+
       @records = store.records
       @store   = store
       @model   = store.model

data/lib/ui_bibz/ui/ux/tables/extensions/paginable.rb

@@ -26,9 +26,6 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def store
-      raise 'Store is nil!' if @search_field.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @search_field.options[:store].try(:records).nil?
-
       @store ||= Store.new @search_field.options[:store]
     end
   end

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

@@ -53,9 +53,6 @@ module UiBibz::Ui::Ux::Tables
 
     # Store must be generated by *table_search_pagination* method
     def store
-      raise 'Store is nil!' if @pagination.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @pagination.options[:store].try(:records).nil?
-
       @store ||= Store.new @pagination.options[:store]
     end
   end

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

@@ -46,9 +46,6 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def store
-      raise 'Store is nil!' if @per_page_field.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @per_page_field.options[:store].try(:records).nil?
-
       @store ||= Store.new @per_page_field.options[:store]
     end
 

data/test/simple_form_test.rb

@@ -132,10 +132,10 @@ test1</textarea></div></form>"
 
   test 'radio field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_radio_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_radio_field, label: 'Radio 1', input_html: { id: "radio_1" }
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_radio_field optional user_name_fr\"><label class=\"control-label ui_radio_field optional\">Name fr</label><input type=\"hidden\" name=\"user[name_fr]\" value=\"\" /><div class=\"radio ui_radio_field optional form-check-input\"><input class=\"ui_radio_field optional form-check-input\" type=\"radio\" value=\"1\" name=\"user[name_fr]\" id=\"user_name_fr_1\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_1\">test1</label></div><div class=\"radio ui_radio_field optional form-check-input\"><input class=\"ui_radio_field optional form-check-input\" type=\"radio\" value=\"2\" name=\"user[name_fr]\" id=\"user_name_fr_2\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_2\">test2</label></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_radio_field optional user_name_fr\"><div class=\"form-check\"><input type=\"radio\" name=\"user[name_fr]\" id=\"radio_1\" value=\"test1\" class=\"ui_radio_field optional form-check-input\" /><label class=\"form-check-label\" for=\"radio_1\">Radio 1</label></div></div></form>"
 
     assert_equal expected, actual
   end
@@ -237,31 +237,40 @@ test1</textarea></div></form>"
     assert_equal expected, actual
   end
 
-  # test 'choice field' do
-  #   actual = ui_form_for @user do |f|
-  #     f.ui_choice_group do |cg|
-  #       cg.input :name_fr, as: :ui_choice_field
-  #       cg.input :name_fr, as: :ui_choice_field
-  #     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\"><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"choice-21472\" /><label class=\"btn-secondary btn checkbox\" checked=\"checked\" for=\"choice-21472\">Name Fr</label><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"choice-13741\" /><label class=\"btn-secondary btn checkbox\" checked=\"checked\" for=\"choice-13741\">Name Fr</label></div></div></form>"
-  #
-  #   assert_equal expected, actual
-  # end
-
-  #   test 'test surround field into simple form' do
-  #     actual = ui_form_for @user do |f|
-  #       concat(f.ui_surround_field do |sf|
-  #         sf.input :name_en, as: :text_field
-  #         sf.addon("€")
-  #       end)
-  #       concat f.input(:name_fr, as: :ui_auto_complete_field, collection: @users, label_method: :name_fr)
-  #     end
-  #
-  #     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div><div class=\"input-group\"><input type=\"text\" name=\"user[name_en]\" id=\"user_name_en\" value=\"test1 en\" class=\"text_field optional form-control\" /><span class=\"input-group-text\">€</span></div></div><div class=\"form-group ui_auto_complete_field optional user_name_fr\"><label class=\"control-label ui_auto_complete_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_auto_complete_field optional form-control auto-complete-field\" autocomplete=\"true\" list=\"user_name_fr-datalist\" /><datalist id=\"user_name_fr-datalist\"><option value=\"1\">test1</option>
-  # <option value=\"2\">test2</option></datalist></div></form>"
-  #
-  #     assert_equal expected, actual
-  #   end
+  test 'ui_button_group' do
+    actual = ui_form_for @user do |f|
+      f.ui_button_group do |bg|
+        bg.button "test"
+      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 class=\"btn-group\" role=\"group\"><button class=\"btn-secondary btn\">test</button></div></div></form>"
+
+    assert_equal expected, actual
+  end
+
+  test 'ui_choice_group' do
+    actual = ui_form_for @user do |f|
+      f.ui_choice_group do |cg|
+        cg.input :name_fr, as: :ui_checkbox_field
+      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>"
+
+    assert_equal expected, actual
+  end
+
+  test 'test surround field into simple form' do
+    actual = ui_form_for @user do |f|
+      f.ui_surround_field do |sf|
+        sf.input :name_en, as: :ui_text_field
+        sf.addon("€")
+      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=\"form-group surround_field\"><div class=\"input-group ui_surround_field\"><input type=\"text\" name=\"user[name_en]\" id=\"user_name_en\" value=\"test1 en\" class=\"form-control string ui_text_field optional\" /><span class=\"input-group-text\">€</span></div></div></form>"
+
+    assert_equal expected, actual
+  end
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta12
+  version: 3.0.0.beta17
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,7 +240,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails Interface Framework using Bootstrap 5.0.0.beta1.
+description: A Rails Interface Framework using Bootstrap 5.0.0.beta3.
 email: thomas@hummel.link
 executables:
 - test
@@ -312,6 +312,8 @@ files:
 - lib/ui_bibz/ui/base.rb
 - lib/ui_bibz/ui/concerns/card_itemable_concern.rb
 - lib/ui_bibz/ui/concerns/html_concern.rb
+- lib/ui_bibz/ui/concerns/navigation_concern.rb
+- lib/ui_bibz/ui/concerns/notification_concern.rb
 - lib/ui_bibz/ui/core/boxes/card.rb
 - lib/ui_bibz/ui/core/boxes/card_accordion.rb
 - lib/ui_bibz/ui/core/boxes/card_column.rb
@@ -666,7 +668,7 @@ rubygems_version: 3.1.2
 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.beta1.
+  and simply using Bootstrap 5.0.0.beta3.
 test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile