ui_bibz 4.0.0.beta8 → 4.0.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af01a0145989f1ebec03cb021d895a0308ca15870a575e46a32ebd6a7ce9810e
-  data.tar.gz: 1ab09e1b4fc00aa28e1778f2498371e5eac60cf398a12a6c538a940797f3f698
+  metadata.gz: '080015eb1e845c649a32a36071964c5fa4cd00577cb2c31b4b5aff4ab9e795d6'
+  data.tar.gz: 3be70d906cea6cc6b12edc2b1c3defdeda61409cfd7fcd41a320dfa18b8d03e6
 SHA512:
-  metadata.gz: 0ab623a9538ae89b59e79dfc2e1173b5c8d171364415cbd1adaedceedb247e6c48b82654b78433155a18946c413c8a4d3b66f1d25a29d4f8e18a29f8b6c2b6c4
-  data.tar.gz: bf448fb0bdb071c7dc915582265bec94dbd28b71647016c119870f7af23e9b00d1a50166a0789c6f95802bb61be91de5357f51f5d81c57217820249d8b98da3f
+  metadata.gz: 130a6ff22a9787851316d8f7f4d0a9bda219f7fd6ad4ce99bf1e92e382aa1ca336160475e7dcdfdb9d2b64e25dab04d040775018229fbdb2631ff0bcd9bb92ee
+  data.tar.gz: 1ccca479b148dced9d5bd7cfa08152031fb786da9dda1b440b7398361cb9e2197277b0de59081cb00af9321b33c7f507d30c4a4a6cb9e05cd3345bd4c710c1ca

data/.gitignore

@@ -45,3 +45,5 @@ coverage
 
 .DS_Store
 node_modules/
+test/dummy/db/*.sqlite3-shm
+test/dummy/db/*.sqlite3-wal

data/Gemfile

@@ -16,6 +16,7 @@ group :development, :test do
   gem 'importmap-rails'
   gem 'minitest'
   gem 'overcommit'
+  gem 'propshaft'
   gem 'rubocop'
   gem 'rubocop-ast'
   gem 'rubocop-minitest'

data/Gemfile.lock

@@ -1,44 +1,44 @@
 PATH
   remote: .
   specs:
-    ui_bibz (4.0.0.beta8)
-      bootstrap (~> 5.3.0)
-      dartsass-sprockets (~> 3.0.0)
+    ui_bibz (4.0.0.beta10)
+      bootstrap-propshaft (~> 5.3.2.2)
+      dartsass-rails
       rails (>= 7.1.0)
       will_paginate
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,35 +46,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -89,24 +89,19 @@ GEM
       execjs (~> 2)
     awesome_print (1.9.2)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
-    bootstrap (5.3.2)
+    bigdecimal (3.1.6)
+    bootstrap-propshaft (5.3.2.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
     builder (3.2.4)
     byebug (11.1.3)
-    childprocess (4.1.0)
-    concurrent-ruby (1.2.2)
+    childprocess (5.0.0)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    dartsass-ruby (3.0.2)
-      sass-embedded (~> 1.54, < 1.67)
-    dartsass-sprockets (3.0.0)
-      dartsass-ruby (~> 3.0)
-      railties (>= 4.0.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    dartsass-rails (0.5.0)
+      railties (>= 6.0.0)
+      sass-embedded (~> 1.63)
     date (3.3.4)
     docile (1.4.0)
     drb (2.2.0)
@@ -120,7 +115,7 @@ GEM
       railties (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.1)
+    google-protobuf (3.25.2)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
@@ -137,10 +132,10 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     iniparse (1.5.0)
-    io-console (0.7.1)
-    irb (1.11.0)
+    io-console (0.7.2)
+    irb (1.11.1)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
@@ -153,7 +148,7 @@ GEM
       net-smtp
     marcel (1.0.2)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     mutex_m (0.2.0)
     net-imap (0.4.9.1)
       date
@@ -169,21 +164,26 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    overcommit (0.61.0)
-      childprocess (>= 0.6.3, < 5)
+    overcommit (0.62.0)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
     parallel (1.24.0)
-    parser (3.3.0.2)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     popper_js (2.11.8)
+    propshaft (0.8.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     psych (5.1.2)
       stringio
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.8)
+    rack (3.0.9)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -191,20 +191,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -212,9 +212,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -224,15 +224,15 @@ GEM
     rake (13.1.0)
     rdoc (6.6.2)
       psych (>= 4.0.0)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     reline (0.4.2)
       io-console (~> 0.5)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -241,10 +241,10 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.34.3)
+    rubocop-minitest (0.34.5)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-performance (1.20.1)
+    rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rails (2.23.1)
@@ -254,10 +254,10 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sass-embedded (1.66.1-x86_64-darwin)
-      google-protobuf (~> 3.23)
-    sass-embedded (1.66.1-x86_64-linux-gnu)
-      google-protobuf (~> 3.23)
+    sass-embedded (1.70.0-x86_64-darwin)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-linux-gnu)
+      google-protobuf (~> 3.25)
     simple_form (5.3.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
@@ -267,15 +267,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.7.0-x86_64-darwin)
-    sqlite3 (1.7.0-x86_64-linux)
+    sqlite3 (1.7.2-x86_64-darwin)
+    sqlite3 (1.7.2-x86_64-linux)
     stringio (3.1.0)
     temple (0.10.3)
     thor (1.3.0)
@@ -305,6 +298,7 @@ DEPENDENCIES
   importmap-rails
   minitest
   overcommit
+  propshaft
   puma
   rubocop
   rubocop-ast

data/app/assets/stylesheets/sass/containers/_panel.scss

@@ -10,7 +10,7 @@ $panel-bg:                           $card-bg;
 
 $panel-img-overlay-padding:          1.25rem !default;
 
-$panel-group-margin:                 $panel-spacer/2 !default;
+$panel-group-margin:                 calc($panel-spacer/2) !default;
 $panel-deck-margin:                  $panel-group-margin !default;
 
 $panel-columns-count:                3 !default;
@@ -80,7 +80,7 @@ $panel-columns-margin:               $panel-spacer-y !default;
 }
 
 .panel-subtitle {
-  margin-top: -($panel-spacer-y / 2);
+  margin-top: -(calc($panel-spacer-y / 2));
   margin-bottom: 0;
 }
 
@@ -151,15 +151,15 @@ $panel-columns-margin:               $panel-spacer-y !default;
 //
 
 .panel-header-tabs {
-  margin-right: -calc($panel-spacer-x / 2);
+  margin-right: -(calc($panel-spacer-x / 2));
   margin-bottom: -$panel-spacer-y;
   margin-left: 0;
   border-bottom: 0;
 }
 
 .panel-header-pills {
-  margin-right: -calc($panel-spacer-x / 2);
-  margin-left: -calc($panel-spacer-x / 2);
+  margin-right: -(calc($panel-spacer-x / 2));
+  margin-left: -(calc($panel-spacer-x / 2));
 }
 
 // panel image

data/app/assets/stylesheets/ui_bibz.sass

@@ -1,25 +1,25 @@
 // libraries
-@import bootstrap
+@import 'bootstrap'
 $fa-font-path: 'fontawesome'
-@import fontawesome/fontawesome
-@import fontawesome/solid
-@import fontawesome/brands
-@import multi-select
-@import bootstrap-multiselect
-@import bootstrap-markdown.min
-@import bootstrap-switch.min
-@import bootstrap-datepicker3.min
+@import 'fontawesome/fontawesome'
+@import 'fontawesome/solid'
+@import 'fontawesome/brands'
+@import 'multi-select'
+@import 'bootstrap-multiselect'
+@import 'bootstrap-markdown.min'
+@import 'bootstrap-switch.min'
+@import 'bootstrap-datepicker3.min'
 
 $states_colors: $theme-colors
 
 // Components
-@import sass/_boxes
-@import sass/_containers
-@import sass/_fixes
-@import sass/_forms
-@import sass/_navigations
-@import sass/_notifications
-@import sass/_tables
+@import 'sass/boxes'
+@import 'sass/containers'
+@import 'sass/fixes'
+@import 'sass/forms'
+@import 'sass/navigations'
+@import 'sass/notifications'
+@import 'sass/tables'
 
 // Other section
 .ui-bibz-clear

data/config/initializers/assets.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-Rails.application.config.assets.precompile += %w[bootstrap.min.js popper.js
-                                                 jquery-3.7.0.min.js bootstrap-multiselect.min.js jquery.multi-select.min.js
-                                                 forms.js interfaces.js tables.js forms/formula.js forms/input-connected.js forms/jquery.multi-select-extend.js controllers/combobox_controller.js debounce.js"]
+# Rails.application.config.assets.precompile += %w[bootstrap.min.js popper.js
+#                                                  jquery-3.7.0.min.js bootstrap-multiselect.min.js jquery.multi-select.min.js
+#                                                  forms.js interfaces.js tables.js forms/formula.js forms/input-connected.js forms/jquery.multi-select-extend.js controllers/combobox_controller.js debounce.js"]

data/config/locales/fr.yml

@@ -15,3 +15,7 @@ fr:
           show:   'Voir'
           delete: 'Supprimer'
           edit:   'Editer'
+  will_paginate:
+    page_entries_info:
+      multi_page: "Affichage %{from} - %{to} sur %{count}"
+      multi_page_html: "Affichage <b>%{from}&nbsp;-&nbsp;%{to}</b> sur <b>%{count}</b>"

data/lib/ui_bibz/builders/data_html_options_builder.rb

@@ -3,12 +3,14 @@
 module UiBibz::Builders
   # Class to build html classes
   class DataHtmlOptionsBuilder
+    include ActionView::Helpers::SanitizeHelper
     attr_accessor :html_options
-    attr_reader :options
+    attr_reader :options, :content
 
-    def initialize(html_options, options)
-      @html_options = html_options
+    def initialize(content, options, html_options)
+      @content = content
       @options = options
+      @html_options = html_options
 
       stimulus_data_html
       hotwire_data_html
@@ -99,7 +101,7 @@ module UiBibz::Builders
       when 'UiBibz::Ui::Core::Notifications::Tooltip'
         options[:tooltip]
       when 'TrueClass'
-        tooltip_content = html_options.delete(:title) || (sanitize_text(content) if options[:text] == false)
+        tooltip_content = html_options.delete(:title) || (sanitize(content) if options[:text] == false)
         UiBibz::Ui::Core::Notifications::Tooltip.new(tooltip_content)
       else
         UiBibz::Ui::Core::Notifications::Tooltip.new(options[:tooltip])

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             = '4.0.0.beta8'
+  VERSION             = '4.0.0.beta10'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/ui/core/component.rb

@@ -62,7 +62,7 @@ module UiBibz::Ui::Core
       @html_options = component_initialize_factory_method.html_options
       @options      = component_initialize_factory_method.options
 
-      @data_html_options_builder = UiBibz::Builders::DataHtmlOptionsBuilder.new(@html_options, @options)
+      @data_html_options_builder = UiBibz::Builders::DataHtmlOptionsBuilder.new(@content, @options, @html_options)
 
       init_options
       init_component_html_options

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

@@ -9,15 +9,19 @@ module UiBibz::Ui::Ux::Tables
 
     # header use i18n
     def header(column, name = nil)
-      @column  = column
-      defaults = [
-        header_name(name),
-        translate_headers_by_defaults,
-        translate_headers_by_defaults_active_record,
-        translate_headers_by_active_record,
-        default_header_name(name)
-      ].compact
-      @name = UiBibz::Utils::Internationalization.new(translate_headers_by_model, default: defaults).translate
+      @column = column
+      @name = name
+      if @name.nil?
+        defaults = [
+          header_name(name),
+          translate_headers_by_defaults,
+          translate_headers_by_defaults_active_record,
+          translate_headers_by_active_record,
+          default_header_name(name)
+        ].compact
+
+        @name = UiBibz::Utils::Internationalization.new(translate_headers_by_model, default: defaults).translate
+      end
       sortable? ? sortable_link : title
     end
 

data/ui_bibz.gemspec

@@ -27,12 +27,11 @@ Gem::Specification.new do |s|
 
   # Rails gems
   s.add_dependency 'rails', '>= 7.1.0'
-
-  # Remove these dependencies after
-  s.add_dependency 'bootstrap', '~> 5.3.0'
-  s.add_dependency 'dartsass-sprockets', '~> 3.0.0'
+  # Switch to bootstrap 5.3.3 as soon as possible
+  s.add_dependency 'bootstrap-propshaft', '~> 5.3.2.2'
+  s.add_dependency 'dartsass-rails'
   s.add_dependency 'will_paginate'
-  # Don't move factory_bot_rails to Gemfile because of bug
+  # Don't move factory_bot_rails to Gemfile else it will be loaded in test/dummy
   s.add_development_dependency 'factory_bot_rails', '~> 4.0' # rubocop:disable Gemspec/DevelopmentDependencies
 
   s.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta8
+  version: 4.0.0.beta10
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: bootstrap
+  name: bootstrap-propshaft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.3.2.2
 - !ruby/object:Gem::Dependency
-  name: dartsass-sprockets
+  name: dartsass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement