ui_bibz 4.0.0.beta9 → 4.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76a2d95cd0f178398298d2cdd0b01ed9c14e3a16ec135ec81447b2ecf40dfdf
-  data.tar.gz: 1bcc88d47ad5512f9e1aac4b38aa869bf7c08d73f0f1c016aa4811ce099cdd9d
+  metadata.gz: d1ea201a191301de2afddad536ed003140c762181dbab07bdded755c9e997595
+  data.tar.gz: 527a0b6ef40be3b694c1ed2dbc0a8aecc7db346d25f7a91084978e631b621864
 SHA512:
-  metadata.gz: c8f9e6cfff1d7725acf80d5cc6d28521733bd7bb835de9761371f094373d31b3fe137e5b6db3082041c226986b2b9be8b38a765eccee3aa5d1af579db4d84849
-  data.tar.gz: 9437dcf275c16c6baf5b9f3927a9d50377c6c6da717ad8117ad485b109dbcaf69cefaa35e2663a87e48d9cfe00c990c4a24937f81d3a2095fd4ea73f821716a6
+  metadata.gz: 284ee31d8189225b5d9930b6055f70f891e4f01735f38a995b02d2a68b3171e525e07ccf0f8f2b9a8b32836c8cb7f8c3f31d10bd9a11b78d0b740245e25e8cbf
+  data.tar.gz: fc2202cf2fbb7571c26d5bc72ece7bfc8024d3ad4081ed4d6e5b52a7e8a81ecc4297945c8002dfbd69e7d9160d3357521ec3a4a6e5dd5fae00bd2b98350358af

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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (4.0.0.beta9)
+    ui_bibz (4.0.0.beta11)
       bootstrap-propshaft (~> 5.3.2.2)
       dartsass-rails
       rails (>= 7.1.0)
@@ -10,35 +10,35 @@ PATH
 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,14 +89,14 @@ GEM
       execjs (~> 2)
     awesome_print (1.9.2)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    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-rails (0.5.0)
@@ -132,7 +132,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     iniparse (1.5.0)
-    io-console (0.7.1)
+    io-console (0.7.2)
     irb (1.11.1)
       rdoc
       reline (>= 0.4.2)
@@ -148,9 +148,9 @@ GEM
       net-smtp
     marcel (1.0.2)
     mini_mime (1.1.5)
-    minitest (5.21.1)
+    minitest (5.22.1)
     mutex_m (0.2.0)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -160,25 +160,30 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.0-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.16.2-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.3)
+    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)
@@ -186,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
@@ -207,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)
@@ -223,7 +228,7 @@ GEM
     reline (0.4.2)
       io-console (~> 0.5)
     rexml (3.2.6)
-    rubocop (1.60.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -236,7 +241,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.34.4)
+    rubocop-minitest (0.34.5)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-performance (1.20.2)
@@ -249,9 +254,9 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sass-embedded (1.69.7-x86_64-darwin)
+    sass-embedded (1.70.0-x86_64-darwin)
       google-protobuf (~> 3.25)
-    sass-embedded (1.69.7-x86_64-linux-gnu)
+    sass-embedded (1.70.0-x86_64-linux-gnu)
       google-protobuf (~> 3.25)
     simple_form (5.3.0)
       actionpack (>= 5.2)
@@ -262,8 +267,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    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)
@@ -278,7 +283,7 @@ GEM
     websocket-extensions (0.1.5)
     will_paginate (4.0.0)
     yard (0.9.34)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   x86_64-darwin-22
@@ -293,6 +298,7 @@ DEPENDENCIES
   importmap-rails
   minitest
   overcommit
+  propshaft
   puma
   rubocop
   rubocop-ast

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

@@ -7,11 +7,11 @@ module UiBibz
   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 = '6.5.1'
+  FONTAWESOME_VERSION = '6.5.2'
   HOMEPAGE            = 'https://hummel.link/ui-bibz/'
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '4.0.0.beta9'
+  VERSION             = '4.0.0.beta11'
   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/test/builders/data_html_classes_builder_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class DataHtmlOptionsBuilderTest < ActiveSupport::TestCase
   def setup
-    @html_class_builder = UiBibz::Builders::DataHtmlOptionsBuilder.new({}, {})
+    @html_class_builder = UiBibz::Builders::DataHtmlOptionsBuilder.new({}, {}, {})
   end
 
   test 'add key' do

data/ui_bibz.gemspec

@@ -27,13 +27,11 @@ Gem::Specification.new do |s|
 
   # Rails gems
   s.add_dependency 'rails', '>= 7.1.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'