ui_bibz 3.0.7 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09075fad5e0a57ae7e47b66cb1e9d84d9e208674216317117fc4cbd74002ec83'
-  data.tar.gz: 717b8ed5d3cfe6bdfa003d2db3e240427e2b96a494f8d422e085d0563e60d09c
+  metadata.gz: f5337e14b3b5be637323fc3daee3a8631e9d16eabf12fd2e467f87c3005ca447
+  data.tar.gz: 8f30eab7ca72300d8832d0a415dc5375da20021685e58dac6a4449d2de7f316c
 SHA512:
-  metadata.gz: 756bb32c729a77d6de316ed2279745e0bc22e3c75e0f9f4e7c8c8d560d60f2c938fb445c84922c46536b3c4c49b151db1f45bb4155668f2418acdbc864f5c46f
-  data.tar.gz: d6e66096bb51fa27ae70f6f3c4a0715bff947df9c1fd9ef07c5f2193e1251a5d037467be677fabf4e1a6c2a1f9a7d5b8dceca8c974833627ecfae10e22745e8e
+  metadata.gz: 65c8c8f10e142f1a94653f779471f9ea86909b7334413c2a532c18e6f9750736f891ec6fbeb710bca0370ad861d40cacb2bd30f365abcda8ba042a9f2bdcedf3
+  data.tar.gz: 960429942f530afe95b51a1a7af8cb586089552e3fc6bd40b940f21df38e463dd8db8daf7613f6343cdcb7e048936dae2ca3d9ee9829e3adcdf3de665aa73032

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.7)
+    ui_bibz (3.0.11)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -83,7 +83,7 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -99,7 +99,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jquery-rails (4.4.0)
@@ -125,9 +125,9 @@ GEM
       iniparse (~> 1.4)
       rexml (~> 3.2)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.1)
       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)
@@ -159,9 +159,9 @@ GEM
       thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
-    rubocop (1.22.1)
+    rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -170,11 +170,11 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
-    rubocop-minitest (0.15.2)
+    rubocop-minitest (0.17.0)
       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.4)
@@ -182,9 +182,9 @@ GEM
       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.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.0)
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
@@ -197,9 +197,9 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     temple (0.8.2)
@@ -208,6 +208,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -215,8 +216,9 @@ GEM
     will_paginate (3.3.1)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
-    yard (0.9.26)
-    zeitwerk (2.4.2)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    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.7'
+  VERSION             = '3.0.11'
   AUTHORS = ['Thooams'].freeze
 end

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

@@ -69,9 +69,9 @@ module UiBibz::Ui::Core::Forms::Selects
     def component_html_options
       super.merge({
                     multiple: options[:multiple],
-                    disabled: options[:state] == :disabled,
-                    include_blank: false,
-                    prompt: false
+                    disabled: options[:state] == :disabled
+                    # include_blank: false,
+                    # prompt: false
                   })
     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/ui_bibz.gemspec

@@ -48,4 +48,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simple_form'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'yard'
+  s.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.11
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -662,7 +662,8 @@ files:
 homepage: https://hummel.link/ui-bibz/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: