ui_bibz 3.0.5 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84252ec73fb2776633eb463f7f3028ddb407d5f8ca8e3ca689417dd2c59f91da
-  data.tar.gz: eb7688183e18d6e0d9485d6a314ec51678be3915e9479a49486dc611b1c483ae
+  metadata.gz: 6f4c4175c6e3db48739cae5571ddf077acdd27b487f22e15ce8b608170cb5f8f
+  data.tar.gz: 82c4fd7abf5d669e7af20c204680772389a56a28380b5c28e5c428d96f693ed7
 SHA512:
-  metadata.gz: bdfcc7bb97485f27732c0c2ddbfc13e08715bde5058d41057a87b83e4d009d3c32ae5f378ce8e41d984c14b2a43e4d7c7de435b776eb1d844362530759462e77
-  data.tar.gz: 679e4e6900dcaaec3dc3439b7c880f26b600884b0ecda99425d2b5d6056b9e6604a18b8e768fe55c2c814197524af12f6ae78cc959852d737369dd806339bdef
+  metadata.gz: ea5d33e9f0a31632f719e13c41fa2f8fc64dd1a74ee3a8ccb6ea93a697f91a3d885de3299ec806377fbf0127ae91b843b696e127eb84adee488cde4ccda9947f
+  data.tar.gz: 9acaa8a446525e350a768717188e902f18a1046ef5043ada106f38bd00d032e2796425753ca7e203fbf1630096fa2b85a09a7ebeb0e3c6f8bbd48f709298b7de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.5)
+    ui_bibz (3.0.9)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -111,23 +111,23 @@ 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.1)
+    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)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -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.2)
       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.11.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)
@@ -216,7 +216,7 @@ GEM
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
     yard (0.9.26)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby

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

@@ -134,12 +134,14 @@ module UiBibz::Concerns::Models::Searchable
             else
               key_name = attribute.keys.first.to_s.pluralize
               attribute.each_value do |value|
-                sql_subquery << "lower(CAST(#{key_name}.#{value} AS TEXT)) LIKE :#{key_name}_#{value}_#{i}"
-                sql_attributes = sql_attributes.merge({ "#{key_name}_#{value}_#{i}".to_sym => "%#{pattern}%" })
+                Array(value).each do |val|
+                  sql_subquery << "lower(CAST(#{key_name}.#{val} AS TEXT)) LIKE :#{key_name}_#{val}_#{i}"
+                  sql_attributes = sql_attributes.merge({ "#{key_name}_#{val}_#{i}".to_sym => "%#{pattern}%" })
+                end
               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.5'
+  VERSION             = '3.0.9'
   AUTHORS = ['Thooams'].freeze
 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/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/ux/tables/components/column.rb

@@ -2,7 +2,9 @@
 
 module UiBibz::Ui::Ux::Tables
   class Column < UiBibz::Ui::Core::Component
-    attr_accessor :hidden, :link, :name, :input_options, :class, :as, :data_index, :date_format, :sort, :format, :count, :custom_sort, :parent, :id, :progress_options
+    attr_accessor :hidden, :link, :name, :input_options, :class, :as, :data_index,
+                  :date_format, :sort, :format, :count, :custom_sort, :parent, :id, :progress_options,
+                  :sortable
 
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
@@ -20,6 +22,7 @@ module UiBibz::Ui::Ux::Tables
       @format        = @options[:format]
       @class         = @options[:class]
       @hidden        = @options[:hidden]
+      @sortable      = @options[:sortable]
       @input_options = @options[:input_options]
       @progress_options = @options[:progress_options] || {}
     end

data/lib/ui_bibz/ui/ux/tables/extensions/sortable.rb

@@ -75,7 +75,13 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def sortable?
-      @options[:sortable].nil? ? true : @options[:sortable]
+      if !@column.sortable.nil?
+        @column.sortable
+      elsif !@options[:sortable].nil?
+        @options[:sortable]
+      else
+        true
+      end
     end
 
     def title

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.9
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-10-26 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