ui_bibz 3.0.0.alpha9 → 3.0.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e609add47b874d22474ad98a691fb0511ac6b1704309355079a369ae7141a2ac
-  data.tar.gz: c202dad217807b43e0857d17de0fe98d6df0ee9e26b20d74c9d33244fae1ab01
+  metadata.gz: 63c95abb3d6e510f893aaa054080dc4e4b3012fd0a071cd0828a8d2333a0d20d
+  data.tar.gz: 5c13dccaeea9254bd66d0c0a778b3ee18764973438a0668b74f9a56b9b093f10
 SHA512:
-  metadata.gz: c57825fadad8a281d4891732ee10a91fc2d7eef81ca51060c9cecba484658b7132cebf1969b796e1ce49698bd50039c037f78782741fe8226083799a908c1720
-  data.tar.gz: d2ff37b288db8a88b8797f22af6f87b43c2f76fe2bcfe0c39bc14d01e582b7a9aacd908a32bf98cd8ee35e6e5df13c32689d1ecd2b669949c6f66338ea3dc5c8
+  metadata.gz: a138d91759572dec4f047dd5fb7dacd4ea517fffefaca70e73c92aba4fc96a1e799c4e11c8c4ad9420f19e6d9ca0d32a714a9d4ced4ddacac0e8c3368ccafe8c
+  data.tar.gz: 380361211a36fbf4cccfff82512233dcd05e84f20949bdf28e5808a53ea16626a1fafd5e8c020d8130307e3ecc3937e0c1e375ac5d91d58acf07cb0d66baaf4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.alpha9)
+    ui_bibz (3.0.0.alpha10)
       rails (~> 6.0.3, >= 6.0.3.2)
       will-paginate-i18n
       will_paginate (~> 3.1.0)
@@ -172,8 +172,8 @@ GEM
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.0)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)

data/README.md

@@ -23,3 +23,7 @@ Full documentation is here with bootstrap 5:
 
 Older documentation is here with bootstrap 4:
 [Ui Bibz v2.5](http://hummel.link/Ui-Bibz/docs/v2.5/)
+
+
+## Donate
+![Liberapay](https://img.shields.io/liberapay/patrons/Thomas.svg?logo=liberapay)

data/lib/ui_bibz/infos.rb

@@ -8,10 +8,10 @@ module UiBibz
   SUMMARY             = "Ui Bibz is an Ui Framework that allows you to build an interface very quickly and simply using Bootstrap #{BOOTSTRAP_VERSION}."
   LICENSE             = 'MIT'
   FONTAWESOME_VERSION = '5.15.1'
-  HOMEPAGE            = 'http://thooams.github.io/Ui-Bibz/'
+  HOMEPAGE            = 'https://hummel.link/ui-bibz/'
   REPO                = 'git+https://github.com/thooams/Ui-Bibz.git'
   EMAIL               = 'thomas@hummel.link'
-  AUTHOR              = 'Thooams'
-  VERSION             = '3.0.0.alpha9'
+  AUTHOR              = 'Thooams [Thomas HUMMEL]'
+  VERSION             = '3.0.0.alpha10'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/ui/core/forms/buttons/button_link.rb

@@ -62,7 +62,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     def button_link_html_tag
       link_to link_url, html_options do
         concat spinner_html unless options[:spinner].nil?
-        concat glyph_and_content_html(options[:text].nil? ? @content : '')
+        concat glyph_and_content_html(@content)
         concat badge_html unless options[:badge].nil?
       end
     end

data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb

@@ -111,7 +111,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_content
-      glyph_and_content_html(options[:text].nil? ? @content : '').html_safe
+      glyph_and_content_html(@content)
     end
 
     def button_html

data/lib/ui_bibz/ui/core/forms/numbers/slider_header.rb

@@ -52,14 +52,14 @@ module UiBibz::Ui::Core::Forms::Numbers
 
     def header_min
       content_tag :div, class: 'slider-header-min' do
-        concat content_tag :label, options[:label_min] || 'Min: '
+        concat content_tag :label, options[:label_min] || 'Min: ', for: options[:label_for_min]
         concat content_tag :span, options[:thumb_min], "data-unit": options[:unit] || options[:unit_min]
       end
     end
 
     def header_max
       content_tag :div, class: 'slider-header-max' do
-        concat content_tag :label, options[:label_max] || 'Max: '
+        concat content_tag :label, options[:label_max] || 'Max: ', for: options[:label_for_max]
         concat content_tag :span, options[:thumb_max], "data-unit": options[:unit] || options[:unit_max]
       end
     end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      button_html_tag
-    end
-  end
+  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button; end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      button_link_html_tag
-    end
-  end
+  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink; end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_dropdown.rb

@@ -4,10 +4,11 @@ module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Dropdown.initialize
 
-    private
-
-    def component_html_classes
-      super << 'input-group-btn'
+    def pre_render
+      capture do
+        concat button_html
+        concat ul_html
+      end
     end
   end
 end

data/lib/ui_bibz/ui/core/navigations/nav.rb

@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def link(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:nav_tags] = nav_tags
       else
@@ -93,7 +93,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def text(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content[:nav_type] = type : options[:nav_type] = type
+      block ? content[:nav_type] = type : options[:nav_type] = type
       @items << NavText.new(content, options, html_options, &block)
     end
 

data/lib/ui_bibz/ui/core/navigations/tab_group.rb

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def tab(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:tag_type] = @options[:tag_type]
       else

data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb

@@ -31,12 +31,13 @@ module UiBibz::Ui::Core::Notifications::Components
   #   end.render
   #
   class ToastHeader < UiBibz::Ui::Core::Component
+    include Webpacker::Helper if defined?(Webpacker)
     # See UiBibz::Ui::Core::Component.initialize
 
     def pre_render
       content_tag :div, html_options do
         concat UiBibz::Ui::Core::Icons::Glyph.new(options[:glyph], class: 'mr-2').render unless options[:glyph].nil?
-        concat image_tag(options[:img], class: 'rounded mr-2') unless options[:img].nil?
+        concat image unless options[:image].nil?
         concat content_tag(:strong, content, class: 'mr-auto')
         concat content_tag(:small, options[:time], class: 'text-muted') unless options[:time].nil?
         concat close_button
@@ -45,6 +46,19 @@ module UiBibz::Ui::Core::Notifications::Components
 
     private
 
+    def image
+      if options[:image].is_a?(String)
+        image_tag(options[:image], class: 'rounded mr-2', alt: sanitize_text(options[:image])) unless options[:image].nil?
+      else
+        options[:image][:class] = UiBibz::Utils::Screwdriver.join_classes(options[:image][:class], 'rounded mr-2')
+        if options[:image].delete(:pack)
+          image_pack_tag(options[:image].delete(:href), **options[:image])
+        else
+          image_tag(options[:image].delete(:href), **options[:image])
+        end
+      end
+    end
+
     def close_button
       content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-dismiss": 'toast', "aria-label": 'Close'
     end

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

@@ -20,7 +20,6 @@ module GlyphExtension
       h[:text] = options[:text]
       h[:label] = options[:label] || content_html || content
       h[:shortcut] = options[:shortcut] unless options[:shortcut].nil?
-      h[:html_options] = options[:html_options] unless options[:html_options].nil?
     end
 
     # UiBibz::Utils::GlyphChanger.new(glyph_options[:name], glyph_options).render unless glyph_options[:name].nil?

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

@@ -28,7 +28,7 @@ module PopoverExtension
       TOOLTIP_METHODS.each { |mth| add_html_data(mth, value: options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
       add_html_data :placement, value: options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
     else
-      add_html_data :title, value: options[:tooltip]
+      add_html_data :title, value: options[:tooltip] == true ? sanitize_text(content) : options[:tooltip]
     end
   end
 end

data/test/ui/core/forms/surrounds/surround_field_test.rb

@@ -31,7 +31,7 @@ class SurroundFieldTest < ActionView::TestCase
         d.link 'Link3', url: '#link3'
       end
     end.render
-    expected = "<div class=\"input-group ui_surround_field\"><div id=\"dropdown-test\" class=\"dropdown input-group-btn\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"dropdown-test\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"dropdown-test\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fas fa-eye\"></i> Link 1</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#link2\">Link 2</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#link3\">Link3</a></div></div></div>"
+    expected = "<div class=\"input-group ui_surround_field\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"dropdown-test\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"dropdown-test\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fas fa-eye\"></i> Link 1</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#link2\">Link 2</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#link3\">Link3</a></div></div>"
 
     assert_equal expected, actual
   end

data/ui_bibz.gemspec

@@ -12,7 +12,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |s|
   s.name        = UiBibz::SLUG
   s.version     = UiBibz::VERSION
-  s.authors     = UiBibz::AUTHORS
+  s.author      = UiBibz::AUTHOR
   s.email       = UiBibz::EMAIL
   s.homepage    = UiBibz::HOMEPAGE
   s.summary     = UiBibz::SUMMARY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha9
+  version: 3.0.0.alpha10
 platform: ruby
 authors:
-- Thooams
+- Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -635,7 +635,7 @@ files:
 - vendor/assets/stylesheets/jquery.multi-select.min.css
 - vendor/assets/stylesheets/svg-with-js.css
 - vendor/assets/stylesheets/tether.min.css
-homepage: http://thooams.github.io/Ui-Bibz/
+homepage: https://hummel.link/ui-bibz/
 licenses:
 - MIT
 metadata: {}