ui_bibz 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab10496daf32afaaca5fd078a9a2620f630fad4da2ea00f5ae8f24aa8ae0826c
-  data.tar.gz: b9292524cdb88cf85094134984f77b950683615b74c235e0ee212990bb20897c
+  metadata.gz: 1bb30ee2a67229de4844d20f26278dd14780ea2b6d385cf2694a40410120cccf
+  data.tar.gz: 258345dcfd10af021551eedbdddd844b93a6f8854bd82cfdacb18c4b4e341b79
 SHA512:
-  metadata.gz: ac16a93775ca52b4a4bcc96cceda6e199063134ae3496b851de5355d4b3cac4d7a4088fb7d748525b330cc54cf93745ee83012179dd210871e98f6c86c9f1135
-  data.tar.gz: 6e68566da4afe3ba625e962c968d1aff7df297695441d7de08a413c73b96ffddf580ff9e66f7d903b57cd0dd38e8c90f7d6269761b79a82354e7ce48c21377c8
+  metadata.gz: 0cbddb81ee89849fafbc96197d7a769e711592ed506e6332701138d129bb9c742c959acb78391ffa93c4c4be67acc642bbf709da40c1de4b3322a1d3174a6088
+  data.tar.gz: a42596aa4b47ed030cfec591164dbddd0a8f8e53b754b69cc66b49ac04eb085b7c4d80661305c673225c4f7a28fdb01878ba6258267d1b62d396f058d3d08a2d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ui_bibz (2.2.2)
-      bootstrap (= 4.2.1)
+    ui_bibz (2.3.0)
+      bootstrap (= 4.3.1)
       haml
       haml-rails
       jquery-rails (>= 3.1.0)
@@ -61,7 +61,7 @@ GEM
     autoprefixer-rails (9.4.7)
       execjs
     awesome_print (1.8.0)
-    bootstrap (4.2.1)
+    bootstrap (4.3.1)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
@@ -216,7 +216,7 @@ DEPENDENCIES
   minitest
   simple_form
   simplecov
-  sqlite3
+  sqlite3 (= 1.3.13)
   ui_bibz!
 
 BUNDLED WITH

data/app/assets/javascripts/form.coffee

@@ -13,11 +13,7 @@
     $('.ui-bibz-connect').inputConnected()
 
   selectPicker: ->
-    $('select.dropdown-select-field').selectpicker
-      iconBase: 'fa'
-      tickIcon: 'fa-check'
-      #style:    'btn-secondary'
-      showTick: false
+    $('select.dropdown-select-field').selectpicker()
 
   switch: ->
     $('input.switch-field').bootstrapSwitch({ size: 'large' })

data/app/assets/javascripts/interface.coffee

@@ -8,6 +8,8 @@
     @popover()
     @notify()
     @fileInputBrowser()
+    @toast()
+    @collapse()
 
   nav: ->
     #$('.nav-tabs .nav-item .nav-link').tab('show')
@@ -48,3 +50,9 @@
       else if (!el.is(':checked'))
         el.prop('readonly', true)
         el.prop('indeterminate', true)
+
+  toast: ->
+    $('.toast').toast()
+
+  collapse: ->
+    $('.collapse').collapse()

data/app/assets/javascripts/ui_bibz.coffee.erb

@@ -70,7 +70,7 @@ $.fn.selectpicker.Constructor.BootstrapVersion = '4'
       $(document).on 'turbolinks:load', ->
         me.initial() # catch event for turbolinks and fix in ready() function
     else
-      $ ->
+      $(document).ready ->
         me.initial()
     return false
 

data/app/assets/stylesheets/forms.sass

@@ -71,3 +71,8 @@
   .dropdown-toggle::after
     content: none
 
+// fix button bug
+.bootstrap-select .dropdown-toggle:after
+  margin-top: 0.5rem
+  margin-bottom: 0.5rem
+

data/app/assets/stylesheets/notifications.sass

@@ -23,5 +23,12 @@
 .fab
   line-height: 0.7 !important
 
-span:not(.input-group-addon) .glyph
+span:not(.input-group-addon, .btn) .glyph
   margin-top: -0.1rem
+
+.input-group-btn span svg
+  margin: 0.25rem
+
+.toast .toast-header img
+  width: 20px
+  height: 20px

data/config/initializers/will_paginate.rb

@@ -21,7 +21,7 @@ module WillPaginate
       def to_html
         list_items = pagination.map do |item|
           case item
-            when Fixnum
+            when Integer
               page_number(item)
             else
               send(item)

data/lib/ui_bibz/helpers/ui/core/boxes_helper.rb

@@ -15,6 +15,15 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
     end
   end
 
+  # Card Accordion
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  #
+  def ui_card_accordion content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Boxes::CardAccordion.new(content, options, html_options).tap(&block).render
+  end
+
   # Card Group Component
   #
   # +options+ (Hash)

data/lib/ui_bibz/helpers/ui/core/notifications_helper.rb

@@ -34,6 +34,23 @@ module UiBibz::Helpers::Ui::Core::NotificationsHelper
     end
   end
 
+  # Toast Component
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def ui_toast content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Notifications::Toast.new(content, options, html_options).tap(&block).render
+  end
+
+  # Spinner Component
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  #
+  def ui_spinner content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Notifications::Spinner.new(content, options, html_options, &block).render
+  end
+
   private
 
   def is_tap content, options

data/lib/ui_bibz/infos.rb

@@ -1,9 +1,9 @@
 module UiBibz
   NAME                = "Ui Bibz"
-  VERSION             = "2.2.2"
+  VERSION             = "2.3.0"
   DESCRIPTION         = "A Rails Interface Framework using Bootstrap."
   SUMMARY             = "Create your project with Ui Bibz. Over a thirty reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more."
   LICENSE             = "MIT"
   FONTAWESOME_VERSION = "5.7.0"
-  BOOTSTRAP_VERSION   = "4.2.1"
+  BOOTSTRAP_VERSION   = "4.3.1"
 end

data/lib/ui_bibz/ui/base.rb

@@ -17,7 +17,7 @@ module UiBibz::Ui
     end
 
     def generate_id name = nil
-      "#{ name || 'id' }-#{ Random.new_seed }"
+      "#{ name || 'id' }-#{ Random.rand(99999) }"
     end
   end
 end

data/lib/ui_bibz/ui/core/boxes/card.rb

@@ -108,8 +108,10 @@ module UiBibz::Ui::Core::Boxes
     def body content = nil, options = nil, html_options = nil, &block
       options, content = inherit_options(content, options, block)
       if is_tap(content, options)
+        content = (content || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse] )
         @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options).tap(&block).render
       else
+        options = (options || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse] )
         @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options, &block).render
       end
     end

data/lib/ui_bibz/ui/core/boxes/card_accordion.rb

@@ -0,0 +1,65 @@
+module UiBibz::Ui::Core::Boxes
+
+  # Create a card accordion
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Boxes::CardAccordion.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::CardAccordion.new(options = nil, html_options = nil) do |cg|
+  #     cg.card content, options, html_options, &block
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::CardAccordion.new do |cg|
+  #     cg.card 'Exemple 1'
+  #     cg.card 'Exemple 2'
+  #     cg.card 'Exemple 3'
+  #   end.render
+  #
+  class CardAccordion < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+      @items = []
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def card content = nil, options = nil, html_options = nil, &block
+      content = (content || {}).merge({ parent_collapse: id })
+      @items << UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options).tap(&block).render
+    end
+
+  private
+
+    def id
+      @id ||= generate_id("card-accordion-id")
+    end
+
+    def component_html_classes
+      "accordion"
+    end
+
+    def component_html_options
+      { id: id }
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -42,7 +42,13 @@ module UiBibz::Ui::Core::Boxes::Components
 
     # Render html tag
     def pre_render
-      content_tag :div, @items.join.html_safe, html_options
+      if options[:collapse]
+        content_tag :div, class: join_classes("collapse", show), id: options[:collapse], "data-parent": "##{ options[:parent_collapse] }" do
+          content_tag :div, @items.join.html_safe, html_options
+        end
+      else
+        content_tag :div, @items.join.html_safe, html_options
+      end
     end
 
     def title content = nil, options = nil, html_options = nil, &block
@@ -67,5 +73,10 @@ module UiBibz::Ui::Core::Boxes::Components
       "text-#{ @options[:status] }" if @options[:outline]
     end
 
+    def show
+      ap @options[:show]
+      "show" if @options[:show]
+    end
+
   end
 end

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

@@ -104,11 +104,18 @@ module UiBibz::Ui::Core
     # Override this method to add html data
     def component_html_data
       # To stimulusjs
-      add_html_data :target, html_options.try(:[], :data).try(:[], :target) || options.try(:delete, :target)
-      add_html_data :controller, html_options.try(:[], :data).try(:[], :controller) || options.try(:delete, :controller)
-      add_html_data :action, html_options.try(:[], :data).try(:[], :action) || options.try(:delete, :action)
+      data_target = html_options.try(:[], :data).try(:[], :target) || options.try(:delete, :target)
+      add_html_data(:target, data_target) unless data_target.nil?
+
+      data_controller = html_options.try(:[], :data).try(:[], :controller) || options.try(:delete, :controller)
+      add_html_data(:controller, data_controller) unless data_controller.nil?
+
+      data_action = html_options.try(:[], :data).try(:[], :action) || options.try(:delete, :action)
+      add_html_data(:action, data_action) unless data_action.nil?
+
       # To turbolinks
-      add_html_data :turbolinks, html_options.try(:[], :data).try(:[], :turbolinks) || options.try(:delete, :turbolinks)
+      data_turbolinks = html_options.try(:[], :data).try(:[], :turbolinks) || options.try(:delete, :turbolinks)
+      add_html_data(:turbolinks, data_turbolinks) unless data_turbolinks.nil?
     end
 
     # Override this method to add html Options
@@ -163,6 +170,7 @@ module UiBibz::Ui::Core
     def initialize_component_html_data
       component_html_data
       popover_data_html
+      tooltip_data_html
     end
 
     def initialize_component_html_options

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

@@ -65,6 +65,7 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     def button_html_tag
       content_tag :button, html_options do
+        concat spinner_html unless options[:spinner].nil?
         concat glyph_and_content_html(options[:text].nil? ? @content : '')
         concat badge_html unless options[:badge].nil?
       end
@@ -77,18 +78,20 @@ module UiBibz::Ui::Core::Forms::Buttons
     def component_html_options
       opts = super
       opts = opts.merge(toggle)                   unless options[:toggle].nil?
+      opts = opts.merge(collapse)                 unless options[:collapse].nil?
       opts = opts.merge(active_html_options)      if options[:state] == :active
       opts = opts.merge({ disabled: 'disabled' }) if options[:state] == :disabled
       opts
     end
 
-    def component_html_data
-      super
-      action
+    def collapse
+      attrs = { "data-toggle": "collapse", "data-target": "##{ options[:collapse] }" }
+      attrs = attrs.merge({ "aria-expanded": true }) if options[:active_collapse]
+      attrs
     end
 
     def status
-      ["btn", outline, options[:status]].compact.join('-')
+      ["btn", outline, options[:status] || "secondary"].compact.join('-')
     end
 
     def outline
@@ -125,6 +128,13 @@ module UiBibz::Ui::Core::Forms::Buttons
       end
     end
 
+    def spinner_html
+      opts = { size: :sm, tag: :span, class: options[:text] == false ? nil : 'mr-2' }
+      opts = opts.merge(options[:spinner]) if options[:spinner].kind_of? Hash
+
+      UiBibz::Ui::Core::Notifications::Spinner.new(nil, opts).render
+    end
+
     # :lg, :sm or :xs
     def size
       "btn-#{ options[:size] }" if options[:size]

data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb

@@ -60,7 +60,6 @@ module UiBibz::Ui::Core::Forms::Choices
   private
 
     def checkbox_field_html_tag
-      options[:action] = html_options[:data].delete(:action)
       content_tag(:div, html_options.except(:id, "data-action")) do
         concat hidden_field_tag content, '0', id: "#{ content }-hidden"
         concat check_box_tag content, options[:value] || '1', options[:checked] || html_options[:checked], checkbox_html_options

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

@@ -26,6 +26,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   #   * +name+ - String
   #   * +size+ - Integer
   #   * +type+ - Symbol
+  # * +html_button+ - Hash
   #
   # ==== Signatures
   #
@@ -119,10 +120,11 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_html
+      html_button = options[:html_button] || {}
       if options[:tag] == :a
-        content_tag dropdown_tag, button_content, class: join_classes("btn", button_status, state, size, "dropdown-toggle"), href: '#', role: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id
+        content_tag dropdown_tag, button_content, { class: join_classes("btn", button_status, state, size, "dropdown-toggle"), href: '#', role: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id }.merge(html_button)
       else
-        content_tag dropdown_tag, button_content, class: join_classes("btn", button_status, state, size, "dropdown-toggle"), type: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id
+        content_tag dropdown_tag, button_content, { class: join_classes("btn", button_status, state, size, "dropdown-toggle"), type: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id }.merge(html_button)
       end
     end
 

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

@@ -75,16 +75,17 @@ module UiBibz::Ui::Core::Forms::Selects
     private
 
     def component_html_options
-      super.merge({
-        multiple:      false,
-        disabled:      options[:state] == :disabled,
-        include_blank: options[:include_blank],
-        prompt:        options[:prompt]
-      })
+      super.merge({}.tap do |h|
+        h[:multiple] = true if options[:multiple]
+        h[:disabled] = options[:state] == :disabled
+        h[:include_blank] = options[:include_blank]
+        h[:prompt] = options[:prompt]
+        h[:title] = options[:placeholder] unless options[:placeholder].nil?
+      end)
     end
 
     def component_html_classes
-      super << ['dropdown-select-field', show_tick, show_menu_arrow, dropup]
+      super << ['dropdown-select-field', show_tick, dropup]
     end
 
     def component_html_data
@@ -114,7 +115,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def style
-      add_html_data('style', "btn-#{ options[:status]}") if options[:style]
+      add_html_data('style', "btn-#{ options[:status] || :secondary }")
     end
 
     def menu_size
@@ -139,10 +140,6 @@ module UiBibz::Ui::Core::Forms::Selects
       'show-tick' if options[:show_tick]
     end
 
-    def show_menu_arrow
-      'show-menu-arrow' if options[:show_menu_arrow]
-    end
-
     def dropup
       'dropup' if options[:dropup]
     end

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

@@ -18,15 +18,8 @@ module UiBibz::Ui::Core::Forms::Selects
   # * +status+ - status of élement with symbol value:
   #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+, +:link+)
   # * +option_tags+ - Array, Object [required]
-  # * +searchable+ - Boolean
-  # * +max_options+ - Integer
-  # * +selected_text_format+ - String
-  # * +menu_size+ - Integer
-  # * +header+ - String
-  # * +actions_box+ - Boolean
-  # * +show_tick+ - Boolean
-  # * +show_menu_arrow+ - Boolean
-  # * +dropup+ - Boolean
+  # * +size+
+  #   (+:xs+, +:sm+, +:lg+)
   # * +append+ - String, Html
   # * +prepend+ - String, Html
   # * +connect+ - Hash
@@ -55,11 +48,11 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Forms::Selects::SelectField.new('fruits', { option_tags: list_of_fruits, searchable: true }, { class: 'test' })
+  #   UiBibz::Ui::Core::Forms::Selects::SelectField.new('fruits', { option_tags: list_of_fruits }, { class: 'test' }).render
   #
-  #   UiBibz::Ui::Core::Forms::Selects::SelectField.new({ option_tags: list_of_fruits, actions_box: true }, { class: 'test' }) do
+  #   UiBibz::Ui::Core::Forms::Selects::SelectField.new({ option_tags: list_of_fruits }, { class: 'test' }) do
   #     'fruits'
-  #   end
+  #   end.render
   #
   # ==== Helper
   #
@@ -75,7 +68,7 @@ module UiBibz::Ui::Core::Forms::Selects
     private
 
     def component_html_classes
-      super << ["select-field", "form-control", size]
+      super << ["select-field", "form-control", "custom-select", size]
     end
 
     def component_options
@@ -83,7 +76,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def size
-      "form-control-#{ options[:size] }" unless options[:size].nil?
+      "custom-select-#{ options[:size] }" unless options[:size].nil?
     end
 
   end

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

@@ -52,6 +52,18 @@ module UiBibz::Ui::Core::Navigations
 
     private
 
+    def component_html_options
+      opts = super
+      opts = opts.merge(collapse) unless options[:collapse].nil?
+      opts
+    end
+
+   def collapse
+      attrs = { role: "button", "data-toggle": "collapse", "data-target": "##{ options[:collapse] }" }
+      attrs = attrs.merge({ "aria-expanded": true }) if options[:active_collapse]
+      attrs
+    end
+
     def text
       @options[:text].nil? ? true : @options[:text]
     end

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

@@ -0,0 +1,50 @@
+module UiBibz::Ui::Core::Notifications::Components
+
+  # Create a alert body
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastBody.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastBody.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastBody.new.render
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastBody.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class ToastBody < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    def pre_render
+      content_tag :div, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      "toast-body"
+    end
+
+  end
+end

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

@@ -0,0 +1,62 @@
+module UiBibz::Ui::Core::Notifications::Components
+
+  # Create a alert body
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastHeader.new.render
+  #
+  #   UiBibz::Ui::Core::Notifications::ToastHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class ToastHeader < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    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 content_tag(:strong, content, class: 'mr-auto')
+        concat content_tag(:small, options[:time], class: 'text-muted') unless options[:time].nil?
+        concat close_button
+      end
+    end
+
+  private
+
+    def close_button
+      content_tag :button, class: 'ml-2 mb-1 close', "data-dismiss": "toast", "aria-label": "Close" do
+        content_tag(:span, "×", "aria-hidden": true).html_safe
+      end
+    end
+
+    def component_html_classes
+      "toast-header"
+    end
+
+  end
+end