ui_bibz 3.0.0.beta17 → 3.0.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293f9667c9bfae713e8968aedb6fb67bb8f391b0ef8f57663e048be71589e4e5
-  data.tar.gz: 4b15c120616b00753011fd7f58e278dbe249cacd98e1642bac153b80b0e6b5de
+  metadata.gz: 710b0c4a072a6505597eb6f7b2c92685eb6e545e470ba72bec6838b0f6acc4f6
+  data.tar.gz: 1c3e4c48723812182a347d8cbe2ef85053fbc72c1f36c07853025212e16f0353
 SHA512:
-  metadata.gz: a9d3053d5303bd6c9ff0c6de3dde049a08a75f25f94e70f3812031050328dd66dc14e3b6909a35f083993ee09b1782c615d3b00c0c8fd41e224bc50f223b4077
-  data.tar.gz: a167b60e21e64c303227f580ca599b95351ae1b5554a5c611fef8abc199abe9180c5aa44af7654a5b61ef777b21d81cb7e289389d3098bfd10f78a26a5597638
+  metadata.gz: da63293c5b8bd94bd2a4797aef3d3b94ae360c2f796730f23bee60fc55c645dad59dd5ec09f22c9251a1ff2cce6c7ccc345e6e9ed82c5b63e7832cfb485fa446
+  data.tar.gz: 0e7d6f80d5d85506c04c8123fd5b94143a6c96f58ba39a90feacb1ed3ec765330c846a7f810af7ea6a8917ec4c92cbb1a448e552ef29a1b638889b2bb126981a

data/.rubocop.yml

@@ -8,7 +8,6 @@ Layout/LineLength:
   Enabled: false
 
 AllCops:
-  TargetRubyVersion: 2.7
   NewCops: enable
 
 Lint/UselessAssignment:

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.1
+ruby-3.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta17)
+    ui_bibz (3.0.0.beta18)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -95,32 +95,32 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.9)
+    i18n (1.8.10)
       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.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.0)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    mini_portile2 (2.5.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.2)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     racc (1.5.2)
     rack (2.2.3)
@@ -155,8 +155,8 @@ GEM
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
-    rubocop (1.12.0)
+    rexml (3.2.5)
+    rubocop (1.13.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -165,12 +165,12 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-minitest (0.11.1)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.12.1)
       rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.10.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-performance (1.11.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
@@ -188,7 +188,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -211,6 +211,7 @@ GEM
     will_paginate (3.3.0)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
+    yard (0.9.26)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -234,6 +235,7 @@ DEPENDENCIES
   simplecov
   sqlite3
   ui_bibz!
+  yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

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

@@ -37,11 +37,13 @@ module UiBibz::Concerns::Models::Searchable
 
     # If there is more one table in html page
     def self.initialize_params
+      @tmp_params = { per_page: @arguments[:per_page] }
+
       return unless good_store_id?
 
       @tmp_params = {
         search: @params[:search],
-        per_page: @params[:per_page],
+        per_page: @params[:per_page] || @arguments[:per_page],
         page: new_search? ? nil : @params[:page],
         sort: @params[:sort],
         direction: @params[:direction]

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.2'
+  FONTAWESOME_VERSION = '5.15.3'
   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.beta17'
+  VERSION             = '3.0.0.beta18'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -5,9 +5,9 @@ module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
 
   included do
     def data_attributes
-      self.class.const_get('DATA_ATTRIBUTES').map do |data_attribute|
+      self.class.const_get('DATA_ATTRIBUTES').filter_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.reduce(&:merge) || {}
     end
   end
 end

data/lib/ui_bibz/ui/core/boxes/card.rb

@@ -90,7 +90,7 @@ module UiBibz::Ui::Core::Boxes
   class Card < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::CardItemableConcern
 
-    # See UiBibz::Ui::Core::Component.initialize
+    # (see UiBibz::Ui::Core::Component#initialize)
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       @items = @content.nil? ? [] : [UiBibz::Ui::Core::Boxes::Components::CardBody.new(@content).render]

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

@@ -94,7 +94,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def component_html_data
       super
-      add_html_data 'toggle', value: 'buttons'
+      add_html_data 'toggle', value: 'buttons' if @options[:form].nil?
     end
   end
 end

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

@@ -25,6 +25,7 @@ module UiBibz::Ui::Core::Forms::Selects
   # * +searchable+ - Boolean
   # * +select_all_option+ - Boolean
   # * +append+ - String, Html
+  # * +non_selected_text+ - String
   # * +open+ - Boolean
   # * +theme+ - Symbol, defaut: +:dark+
   # * +prepend+ - String, Html
@@ -83,10 +84,12 @@ module UiBibz::Ui::Core::Forms::Selects
       clickable_opt_group
       collapsible_opt_group
       searchable
+      non_selected_text
       select_all_options
       number_displayed
       dropdown_menu_classes
       dropdown_classes
+      n_selected_text
     end
 
     def clickable_opt_group
@@ -101,6 +104,10 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('enable_filtering') if options[:searchable]
     end
 
+    def n_selected_text
+      add_html_data('n_selected_text', value: options[:n_selected_text]) if options[:n_selected_text]
+    end
+
     def number_displayed
       add_html_data('number_displayed') if options[:number_displayed]
     end
@@ -109,6 +116,10 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('include_select_all_option') if options[:select_all_options]
     end
 
+    def non_selected_text
+      add_html_data('non_selected_text', value: options[:non_selected_text]) if options[:non_selected_text]
+    end
+
     def dropdown_menu_classes
       classes = join_classes(theme, alignment, open)
       add_html_data('dropdown_menu_classes', value: classes.nil? ? nil : classes.join(' '))

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

@@ -42,6 +42,7 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, html_options do
         concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-text')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
+        concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
         concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
         concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-text')
       end

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -37,9 +37,9 @@ module UiBibz::Utils
       if opts.is_a?(Hash)
         @position = opts[:position]
 
-        opts.map do |k, v|
+        opts.filter_map do |k, v|
           send(k, size, v) if POSITIONING.include?(k.to_sym)
-        end.compact.join(' ')
+        end.join(' ')
       else
         send('num', size, opts)
       end

data/lib/ui_bibz/utils/screwdriver.rb

@@ -7,7 +7,7 @@ module UiBibz::Utils
 
     class << self
       def join_classes(*classes)
-        klasses = Array(classes).flatten.map(&:to_s).compact.uniq.reject(&:blank?)
+        klasses = Array(classes).flatten.filter_map(&:to_s).uniq.reject(&:blank?)
         klasses.empty? ? nil : klasses
       end
 

data/test/simple_form_test.rb

@@ -256,7 +256,7 @@ test1</textarea></div></form>"
       end
     end
 
-    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><div class=\"form-check\"><input type=\"checkbox\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_checkbox_field optional form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"user_name_fr\">Name Fr</label></div></div></div></form>"
+    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div class=\"btn-group button-choice btn-group-toggle\"><div class=\"form-check\"><input type=\"checkbox\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_checkbox_field optional form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"user_name_fr\">Name Fr</label></div></div></div></form>"
 
     assert_equal expected, actual
   end

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

@@ -23,4 +23,11 @@ class CheckboxFieldTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
+  test 'checkbox_field with html_options' do
+    actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { checked: true }, { data: { name: 'check' } }).render
+    expected = "<div class=\"form-check\"><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" data-name=\"check\" class=\"form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"John\">John</label></div>"
+
+    assert_equal expected, actual
+  end
 end

data/test/ui/core/forms/selects/{multi_select_field_test.rb → dropdown_select_field_test.rb}

@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class DropdownSelectFieldTest < ActionView::TestCase
-  test 'Multi Select Field' do
+  test 'Dropdown Select Field' do
     options  = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual   = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', multiple: true, option_tags: options).render
     expected = "<select name=\"example[]\" id=\"example\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"option 0\">option 0</option>
@@ -12,10 +12,10 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'Multi Select Field data html options' do
+  test 'Dropdown Select Field data html options' do
     grouped_options = { 'North America' => [['United statuss', 'US'], 'Canada'], 'Europe' => %w[Denmark Germany France] }
-    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, select_all_options: true, number_displayed: 2, status: :danger }).render
-    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" data-dropdown-classes=\"dropdown\" class=\"btn-danger multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
+    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, non_selected_text: 'test', select_all_options: true, number_displayed: 2, status: :danger, n_selected_text: "items selected" }).render
+    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-non-selected-text=\"test\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" data-dropdown-classes=\"dropdown\" data-n-selected-text=\"items selected\" class=\"btn-danger multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
 <option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>
 <option value=\"Germany\">Germany</option>
 <option value=\"France\">France</option></optgroup></select>"
@@ -23,7 +23,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'Multi select Field refresh option' do
+  test 'Dropdown Select Field refresh option' do
     actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { multiple: true, refresh: { target: { url: '/' } } }).render
     expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"test[]\" id=\"test\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"></select><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&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>"
 

data/ui_bibz.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.description = UiBibz::DESCRIPTION
   s.license     = UiBibz::LICENSE
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.0.0'
 
   s.files         = `git ls-files`.split
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split
@@ -47,4 +47,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simple_form'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta17
+  version: 3.0.0.beta18
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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'
 description: A Rails Interface Framework using Bootstrap 5.0.0.beta3.
 email: thomas@hummel.link
 executables:
@@ -546,8 +560,8 @@ files:
 - test/ui/core/forms/numbers/number_field_test.rb
 - test/ui/core/forms/numbers/range_field_test.rb
 - test/ui/core/forms/numbers/slider_field_test.rb
+- test/ui/core/forms/selects/dropdown_select_field_test.rb
 - test/ui/core/forms/selects/multi_column_field_test.rb
-- test/ui/core/forms/selects/multi_select_field_test.rb
 - test/ui/core/forms/selects/select_field_test.rb
 - test/ui/core/forms/surrounds/surround_field_test.rb
 - test/ui/core/forms/textareas/markdown_editor_field_test.rb
@@ -657,14 +671,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Ui Bibz is an Ui Framework that allows you to build an interface very quickly
@@ -759,8 +773,8 @@ test_files:
 - test/ui/core/forms/numbers/number_field_test.rb
 - test/ui/core/forms/numbers/range_field_test.rb
 - test/ui/core/forms/numbers/slider_field_test.rb
+- test/ui/core/forms/selects/dropdown_select_field_test.rb
 - test/ui/core/forms/selects/multi_column_field_test.rb
-- test/ui/core/forms/selects/multi_select_field_test.rb
 - test/ui/core/forms/selects/select_field_test.rb
 - test/ui/core/forms/surrounds/surround_field_test.rb
 - test/ui/core/forms/textareas/markdown_editor_field_test.rb