ui_bibz 3.0.0.beta10 → 3.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b4963785be829c23f3f560fdc03346b3ee8beba96998a95b7ecf15ba20d7bf
-  data.tar.gz: 0e37bab962b5fb777493fbe861cf21efd0acb2c6072cda35c8c0c24686ecee77
+  metadata.gz: a24ee2f7f963d13b2f79652d8e02c196072e3d674c1f528a92b121598f6ccd08
+  data.tar.gz: 9dd65d798d69e14c08de9c5e2fd6c198e0df7def2fe06e22341124f1a96e2d05
 SHA512:
-  metadata.gz: d5a557c7bd724918100d60570f86fdd9a49b0862bc2735f11a450a524dc97569929fbc1753cbc69a71c864df51aeb5eaae67f02daff2a712cadb088d10e5961d
-  data.tar.gz: a892279deea5157f18bb6f37fb6eed213ab979890e652d35058da21696e0d000c9ce8305bd48433fcb56f8fcb571840ee4a850e78b240c935dc5a5a98b952bb7
+  metadata.gz: f634662ead3cda0d2d6898352f9634666c3282d3e066a18eed7c76e3dd03b955b7cc465955584140d81a3d73e38f443fd537756f684d9d01e1831d6dc6cc90e0
+  data.tar.gz: 2d7b682c66482d611ec5ac47751027529caa59b5672bab233e9c413b0e3c45e82ec69c471330aae1a05002ea41aa353fd35de33e5677aa41b8ff3e70bf91e42b

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.beta10)
+    ui_bibz (3.0.0.beta15)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -9,56 +9,56 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.0.3.5)
+      actionpack (= 6.0.3.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    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)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.0.3.5)
+      actionpack (= 6.0.3.5)
+      actionview (= 6.0.3.5)
+      activejob (= 6.0.3.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionpack (6.0.3.5)
+      actionview (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       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.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    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)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.3.5)
+      activesupport (= 6.0.3.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.0.3.5)
+      activesupport (= 6.0.3.5)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
+    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.4)
+    activesupport (6.0.3.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -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)
@@ -128,29 +128,29 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    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.4)
+      railties (= 6.0.3.5)
       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.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.0.3.5)
+      actionpack (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -182,9 +182,9 @@ GEM
     ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
     sexp_processor (4.15.2)
-    simple_form (5.0.3)
-      actionpack (>= 5.0)
-      activemodel (>= 5.0)
+    simple_form (5.1.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

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/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.beta2'
   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.beta10'
+  VERSION             = '3.0.0.beta15'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -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/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

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

@@ -22,6 +22,8 @@ module UiBibz::Ui::Core::Forms::Choices
   # * +action+ - String Stimulus Option
   # * +label+ - [String/Boolean]
   # * +boolean+ - Boolean Add an hidden field for rails
+  # * +wrapper_html+: - Hash html_options for the wrapper
+  # * +label_html+: - Hash html_options for the label
   #
   # ==== Signatures
   #
@@ -52,30 +54,35 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # Render html tag
     def pre_render
-      checkbox_field_html_tag
+      content_tag :div, wrapper_html_options  do
+        concat hidden_field_tag(content, '0', id: "#{content}-hidden") if options[:boolean]
+        concat check_box_tag(content, options[:value] || '1', options[:checked] || html_options[:checked], checkbox_html_options)
+        concat label_tag(label_name, label_content, label_html_options) if options[:label] != false
+      end
     end
 
     private
 
-    def checkbox_field_html_tag
-      content_tag(:div, html_options.except(:id, 'data-action')) do
-        concat hidden_field_tag content, '0', id: "#{content}-hidden" if options[:boolean]
-        concat check_box_tag content, options[:value] || '1', options[:checked] || html_options[:checked], checkbox_html_options
-        concat label_tag(label_name, label_content, class: 'form-check-label') if options[:label] != false
+    def wrapper_html_options
+      (options[:wrapper_html] || {}).tap do |option|
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(wrapper_classes, inline, options[:wrapper_html].try(:[], :class))
       end
     end
 
-    def checkbox_html_options
-      {
-        disabled: disabled?,
-        indeterminate: options[:indeterminate],
-        "data-action": options[:action],
-        class: UiBibz::Utils::Screwdriver.join_classes('form-check-input', input_status)
-      }.tap do |html|
-        html[:id] = html_options[:id] if html_options[:id]
+    def label_html_options
+      (options[:label_html] || {}).tap do |option|
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(label_classes, options[:label_html].try(:[], :class))
       end
     end
 
+    def checkbox_html_options
+      html_options.merge({
+                           disabled: disabled?,
+                           checked: html_options[:checked] || options[:state] == :active,
+                           indeterminate: options[:indeterminate]
+                         })
+    end
+
     def label_name
       html_options[:id] || content
     end
@@ -92,7 +99,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_classes
-      super << component_wrapper_html_classes
+      super << ['form-check-input', input_status]
     end
 
     def input_status
@@ -105,8 +112,12 @@ module UiBibz::Ui::Core::Forms::Choices
       'form-check-inline' if options[:inline]
     end
 
-    def component_wrapper_html_classes
-      ['form-check', inline]
+    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
 
@@ -116,5 +120,7 @@ module UiBibz::Ui::Core::Forms::Choices
     def input_id
       @input_id ||= @options[:id] || generate_id('choice')
     end
+
+    def state; end
   end
 end

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

@@ -21,6 +21,8 @@ module UiBibz::Ui::Core::Forms::Choices
   # * +inline+ - Boolean
   # * +action+ - String Stimulus Option
   # * +label+ - String
+  # * +wrapper_html+: - Hash html_options for the wrapper
+  # * +label_html+: - Hash html_options for the label
   #
   # ==== Signatures
   #
@@ -51,46 +53,16 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # Render html tag
     def pre_render
-      radio_field_html_tag
-    end
-
-    private
-
-    def radio_field_html_tag
-      content_tag :div, html_options.except(:id) do
+      content_tag :div, wrapper_html_options 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 checkbox_html_options
-      {
-        disabled: options[:state] == :disabled,
-        "data-action": options[:action],
-        class: UiBibz::Utils::Screwdriver.join_classes('form-check-input', input_status)
-      }
-    end
+    private
 
     def label_name
-      "#{content}_#{options[:value]}"
-    end
-
-    def component_html_classes
-      super << component_wrapper_html_classes
-    end
-
-    def status; end
-
-    def input_status
-      "form-check-input-#{options[:status]}" if options[:status]
-    end
-
-    def inline
-      'form-check-inline' if options[:inline]
-    end
-
-    def component_wrapper_html_classes
-      ['form-check', inline]
+      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/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/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/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

@@ -21,6 +21,16 @@ class SimpleFormTest < ActionView::TestCase
     @user       = @users.first
   end
 
+  test 'simple form input' do
+    actual = simple_form_for @user do |f|
+      f.input :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 class=\"form-group string optional user_name_fr\"><label class=\"control-label string optional\" for=\"user_name_fr\">Name fr</label><input class=\"form-control string optional\" type=\"text\" value=\"test1\" name=\"user[name_fr]\" id=\"user_name_fr\" /></div></form>"
+
+    assert_equal expected, actual
+  end
+
   test 'auto complete field input in simple form' do
     actual = simple_form_for @user do |f|
       f.input :name_fr, as: :ui_auto_complete_field, collection: @users, label_method: :name_fr
@@ -122,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 class=\"ui_radio_field optional form-check\" 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 class=\"ui_radio_field optional form-check\" 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
@@ -227,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/forms/choices/checkbox_field_test.rb

@@ -16,4 +16,11 @@ class CheckboxFieldTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
+  test 'checkbox_field with options and html_options' do
+    actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', action: 'click->controller#action', label_html: { class: 'test' }, wrapper_html: { title: "My title" }).render
+    expected = "<div title=\"My title\" class=\"form-check\"><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" data-action=\"click-&gt;controller#action\" class=\"form-check-input\" /><label class=\"form-check-label test\" for=\"John\">John</label></div>"
+
+    assert_equal expected, actual
+  end
 end

data/test/ui/core/forms/choices/choice_group_test.rb

@@ -11,7 +11,7 @@ class ChoiceGroupTest < ActionView::TestCase
       bc.choice 'Checkbox 2', state: :active
     end
 
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn\" for=\"#{actual.items.first.input_options[:id]}\">Checkbox 1</label><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-secondary btn\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Checkbox 2</label></div>"
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn\" for=\"#{actual.items.first.input_options[:id]}\">Checkbox 1</label><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"btn-secondary btn\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Checkbox 2</label></div>"
 
     assert_equal expected, actual.render
   end
@@ -22,7 +22,7 @@ class ChoiceGroupTest < ActionView::TestCase
       bc.choice 'Radio 2', state: :active
     end
 
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn\" for=\"#{actual.items.first.input_options[:id]}\">Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-secondary btn\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn\" for=\"#{actual.items.first.input_options[:id]}\">Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"btn-secondary btn\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
 
     assert_equal expected, actual.render
   end
@@ -32,7 +32,7 @@ class ChoiceGroupTest < ActionView::TestCase
       bc.choice 'Radio 1', glyph: 'diamond', status: :primary
       bc.choice 'Radio 2', state: :active
     end
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-lg button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-outline-primary btn btn-lg\" for=\"#{actual.items.first.input_options[:id]}\"><i class=\"glyph fas fa-diamond\"></i> Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-outline-secondary btn btn-lg\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-lg button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-outline-primary btn btn-lg\" for=\"#{actual.items.first.input_options[:id]}\"><i class=\"glyph fas fa-diamond\"></i> Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"btn-outline-secondary btn btn-lg\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
 
     assert_equal expected, actual.render
   end

data/test/ui/core/forms/choices/radio_field_test.rb

@@ -9,4 +9,11 @@ class RadioFieldTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
+  test 'checkbox_field with options and html_options' do
+    actual = UiBibz::Ui::Core::Forms::Choices::RadioField.new('John', action: 'click->controller#action', label_html: { class: 'test' }, wrapper_html: { title: "My title" }).render
+    expected = "<div title=\"My title\" class=\"form-check\"><input type=\"radio\" name=\"John\" id=\"John_\" data-action=\"click-&gt;controller#action\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"John_\">John</label></div>"
+
+    assert_equal expected, actual
+  end
 end

data/test/ui/core/forms/surrounds/surround_field_test.rb

@@ -87,7 +87,7 @@ class SurroundFieldTest < ActionView::TestCase
       sf.button_refresh
     end.render
 
-    expected = "<div class=\"input-group ui_surround_field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-gem\"></i></span><span class=\"input-group-text\">test</span><button class=\"btn-secondary btn\">button</button><div class=\"input-group-btn\" role=\"group\"><button class=\"btn-secondary btn\">test</button></div><a class=\"btn-secondary btn\" role=\"button\" href=\"#\">link</a><div class=\"input-group-text\" label=\"false\"><input type=\"checkbox\" name=\"check\" id=\"check\" value=\"1\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"check\">check</label></div><div class=\"input-group-text\" label=\"false\"><input type=\"radio\" name=\"radio\" id=\"radio_\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"radio_\">radio</label></div><input type=\"text\" name=\"text\" id=\"text\" class=\"form-control\" /><input type=\"text\" name=\"date\" id=\"date\" data-date-locale=\"en\" data-provide=\"datepicker\" data-date-format=\"yyyy-mm-dd\" data-date-today-btn=\"linked\" data-date-toggle-active=\"true\" class=\"date_picker form-control\" /><select name=\"dropdown_select\" id=\"dropdown_select\" data-wrapper-classes=\"input-group-btn\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\"></select><select name=\"select\" id=\"select\" class=\"select-field form-control form-select\"></select><input type=\"text\" name=\"auto\" id=\"auto\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"auto-datalist\" /><datalist id=\"auto-datalist\"></datalist><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i></span></div>"
+    expected = "<div class=\"input-group ui_surround_field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-gem\"></i></span><span class=\"input-group-text\">test</span><button class=\"btn-secondary btn\">button</button><div class=\"input-group-btn\" role=\"group\"><button class=\"btn-secondary btn\">test</button></div><a class=\"btn-secondary btn\" role=\"button\" href=\"#\">link</a><div class=\"form-check\"><input type=\"checkbox\" name=\"check\" id=\"check\" value=\"1\" class=\"form-check-input input-group-text\" label=\"false\" /><label class=\"form-check-label\" for=\"check\">check</label></div><div class=\"form-check\"><input type=\"radio\" name=\"radio\" id=\"radio_\" class=\"form-check-input input-group-text\" label=\"false\" /><label class=\"form-check-label\" for=\"radio_\">radio</label></div><input type=\"text\" name=\"text\" id=\"text\" class=\"form-control\" /><input type=\"text\" name=\"date\" id=\"date\" data-date-locale=\"en\" data-provide=\"datepicker\" data-date-format=\"yyyy-mm-dd\" data-date-today-btn=\"linked\" data-date-toggle-active=\"true\" class=\"date_picker form-control\" /><select name=\"dropdown_select\" id=\"dropdown_select\" data-wrapper-classes=\"input-group-btn\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\"></select><select name=\"select\" id=\"select\" class=\"select-field form-control form-select\"></select><input type=\"text\" name=\"auto\" id=\"auto\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"auto-datalist\" /><datalist id=\"auto-datalist\"></datalist><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i></span></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.beta10
+  version: 3.0.0.beta15
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-15 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.beta2.
 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.beta2.
 test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile