ui_bibz 3.0.0.beta15 → 3.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24ee2f7f963d13b2f79652d8e02c196072e3d674c1f528a92b121598f6ccd08
-  data.tar.gz: 9dd65d798d69e14c08de9c5e2fd6c198e0df7def2fe06e22341124f1a96e2d05
+  metadata.gz: ffa18823b220fe50b0aab6b3b25e06d184bc514266edaf8a24e47345e8816001
+  data.tar.gz: c189f21d3f6ad9943f8fc9ce303eb9578d1159366a7fc3340d9a5fed8205d9ad
 SHA512:
-  metadata.gz: f634662ead3cda0d2d6898352f9634666c3282d3e066a18eed7c76e3dd03b955b7cc465955584140d81a3d73e38f443fd537756f684d9d01e1831d6dc6cc90e0
-  data.tar.gz: 2d7b682c66482d611ec5ac47751027529caa59b5672bab233e9c413b0e3c45e82ec69c471330aae1a05002ea41aa353fd35de33e5677aa41b8ff3e70bf91e42b
+  metadata.gz: 53ef82ec6ccc0bd9f4036887402fef838f6e206d2ce59282fd3b9571eaa1b960767607e99286bb515e95d801c8c8a4c4f7750c219096bed99b49ccd55cabc37c
+  data.tar.gz: 7e4f7f43e3fb0e1830eafc73b35c6901184586973db3d5964b06de5e27503edbee78d945f8203104effc617c3a4b0263a8903fd5d7cc0193a83a4e6c626b22ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta15)
+    ui_bibz (3.0.0.beta16)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -65,7 +65,7 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.2)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     builder (3.2.4)
     byebug (11.1.3)
     childprocess (4.0.0)
@@ -113,8 +113,8 @@ GEM
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
-    nio4r (2.5.5)
+    minitest (5.14.4)
+    nio4r (2.5.7)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -156,9 +156,9 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rubocop (1.9.1)
+    rubocop (1.11.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -171,7 +171,7 @@ GEM
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.3)
       rubocop (>= 0.87, < 2.0)
-    rubocop-performance (1.9.2)
+    rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
@@ -213,6 +213,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
@@ -236,6 +237,7 @@ DEPENDENCIES
   simplecov
   sqlite3
   ui_bibz!
+  yard
 
 BUNDLED WITH
    2.1.4

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

@@ -120,18 +120,18 @@ module UiBibz::Concerns::Models::Searchable
             if attribute == :as
               attribute.each_value do |value|
                 sql_subquery << "lower(#{value}) LIKE :#{value}_#{i}"
-                sql_attributes = sql_attributes.merge(Hash["#{value}_#{i}".to_sym, "%#{pattern}%"])
+                sql_attributes = sql_attributes.merge({ "#{value}_#{i}".to_sym => "%#{pattern}%" })
               end
             else
               key_name = attribute.keys.first.to_s.pluralize
               attribute.each_value do |value|
                 sql_subquery << "lower(#{key_name}.#{value}) LIKE :#{key_name}_#{value}_#{i}"
-                sql_attributes = sql_attributes.merge(Hash["#{key_name}_#{value}_#{i}".to_sym, "%#{pattern}%"])
+                sql_attributes = sql_attributes.merge({ "#{key_name}_#{value}_#{i}".to_sym => "%#{pattern}%" })
               end
             end
           else
             sql_subquery << "lower(#{to_s.underscore.pluralize.split('/').last}.#{attribute}) LIKE :#{attribute}_#{i}"
-            sql_attributes = sql_attributes.merge(Hash["#{attribute}_#{i}".to_sym, "%#{pattern}%"])
+            sql_attributes = sql_attributes.merge({ "#{attribute}_#{i}".to_sym => "%#{pattern}%" })
           end
         end
         sql_query << "(#{sql_subquery.join(' OR ')})"

data/lib/ui_bibz/infos.rb

@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta15'
+  VERSION             = '3.0.0.beta16'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder.rb

@@ -17,7 +17,7 @@ module UiBibzForm
       wrapper_html   = (options[:input_html] || {}).merge({ class: input_classes })
       surround_field = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(content, opts, html_options).tap(&block)
       errors_text    = surround_field.errors.flatten.to_sentence
-      required       = surround_field.required_fields.any? { |u| u == true }
+      required       = surround_field.required_fields.any?(true)
       wrapper_classes = UiBibz::Utils::Screwdriver.join_classes(('has-error' if errors_text.present?), wrapper_html.try(:[], :class))
       label_classes = UiBibz::Utils::Screwdriver.join_classes(('required' if required), 'control-label')
       abbr_html     = content_tag('abbr', I18n.t(:"simple_form.required.mark", default: '*'), title: I18n.t(:"simple_form.required.text", default: 'required')) if required

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/component.rb

@@ -149,7 +149,7 @@ module UiBibz::Ui::Core
     def add_html_data(name, value: true)
       html_options[:data] = {} if html_options[:data].nil?
       value = value.is_a?(String) ? value.strip : value
-      html_options[:data].update(Hash[name, value])
+      html_options[:data].update({ name => value })
     end
 
     def disabled?

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/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

@@ -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.beta15
+  version: 3.0.0.beta16
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-03-10 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.beta2.
 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
@@ -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