ui_bibz 3.0.3 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381fe687b6f870e28180cb109cba31516bda4bffd2337434e51d6f41f42e849c
-  data.tar.gz: 237ae1863d6fb0c7f8bbc04b76a332f8a6f35886e4956c4606b78da39bfbacc0
+  metadata.gz: '09075fad5e0a57ae7e47b66cb1e9d84d9e208674216317117fc4cbd74002ec83'
+  data.tar.gz: 717b8ed5d3cfe6bdfa003d2db3e240427e2b96a494f8d422e085d0563e60d09c
 SHA512:
-  metadata.gz: b80564e26c0feb5283edded6dcbe44e762122270df77b2bc32e122c904ac5ae740ce456cadb03e0ae29987de28f886d381b921094fd8111a35f8993fe46a957b
-  data.tar.gz: ebe6b69f108fa97985127a144e3f8c53a9d610c05880e83c1bc81eb3784cb6fa2075c2d56afe21892602a1f164463f1b62762cc296e79309019feec056ad3041
+  metadata.gz: 756bb32c729a77d6de316ed2279745e0bc22e3c75e0f9f4e7c8c8d560d60f2c938fb445c84922c46536b3c4c49b151db1f45bb4155668f2418acdbc864f5c46f
+  data.tar.gz: d6e66096bb51fa27ae70f6f3c4a0715bff947df9c1fd9ef07c5f2193e1251a5d037467be677fabf4e1a6c2a1f9a7d5b8dceca8c974833627ecfae10e22745e8e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.3)
+    ui_bibz (3.0.7)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -9,60 +9,60 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4)
-      actionpack (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4)
-      actionview (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4)
-      actionpack (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4)
-      activesupport (= 6.1.4)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activestorage (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activesupport (= 6.1.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -111,49 +111,49 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     nio4r (2.5.8)
-    nokogiri (1.12.3)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4)
-      actioncable (= 6.1.4)
-      actionmailbox (= 6.1.4)
-      actionmailer (= 6.1.4)
-      actionpack (= 6.1.4)
-      actiontext (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activemodel (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4)
+      railties (= 6.1.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.1)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -161,23 +161,23 @@ GEM
     rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.19.1)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.10.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
-    rubocop-minitest (0.15.0)
+    rubocop-minitest (0.15.2)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -207,7 +207,7 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

data/config/initializers/will_paginate.rb

@@ -72,12 +72,12 @@ module WillPaginate
       end
 
       def previous_page
-        num = @collection.current_page > 1 && @collection.current_page - 1
+        num = @collection.current_page > 1 && (@collection.current_page - 1)
         previous_or_next_page num, @options[:previous_label], 'previous'
       end
 
       def next_page
-        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+        num = @collection.current_page < @collection.total_pages && (@collection.current_page + 1)
         previous_or_next_page num, @options[:next_label], 'next'
       end
     end

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

@@ -139,7 +139,7 @@ module UiBibz::Concerns::Models::Searchable
               end
             end
           else
-            sql_subquery << "lower(CAST(#{to_s.underscore.pluralize.split('/').last}.#{attribute} AS TEXT)) LIKE :#{attribute}_#{i}"
+            sql_subquery << "lower(CAST(#{table_name}.#{attribute} AS TEXT)) LIKE :#{attribute}_#{i}"
             sql_attributes = sql_attributes.merge({ "#{attribute}_#{i}".to_sym => "%#{pattern}%" })
           end
         end

data/lib/ui_bibz/infos.rb

@@ -4,14 +4,14 @@ module UiBibz
   NAME                = 'Ui Bibz'
   SLUG                = 'ui_bibz'
   BOOTSTRAP_VERSION   = '5.0.2'
-  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}."
+  DESCRIPTION         = "A Rails Interface Framework using Bootstrap #{BOOTSTRAP_VERSION}.".freeze
+  SUMMARY             = "Ui Bibz is an Ui Framework that allows you to build an interface very quickly and simply using Bootstrap #{BOOTSTRAP_VERSION}.".freeze
   LICENSE             = 'MIT'
   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.3'
+  VERSION             = '3.0.7'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -7,5 +7,9 @@ module UiBibzInputs
     def input(_wrapper_options)
       UiBibz::Ui::Core::Forms::Files::FileField.new(input_attribute_name, options, input_html_options).render
     end
+
+    def input_attribute_name
+      options[:multiple] ? "#{super}[]" : super
+    end
   end
 end

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

@@ -73,7 +73,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_html
-      content_tag :button, button_content, (options[:html_button] || {}).merge(class: join_classes('btn', button_status, size, options[:html_button].try(:[], :class)))
+      content_tag dropdown_tag, button_content, dropdown_html_options
     end
 
     def split_html
@@ -86,11 +86,27 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def split_classes
-      join_classes('btn', button_status, size, 'dropdown-toggle', 'dropdown-toggle-split', options[:split_html].try(:[], :class))
+      join_classes('btn', button_status, size, state, 'dropdown-toggle', 'dropdown-toggle-split', options[:split_html].try(:[], :class))
     end
 
     def src_only
       content_tag :span, 'Toggle Dropdown', class: 'sr-only'
     end
+
+    def dropdown_html_options
+      opts = (options[:html_button] || {})
+      opts = opts.merge(href: options[:url]) if options[:tag] == :a
+      opts.merge(class: join_classes('btn', button_status, state, size, options[:html_button].try(:[], :class)))
+    end
+
+    def split_dropdown_html_option
+      (options[:html_split] || {}).merge({
+                                           class: split_classes,
+                                           type: 'button',
+                                           'data-bs-toggle' => 'dropdown',
+                                           'aria-haspopup' => true,
+                                           'aria-expanded' => false
+                                         })
+    end
   end
 end

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

@@ -59,10 +59,13 @@ module UiBibz::Ui::Core::Forms::Files
     end
 
     def format_value(value)
-      if value.is_a? ActiveStorage::Attached::One
+      case value
+      when ActiveStorage::Attached::One
         return '' unless value.attached?
 
         return value.attachment.blob.filename
+      when ActiveStorage::Attached::Many
+        return ''
       end
 
       value.to_s

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

@@ -78,7 +78,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def not_on_hundred_percent?
-      options[:max].present? && options[:max] != 100 || options[:min].present? && options[:min] != 0
+      (options[:max].present? && options[:max] != 100) || (options[:min].present? && options[:min] != 0)
     end
 
     def absolute_total

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

@@ -102,6 +102,7 @@ module UiBibz::Ui::Core::Forms::Selects
 
     def searchable
       add_html_data('enable_filtering') if options[:searchable]
+      add_html_data('fuzzy_search') if options[:searchable] == :fuzzy
     end
 
     def n_selected_text

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

@@ -78,7 +78,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def from_current_results
-      store.limit_value * store.current_page - store.limit_value + 1
+      (store.limit_value * store.current_page) - store.limit_value + 1
     end
 
     def to_current_results

data/test/ui/core/forms/dropdowns/dropdown_test.rb

@@ -43,13 +43,4 @@ class DropdownTest < ActionView::TestCase
 
     assert_equal expected, actual.render
   end
-
-  test 'Split Dropdown' do
-    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Split Dropdown').tap do |d|
-      d.link 'state'
-    end
-    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-expanded=\"false\" id=\"#{actual.id}\">Split Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"
-
-    assert_equal expected, actual.render
-  end
 end

data/test/ui/core/forms/dropdowns/split_dropdown_test.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+class SplitDropdownTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'Split Dropdown' do
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Split Dropdown').tap do |d|
+      d.link 'state'
+    end
+    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-expanded=\"false\" id=\"#{actual.id}\">Split Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"
+
+    assert_equal expected, actual.render
+  end
+
+  test 'Split Dropdown with link' do
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Split Dropdown', tag: :a, url: "#test").tap do |d|
+      d.link 'state'
+    end
+    expected = "<div class=\"dropdown\"><a class=\"btn btn-secondary dropdown-toggle\" role=\"button\" data-bs-toggle=\"dropdown\" aria-expanded=\"false\" id=\"#{actual.id}\">Split Dropdown</a><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"
+
+    assert_equal expected, actual.render
+  end
+end

data/test/ui/core/forms/selects/dropdown_select_field_test.rb

@@ -12,6 +12,15 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  test 'Dropdown Select Field with fuzzy search' do
+    options  = options_for_select(Array.new(2) { |i| "option #{i}" })
+    actual   = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', option_tags: options, searchable: :fuzzy).render
+    expected = "<select name=\"example\" id=\"example\" data-enable-filtering=\"true\" data-fuzzy-search=\"true\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></select>"
+
+    assert_equal expected, actual
+  end
+
   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, non_selected_text: 'test', select_all_options: true, number_displayed: 2, status: :danger, n_selected_text: "items selected" }).render

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.7
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -555,6 +555,7 @@ files:
 - test/ui/core/forms/choices/radio_field_test.rb
 - test/ui/core/forms/dates/date_picker_field_test.rb
 - test/ui/core/forms/dropdowns/dropdown_test.rb
+- test/ui/core/forms/dropdowns/split_dropdown_test.rb
 - test/ui/core/forms/files/file_field_test.rb
 - test/ui/core/forms/numbers/formula_field_test.rb
 - test/ui/core/forms/numbers/number_field_test.rb
@@ -768,6 +769,7 @@ test_files:
 - test/ui/core/forms/choices/radio_field_test.rb
 - test/ui/core/forms/dates/date_picker_field_test.rb
 - test/ui/core/forms/dropdowns/dropdown_test.rb
+- test/ui/core/forms/dropdowns/split_dropdown_test.rb
 - test/ui/core/forms/files/file_field_test.rb
 - test/ui/core/forms/numbers/formula_field_test.rb
 - test/ui/core/forms/numbers/number_field_test.rb