ui_bibz 2.5.2 → 3.0.0.alpha3

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

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   class MultiColumnField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

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

@@ -53,9 +53,6 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   class MultiSelectField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
     # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

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

@@ -61,14 +61,11 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   class SelectField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
     def component_html_classes
-      super << ['select-field', 'form-control', 'custom-select', size]
+      super << ['select-field', 'form-control', 'form-select', size]
     end
 
     def component_options
@@ -76,7 +73,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def size
-      "custom-select-#{options[:size]}" unless options[:size].nil?
+      "form-select-#{options[:size]}" unless options[:size].nil?
     end
   end
 end

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundAddon < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -19,7 +16,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     def component_html_classes
-      'input-group-addon'
+      'input-group-text'
     end
   end
 end

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, class: 'input-group-btn' do

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundButtonGroup < UiBibz::Ui::Core::Forms::Buttons::ButtonGroup
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, class: 'input-group-btn' do

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

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButtonRefresh < UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh
-    # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
-
-    def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_refresh_html_tag
-      end
-    end
-  end
+  class SurroundButtonRefresh < UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh; end
 end

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

@@ -3,14 +3,19 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundCheckboxField < UiBibz::Ui::Core::Forms::Choices::CheckboxField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
+    def component_html_options
+      { label: false }
+    end
+
+    def component_wrapper_html_classes
+      inline
+    end
+
     def component_html_classes
-      super << 'input-group-addon'
+      super << 'input-group-text'
     end
   end
 end

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

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

@@ -3,14 +3,19 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundRadioField < UiBibz::Ui::Core::Forms::Choices::RadioField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
+    def component_html_options
+      { label: false }
+    end
+
+    def component_wrapper_html_classes
+      inline
+    end
+
     def component_html_classes
-      super << 'input-group-addon'
+      super << 'input-group-text'
     end
   end
 end

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

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundSwitchField < UiBibz::Ui::Core::Forms::Choices::SwitchField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb

@@ -50,6 +50,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
   #   end
   #
   class SurroundField < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
     attr_reader :errors, :required_fields
 
     # See UiBibz::Ui::Core::Component.initialize
@@ -132,10 +133,6 @@ module UiBibz::Ui::Core::Forms::Surrounds
       @items << UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &block).render
     end
 
-    def html(content)
-      @items << content
-    end
-
     # Not correctly implemented
     # def switch_field content = nil, options = nil, html_options = nil, &block
     #   @items << SurroundSwitchField.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb

@@ -47,9 +47,6 @@ module UiBibz::Ui::Core::Forms::Textareas
   #
   class MarkdownEditorField < 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
@@ -70,7 +67,7 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     def provide
-      add_html_data('provide', 'markdown')
+      add_html_data('provide', value: 'markdown')
     end
 
     def autofocus
@@ -86,15 +83,15 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     def icon_library
-      add_html_data('iconlibrary', 'fa-5')
+      add_html_data('iconlibrary', value: 'fa')
     end
 
     def hidden_buttons
-      add_html_data('hiddenButtons', options[:hidden_buttons]) if options[:hidden_buttons]
+      add_html_data('hiddenButtons', value: options[:hidden_buttons]) if options[:hidden_buttons]
     end
 
     def disabled_buttons
-      add_html_data('disabledButtons', options[:disabled_buttons]) if options[:disabled_buttons]
+      add_html_data('disabledButtons', value: options[:disabled_buttons]) if options[:disabled_buttons]
     end
 
     def status

data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb

@@ -30,10 +30,10 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   # ==== Examples
   #
-  #   options = options_for_select(2.times.map{ |i| "option #{i}" })
+  #   options = options_for_select(Array.new(2){ |i| "option #{i}" })
   #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('company', { option_tags: options }, { class: 'test' })
   #
-  #   options = options_for_select(2.times.map{ |i| "option #{i}" })
+  #   options = options_for_select(Array.new(2){ |i| "option #{i}" })
   #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(option_tags: options) do
   #     #content
   #   end
@@ -46,9 +46,6 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   class AutoCompleteField < UiBibz::Ui::Core::Forms::Texts::TextField
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/texts/text_field.rb

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Forms::Texts
     include SurroundExtension
 
     # 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/core/icons/components/glyph_counter.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Icons::Components
   class GlyphCounter < UiBibz::Ui::Core::Icons::Components::GlyphText
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/icons/components/glyph_text.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Icons::Components
   class GlyphText < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -24,7 +21,7 @@ module UiBibz::Ui::Core::Icons::Components
     end
 
     def transform
-      add_html_data 'fa_transform', options[:transform] if options[:transform]
+      add_html_data 'fa_transform', value: options[:transform] if options[:transform]
     end
   end
 end

data/lib/ui_bibz/ui/core/icons/glyph.rb

@@ -58,9 +58,6 @@ module UiBibz::Ui::Core::Icons
   #   end
   class Glyph < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -127,7 +124,7 @@ module UiBibz::Ui::Core::Icons
     end
 
     def transform
-      add_html_data 'fa_transform', options[:transform] if options[:transform]
+      add_html_data 'fa_transform', value: options[:transform] if options[:transform]
     end
 
     def content

data/lib/ui_bibz/ui/core/icons/star.rb

@@ -45,9 +45,6 @@ module UiBibz::Ui::Core::Icons
   #
   class Star < 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/core/layouts/col.rb

@@ -25,6 +25,7 @@ module UiBibz::Ui::Core::Layouts
   # * +md+ - Hash
   # * +lg+ - Hash
   # * +xl+ - Hash
+  # * +xxl+ - Hash
   #
   # ==== Signatures
   #
@@ -51,6 +52,9 @@ module UiBibz::Ui::Core::Layouts
   class Col < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
+      unless block.nil?
+        content = content.is_a?(Integer) ? { num: content } : content
+      end
       super
     end
 
@@ -62,48 +66,7 @@ module UiBibz::Ui::Core::Layouts
     private
 
     def component_html_classes
-      col_classes
-    end
-
-    def col_classes
-      kl = []
-      @options.each do |ke, va|
-        kl << write_classes(ke, va) if %w[xs sm md lg xl].include?(ke)
-      end
-      if not_col_options?
-        kl = 'col'
-      elsif kl.empty?
-        kl << write_classes(:md, @options)
-      end
-      kl
-    end
-
-    def not_col_options?
-      (@options.keys & %w[xs sm md lg xl num offset push pull]).empty?
-    end
-
-    def write_classes(size, opts)
-      opts.map { |k, v| send(k, size.to_sym, v) if %w[num offset push pull].include?(k) }.join(' ')
-    end
-
-    # col-md-9
-    def num(size, number)
-      size == :auto ? 'col' : "col-#{size}-#{number}"
-    end
-
-    # col-md-offset-9
-    def offset(size, number)
-      "offset-#{size}-#{number}"
-    end
-
-    # col-md-push-9
-    def push(size, number)
-      "col-#{size}-push-#{number}"
-    end
-
-    # col-md-pull-9
-    def pull(size, number)
-      "col-#{size}-pull-#{number}"
+      UiBibz::Utils::BreakdownClassNameGenerator.new(@options).class_names
     end
   end
 end

data/lib/ui_bibz/ui/core/layouts/container.rb

@@ -42,9 +42,6 @@ module UiBibz::Ui::Core::Layouts
   #
   class Container < 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
@@ -54,11 +51,17 @@ module UiBibz::Ui::Core::Layouts
     private
 
     def component_html_classes
-      type
+      klass_name
     end
 
-    def type
-      options[:type] == :fluid ? 'container-fluid' : 'container'
+    def klass_name
+      if options[:type] == :fluid
+        'container-fluid'
+      elsif options[:size]
+        "container-#{options[:size]}"
+      else
+        'container'
+      end
     end
   end
 end

data/lib/ui_bibz/ui/core/layouts/row.rb

@@ -25,6 +25,12 @@ module UiBibz::Ui::Core::Layouts
   #     #content
   #   end
   #
+  #   UiBibz::Ui::Core::Layouts::Row.new(options = {}, html_options = {}) do |row|
+  #     row.col do
+  #       # content
+  #     end
+  #   end
+  #
   # ==== Helper
   #
   #  row(content, options = {}, html_options = {})
@@ -33,21 +39,45 @@ module UiBibz::Ui::Core::Layouts
   #    content
   #  end
   #
+  #  row(options = {}, html_options = {}) do |row|
+  #    row.col do
+  #      content
+  #    end
+  #  end
+  #
   class Row < 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)
+      unless block.nil?
+        content = content.is_a?(Integer) ? { num: content } : content
+      end
       super
+      @items = [@content]
     end
 
     # Render html tag
     def pre_render
-      content_tag :div, content, html_options
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def col(content = nil, options = nil, html_options = nil, &block)
+      @items << UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options, &block).render
     end
 
     private
 
     def component_html_classes
-      options[:type] == :form ? 'form-row' : 'row'
+      [
+        'row',
+        (UiBibz::Utils::BreakdownClassNameGenerator.new(@options[:gutters], 'g').class_names if @options[:gutters]),
+        (UiBibz::Utils::BreakdownClassNameGenerator.new(@options, 'row-cols').class_names if breakpoints_present?)
+      ]
+    end
+
+    def breakpoints_present?
+      @options.keys.size - (@options.keys.map(&:to_sym) - [UiBibz::Ui::Core::Component::BREAKPOINTS, :num].flatten).size != 0
     end
   end
 end