ui_bibz 3.0.0.beta3 → 3.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe8b08b80f4ee4b0ab28e1956134dea1530d71ff1bfe0d6d1b6e3800d839bce
-  data.tar.gz: 7970efb91f6a676dc012753c8cc79e39ae4514db97818ac1394f55b37e729a99
+  metadata.gz: 5d3e72f23a91692fcd9919939cac116b0434333c8597b11dcef0f7b8cb766d87
+  data.tar.gz: f3b225819371ddbe82c9f2f3c84388f4e2fed1edce822e539e649e761f6224b8
 SHA512:
-  metadata.gz: a24bc17b0a2afcfbec5a89a058920e411aaa8c7e014b9f3604880a659f813ced5431e96a975da9d32d43500508e18b19531aaf1caccefea0ecade3fa24df0e94
-  data.tar.gz: 512a44e10d6944881806b3ccf697715f0c9fabf240338813ccea5a54b4a9299a52304cc097e6c90658644a28e7355e3449e775b54d95ffc343e3b3eb55395ac4
+  metadata.gz: ff3ce0988337055522cfb625287a83104691d0931219c76763e8014b0e8775496fa21312721896bc3fed30b26473f058abf2f3f7f87ea3d9cb7a19bf94409f14
+  data.tar.gz: 64cdd3c257b47403e4ebf83ab47fb56b3c0f73136a1d4db0fbbf300925b32999b374c6054271bba50bca2b0b7da0dc37db1d9c21178c718397d1f7d6fd110ae5

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: 95196f8dbe3406321c6e7b406585532102784f0a3d4141a25f53937eedb844b6
+        CC_TEST_REPORTER_ID: 7e50558afc7a861280e3194a765a159e9ea5bdd22d2ebe6c13e5e23fe914c66b
       with:
         coverageCommand: bundle exec rake

data/.github/workflows/dependencies-checker.yml

@@ -0,0 +1,13 @@
+name: Dependencies Checker
+
+on: pull_request
+
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: 'Bundler Audit'
+        uses: andrewmcodes/bundler-audit-action@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/linter.yml

@@ -0,0 +1,16 @@
+name: Linter
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Rubocop linter
+      uses: thooams/rubocop-action@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-ast
   - rubocop-performance
   - rubocop-rails
   - rubocop-minitest

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta3)
+    ui_bibz (3.0.0.beta8)
       will-paginate-i18n
-      will_paginate (~> 3.1.0)
+      will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
 
 GEM
@@ -64,16 +64,14 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+    ast (2.4.2)
     awesome_print (1.8.0)
     builder (3.2.4)
     byebug (11.1.3)
     childprocess (4.0.0)
-    codeclimate-test-reporter (1.0.7)
-      simplecov
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    docile (1.3.4)
+    docile (1.3.5)
     erubi (1.10.0)
     erubis (2.7.0)
     factory_bot (4.11.1)
@@ -97,14 +95,14 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.7)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -160,7 +158,7 @@ GEM
     rake (13.0.3)
     regexp_parser (2.0.3)
     rexml (3.2.4)
-    rubocop (1.8.0)
+    rubocop (1.9.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -169,9 +167,9 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.2)
+    rubocop-minitest (0.10.3)
       rubocop (>= 0.87, < 2.0)
     rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
@@ -181,13 +179,13 @@ GEM
       rack (>= 1.1)
       rubocop (>= 0.90.0, < 2.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.15.0)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.15.1)
+    sexp_processor (4.15.2)
     simple_form (5.0.3)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.21.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -202,7 +200,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     temple (0.8.2)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tzinfo (1.2.9)
@@ -212,7 +210,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will-paginate-i18n (0.1.15)
-    will_paginate (3.1.8)
+    will_paginate (3.3.0)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
     zeitwerk (2.4.2)
@@ -223,7 +221,6 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   byebug
-  codeclimate-test-reporter
   factory_bot_rails (~> 4.0)
   haml-rails
   jquery-rails (>= 3.1.0)

data/README.md

@@ -1,11 +1,12 @@
 ![Ui Bibz logo](https://repository-images.githubusercontent.com/29547689/e29b2180-0d59-11eb-89f3-4541571d7c67)
 
 [![Gem Version](https://badge.fury.io/rb/ui_bibz.svg)](https://badge.fury.io/rb/ui_bibz)
-[![Code Climate](https://codeclimate.com/github/thooams/Ui-Bibz/badges/gpa.svg)](https://codeclimate.com/github/thooams/Ui-Bibz)
-[![Test Coverage](https://codeclimate.com/github/thooams/Ui-Bibz/badges/coverage.svg)](https://codeclimate.com/github/thooams/Ui-Bibz)
-[![Inline docs](http://inch-ci.org/github/thooams/Ui-Bibz.svg?branch=master)](http://inch-ci.org/github/thooams/Ui-Bibz)
-[![security](https://hakiri.io/github/thooams/Ui-Bibz/master.svg)](https://hakiri.io/github/thooams/Ui-Bibz/master)
-![Ci](https://github.com/thooams/Ui-Bibz/workflows/CI/badge.svg)
+[![Maintainability](https://api.codeclimate.com/v1/badges/cfbe9828c32d69581534/maintainability)](https://codeclimate.com/github/thooams/ui_bibz/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/cfbe9828c32d69581534/test_coverage)](https://codeclimate.com/github/thooams/ui_bibz/test_coverage)
+[![security](https://hakiri.io/github/thooams/ui_bibz/main.svg)](https://hakiri.io/github/thooams/ui_bibz/main)
+[![Ci](https://github.com/thooams/ui_bibz/workflows/CI/badge.svg)](https://github.com/thooams/ui_bibz/actions)
+[![Linter](https://github.com/thooams/chart_bibz/workflows/Linter/badge.svg)](https://github.com/thooams/chart_bibz/actions)
+[![Inline docs](http://inch-ci.org/github/thooams/ui_bibz.svg?branch=main)](http://inch-ci.org/github/thooams/ui_bibz)
 
 This project rocks and uses MIT-LICENSE.
 
@@ -21,7 +22,7 @@ Full documentation is here with bootstrap 5:
 [Ui Bibz v3](http://hummel.link/ui-bibz/)
 
 Older documentation is here with bootstrap 4:
-[Ui Bibz v2.5](http://hummel.link/Ui-Bibz/docs/v2.5/)
+[Ui Bibz v2.5](http://hummel.link/ui-bibz/docs/v2.5/)
 
 
 ## Donate

data/lib/ui_bibz.rb

@@ -180,9 +180,11 @@ module UiBibz
       module Notifications
         autoload :Alert,                   'ui_bibz/ui/core/notifications/alert'
         autoload :Badge,                   'ui_bibz/ui/core/notifications/badge'
+        autoload :Popover,                 'ui_bibz/ui/core/notifications/popover'
         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'
+        autoload :Tooltip,                 'ui_bibz/ui/core/notifications/tooltip'
       end
 
       module Windows

data/lib/ui_bibz/infos.rb

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

data/lib/ui_bibz/ui/core/forms/dropdowns/split_dropdown.rb

@@ -73,12 +73,12 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_html
-      content_tag :button, button_content, class: join_classes('btn', button_status, size)
+      content_tag :button, button_content, (options[:html_button] || {}).merge(class: join_classes('btn', button_status, size, options[:html_button].try(:[], :class)))
     end
 
     def split_html
-      content_tag :button, split_content, class: split_classes, type: 'button',
-                                          'data-bs-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false
+      content_tag :button, split_content, (options[:html_split] || {}).merge(class: split_classes, type: 'button',
+                                                                             'data-bs-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false)
     end
 
     def split_content
@@ -86,7 +86,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def split_classes
-      join_classes('btn', button_status, size, 'dropdown-toggle', 'dropdown-toggle-split')
+      join_classes('btn', button_status, size, 'dropdown-toggle', 'dropdown-toggle-split', options[:split_html].try(:[], :class))
     end
 
     def src_only

data/lib/ui_bibz/ui/core/forms/files/file_field.rb

@@ -45,19 +45,17 @@ module UiBibz::Ui::Core::Forms::Files
 
     # Render html tag
     def pre_render
-      content_tag :div, html_options do
-        concat file_field_tag content, class: 'form-file-input', multiple: options[:multiple], disabled: disabled?
-        concat label_text_and_button
-      end
+      file_field_tag content, html_options
     end
 
     private
 
-    def label_text_and_button
-      label_tag label_name, class: 'form-file-label' do
-        concat content_tag(:span, format_value(options[:input_text] || options[:value]), class: 'form-file-text')
-        concat content_tag(:span, options[:button_text] || 'Browse', class: 'form-file-button')
-      end
+    def component_html_options
+      super.merge({
+                    multiple: options[:multiple],
+                    disabled: disabled?,
+                    value: format_value(options[:input_text] || options[:value])
+                  })
     end
 
     def format_value(value)
@@ -70,12 +68,8 @@ module UiBibz::Ui::Core::Forms::Files
       value.to_s
     end
 
-    def label_name
-      html_options[:id] || content
-    end
-
     def component_html_classes
-      super << 'form-file'
+      super << 'form-control'
     end
   end
 end

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

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

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Core::Notifications
+  # Create a popover
+  #
+  # 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:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Notifications::Popover.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::Popover.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::Popover.new(class: 'my-toast').tap |t|
+  #     t.header "My header toast", glyph: 'eye', time: 'now'
+  #     t.body "My body toast"
+  #   end
+  #
+  # ==== Helper
+  #
+  #   popover = UiBibz::Ui::Core::Notifications::Popover.new(position: :left) do
+  #      My content
+  #   end
+  #   ui_glyph("diamond", popover: popover)
+  #
+  #   # or
+  #
+  #   ui_glyph("diamond", {popover: true}, { title: "My content" })
+  #
+  #   # or
+  #
+  #   ui_glyph("diamond", popover: { title: "My content", position: :right})
+  #
+  class Popover < UiBibz::Ui::Core::Component
+    # 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
+    DATA_ATTRIBUTES = %i[animation container delay html selector
+                         template title trigger offset fallbackPlacement
+                         boundary customClass popperConfig].freeze
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize(content = nil, options = nil, html_options = nil, &block)
+      super
+      @content = @options[:content] if content.is_a?(Hash) && block.nil?
+    end
+
+    # Render html tag
+    def render
+      base_attributes.merge(data_attributes)
+    end
+
+    private
+
+    def base_attributes
+      {
+        'data-bs-toggle' => 'popover',
+        'data-bs-content' => @content.html_safe
+      }.tap do |h|
+        h['data-bs-placement'] = options[:position] || options[:placement] if (options[:position] || options[:placement]).present?
+      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
+  end
+end

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

@@ -25,20 +25,20 @@ module UiBibz::Ui::Core::Notifications
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Toast.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Notifications::Toast.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Toast.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Notifications::Toast.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Toast.new(class: 'my-toast').tap |t|
+  #   UiBibz::Ui::Core::Notifications::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|
+  #   UiBibz::Ui::Core::Notifications::Toast.new(class: 'my-toast').tap |t|
   #     t.header glyph: 'eye', time: 'now' do
   #       My header toast
   #     end

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Core::Notifications
+  # Create a tooltip
+  #
+  # 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:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Notifications::Tooltip.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::Tooltip.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::Tooltip.new("My content")
+  #
+  #   # or
+  #
+  #   UiBibz::Ui::Core::Notifications::Tooltip.new(position: :right) do
+  #     content
+  #   end
+  #
+  # ==== Helper
+  #
+  #   tooltip = UiBibz::Ui::Core::Notifications::Tooltip.new("My content", position: :left)
+  #   ui_glyph("diamond", tooltip: tooltip)
+  #
+  #   # or
+  #
+  #   ui_glyph("diamond", {tooltip: true}, { title: "My content" })
+  #
+  #   # or
+  #
+  #   ui_glyph("diamond", tooltip: { title: "My content", position: :right})
+  #
+  class Tooltip < UiBibz::Ui::Core::Component
+    # 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
+    DATA_ATTRIBUTES = %i[animation container delay html selector template trigger
+                         fallbackPlacement boundary].freeze
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize(content = nil, options = nil, html_options = nil, &block)
+      super
+      @content = @options[:title] if content.is_a?(Hash) && block.nil?
+    end
+
+    # Render html tag
+    def render
+      base_attributes.merge(data_attributes)
+    end
+
+    private
+
+    def base_attributes
+      {
+        'data-bs-toggle' => 'tooltip',
+        'data-bs-title' => @content.html_safe
+      }.tap do |h|
+        h['data-bs-placement'] = options[:position] || options[:placement] if (options[:position] || options[:placement]).present?
+      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
+  end
+end

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

@@ -1,34 +1,37 @@
 # frozen_string_literal: true
 
 module PopoverExtension
-  TOOLTIP_METHODS = %i[animation container delay html placement selector template title trigger
-                       offset fallback_placement boundary sanitize white_list santitize_fn].freeze
-
-  POPOVER_METHODS = %i[animation container delay html placement selector template title
-                       trigger offset fallback_placement boundary sanitize white_list sanitize_fn].freeze
-
   def popover_data_html
-    if options[:popover].present?
-      add_html_data 'bs-toggle', value: 'popover'
-      add_html_data 'bs-content', value: (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
-    end
+    return if options[:popover].nil?
 
-    return unless options[:popover].is_a?(Hash)
-
-    POPOVER_METHODS.each { |mth| add_html_data(mth, value: options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
-    add_html_data 'bs-placement', value: options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
+    html_options.update(generate_popover.render)
   end
 
   def tooltip_data_html
     return if options[:tooltip].nil?
 
-    add_html_data 'bs-toggle', value: 'tooltip'
+    html_options.update(generate_tooltip.render)
+  end
+
+  private
+
+  def generate_tooltip
+    case options[:tooltip].class.name
+    when 'UiBibz::Ui::Core::Notifications::Tooltip'
+      options[:tooltip]
+    when 'TrueClass'
+      UiBibz::Ui::Core::Notifications::Tooltip.new(html_options.delete(:title))
+    else
+      UiBibz::Ui::Core::Notifications::Tooltip.new(options[:tooltip])
+    end
+  end
 
-    if options[:tooltip].is_a?(Hash)
-      TOOLTIP_METHODS.each { |mth| add_html_data(mth, value: options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
-      add_html_data 'bs-placement', value: options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
+  def generate_popover
+    case options[:popover].class.name
+    when 'UiBibz::Ui::Core::Notifications::Popover'
+      options[:popover]
     else
-      add_html_data :title, value: options[:tooltip] == true ? sanitize_text(content) : options[:tooltip]
+      UiBibz::Ui::Core::Notifications::Popover.new(options[:popover])
     end
   end
 end

data/test/simple_form_test.rb

@@ -202,7 +202,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_file_field
     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_file_field optional user_name_fr\"><label class=\"control-label ui_file_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"ui_file_field optional form-file\"><input type=\"file\" name=\"user[name_fr]\" id=\"user_name_fr\" class=\"form-file-input\" /><label class=\"form-file-label\" for=\"user_name_fr\"><span class=\"form-file-text\">test1</span><span class=\"form-file-button\">Browse</span></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_file_field optional user_name_fr\"><label class=\"control-label ui_file_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"file\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_file_field optional form-control\" /></div></form>"
 
     assert_equal expected, actual
   end

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

@@ -90,22 +90,22 @@ class ButtonTest < ActionView::TestCase
   end
 
   test 'button with complex popover' do
-    actual = ui_button('My Button', popover: { content: 'My popover', position: :left })
-    expected = '<button data-bs-toggle="popover" data-bs-content="My popover" data-bs-placement="left" class="btn-secondary btn">My Button</button>'
+    actual = ui_button('My Button', popover: { content: 'My popover', position: :left, html: true })
+    expected = "<button data-bs-toggle=\"popover\" data-bs-content=\"My popover\" data-bs-placement=\"left\" data-bs-html=\"true\" class=\"btn-secondary btn\">My Button</button>"
 
     assert_equal expected, actual
   end
 
   test 'button with simple tooltip' do
     actual = ui_button('My Button', { tooltip: 'My Button' }, { title: 'My tooltip' })
-    expected = '<button title="My tooltip" data-bs-toggle="tooltip" data-title="My Button" class="btn-secondary btn">My Button</button>'
+    expected = '<button title="My tooltip" data-bs-toggle="tooltip" data-bs-title="My Button" 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-bs-toggle="tooltip" data-title="My tooltip" data-bs-placement="left" class="btn-secondary btn">My Button</button>'
+    expected = '<button data-bs-toggle="tooltip" data-bs-title="My tooltip" data-bs-placement="left" class="btn-secondary btn">My Button</button>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/files/file_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class FileFieldTest < ActionView::TestCase
   test 'file_field' do
     actual = UiBibz::Ui::Core::Forms::Files::FileField.new('test').render
-    expected = "<div class=\"form-file\"><input type=\"file\" name=\"test\" id=\"test\" class=\"form-file-input\" /><label class=\"form-file-label\" for=\"test\"><span class=\"form-file-text\"></span><span class=\"form-file-button\">Browse</span></label></div>"
+    expected = "<input type=\"file\" name=\"test\" id=\"test\" value=\"\" class=\"form-control\" />"
 
     assert_equal expected, actual
   end

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

@@ -4,14 +4,14 @@ require 'test_helper'
 class NavbarTest < ActionView::TestCase
   test 'Navbar' do
     actual = UiBibz::Ui::Core::Navigations::Navbar.new
-    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
 
     assert_equal expected, actual.render
   end
 
   test 'Navbar with options' do
     actual = UiBibz::Ui::Core::Navigations::Navbar.new(title: 'Brand', expand_size: :xs, status: :primary, position: :top, brand_position: :right)
-    expected = "<nav class=\"bg-primary navbar navbar-light fixed-top navbar-expand-xs\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><span class=\"navbar-brand\">Brand</span><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
+    expected = "<nav class=\"bg-primary navbar navbar-light fixed-top navbar-expand-xs\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><span class=\"navbar-brand\">Brand</span><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
 
     assert_equal expected, actual.render
   end
@@ -30,7 +30,7 @@ class NavbarTest < ActionView::TestCase
       end
       nb.text 'test'
     end
-    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\">Brand</span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#Home\" class=\"active nav-link\">Home</a></li><li class=\"nav-item\"><a href=\"#profile\" class=\"nav-link\">Profile</a></li><li class=\"nav-item\"><a href=\"#messages\" class=\"nav-link\">Messages</a></li></ul><form type=\"form_tag\" position=\"right\" class=\"d-flex\" action=\"#\" accept-charset=\"UTF-8\" method=\"post\"><button class=\"btn-secondary btn\">Search</button></form><span class=\"navbar-text\">test</span></div></div></nav>"
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\">Brand</span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#Home\" class=\"active nav-link\">Home</a></li><li class=\"nav-item\"><a href=\"#profile\" class=\"nav-link\">Profile</a></li><li class=\"nav-item\"><a href=\"#messages\" class=\"nav-link\">Messages</a></li></ul><form type=\"form_tag\" position=\"right\" class=\"d-flex\" action=\"#\" accept-charset=\"UTF-8\" method=\"post\"><button class=\"btn-secondary btn\">Search</button></form><span class=\"navbar-text\">test</span></div></div></nav>"
 
     assert_equal expected, actual.render
   end
@@ -43,7 +43,7 @@ class NavbarTest < ActionView::TestCase
       end
     end
     expected =
-      "<nav class=\"bg-dark navbar navbar-dark navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\"><img src=\"/images/ruby-white\" /></span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#link\" class=\"nav-link\">Link</a></li></ul></div></div></nav>"
+      "<nav class=\"bg-dark navbar navbar-dark navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\"><img src=\"/images/ruby-white\" /></span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#link\" class=\"nav-link\">Link</a></li></ul></div></div></nav>"
 
     assert_equal expected, actual.render
   end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+class PopoverTest < ActionView::TestCase
+  setup do
+    @parameters = { animation: true, container: "body", position: :left,
+                    delay: 10, html: true, selector: false, template: "<b>",
+                    trigger: "hover focus", fallbackPlacement: %w[top right],
+                    boundary: 'clippingParents', title: "My title", offset: 2,
+                    customClass: "test", popperConfig: "Mystring" }
+  end
+
+  test 'popover by hash' do
+    actual   = UiBibz::Ui::Core::Notifications::Popover.new(@parameters.merge(content: "My Content")).render
+    expected = { "data-bs-toggle" => "popover", "data-bs-content" => "My Content", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-title" => "My title", "data-bs-trigger" => "hover focus", "data-bs-offset" => 2, "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents", "data-bs-customClass" => "test", "data-bs-popperConfig" => "Mystring" }
+
+    assert_equal expected, actual
+  end
+
+  test 'popover with content and options' do
+    actual = UiBibz::Ui::Core::Notifications::Popover.new("My Content", @parameters).render
+
+    expected = { "data-bs-toggle" => "popover", "data-bs-content" => "My Content", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-title" => "My title", "data-bs-trigger" => "hover focus", "data-bs-offset" => 2, "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents", "data-bs-customClass" => "test", "data-bs-popperConfig" => "Mystring" }
+
+    assert_equal expected, actual
+  end
+
+  test 'popover with block and options' do
+    actual = UiBibz::Ui::Core::Notifications::Popover.new(@parameters) do
+      "My Content"
+    end.render
+
+    expected = { "data-bs-toggle" => "popover", "data-bs-content" => "My Content", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-title" => "My title", "data-bs-trigger" => "hover focus", "data-bs-offset" => 2, "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents", "data-bs-customClass" => "test", "data-bs-popperConfig" => "Mystring" }
+
+    assert_equal expected, actual
+  end
+
+  test 'glyph with popover object' do
+    popover = UiBibz::Ui::Core::Notifications::Popover.new(@parameters.merge(content: "My Content"))
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", popover: popover).render
+    expected = "<i data-bs-toggle=\"popover\" data-bs-content=\"My Content\" data-bs-placement=\"left\" data-bs-animation=\"true\" data-bs-container=\"body\" data-bs-delay=\"10\" data-bs-html=\"true\" data-bs-selector=\"false\" data-bs-template=\"<b>\" data-bs-title=\"My title\" data-bs-trigger=\"hover focus\" data-bs-offset=\"2\" data-bs-fallbackPlacement=\"top right\" data-bs-boundary=\"clippingParents\" data-bs-customClass=\"test\" data-bs-popperConfig=\"Mystring\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
+
+  test 'glyph with popover hash' do
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", popover: @parameters.merge(content: "My Content")).render
+    expected = "<i data-bs-toggle=\"popover\" data-bs-content=\"My Content\" data-bs-placement=\"left\" data-bs-animation=\"true\" data-bs-container=\"body\" data-bs-delay=\"10\" data-bs-html=\"true\" data-bs-selector=\"false\" data-bs-template=\"<b>\" data-bs-title=\"My title\" data-bs-trigger=\"hover focus\" data-bs-offset=\"2\" data-bs-fallbackPlacement=\"top right\" data-bs-boundary=\"clippingParents\" data-bs-customClass=\"test\" data-bs-popperConfig=\"Mystring\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
+end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+class TooltipTest < ActionView::TestCase
+  setup do
+    @parameters = { animation: true, container: "body", position: :left,
+                    delay: 10, html: true, selector: false, template: "<b>",
+                    trigger: "hover focus", fallbackPlacement: %w[top right],
+                    boundary: 'clippingParents' }
+  end
+
+  test 'tooltip by hash' do
+    actual   = UiBibz::Ui::Core::Notifications::Tooltip.new(@parameters.merge(title: "My Title")).render
+    expected = { "data-bs-toggle" => "tooltip", "data-bs-title" => "My Title", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-trigger" => "hover focus", "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents" }
+
+    assert_equal expected, actual
+  end
+
+  test 'tooltip with content and options' do
+    actual = UiBibz::Ui::Core::Notifications::Tooltip.new("My Title", @parameters).render
+
+    expected = { "data-bs-toggle" => "tooltip", "data-bs-title" => "My Title", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-trigger" => "hover focus", "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents" }
+
+    assert_equal expected, actual
+  end
+
+  test 'tooltip with block and options' do
+    actual = UiBibz::Ui::Core::Notifications::Tooltip.new(@parameters) do
+      "My Title"
+    end.render
+
+    expected = { "data-bs-toggle" => "tooltip", "data-bs-title" => "My Title", "data-bs-placement" => :left, "data-bs-animation" => true, "data-bs-container" => "body", "data-bs-delay" => 10, "data-bs-html" => true, "data-bs-selector" => false, "data-bs-template" => "<b>", "data-bs-trigger" => "hover focus", "data-bs-fallbackPlacement" => %w[top right], "data-bs-boundary" => "clippingParents" }
+
+    assert_equal expected, actual
+  end
+
+  test 'glyph with tooltip object' do
+    tooltip = UiBibz::Ui::Core::Notifications::Tooltip.new(@parameters.merge(title: "My Title"))
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", tooltip: tooltip).render
+    expected = "<i data-bs-toggle=\"tooltip\" data-bs-title=\"My Title\" data-bs-placement=\"left\" data-bs-animation=\"true\" data-bs-container=\"body\" data-bs-delay=\"10\" data-bs-html=\"true\" data-bs-selector=\"false\" data-bs-template=\"<b>\" data-bs-trigger=\"hover focus\" data-bs-fallbackPlacement=\"top right\" data-bs-boundary=\"clippingParents\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
+
+  test 'glyph with tooltip hash' do
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", tooltip: @parameters.merge(title: "My Title")).render
+    expected = "<i data-bs-toggle=\"tooltip\" data-bs-title=\"My Title\" data-bs-placement=\"left\" data-bs-animation=\"true\" data-bs-container=\"body\" data-bs-delay=\"10\" data-bs-html=\"true\" data-bs-selector=\"false\" data-bs-template=\"<b>\" data-bs-trigger=\"hover focus\" data-bs-fallbackPlacement=\"top right\" data-bs-boundary=\"clippingParents\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
+
+  test 'glyph with tooltip boolean' do
+    actual = UiBibz::Ui::Core::Icons::Glyph.new("diamond", { tooltip: true }, { title: "My Title" }).render
+    expected = "<i data-bs-toggle=\"tooltip\" data-bs-title=\"My Title\" class=\"glyph fas fa-diamond\"></i>"
+
+    assert_equal expected, actual
+  end
+end

data/ui_bibz.gemspec

@@ -30,12 +30,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '~> 6.0.3', '>= 6.0.3.2'
 
   # Remove these dependencies after
-  s.add_dependency 'will_paginate', '~> 3.1.0'
+  s.add_dependency 'will_paginate', '~> 3.3.0'
   s.add_dependency 'will_paginate-bootstrap4'
   s.add_dependency 'will-paginate-i18n'
 
   # Development gems
-  s.add_development_dependency 'codeclimate-test-reporter'
   s.add_development_dependency 'factory_bot_rails', '~> 4.0'
   s.add_development_dependency 'haml-rails'
   s.add_development_dependency 'minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta8
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap4
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -261,9 +247,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".github/FUNDING.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/dependencies-checker.yml"
+- ".github/workflows/linter.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".overcommit.yml"
@@ -424,9 +411,11 @@ files:
 - lib/ui_bibz/ui/core/notifications/components/bar.rb
 - lib/ui_bibz/ui/core/notifications/components/toast_body.rb
 - lib/ui_bibz/ui/core/notifications/components/toast_header.rb
+- lib/ui_bibz/ui/core/notifications/popover.rb
 - lib/ui_bibz/ui/core/notifications/progress_bar.rb
 - lib/ui_bibz/ui/core/notifications/spinner.rb
 - lib/ui_bibz/ui/core/notifications/toast.rb
+- lib/ui_bibz/ui/core/notifications/tooltip.rb
 - lib/ui_bibz/ui/core/windows/components/modal_body.rb
 - lib/ui_bibz/ui/core/windows/components/modal_footer.rb
 - lib/ui_bibz/ui/core/windows/components/modal_header.rb
@@ -577,9 +566,11 @@ files:
 - test/ui/core/navigations/toolbar_test.rb
 - test/ui/core/notifications/alert_test.rb
 - test/ui/core/notifications/badge_test.rb
+- test/ui/core/notifications/popover_test.rb
 - test/ui/core/notifications/progress_bar_test.rb
 - test/ui/core/notifications/spinner_test.rb
 - test/ui/core/notifications/toast_test.rb
+- test/ui/core/notifications/tooltip_test.rb
 - test/ui/core/windows/modal_test.rb
 - test/ui/utils/breakdown_class_name_generator_test.rb
 - test/ui/ux/containers/panel_test.rb
@@ -787,9 +778,11 @@ test_files:
 - test/ui/core/navigations/toolbar_test.rb
 - test/ui/core/notifications/alert_test.rb
 - test/ui/core/notifications/badge_test.rb
+- test/ui/core/notifications/popover_test.rb
 - test/ui/core/notifications/progress_bar_test.rb
 - test/ui/core/notifications/spinner_test.rb
 - test/ui/core/notifications/toast_test.rb
+- test/ui/core/notifications/tooltip_test.rb
 - test/ui/core/windows/modal_test.rb
 - test/ui/utils/breakdown_class_name_generator_test.rb
 - test/ui/ux/containers/panel_test.rb

data/.codeclimate.yml

@@ -1,8 +0,0 @@
-version: "2"
-plugins:
-  brakeman:
-    enabled: true
-  bundler-audit:
-    enabled: true
-  rubocop:
-    enabled: true