ui_bibz 2.2.2 → 2.3.0

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

@@ -0,0 +1,89 @@
+module UiBibz::Ui::Core::Notifications
+
+  # Create a spinner
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +status+ - status of élement with symbol value:
+  #   (+:primary+, +:secondary+, +:success+, +:danger+, +:warning+, +:info+, +:light+, +:dark+)
+  # * +size+
+  #   (+:xs+, +:sm+, +:lg+)
+  # * +type+
+  #   (+:border+, +:grow+)
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Notifications::Spinner.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::Spinner.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::Spinner.new(content, status: :success, type: :pill).render
+  #
+  #   UiBibz::Ui::Core::Notifications::Spinner.new() do
+  #     #content
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   ui_spinner(content, options = {}, html_options = {})
+  #
+  #   ui_spinner(options = {}, html_options = {}) do
+  #     content
+  #   end
+  #
+  class Spinner < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag tag_html, html_options do
+        content_tag :span, @content || "Loading...", class: "sr-only"
+      end
+    end
+
+  private
+
+    def component_html_options
+      super.merge({ role: "status" })
+    end
+
+    def component_html_classes
+      ["spinner-#{ type }", status, size]
+    end
+
+    def status
+      "text-#{ @options[:status] || :secondary }" if options[:status]
+    end
+
+    def type
+      @options[:type] || "border"
+    end
+
+    def size
+      "spinner-#{ type }-#{ options[:size] }" if options[:size]
+    end
+
+    def tag_html
+      options[:tag] || :div
+    end
+
+  end
+end

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

@@ -0,0 +1,97 @@
+require 'ui_bibz/ui/core/notifications/components/toast_header'
+require 'ui_bibz/ui/core/notifications/components/toast_body'
+module UiBibz::Ui::Core::Notifications
+
+  # Create an alert
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +status+ - status of élement with symbol value:
+  #   (+:default+, +:primary+, +:info+, +:warning+, +:danger+)
+  # * +glyph+ - [String | Hash] Add glyph with name or hash options
+  #   * +name+ - [String]
+  #   *+timeout+ - [Integer]
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Toast.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Toast.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Toast.new(class: 'my-toast').tap |t|
+  #     t.header "My header toast", glyph: 'eye', time: 'now'
+  #     t.body "My body toast"
+  #   end
+  #
+  #   UiBibz::Ui::Core::Toast.new(class: 'my-toast').tap |t|
+  #     t.header glyph: 'eye', time: 'now' do
+  #       My header toast
+  #     end
+  #     t.body class: 'my-body-toast' do
+  #       My body toast
+  #     end
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   ui_toast(options = { tap: true }, html_options = {}) do |t|
+  #     t.header "My header toast", glyph: 'eye', time: 'now'
+  #     t.body "My body toast"
+  #   end
+  #
+  class Toast < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag :div, html_options do
+        concat @header
+        concat @body
+      end
+    end
+
+    # Add Header which is a component
+    def header content = nil, options = nil, html_options = nil, &block
+      @header = UiBibz::Ui::Core::Notifications::Components::ToastHeader.new(content, options, html_options, &block).render
+    end
+
+    # 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
+    end
+
+  private
+
+    def component_html_classes
+      super << 'toast'
+    end
+
+    def component_html_options
+      { role: 'alert', "aria-live": "assertive", "aria-atomic": true }
+    end
+
+    def component_html_data
+      super
+      add_html_data "autohide", options[:auto_hide] if options[:auto_hide]
+    end
+
+  end
+end

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

@@ -1,17 +1,28 @@
 module PopoverExtension
 
+  TOOLTIP_METHODS = %i(animation container delay html placement selector template title trigger
+    offset fallback_placement boundary sanitize white_list santitize_fn)
+
+  POPOVER_METHODS = %i(animation container content delay html placement selector template title
+    trigger offset fallback_placement boundary sanitize white_list sanitize_fn)
+
   def popover_data_html
     unless options[:popover].blank?
       add_html_data :toggle, "popover"
       add_html_data :content, (options[:popover].kind_of?(String) ? options[:popover] : options[:popover][:content])
     end
     if options[:popover].kind_of?(Hash)
-      add_html_data :title, options[:popover].try(:[], :title)         unless options[:popover].try(:[], :title).nil?
+      POPOVER_METHODS.each{ |mth| add_html_data(mth, options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
       add_html_data :placement, options[:popover].try(:[], :position)  unless options[:popover].try(:[], :position).nil?
-      add_html_data :trigger, options[:popover].try(:[], :trigger)     unless options[:popover].try(:[], :trigger).nil?
-      add_html_data :template, options[:popover].try(:[], :template)   unless options[:popover].try(:[], :template).nil?
-      add_html_data :animation, options[:popover].try(:[], :animation) unless options[:popover].try(:[], :animation).nil?
-      add_html_data :html, options[:popover].try(:[], :html)           unless options[:popover].try(:[], :html).nil?
+    end
+  end
+
+  def tooltip_data_html
+    add_html_data :toggle, "tooltip" unless options[:tooltip].nil?
+
+    if options[:tooltip].kind_of?(Hash)
+      TOOLTIP_METHODS.each{ |mth| add_html_data(mth, options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
+      add_html_data :placement, options[:tooltip].try(:[], :position)  unless options[:tooltip].try(:[], :position).nil?
     end
   end
 

data/lib/ui_bibz.rb

@@ -76,6 +76,7 @@ module UiBibz
 
       module Boxes
         autoload :Card,                    "ui_bibz/ui/core/boxes/card"
+        autoload :CardAccordion,           "ui_bibz/ui/core/boxes/card_accordion"
         autoload :CardColumn,              "ui_bibz/ui/core/boxes/card_column"
         autoload :CardDeck,                "ui_bibz/ui/core/boxes/card_deck"
         autoload :CardGroup,               "ui_bibz/ui/core/boxes/card_group"
@@ -172,6 +173,8 @@ module UiBibz
         autoload :Alert,                   "ui_bibz/ui/core/notifications/alert"
         autoload :Badge,                   "ui_bibz/ui/core/notifications/badge"
         autoload :ProgressBar,             "ui_bibz/ui/core/notifications/progress_bar"
+        autoload :Spinner,                 "ui_bibz/ui/core/notifications/spinner"
+        autoload :Toast,                   "ui_bibz/ui/core/notifications/toast"
       end
 
       module Windows

data/test/simple_form_test.rb

@@ -47,7 +47,7 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :ui_dropdown_select_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 name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\" data-style=\"btn-secondary\" title=\"false\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -59,7 +59,7 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :ui_dropdown_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\" data-style=\"btn-secondary\" title=\"false\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -159,7 +159,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_select_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 name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control custom-select\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -170,7 +170,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_select_field, refresh: { target: { data: [] }}, 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 name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"field-refresh input-group ui_surround_field\"><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"field-refresh input-group ui_surround_field\"><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control custom-select\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#user_name_fr&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></div></div></form>"
 
     assert_equal expected, actual
@@ -182,7 +182,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control custom-select\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -195,7 +195,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_select_field, collection: @countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control\"><option selected=\"selected\" value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control custom-select\"><option selected=\"selected\" value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></select></div></form>"
 
     assert_equal expected, actual
@@ -208,7 +208,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control\"><optgroup label=\"Europe\"><option selected=\"selected\" value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select-field form-control custom-select\"><optgroup label=\"Europe\"><option selected=\"selected\" value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual

data/test/ui/core/component_test.rb

@@ -24,4 +24,5 @@ class ComponentTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
 end

data/test/ui/core/forms/buttons/button_group_test.rb

@@ -7,7 +7,7 @@ class ButtonGroupTest < ActionView::TestCase
     actual = ui_button_group do |bg|
       bg.button 'state'
     end
-    expected = "<div class=\"btn-group\" role=\"group\"><button class=\"btn\">state</button></div>"
+    expected = "<div class=\"btn-group\" role=\"group\"><button class=\"btn-secondary btn\">state</button></div>"
 
     assert_equal expected, actual
   end
@@ -16,7 +16,7 @@ class ButtonGroupTest < ActionView::TestCase
     actual = ui_button_group(position: :vertical) do |bg|
       bg.button 'state'
     end
-    expected = "<div class=\"btn-group-vertical\" role=\"group\"><button class=\"btn\">state</button></div>"
+    expected = "<div class=\"btn-group-vertical\" role=\"group\"><button class=\"btn-secondary btn\">state</button></div>"
 
     assert_equal expected, actual
   end
@@ -34,7 +34,7 @@ class ButtonGroupTest < ActionView::TestCase
     actual = ui_button_group(size: :sm) do |bg|
       bg.button 'state'
     end
-    expected = "<div class=\"btn-group btn-group-sm\" role=\"group\"><button class=\"btn btn-sm\">state</button></div>"
+    expected = "<div class=\"btn-group btn-group-sm\" role=\"group\"><button class=\"btn-secondary btn btn-sm\">state</button></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/buttons/button_test.rb

@@ -5,7 +5,7 @@ class ButtonTest < ActionView::TestCase
 
   test "button" do
     actual   = ui_button('state')
-    expected = "<button class=\"btn\">state</button>"
+    expected = "<button class=\"btn-secondary btn\">state</button>"
 
     assert_equal expected, actual
   end
@@ -26,56 +26,91 @@ class ButtonTest < ActionView::TestCase
 
   test 'button disabled' do
     actual   = ui_button('state', state: :disabled)
-    expected = "<button class=\"disabled btn\" disabled=\"disabled\">state</button>"
+    expected = "<button class=\"disabled btn-secondary btn\" disabled=\"disabled\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button active' do
     actual   = ui_button('state', state: :active)
-    expected = "<button class=\"active btn\" aria-pressed=\"true\">state</button>"
+    expected = "<button class=\"active btn-secondary btn\" aria-pressed=\"true\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button badge' do
     actual   = ui_button('state', badge: 2)
-    expected = "<button class=\"btn\">state<span class=\"badge-secondary badge\">2</span></button>"
+    expected = "<button class=\"btn-secondary btn\">state<span class=\"badge-secondary badge\">2</span></button>"
 
     assert_equal expected, actual
   end
 
   test 'button block' do
     actual   = ui_button('state', type: :block)
-    expected = "<button class=\"btn btn-block\">state</button>"
+    expected = "<button class=\"btn-secondary btn btn-block\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button size' do
     actual   = ui_button('state', size: :sm)
-    expected = "<button class=\"btn btn-sm\">state</button>"
+    expected = "<button class=\"btn-secondary btn btn-sm\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button toggle' do
     actual   = ui_button('state', toggle: true)
-    expected = "<button class=\"btn\" data-toggle=\"button\" aria-pressed=\"false\" autocomplete=\"off\">state</button>"
+    expected = "<button class=\"btn-secondary btn\" data-toggle=\"button\" aria-pressed=\"false\" autocomplete=\"off\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button glyph' do
     actual   = ui_button('state', glyph: 'diamond')
-    expected = "<button class=\"btn\"><i class=\"glyph fas fa-diamond\"></i>  state</button>"
+    expected = "<button class=\"btn-secondary btn\"><i class=\"glyph fas fa-diamond\"></i>  state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button glyph without text' do
     actual   = ui_button('state', glyph: 'diamond', text: false)
-    expected = "<button class=\"btn without-text\"><i title=\"state\" class=\"glyph fas fa-diamond\"></i></button>"
+    expected = "<button class=\"btn-secondary btn without-text\"><i title=\"state\" class=\"glyph fas fa-diamond\"></i></button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button with collapse' do
+    actual   = ui_button('state', collapse: 'collapse-id')
+    expected = "<button class=\"btn-secondary btn\" data-toggle=\"collapse\" data-target=\"#collapse-id\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test "button with simple popover" do
+    actual = ui_button('My Button', popover: 'My popover')
+    expected = "<button data-toggle=\"popover\" data-content=\"My popover\" class=\"btn-secondary btn\">My Button</button>"
+
+    assert_equal expected, actual
+  end
+
+  test "button with complex popover" do
+    actual = ui_button('My Button', popover: { content: 'My popover', position: :left })
+    expected = "<button data-toggle=\"popover\" data-content=\"My popover\" data-placement=\"left\" class=\"btn-secondary btn\">My Button</button>"
+
+    assert_equal expected, actual
+  end
+
+  test "button with simple tooltip" do
+    actual = ui_button('My Button', { tooltip: true }, { title: 'My tooltip' })
+    expected = "<button title=\"My tooltip\" data-toggle=\"tooltip\" class=\"btn-secondary btn\">My Button</button>"
+
+    assert_equal expected, actual
+  end
+
+  test "button with complex tooltip" do
+    actual = ui_button('My Button', tooltip: { title: 'My tooltip', position: :left })
+    expected = "<button data-toggle=\"tooltip\" data-title=\"My tooltip\" data-placement=\"left\" class=\"btn-secondary btn\">My Button</button>"
 
     assert_equal expected, actual
   end

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

@@ -3,7 +3,7 @@ require 'test_helper'
 class CheckboxFieldTest < ActionView::TestCase
 
     test 'checkbox_field' do
-      actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { value: 1, status: :primary, type: :circle }).render
+      actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { value: 1 }).render
       expected = "<div class=\"custom-control custom-checkbox\"><input type=\"hidden\" name=\"John\" id=\"John-hidden\" value=\"0\" /><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" class=\"custom-control-input\" /><label class=\"custom-control-label\" for=\"John\">John</label></div>"
 
       assert_equal expected, actual

data/test/ui/core/forms/selects/dropdown_select_field_test.rb

@@ -5,7 +5,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', options_tags: options).render
-      expected = "<select name=\"test\" id=\"test\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -13,7 +13,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field searchable' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, searchable: true }).render
-      expected = "<select name=\"test\" id=\"test\" data-live-search=\"true\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-live-search=\"true\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -21,7 +21,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field max_options' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, max_options: 2 }).render
-      expected = "<select name=\"test\" id=\"test\" data-max-options=\"2\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-max-options=\"2\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -29,7 +29,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field selected_text_format' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, selected_text_format: "count > x" }).render
-      expected = "<select name=\"test\" id=\"test\" data-selected-text-format=\"count &gt; x\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-selected-text-format=\"count &gt; x\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -37,7 +37,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field menu_size' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, menu_size: 2 }).render
-      expected = "<select name=\"test\" id=\"test\" data-size=\"2\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-size=\"2\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -45,7 +45,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field actions_box' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, actions_box: true }).render
-      expected = "<select name=\"test\" id=\"test\" data-actions-box=\"true\" class=\"dropdown-select-field\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-style=\"btn-secondary\" data-actions-box=\"true\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -53,7 +53,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field show_tick' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, show_tick: true }).render
-      expected = "<select name=\"test\" id=\"test\" class=\"dropdown-select-field show-tick\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-style=\"btn-secondary\" class=\"dropdown-select-field show-tick\"></select>"
 
       assert_equal expected, actual
     end
@@ -61,7 +61,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field show_menu_arrow' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, show_menu_arrow: true }).render
-      expected = "<select name=\"test\" id=\"test\" class=\"dropdown-select-field show-menu-arrow\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select>"
 
       assert_equal expected, actual
     end
@@ -69,14 +69,14 @@ class DropdownSelectFieldTest < ActionView::TestCase
     test 'dropdown_select_field dropup' do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { options_tags: options, dropup: true }).render
-      expected = "<select name=\"test\" id=\"test\" class=\"dropdown-select-field dropup\"></select>"
+      expected = "<select name=\"test\" id=\"test\" data-style=\"btn-secondary\" class=\"dropdown-select-field dropup\"></select>"
 
       assert_equal expected, actual
     end
 
     test 'dropdown_select_field refresh' do
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { refresh: { mode: 'local', target: { data: [] }}}).render
-      expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"test\" id=\"test\" class=\"dropdown-select-field\"></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;local&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&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></div>"
+      expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"test\" id=\"test\" data-style=\"btn-secondary\" class=\"dropdown-select-field\"></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;local&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&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></div>"
 
       assert_equal expected, actual
     end

data/test/ui/core/forms/selects/select_field_test.rb

@@ -5,7 +5,7 @@ class SelectFieldTest < ActionView::TestCase
     test "Select Field" do
       options  = options_for_select(2.times.map{ |i| "option #{i}" })
       actual   = UiBibz::Ui::Core::Forms::Selects::SelectField.new('example', option_tags: options).render
-      expected = "<select name=\"example\" id=\"example\" class=\"select-field form-control\"><option value=\"option 0\">option 0</option>
+      expected = "<select name=\"example\" id=\"example\" class=\"select-field form-control custom-select\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></select>"
 
       assert_equal expected, actual
@@ -13,7 +13,7 @@ class SelectFieldTest < ActionView::TestCase
 
     test "Select Field refresh" do
       actual   = UiBibz::Ui::Core::Forms::Selects::SelectField.new('example', refresh: { target: { url: '/' }}).render
-      expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"example\" id=\"example\" class=\"select-field form-control\"></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#example&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></div>"
+      expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"example\" id=\"example\" class=\"select-field form-control custom-select\"></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#example&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></div>"
 
       assert_equal expected, actual
     end

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

@@ -39,7 +39,7 @@ class SurroundFieldTest < ActionView::TestCase
       actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
         sf.button 'Submit'
       end.render
-      expected = "<div class=\"input-group ui_surround_field\"><div class=\"input-group-btn\"><button class=\"btn\">Submit</button></div></div>"
+      expected = "<div class=\"input-group ui_surround_field\"><div class=\"input-group-btn\"><button class=\"btn-secondary btn\">Submit</button></div></div>"
 
       assert_equal expected, actual
     end
@@ -50,7 +50,7 @@ class SurroundFieldTest < ActionView::TestCase
         sf.addon '€'
         sf.glyph 'pencil'
       end.render
-      expected = "<div class=\"input-group ui_surround_field\"><div class=\"input-group-btn\"><button class=\"btn\">Submit</button></div><span class=\"input-group-addon\">€</span><span class=\"input-group-addon\"><i class=\"glyph fas fa-pencil\"></i></span></div>"
+      expected = "<div class=\"input-group ui_surround_field\"><div class=\"input-group-btn\"><button class=\"btn-secondary btn\">Submit</button></div><span class=\"input-group-addon\">€</span><span class=\"input-group-addon\"><i class=\"glyph fas fa-pencil\"></i></span></div>"
 
       assert_equal expected, actual
     end

data/test/ui/core/navigations/link_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+class LinkTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'Link' do
+    actual = ui_link 'My link', url: "#link"
+    expected = "<a href=\"#link\">My link</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'Link without text' do
+    actual = ui_link 'My link', glyph: "gem", text: false, url: "#link"
+    expected = "<a href=\"#link\"><i title=\"My link\" class=\"glyph fas fa-gem\"></i></a>"
+
+    assert_equal expected, actual
+  end
+
+  test "Link with collapse option" do
+    actual = ui_link 'My link', url: "#link", collapse: 'collapse-id'
+    expected = "<a role=\"button\" data-toggle=\"collapse\" data-target=\"#collapse-id\" href=\"#link\">My link</a>"
+
+    assert_equal expected, actual
+  end
+
+end