ui_bibz 3.0.0.alpha9 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e609add47b874d22474ad98a691fb0511ac6b1704309355079a369ae7141a2ac
-  data.tar.gz: c202dad217807b43e0857d17de0fe98d6df0ee9e26b20d74c9d33244fae1ab01
+  metadata.gz: 9e265efc2e27c62c3bdefd67242d59b0bad016d3fab791b74880b1a9030092ce
+  data.tar.gz: 324e8e048bc431bf9426f7bb54572e95035e7079e1c87304349963592c1d13fe
 SHA512:
-  metadata.gz: c57825fadad8a281d4891732ee10a91fc2d7eef81ca51060c9cecba484658b7132cebf1969b796e1ce49698bd50039c037f78782741fe8226083799a908c1720
-  data.tar.gz: d2ff37b288db8a88b8797f22af6f87b43c2f76fe2bcfe0c39bc14d01e582b7a9aacd908a32bf98cd8ee35e6e5df13c32689d1ecd2b669949c6f66338ea3dc5c8
+  metadata.gz: ff64e1386ea6c156c0e82ad35950c50e7e603a154fbbc7104de530efbe6e15b3b2f5b9955899ecee33e7dce5883e0b15144fbc04d4e82f007d326bc017cc76d8
+  data.tar.gz: daf77edc8f5dbdeffa62a3822a232d80c39a2bc7f3cf5e6b8fdb1d06b261bd4c14b84de1f2a2422fa1bbc1535fa6a5e115bcd965b4fb269e4279e2c39055d590

data/.github/FUNDING.yml

@@ -2,3 +2,4 @@
 
 github: thooams
 patreon: user?u=8672183
+liberapay: thooams

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.alpha9)
+    ui_bibz (3.0.0.beta2)
       rails (~> 6.0.3, >= 6.0.3.2)
       will-paginate-i18n
       will_paginate (~> 3.1.0)
@@ -84,7 +84,7 @@ GEM
       railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.2.0)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
     haml-rails (2.0.1)
@@ -105,7 +105,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -123,7 +123,7 @@ GEM
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.20.0)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     rack (2.2.3)
@@ -157,28 +157,28 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.0)
     rexml (3.2.4)
-    rubocop (1.3.1)
+    rubocop (1.6.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.1)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.8.1)
+    rubocop-rails (2.9.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.87.0)
+      rubocop (>= 0.90.0, < 2.0)
     ruby-progressbar (1.10.1)
     ruby_parser (3.15.0)
       sexp_processor (~> 4.9)
@@ -186,10 +186,12 @@ GEM
     simple_form (5.0.3)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.19.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -212,7 +214,7 @@ GEM
     will_paginate (3.1.8)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -227,6 +229,7 @@ DEPENDENCIES
   minitest
   overcommit
   rubocop
+  rubocop-ast
   rubocop-minitest
   rubocop-performance
   rubocop-rails

data/README.md

@@ -19,7 +19,11 @@ Ui Bibz load [Bootstrap](http://getbootstrap.com/) and [Font Awesome](http://fon
 
 ## Documentation
 Full documentation is here with bootstrap 5:
-[Ui Bibz v3](http://hummel.link/Ui-Bibz/)
+[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/)
+
+
+## Donate
+![Liberapay](https://img.shields.io/liberapay/patrons/Thomas.svg?logo=liberapay)

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

@@ -110,7 +110,7 @@ module UiBibz::Concerns::Models::Searchable
       search_patterns = @tmp_params[:search].strip.gsub(/(?<=[\\s])\\s*|^\\s+|\\s+$/, '').downcase
 
       search_patterns_tmp = search_patterns.scan(/"(.*?)"/).flatten
-      search_patterns     = search_patterns.gsub(/"(.*?)"/, '').split(' ')
+      search_patterns     = search_patterns.gsub(/"(.*?)"/, '').split
       search_patterns << search_patterns_tmp
 
       search_patterns.flatten.each_with_index do |pattern, i|

data/lib/ui_bibz/infos.rb

@@ -3,15 +3,15 @@
 module UiBibz
   NAME                = 'Ui Bibz'
   SLUG                = 'ui_bibz'
-  BOOTSTRAP_VERSION   = '5.0.0.alpha3'
+  BOOTSTRAP_VERSION   = '5.0.0.beta1'
   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'
-  HOMEPAGE            = 'http://thooams.github.io/Ui-Bibz/'
+  HOMEPAGE            = 'https://hummel.link/ui-bibz/'
   REPO                = 'git+https://github.com/thooams/Ui-Bibz.git'
   EMAIL               = 'thomas@hummel.link'
-  AUTHOR              = 'Thooams'
-  VERSION             = '3.0.0.alpha9'
+  AUTHOR              = 'Thooams [Thomas HUMMEL]'
+  VERSION             = '3.0.0.beta2'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -7,7 +7,7 @@ module UiBibzInputs
     def input(wrapper_options)
       unless string?
         input_html_classes.unshift('string')
-        input_html_options[:type] ||= input_type if html5?
+        # input_html_options[:type] ||= input_type if html5?
       end
 
       merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)

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

@@ -6,11 +6,17 @@ module UiBibz::Ui::Concerns::HtmlConcern #:nodoc:
   included do
     def html(content = nil, &block)
       if block.nil?
-        @items << content
+        @items << RenderString.new(content)
       else
         context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
-        @items << context.capture(&block)
+        @items << RenderString.new(context.capture(&block))
       end
     end
   end
 end
+
+class RenderString < SimpleDelegator
+  def render
+    self
+  end
+end

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Boxes::Components
     # Render html tag
     def pre_render
       if options[:collapse]
-        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], "data-parent": "##{options[:parent_collapse]}" do
+        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], "data-bs-parent": "##{options[:parent_collapse]}" do
           content_tag :div, @items.join.html_safe, html_options
         end
       else

data/lib/ui_bibz/ui/core/forms/buttons/button.rb

@@ -83,8 +83,8 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-toggle": :collapse,
-        "data-target": "##{options[:collapse]}",
+        "data-bs-toggle": :collapse,
+        "data-bs-target": "##{options[:collapse]}",
         "aria-controls": options[:collapse],
         "aria-expanded": options[:expand_collapse].nil? ? false : options[:expand_collapse]
       }
@@ -99,7 +99,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     def toggle
-      { 'data-toggle' => 'button', 'aria-pressed' => false, 'autocomplete' => 'off' }
+      { 'data-bs-toggle' => 'button', 'aria-pressed' => false, 'autocomplete' => 'off' }
     end
 
     def active_html_options
@@ -121,7 +121,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     def spinner_html
-      opts = { size: :sm, tag: :span, class: options[:text] == false ? nil : 'mr-2' }
+      opts = { size: :sm, tag: :span, class: options[:text] == false ? nil : 'me-2' }
       opts = opts.merge(options[:spinner]) if options[:spinner].is_a? Hash
 
       UiBibz::Ui::Core::Notifications::Spinner.new(nil, opts).render

data/lib/ui_bibz/ui/core/forms/buttons/button_link.rb

@@ -62,7 +62,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     def button_link_html_tag
       link_to link_url, html_options do
         concat spinner_html unless options[:spinner].nil?
-        concat glyph_and_content_html(options[:text].nil? ? @content : '')
+        concat glyph_and_content_html(@content)
         concat badge_html unless options[:badge].nil?
       end
     end
@@ -78,7 +78,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-toggle": :collapse,
+        "data-bs-toggle": :collapse,
         "aria-controls": options[:collapse],
         "aria-expanded": options[:expand_collaspe].nil? ? false : options[:expand_collaspe]
       }

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

@@ -21,16 +21,18 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   # * +status+ - status of element with symbol value:
   #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+)
   # * +size+
+  # * +open+ - Boolean
   #   (+:xs+, +:sm+, +:lg+)
   # * +glyph+ - Add glyph with name or hash options
   #   * +name+ - String
   #   * +size+ - Integer
   #   * +type+ - Symbol
   # * +html_button+ - Hash
+  # * +theme+ - Symbol, defaut: +:dark+
   # * +position+ - Symbol
   #   (+:up+, +:right+, +:down+, +:left+)
-  # * +alignment+ - Symbol
-  #   (+:right)
+  # * +alignment+ - Symbol/Hash - eq. { direction: :start, size: :lg }
+  #   (+:left+, +:right+, +:start+, +:end+)
   #
   # ==== Signatures
   #
@@ -111,15 +113,15 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_content
-      glyph_and_content_html(options[:text].nil? ? @content : '').html_safe
+      glyph_and_content_html(@content)
     end
 
     def button_html
       html_button = options[:html_button] || {}
       if options[:tag] == :a
-        content_tag dropdown_tag, button_content, { class: join_classes('btn', button_status, state, size, 'dropdown-toggle'), role: 'button', 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, 'id' => id }.merge(html_button)
+        content_tag dropdown_tag, button_content, { class: join_classes('btn', button_status, state, size, 'dropdown-toggle'), role: 'button', 'data-bs-toggle' => 'dropdown', 'aria-expanded' => false, 'id' => id }.merge(html_button)
       else
-        content_tag dropdown_tag, button_content, { class: join_classes('btn', button_status, state, size, 'dropdown-toggle'), type: 'button', 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, 'id' => id }.merge(html_button)
+        content_tag dropdown_tag, button_content, { class: join_classes('btn', button_status, state, size, 'dropdown-toggle'), type: 'button', 'data-bs-toggle' => 'dropdown', 'aria-expanded' => false, 'id' => id }.merge(html_button)
       end
     end
 
@@ -132,11 +134,17 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def alignment
-      "dropdown-menu-#{@options[:alignment]}" unless @options[:alignment].nil?
+      return nil if @options[:alignment].nil?
+
+      if @options[:alignment].is_a? Hash
+        ['dropdown-menu', @options[:alignment][:size], match_direction[@options[:alignment][:direction]]].join('-')
+      else
+        "dropdown-menu-#{match_direction[@options[:alignment]]}"
+      end
     end
 
     def position
-      "drop#{@options[:position] || 'down'}"
+      "drop#{match_direction[@options[:position] || :down]}"
     end
 
     def open
@@ -171,5 +179,17 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     def theme
       'dropdown-menu-dark' if @options[:theme]
     end
+
+    # Match end and start directions
+    def match_direction
+      {
+        up: 'up',
+        right: 'end',
+        down: 'down',
+        left: 'start',
+        start: 'start',
+        end: 'end'
+      }.with_indifferent_access
+    end
   end
 end

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

@@ -78,7 +78,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
 
     def split_html
       content_tag :button, split_content, class: split_classes, type: 'button',
-                                          'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false
+                                          'data-bs-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false
     end
 
     def split_content

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

@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Forms::Numbers
         sf.text_field formula_field_name, nil, text_field_formula_html_options
         sf.addon '=', class: 'formula-field-sign'
         sf.text_field content, nil, text_field_input_html_options
-        sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { toggle: 'tooltip' } }
+        sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { "bs-toggle": 'tooltip' } }
         sf.addon @options[:prepend] unless @options[:prepend].nil?
       end.render
     end

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

@@ -52,14 +52,14 @@ module UiBibz::Ui::Core::Forms::Numbers
 
     def header_min
       content_tag :div, class: 'slider-header-min' do
-        concat content_tag :label, options[:label_min] || 'Min: '
+        concat content_tag :label, options[:label_min] || 'Min: ', for: options[:label_for_min]
         concat content_tag :span, options[:thumb_min], "data-unit": options[:unit] || options[:unit_min]
       end
     end
 
     def header_max
       content_tag :div, class: 'slider-header-max' do
-        concat content_tag :label, options[:label_max] || 'Max: '
+        concat content_tag :label, options[:label_max] || 'Max: ', for: options[:label_for_max]
         concat content_tag :span, options[:thumb_max], "data-unit": options[:unit] || options[:unit_max]
       end
     end

data/lib/ui_bibz/ui/core/forms/selects/dropdown_select_field.rb

@@ -25,7 +25,13 @@ module UiBibz::Ui::Core::Forms::Selects
   # * +searchable+ - Boolean
   # * +select_all_option+ - Boolean
   # * +append+ - String, Html
+  # * +open+ - Boolean
+  # * +theme+ - Symbol, defaut: +:dark+
   # * +prepend+ - String, Html
+  # * +position+ - Symbol
+  #   (+:up+, +:right+, +:down+, +:left+)
+  # * +alignment+ - Symbol
+  #   (+:right)
   # * +connect+ - Hash
   #   * +event+ - String
   #   * +mode+ - String
@@ -69,7 +75,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def component_html_classes
-      [size, type, button_status, 'multi-select-field']
+      [open, size, type, button_status, 'multi-select-field']
     end
 
     def component_html_data
@@ -79,6 +85,8 @@ module UiBibz::Ui::Core::Forms::Selects
       searchable
       select_all_options
       number_displayed
+      dropdown_menu_classes
+      dropdown_classes
     end
 
     def clickable_opt_group
@@ -101,6 +109,32 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('include_select_all_option') if options[:select_all_options]
     end
 
+    def dropdown_menu_classes
+      classes = join_classes(theme, alignment, open)
+      add_html_data('dropdown_menu_classes', value: classes.nil? ? nil : classes.join(' '))
+    end
+
+    def dropdown_classes
+      classes = join_classes(position, open)
+      add_html_data('dropdown_classes', value: classes.nil? ? nil : classes.join(' '))
+    end
+
+    def position
+      "drop#{@options[:position] || 'down'}"
+    end
+
+    def theme
+      'dropdown-menu-dark' if @options[:theme]
+    end
+
+    def open
+      'show' if @options[:open]
+    end
+
+    def alignment
+      "dropdown-menu-#{@options[:alignment]}" unless @options[:alignment].nil?
+    end
+
     def type
       'btn-block' if options[:type] == :block
     end
@@ -117,9 +151,5 @@ module UiBibz::Ui::Core::Forms::Selects
     def outline
       'outline' if options[:outline]
     end
-
-    def theme
-      'dropdown-menu-dark' if @options[:theme]
-    end
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      button_html_tag
-    end
-  end
+  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button; end
 end