ui_bibz 2.5.6 → 3.0.0.alpha8

data/lib/ui_bibz/ui/extensions/core/forms/connect_extension.rb

@@ -14,7 +14,7 @@ module ConnectExtension
 
   def connect_opts
     selector = options[:refresh][:target][:selector]
-    options[:refresh][:target][:selector] = selector.blank? ? "##{connect_options_selector}" : selector
+    options[:refresh][:target][:selector] = selector.presence || "##{connect_options_selector}"
 
     options[:refresh].merge({
                               connect: {
@@ -26,6 +26,6 @@ module ConnectExtension
   end
 
   def connect_options
-    add_html_data('connect', options[:connect]) if options[:connect]
+    add_html_data('connect', value: options[:connect]) if options[:connect]
   end
 end

data/lib/ui_bibz/ui/extensions/core/forms/surround_extension.rb

@@ -7,7 +7,7 @@ module SurroundExtension
   private
 
   def surrounded?
-    !options[:append].nil? || !options[:prepend].nil? || !options[:refresh].nil? || !options[:surrounded].nil?
+    options[:append].present? || options[:prepend].present? || options[:refresh].present? || options[:surrounded].present?
   end
 
   def surround_wrapper_tag(ct_tag)

data/lib/ui_bibz/ui/ux/containers/components/panel_body.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Ux::Containers::Components
   #
   class PanelBody < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render

data/lib/ui_bibz/ui/ux/containers/components/panel_column.rb

@@ -23,6 +23,8 @@ module UiBibz::Ui::Ux::Containers::Components
   #   end.render
   #
   class PanelColumn < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super

data/lib/ui_bibz/ui/ux/containers/components/panel_deck.rb

@@ -23,6 +23,8 @@ module UiBibz::Ui::Ux::Containers::Components
   #   end.render
   #
   class PanelDeck < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super

data/lib/ui_bibz/ui/ux/containers/components/panel_footer.rb

@@ -33,9 +33,6 @@ module UiBibz::Ui::Ux::Containers::Components
   #
   class PanelFooter < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render

data/lib/ui_bibz/ui/ux/containers/components/panel_group.rb

@@ -21,6 +21,8 @@ module UiBibz::Ui::Ux::Containers::Components
   #   end.render
   #
   class PanelGroup < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super

data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ui_bibz/ui/ux/containers/components/panel_tab_group'
+require 'ui_bibz/ui/ux/containers/components/panel_header_title'
 module UiBibz::Ui::Ux::Containers::Components
   # Create a panel header
   #
@@ -33,9 +34,6 @@ module UiBibz::Ui::Ux::Containers::Components
   #
   class PanelHeader < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -45,8 +43,8 @@ module UiBibz::Ui::Ux::Containers::Components
       end
     end
 
-    def title(text)
-      @content = content_tag :div, text, class: 'panel-title'
+    def title(content = nil, options = nil, html_options = nil, &block)
+      @content = PanelHeaderTitle.new(content, options, html_options, &block).render
     end
 
     def actions(content = nil, options = nil, html_options = nil, &block)
@@ -54,7 +52,7 @@ module UiBibz::Ui::Ux::Containers::Components
     end
 
     def tab_group(content = nil, options = nil, html_options = nil, &block)
-      @content = if tap?(content, options)
+      @content = if tapped?(block)
                    PanelTabGroup.new(content, options, html_options).tap(&block).render
                  else
                    PanelTabGroup.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/ux/containers/components/panel_header_title.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Ux::Containers::Components
+  # Create a panel header
+  #
+  # ==== 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::PanelHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::CarHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new.render
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class PanelHeaderTitle < UiBibz::Ui::Core::Component
+    # See UiBibz::Ui::Core::Component.initialize
+
+    # Render html tag
+    def pre_render
+      content_tag :div, @content, html_options
+    end
+
+    private
+
+    def component_html_classes
+      'panel-title'
+    end
+  end
+end

data/lib/ui_bibz/ui/ux/containers/components/panel_tab_group.rb

@@ -31,10 +31,6 @@ module UiBibz::Ui::Ux::Containers::Components
   #   end.render
   #
   class PanelTabGroup < UiBibz::Ui::Core::Navigations::TabGroup
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
-
     private
 
     def component_html_classes

data/lib/ui_bibz/ui/ux/containers/components/panel_toolbar.rb

@@ -24,9 +24,6 @@ module UiBibz::Ui::Ux::Containers::Components
   #
   class PanelToolbar < UiBibz::Ui::Core::Navigations::Toolbar
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/ux/containers/panel.rb

@@ -39,6 +39,8 @@ module UiBibz::Ui::Ux::Containers
   #   end
   #
   class Panel < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       @items = []
@@ -74,7 +76,7 @@ module UiBibz::Ui::Ux::Containers
 
     # Add Header which is a component
     def header(content = nil, options = nil, html_options = nil, &block)
-      @header = if tap?(content, options)
+      @header = if tapped?(block)
                   UiBibz::Ui::Ux::Containers::Components::PanelHeader.new(content, options, html_options).tap(&block).render
                 else
                   UiBibz::Ui::Ux::Containers::Components::PanelHeader.new(content, options, html_options, &block).render
@@ -83,7 +85,7 @@ module UiBibz::Ui::Ux::Containers
 
     # Add Header which is a component
     def footer(content = nil, options = nil, html_options = nil, &block)
-      @footer = if tap?(content, options)
+      @footer = if tapped?(block)
                   UiBibz::Ui::Ux::Containers::Components::PanelFooter.new(content, options, html_options).tap(&block).render
                 else
                   UiBibz::Ui::Ux::Containers::Components::PanelFooter.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/ux/tables/components/thead.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Ux::Tables
   #
   class Thead < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render

data/lib/ui_bibz/ui/ux/tables/table.rb

@@ -7,7 +7,6 @@ require 'ui_bibz/ui/ux/tables/components/actions'
 require 'ui_bibz/ui/ux/tables/components/thead'
 require 'ui_bibz/ui/ux/tables/components/as'
 require 'ui_bibz/ui/ux/tables/extensions/paginable'
-require 'ui_bibz/ui/ux/tables/extensions/paginable'
 require 'ui_bibz/ui/ux/tables/extensions/searchable'
 require 'ui_bibz/ui/ux/tables/extensions/sortable'
 require 'ui_bibz/ui/ux/tables/extensions/actionable'
@@ -28,7 +27,6 @@ module UiBibz::Ui::Ux::Tables
   # You can pass arguments in options attribute:
   # * +store+ - Store generate by '+table_search_pagination+' method
   # * +url+ - String
-  # * +tap+ - Boolean
   # * +actionable+ - Boolean
   # * +sortable+ - Boolean
   # * +searchable+ - Boolean
@@ -50,7 +48,7 @@ module UiBibz::Ui::Ux::Tables
   #
   #   UiBibz::Ui::Ux::Tables::Table.new(store: @store)
   #
-  #   UiBibz::Ui::Ux::Tables::Table.new(store: @store, tap: true) do |t|
+  #   UiBibz::Ui::Ux::Tables::Table.new(store: @store) do |t|
   #     t.columns do |c|
   #       c.column :id, name: '#'
   #     end
@@ -81,7 +79,7 @@ module UiBibz::Ui::Ux::Tables
   #
   #   table(options = {}, html_options = {})
   #
-  #   table(options = { tap: true }, html_options = {}) do |t|
+  #   table(options = {}, html_options = {}) do |t|
   #     t.columns do |cls|
   #       cls.column(name, options = {}, html_options = {})
   #       cls.column(options = {}, html_options = {}) do

data/lib/ui_bibz/ui/ux/tables/table_card.rb

@@ -18,7 +18,6 @@ module UiBibz::Ui::Ux::Tables
   # You can pass arguments in options attribute:
   # * +store+ - Store generate by '+table_search_pagination+' method
   # * +url+ - String
-  # * +tap+ - Boolean
   # * +table_options+ - Hash
   #   * +actionable+ - Boolean
   #   * +sortable+ - Boolean
@@ -40,7 +39,7 @@ module UiBibz::Ui::Ux::Tables
   #
   #   UiBibz::Ui::Ux::Tables::TableCard.new(store: @store)
   #
-  #   UiBibz::Ui::Ux::Tables::TableCard.new(store: @store, tap: true) do |t|
+  #   UiBibz::Ui::Ux::Tables::TableCard.new(store: @store) do |t|
   #     t.columns do |c|
   #       c.column '#', { data_index: '#' }
   #     end
@@ -72,7 +71,7 @@ module UiBibz::Ui::Ux::Tables
   #
   #   table_card(options = {}, html_options = {})
   #
-  #   table_card(options = { tap: true }, html_options = {}) do |t|
+  #   table_card(options = {}, html_options = {}) do |t|
   #     t.header(content, options = {}, html_options = {})
   #     # or
   #     t.header(options = {}, html_options = {}) do
@@ -105,6 +104,8 @@ module UiBibz::Ui::Ux::Tables
   #     end
   #   end
   class TableCard < UiBibz::Ui::Core::Boxes::Card
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Boxes::Card.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super

data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb

@@ -34,12 +34,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def render
-      if @per_page_field.options[:wrap_form] != false
+      if @per_page_field.options[:wrap_form] == false
+        per_page_html
+      else
         form_tag(url_for(url_parameters), method: :get) do
           per_page_html_in_wrap
         end
-      else
-        per_page_html
       end
     end
 

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -13,12 +13,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def pre_render
-      if options[:wrap_form] != false
+      if options[:wrap_form] == false
+        search_field_html
+      else
         form_tag(url_for(url_parameters), method: :get, class: 'form-table-search-field') do
           search_field_html_in_wrap
         end
-      else
-        search_field_html
       end
     end
 
@@ -40,23 +40,23 @@ module UiBibz::Ui::Ux::Tables
     def search_field_html
       # add surround_field maybe ?
       content_tag :div, html_options do
-        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-text')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
         concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
-        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-text')
       end
     end
 
     def search_field_html_in_wrap
       content_tag :div, html_options do
-        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-text')
         store.parameters.with_indifferent_access.reject { |k, _| default_parameters?(k) }.each do |k, v|
           concat tag(:input, type: 'hidden', name: k, value: v)
         end
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
         concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
-        concat content_tag(:span, clear_button, class: 'input-group-btn clear-search-btn')
+        concat clear_button
       end
     end
 
@@ -69,7 +69,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def clear_button
-      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary'
+      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
     end
 
     def component_html_classes

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module UiBibz::Utils
+  # Generate the col class name
+  class BreakdownClassNameGenerator
+    POSITIONING = %i[num offset push pull order].freeze
+    BREAKPOINTS = UiBibz::Ui::Core::Component::BREAKPOINTS
+    PARAMETERS =  BREAKPOINTS + POSITIONING + [:position]
+
+    def initialize(options = {}, klass_name = 'col')
+      @options = options.is_a?(Integer) ? { num: options } : options
+      @klass_name = klass_name
+    end
+
+    # Possible options
+    # 3 or md: 3 or md: { num: 3 }, xs: { num: 4 }
+    def class_names
+      return @klass_name unless col_options?
+
+      kl = []
+      @options.each do |key, value|
+        kl << write_classes(key.to_sym, value) if BREAKPOINTS.include?(key.to_sym)
+      end
+      kl << write_classes(nil, @options)
+
+      kl.delete_if(&:blank?)
+    end
+
+    private
+
+    def col_options?
+      (@options.keys.map(&:to_sym) & PARAMETERS).present?
+    end
+
+    # md: 8 or md: { num: 3}, xs: { num: 4 }
+    def write_classes(size, opts)
+      if opts.is_a?(Hash)
+        @position = opts[:position]
+
+        opts.map do |k, v|
+          send(k, size, v) if POSITIONING.include?(k.to_sym)
+        end.compact.join(' ')
+      else
+        send('num', size, opts)
+      end
+    end
+
+    # col-md-9
+    def num(size, number, _pos = nil)
+      size == :auto ? @klass_name : ["#{@klass_name}#{position}", size, number].compact.join('-')
+    end
+
+    # col-md-offset-9
+    def offset(size, number)
+      ['offset', size, number].compact.join('-')
+    end
+
+    # col-md-push-9
+    def push(size, number)
+      [@klass_name, size, 'push', number].compact.join('-')
+    end
+
+    # order-md-9
+    def order(size, number)
+      ['order', size, number].compact.join('-')
+    end
+
+    # col-md-pull-9
+    def pull(size, number)
+      [@klass_name, size, 'pull', number].compact.join('-')
+    end
+
+    def position
+      case @position || @options[:position]
+      when :vertical
+        'y'
+      when :horizontal
+        'x'
+      end
+    end
+  end
+end

data/lib/ui_bibz/utils/internationalization.rb

@@ -12,7 +12,7 @@ module UiBibz::Utils
     end
 
     def translate
-      I18n.t(@translation, options_with_default)
+      I18n.t(@translation, **options_with_default)
     end
 
     private
@@ -30,7 +30,7 @@ module UiBibz::Utils
     end
 
     def translate_default
-      I18n.t([*@options[:default]].select { |translation| i18n_set? translation }.first, default: [*@options[:default]].last)
+      I18n.t(Array(@options[:default]).find { |translation| i18n_set? translation }, default: Array(@options[:default]).last)
     end
   end
 end