ui_bibz 3.0.0.beta8 → 3.0.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3e72f23a91692fcd9919939cac116b0434333c8597b11dcef0f7b8cb766d87
-  data.tar.gz: f3b225819371ddbe82c9f2f3c84388f4e2fed1edce822e539e649e761f6224b8
+  metadata.gz: c8e9f704fae6975451f3f51f700ee7df8e880045c95b686065e2992b9ed027ea
+  data.tar.gz: 6ae209045ca11867361a63347150cf8435984976f00026b89c556fcf2dea5674
 SHA512:
-  metadata.gz: ff3ce0988337055522cfb625287a83104691d0931219c76763e8014b0e8775496fa21312721896bc3fed30b26473f058abf2f3f7f87ea3d9cb7a19bf94409f14
-  data.tar.gz: 64cdd3c257b47403e4ebf83ab47fb56b3c0f73136a1d4db0fbbf300925b32999b374c6054271bba50bca2b0b7da0dc37db1d9c21178c718397d1f7d6fd110ae5
+  metadata.gz: d387972cb0c0b4a0d4d8768782e92608876e0c90fb16a1f3895c5b130707df80901317440b5e69cfaecefebc691d03a614935d595bbcf8246664340d564923df
+  data.tar.gz: 5786310071a16944f8a45d3c0bb0e282cd21c151fd8513d45a8d31b5e43892e44113e8f2800a326e528b6f424b73db8952b27c508cc6ffca1e1ea063b4591027

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta8)
+    ui_bibz (3.0.0.beta13)
       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)
@@ -114,7 +114,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
-    nio4r (2.5.4)
+    nio4r (2.5.5)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -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/infos.rb

@@ -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.beta8'
+  VERSION             = '3.0.0.beta13'
   AUTHORS = ['Thooams'].freeze
 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/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

@@ -116,5 +116,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/extensions/core/component/popover_extension.rb

@@ -1,12 +1,44 @@
 # frozen_string_literal: true
 
 module PopoverExtension
+  # Add popover to a component
+  #
+  # By tooltip object
+  #
+  #   popover = UiBibz::Ui::Core::Notifications::Popover.new("My Popover")
+  #   UiBibz::Ui::Core::Component.new("My content", popover: popover)
+  #
+  # By Hash
+  #
+  #   UiBibz::Ui::Core::Component.new("My content", popover: { content: "My Popover" })
+  #
+  # By String
+  #
+  #   UiBibz::Ui::Core::Component.new("My content", popover: "My Popover")
+  #
   def popover_data_html
     return if options[:popover].nil?
 
     html_options.update(generate_popover.render)
   end
 
+  # Add tooltip to a component
+  #
+  # By tooltip object
+  #
+  #   tooltip = UiBibz::Ui::Core::Notifications::Tooltip.new("My tooltip")
+  #   UiBibz::Ui::Core::Component.new("My content", tooltip: tooltip)
+  #
+  # By Boolean
+  #
+  #   UiBibz::Ui::Core::Component.new("My content", tooltip: true)
+  #   # or
+  #   UiBibz::Ui::Core::Component.new("My content", {tooltip: true}, { title: 'My tooltip' })
+  #
+  # By Hash
+  #
+  #   UiBibz::Ui::Core::Component.new("My content", tooltip: { title: 'My tooltip' })
+  #
   def tooltip_data_html
     return if options[:tooltip].nil?
 
@@ -20,7 +52,8 @@ module PopoverExtension
     when 'UiBibz::Ui::Core::Notifications::Tooltip'
       options[:tooltip]
     when 'TrueClass'
-      UiBibz::Ui::Core::Notifications::Tooltip.new(html_options.delete(:title))
+      tooltip_content = html_options.delete(:title) || (sanitize_text(content) if options[:text] == false)
+      UiBibz::Ui::Core::Notifications::Tooltip.new(tooltip_content)
     else
       UiBibz::Ui::Core::Notifications::Tooltip.new(options[:tooltip])
     end

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

@@ -35,7 +35,7 @@ module UiBibz::Ui::Ux::Tables
 
       return if default_actions? != true && @actions.raw_list.empty?
 
-      UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new(dropdown_action_name, { position: :right, size: :sm, glyph: actions_glyph }, { class: 'dropdown-action' }).tap do |d|
+      UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new(dropdown_action_name, { size: :sm, glyph: actions_glyph }, { class: 'dropdown-action' }).tap do |d|
         actions_links(record).each do |l|
           d.html l.to_s.html_safe
         end

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

@@ -42,7 +42,8 @@ module UiBibz::Ui::Ux::Tables
   # * +size+
   #   (+:sm+)
   # * +responsive+ - Boolean
-  # * +reflow+ - Boolean
+  # * +breakpoint+
+  #   (+:sm+, +:md+, +:lg+, +:xl+, +:xxl+)
   #
   # ==== Signatures
   #
@@ -118,7 +119,7 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def pre_render
-      table_html
+      options[:responsive] ? content_tag(:div, table_html, class: responsive) : table_html
     end
 
     # Store must be generated by *table_search_pagination* method
@@ -184,7 +185,7 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def component_html_classes
-      ['table', striped, bordered, hoverable, size, responsive, reflow]
+      ['table', striped, bordered, hoverable, size]
     end
 
     def status
@@ -208,11 +209,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def responsive
-      'table-responsive' unless @options[:responsive].nil?
-    end
-
-    def reflow
-      'table-reflow' unless @options[:reflow].nil?
+      ['table-responsive', @options[:breakpoint]].compact.join('-') unless @options[:responsive].nil?
     end
   end
 end

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

@@ -32,7 +32,8 @@ module UiBibz::Ui::Ux::Tables
   #   * +size+
   #     (+sm+)
   #   * +responsive+ - Boolean
-  #   * +reflow+ - Boolean
+  #   * +breakpoint+
+  #     (+:sm+, +:md+, +:lg+, +:xl+, +:xxl+)
   #
   #
   # ==== Signatures

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

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

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

@@ -49,4 +49,11 @@ class PopoverTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
+  test 'glyph with popover String' do
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", popover: "My Content").render
+    expected = "<i data-bs-toggle=\"popover\" data-bs-content=\"My Content\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
 end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'ui_bibz/ui/ux/tables/components/store'
+require 'ui_bibz/ui/ux/tables/extensions/paginable'
+require 'ui_bibz/ui/ux/tables/extensions/searchable'
+require 'ui_bibz/ui/ux/tables/extensions/sortable'
+require 'ui_bibz/ui/ux/tables/extensions/actionable'
+
+class TableCardTest < ActionView::TestCase
+  setup do
+    create_list(:user, 25)
+    params = ActionController::Parameters.new({
+                                                controller: 'users',
+                                                action: 'index',
+                                                sort: 'users.name_fr',
+                                                direction: 'asc',
+                                                search: 'Name fr',
+                                                per_page: 2,
+                                                page: 1,
+                                                only_path: true
+                                              })
+    @users = User.table_search_pagination(params, session)
+    @store = UiBibz::Ui::Ux::Tables::Store.new @users
+  end
+
+  test 'table card visual options' do
+    table_card = UiBibz::Ui::Ux::Tables::TableCard.new(store: @users, table_options: { striped: true, status: :inverse, responsive: true, bordered: true, size: :sm, hoverable: true, breakpoint: :sm }).render
+    actual_table_classes = Nokogiri::HTML(table_card).xpath('//table')[0].attributes['class'].value
+    div_classes = Nokogiri::HTML(table_card).xpath('//div').css('.table-responsive-sm')[0].attributes['class'].value
+    table_classes = 'table-inverse table table-striped table-bordered table-hoverable table-sm'
+    actual_div_classes = 'table-responsive-sm'
+
+    assert_equal table_classes, actual_table_classes
+    assert_equal div_classes, actual_div_classes
+  end
+end

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

@@ -195,11 +195,14 @@ class TableTest < ActionView::TestCase
   end
 
   test 'table visual options' do
-    table  = UiBibz::Ui::Ux::Tables::Table.new(store: @users, striped: true, status: :inverse, responsive: true, bordered: true, size: :sm, hoverable: true, reflow: true).render
-    actual = Nokogiri::HTML(table).xpath('//table')[0].attributes['class'].value
-    expected = 'table-inverse table table-striped table-bordered table-hoverable table-sm table-responsive table-reflow'
-
-    assert_equal expected, actual
+    table = UiBibz::Ui::Ux::Tables::Table.new(store: @users, striped: true, status: :inverse, responsive: true, bordered: true, size: :sm, hoverable: true, breakpoint: :sm).render
+    div_classes = Nokogiri::HTML(table).xpath('//div')[0].attributes['class'].value
+    actual_table_classes = Nokogiri::HTML(table).xpath('//table')[0].attributes['class'].value
+    table_classes = 'table-inverse table table-striped table-bordered table-hoverable table-sm'
+    actual_div_classes = 'table-responsive-sm'
+
+    assert_equal table_classes, actual_table_classes
+    assert_equal div_classes, actual_div_classes
   end
 
   test 'table thead visual options' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta8
+  version: 3.0.0.beta13
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -574,6 +574,7 @@ files:
 - test/ui/core/windows/modal_test.rb
 - test/ui/utils/breakdown_class_name_generator_test.rb
 - test/ui/ux/containers/panel_test.rb
+- test/ui/ux/tables/table_card_test.rb
 - test/ui/ux/tables/table_test.rb
 - test/ui_bibz_test.rb
 - ui_bibz.gemspec
@@ -786,5 +787,6 @@ test_files:
 - test/ui/core/windows/modal_test.rb
 - test/ui/utils/breakdown_class_name_generator_test.rb
 - test/ui/ux/containers/panel_test.rb
+- test/ui/ux/tables/table_card_test.rb
 - test/ui/ux/tables/table_test.rb
 - test/ui_bibz_test.rb