ui_bibz 3.0.0.alpha5 → 3.0.0.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf6fae8ebb33a996aababffe959f600d9cce3c84554a9574d54f8623bc12d8e
-  data.tar.gz: 5f3aa30344b85d267698918a1dc63bbbc8a220fef61395e5f9ca141666175c82
+  metadata.gz: 14f3630b3e813fbac60b0a3e5a7651a09a507dd3dee4a0e252288a7baa3728e2
+  data.tar.gz: b9baafb65a65cc12b9e1d57c4fec819f01a6b36cd1e6865c9d26a4a8a5fac155
 SHA512:
-  metadata.gz: b9fecae8a62e153525d66d32626d01be6cb28ae0fb777ccc99ff14fabcbf3cb802c84c6095acef8da1232b2d02508e7199d28102b12dae75f09a7d7acd1e5482
-  data.tar.gz: 4c20b4a4117f93a2539a6121b6b86471585c10eac3df4aeaf51c0521224a1ffa70de65447559413b5ab2503f3cab07027a497ddf7f253d2c90012d43362a24ba
+  metadata.gz: 890d5d75f44d9e31753f5928ffac99386adbf43ed95ad0cc452edf6b492aa3e6cc5de07186c62923ac091de30b759c191872b62d76eebffbf50c5630f7317297
+  data.tar.gz: 41bf57292c76239790786809649dd5d8bb83220b20789976b1af1c4d5332f210335448de36dce170d3610c86c93529af3816c352b57ba9f9ec73d7de95afa561

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.alpha5)
+    ui_bibz (3.0.0.alpha11)
       rails (~> 6.0.3, >= 6.0.3.2)
       will-paginate-i18n
       will_paginate (~> 3.1.0)
@@ -75,7 +75,7 @@ GEM
     concurrent-ruby (1.1.7)
     crass (1.0.6)
     docile (1.3.2)
-    erubi (1.9.0)
+    erubi (1.10.0)
     erubis (2.7.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
@@ -123,7 +123,7 @@ GEM
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     rack (2.2.3)
@@ -159,21 +159,21 @@ GEM
     rake (13.0.1)
     regexp_parser (1.8.2)
     rexml (3.2.4)
-    rubocop (1.0.0)
+    rubocop (1.4.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
+    rubocop-ast (1.2.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.0)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
@@ -202,7 +202,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     websocket-driver (0.7.3)

data/README.md

@@ -23,3 +23,7 @@ Full documentation is here with bootstrap 5:
 
 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.alpha2'
+  BOOTSTRAP_VERSION   = '5.0.0.alpha3'
   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.alpha5'
+  AUTHOR              = 'Thooams [Thomas HUMMEL]'
+  VERSION             = '3.0.0.alpha11'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -4,7 +4,7 @@ module UiBibzInputs
   class UiCheckboxFieldInput < BaseInput
     include UiBibz::Ui::Core::Forms::Choices
 
-    def label
+    def label(_wrapper_options)
       false
     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

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

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

@@ -38,7 +38,11 @@ module UiBibz::Ui::Core::Boxes::Components
     # Render html tag
     def pre_render
       # image_tag content, html_options
-      image_tag content, html_options
+      if options[:pack]
+        image_pack_tag content, html_options
+      else
+        image_tag content, html_options
+      end
     end
 
     private

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

@@ -16,12 +16,11 @@ module UiBibz::Ui::Core::Forms::Buttons
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
   # * +status+ - status of element with symbol value:
-  #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+, +:link+)
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
   # * +size+
   #   (+:xs+, +:sm+, +:lg+)
   # * +outline+ - Boolean
   # * +state+ - Symbol (+:active+, +:disabled)
-  # * +type+ - Symbol (+:outline)
   # * +collapse+ - String
   # * +expand_collaspe+ - Boolean
   # * +glyph+ - Add glyph with name or hash options
@@ -63,13 +62,13 @@ module UiBibz::Ui::Core::Forms::Buttons
     def button_html_tag
       content_tag :button, 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
 
     def component_html_classes
-      super << ['btn', size, type, without_text]
+      super << ['btn', size]
     end
 
     def component_html_options
@@ -107,14 +106,6 @@ module UiBibz::Ui::Core::Forms::Buttons
       { 'aria-pressed' => true }
     end
 
-    def type
-      'btn-block' if options[:type] == :block
-    end
-
-    def without_text
-      'without-text' unless options[:text].nil?
-    end
-
     def action
       add_html_data('action', value: options[:action]) unless options[:action].nil?
     end

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

@@ -22,7 +22,6 @@ module UiBibz::Ui::Core::Forms::Buttons
   # * +url+ - String url
   # * +outline+ - Boolean
   # * +state+ - Symbol (+:active+, +:disabled)
-  # * +type+ - Symbol (+:block)
   # * +glyph+ - Add glyph with name or hash options
   #   * +name+ - String
   #   * +size+ - Integer
@@ -63,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

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

@@ -20,7 +20,6 @@ module UiBibz::Ui::Core::Forms::Buttons
   #   (+:xs+, +:sm+, +:lg+)
   # * +outline+ - Boolean
   # * +state+ - Symbol (+:active+, +:disabled)
-  # * +type+ - Symbol (+:outline)
   # * +glyph+ - Add glyph with name or hash options
   #   * +name+ - String
   #   * +size+ - Integer

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

@@ -70,7 +70,7 @@ module UiBibz::Ui::Core::Forms::Choices
         disabled: disabled?,
         indeterminate: options[:indeterminate],
         "data-action": options[:action],
-        class: 'form-check-input'
+        class: UiBibz::Utils::Screwdriver.join_classes('form-check-input', input_status)
       }.tap do |html|
         html[:id] = html_options[:id] if html_options[:id]
       end
@@ -95,6 +95,12 @@ module UiBibz::Ui::Core::Forms::Choices
       super << component_wrapper_html_classes
     end
 
+    def input_status
+      "form-check-input-#{options[:status]}" if options[:status]
+    end
+
+    def status; end
+
     def inline
       'form-check-inline' if options[:inline]
     end

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

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Forms::Choices
       {
         disabled: options[:state] == :disabled,
         "data-action": options[:action],
-        class: 'form-check-input'
+        class: UiBibz::Utils::Screwdriver.join_classes('form-check-input', input_status)
       }
     end
 
@@ -79,6 +79,12 @@ module UiBibz::Ui::Core::Forms::Choices
       super << component_wrapper_html_classes
     end
 
+    def status; end
+
+    def input_status
+      "form-check-input-#{options[:status]}" if options[:status]
+    end
+
     def inline
       'form-check-inline' if options[:inline]
     end

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

@@ -43,6 +43,10 @@ module UiBibz::Ui::Core::Forms::Choices
   class SwitchField < UiBibz::Ui::Core::Forms::Choices::CheckboxField
     private
 
+    def component_options
+      { boolean: true }
+    end
+
     def component_html_classes
       ['form-check', 'form-switch', inline]
     end

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

@@ -29,7 +29,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   # * +html_button+ - Hash
   # * +position+ - Symbol
   #   (+:up+, +:right+, +:down+, +:left+)
-  # * +alignement+ - Symbol
+  # * +alignment+ - Symbol
   #   (+:right)
   #
   # ==== Signatures
@@ -111,7 +111,7 @@ 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
@@ -124,15 +124,15 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def ul_html
-      content_tag :div, @items.join.html_safe, class: join_classes('dropdown-menu', theme, alignement, open), 'arial-labelledby' => id
+      content_tag :div, @items.join.html_safe, class: join_classes('dropdown-menu', theme, alignment, open), 'arial-labelledby' => id
     end
 
     def dropdown_tag
       options[:tag] || :button
     end
 
-    def alignement
-      "dropdown-menu-#{@options[:alignement]}" unless @options[:alignement].nil?
+    def alignment
+      "dropdown-menu-#{@options[:alignment]}" unless @options[:alignment].nil?
     end
 
     def position
@@ -148,7 +148,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def inline
-      'btn-group' if @options[:inline] || @options[:alignement]
+      'btn-group' if @options[:inline] || @options[:alignment]
     end
 
     def without_caret

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

@@ -69,7 +69,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     private
 
     def component_html_classes
-      ['btn-group', position, alignement, open, inline, keep_open]
+      ['btn-group', position, alignment, open, inline, keep_open]
     end
 
     def button_html

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

@@ -49,10 +49,12 @@ module UiBibz::Ui::Core::Forms::Numbers
 
     def formula_field_html_tag
       UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(class: join_classes('formula_field', state, size)).tap do |sf|
+        sf.addon @options[:append] unless @options[:append].nil?
         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 @options[:prepend] unless @options[:prepend].nil?
       end.render
     end
 

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

@@ -20,6 +20,12 @@ module UiBibz::Ui::Core::Forms::Numbers
   # * +step+ - [Float, Integer]
   # * +in+ - Array
   # * +within+ - Array
+  # * +status+ - status of element with symbol value:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +thumb_status+ - status of the thumb:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +track_status+ - status of track:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
   #
   # ==== Signatures
   #
@@ -75,7 +81,19 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def component_html_classes
-      'form-range'
+      ['form-range', status, thumb_status, track_status]
+    end
+
+    def status
+      "form-range-#{options[:status]}" if options[:status]
+    end
+
+    def thumb_status
+      "form-range-thumb-#{options[:thumb_status]}" if options[:thumb_status]
+    end
+
+    def track_status
+      "form-range-track-#{options[:track_status]}" if options[:track_status]
     end
 
     def option_label(value)

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

@@ -20,6 +20,10 @@ module UiBibz::Ui::Core::Forms::Numbers
   # * +step+ - [Float, Integer]
   # * +in+ - Array
   # * +within+ - Array
+  # * +status+ - status of element with symbol value:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +track_status+ - status of track:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
   #
   # ==== Signatures
   #
@@ -114,13 +118,21 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def component_html_classes
-      ['slider', ('disabled' if disabled)]
+      ['slider', status, track_status, ('disabled' if disabled)]
     end
 
     def disabled
       'disabled' if options[:state] == :disabled || html_options[:disabled]
     end
 
+    def status
+      "slider-#{options[:status]}" if options[:status]
+    end
+
+    def track_status
+      "slider-track-#{options[:track_status]}" if options[:track_status]
+    end
+
     def range_name(suffix)
       if content.end_with?(']')
         content.dup.insert(-2, suffix)

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

@@ -69,7 +69,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 +79,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 +103,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 +145,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