ui_bibz 2.5.5 → 3.0.0.alpha6

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

data/lib/ui_bibz/ui/core/lists/components/list.rb

@@ -20,7 +20,6 @@ module UiBibz::Ui::Core::Lists::Components
   # * +state+ - status of element with symbol value:
   #   (+:active+, +:disabled+)
   # * +url+
-  # * +tap+ - Boolean to add header and body
   # * +status+ - status of element with symbol value:
   #   (+:default+, +:primary+, +:info+, +:warning+, +:danger+)
   # * +glyph+ - Add glyph with name or hash options
@@ -30,7 +29,7 @@ module UiBibz::Ui::Core::Lists::Components
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Lists::Components::List.new(tap: true) do |l|
+  #   UiBibz::Ui::Core::Lists::Components::List.new do |l|
   #     l.header content =  nil, options = nil, html_options = nil, &block
   #     l.body content =  nil, options = nil, html_options = nil, &block
   #   end
@@ -49,7 +48,7 @@ module UiBibz::Ui::Core::Lists::Components
   #       'Test 2'
   #   end.render
   #
-  #   UiBibz::Ui::Core::List.new(tap: true, state: :active) do |l|
+  #   UiBibz::Ui::Core::List.new(state: :active) do |l|
   #     l.header 'My title', nil, class: 'my-title'
   #     l.body do
   #       'My content'
@@ -57,16 +56,15 @@ module UiBibz::Ui::Core::Lists::Components
   #   end.render
   #
   class List < 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
-    end
 
     # Render html tag
     def pre_render
       content_tag tag_type, html_options do
         concat glyph_and_content_html if @content
-        concat header_html if @body
+        concat header_html if @header
         concat body_html   if @body
         concat badge_html  if @options[:badge]
       end
@@ -105,7 +103,7 @@ module UiBibz::Ui::Core::Lists::Components
     end
 
     def header_classes
-      'flex-column align-items-start' unless options[:tap].nil?
+      'flex-column align-items-start' if @options[:tap]
     end
 
     def tag_type_class

data/lib/ui_bibz/ui/core/lists/components/list/list_body.rb

@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Lists::Components
   # You can pass arguments in options attribute:
   class ListBody < 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/lists/components/list/list_header.rb

@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Lists::Components
   # You can pass arguments in options attribute:
   class ListHeader < 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/lists/list_group.rb

@@ -22,7 +22,7 @@ module UiBibz::Ui::Core::Lists
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::ListGroup.new().tap |lg|
+  #   UiBibz::Ui::Core::ListGroup.new.tap |lg|
   #     ...
   #     lg.list content = nil, options = nil, html_options = nil, &block
   #     ...
@@ -30,7 +30,7 @@ module UiBibz::Ui::Core::Lists
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::ListGroup.new().tap do |d|
+  #   UiBibz::Ui::Core::ListGroup.new.tap do |d|
   #     d.list 'Test', status: :success
   #     d.list 'Test2', status: :primary
   #   end.render
@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Lists
   #     d.list(status: :primary) do
   #       'Test 2'
   #     end
-  #     d.list(tap: true, state: :active) do |l|
+  #     d.list(state: :active) do |l|
   #       l.header 'My title', nil, class: 'my-title'
   #       l.body do
   #         'My content'
@@ -50,12 +50,12 @@ module UiBibz::Ui::Core::Lists
   #
   # ==== Helper
   #
-  #   list_group( options = { tap: true }, html_options = {}) do |l|
+  #   list_group( options = {}, html_options = {}) do |l|
   #     l.list(content, options = {}, html_options = {})
   #     l.list(options = {}, html_options = {}) do
   #       content
   #     end
-  #     l.list(options = { tap: true }, html_options = {}) do |li|
+  #     l.list(options = {}, html_options = {}) do |li|
   #       li.header(content, options = {}, html_options = {})
   #       # or
   #       li.header(options = {}, html_options = {}) do
@@ -71,6 +71,8 @@ module UiBibz::Ui::Core::Lists
   #   end
   #
   class ListGroup < 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
@@ -87,7 +89,8 @@ module UiBibz::Ui::Core::Lists
     def list(content = nil, options = {}, html_options = nil, &block)
       options = options.merge({ tag_type: @options[:tag_type] }) unless @options[:tag_type].nil?
 
-      @lists << if tap?(content, options)
+      @lists << if tapped?(block)
+                  content = (content || {}).merge(tap: true)
                   UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options).tap(&block).render
                 else
                   UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options, &block).render

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

@@ -8,7 +8,6 @@ module UiBibz::Ui::Core::Navigations
   # Separators are automatically added in CSS through +:before+ and +content+.
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
-  # You can use tap method to add link items.
   #
   # ==== Attributes
   #
@@ -56,7 +55,7 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Helper
   #
-  #   ui_breadcrumb({tap: true}) do |b|
+  #   ui_breadcrumb do |b|
   #     b.link(content, options = {}, html_options = {})
   #     b.link(options = {}, html_options = {}) do
   #       content
@@ -69,6 +68,8 @@ module UiBibz::Ui::Core::Navigations
   #   ui_breadcrumb(@users, { link_label: name, link_url: user_path(:id) })
   #
   class Breadcrumb < 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/core/navigations/components/breadcrumb_link.rb

@@ -41,9 +41,6 @@ module UiBibz::Ui::Core::Navigations::Components
   #
   class BreadcrumbLink < UiBibz::Ui::Core::Navigations::Link
     # 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/navigations/components/nav_dropdown.rb

@@ -44,9 +44,6 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -59,11 +56,11 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def component_html_classes
-      [type, 'nav-item', without_caret]
+      [position, open, keep_open, 'nav-item', without_caret]
     end
 
     def link_html
-      link_to button_content, '#', class: join_classes(size, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
+      content_tag :a, button_content, class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
     end
   end
 end

data/lib/ui_bibz/ui/core/navigations/components/nav_link.rb

@@ -41,6 +41,8 @@ module UiBibz::Ui::Core::Navigations
   #   end.render
   #
   class NavLink < 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
@@ -49,7 +51,7 @@ module UiBibz::Ui::Core::Navigations
 
     # Render html tag
     def pre_render
-      if options[:nav_tags] == :a || options[:nav_type] == 'nav-links'
+      if options[:nav_tags] == :a || %w[nav-links list-group].include?(options[:nav_type])
         UiBibz::Ui::Core::Navigations::NavLinkLink.new(content, options, html_options).render
       else
         cont = if options[:tag_type] == :span

data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb

@@ -20,13 +20,10 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavLinkLink < UiBibz::Ui::Core::Component
     # UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
-      link_to options[:url], html_options do
+      content_tag :a, { href: options[:url] }.merge(html_options) do
         concat glyph_and_content_html
         concat tag_html if options[:tag]
       end
@@ -35,11 +32,23 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def component_html_classes
-      'nav-link'
+      if options[:nav_type] == 'list-group'
+        'list-group-item list-group-item-action'
+      else
+        'nav-link'
+      end
     end
 
     def component_html_options
-      options[:nav_type] == 'nav-tabs' ? { 'data-toggle' => 'tab', role: 'tab' } : {}
+      html_tag_base = { 'data-toggle' => 'tab', role: 'tab' }
+      case options[:nav_type]
+      when 'nav-tabs'
+        html_tag_base
+      when 'list-group'
+        html_tag_base.merge("aria-controls": sanitize_text(content))
+      else
+        {}
+      end.merge(options[:a_html] || {})
     end
   end
 end