ui_bibz 3.0.6 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a1dd66cbd7e134c7defdad8c359d9c64beb21eb6196436a518cb17a83a8df2
-  data.tar.gz: a89c779194577142ace4a56e53089ed0dceb8b96988207f9f6c043f0d0354b9b
+  metadata.gz: 9b146db4d6722946556a0ac54bf0ebbb5d4e7b537e0802154f3c46d8c1b55324
+  data.tar.gz: 650e30abeca77084a2c54f86d52dd1fa3d3ba4e1b66513ad17a0469f05cf88de
 SHA512:
-  metadata.gz: c39e166f3cda1b05035d734b652d44a50af2cbbb4b9a9bfbd78f1582a03b32bd2356eebe00d470e46b77bbf45a672226830b38cb1826d156997145e5b62453ac
-  data.tar.gz: 353ae7e27e66411c506bc984e8575263371117e3461f3de5cdf1f833790be324bec3ff75d6ff15ac98c7e60fcddc41dc68f5cf601e8dddfd0c809a0c8b93ff29
+  metadata.gz: 24117c844b5581683e42c8df8df75bd4c9d3a21eda00785ace4bb969a9aa016e49b42b3dc8da579ca860ecb633a109def24f53559736cc53b747e3fb9e4d84ad
+  data.tar.gz: 1a214086bc20f51ece91bd425ebfc5870600dd062c2204b80cc872deee48c4c902b4149b76b65d0f85ed4dc8433d8fd2593aa91992b60f822df1203fae40fe21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.6)
+    ui_bibz (3.0.10)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -113,7 +113,7 @@ GEM
       mini_mime (>= 0.1.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)
@@ -127,7 +127,7 @@ GEM
     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,7 +161,7 @@ GEM
     rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.22.1)
+    rubocop (1.22.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -172,19 +172,19 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
-    rubocop-minitest (0.15.1)
+    rubocop-minitest (0.15.2)
       rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.11.5)
+    rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.3)
+    rubocop-rails (2.12.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.17.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
-    sexp_processor (4.15.3)
+    ruby_parser (3.18.0)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.0)
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
@@ -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/lib/ui_bibz/concerns/models/searchable.rb

@@ -82,7 +82,7 @@ module UiBibz::Concerns::Models::Searchable
 
     def self.generate_default_sql(sql)
       if sorting?
-        sql.paginate(page: @tmp_params[:page], per_page: @tmp_params[:per_page])
+        sql.reorder('').paginate(page: @tmp_params[:page], per_page: @tmp_params[:per_page])
       else
         sql.reorder(order_sql).paginate(page: @tmp_params[:page], per_page: @tmp_params[:per_page])
       end
@@ -134,8 +134,10 @@ 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
@@ -150,7 +152,7 @@ module UiBibz::Concerns::Models::Searchable
     end
 
     def self.order_sql
-      sorting? ? "#{table_name}.id asc" : "#{@tmp_params[:sort]} #{@tmp_params[:direction]}"
+      sorting? ? '' : "#{@tmp_params[:sort]} #{@tmp_params[:direction]}"
     end
 
     def self.search_sort_paginate

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.6'
+  VERSION             = '3.0.10'
   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/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/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.6
+  version: 3.0.10
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-11-02 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