ui_bibz 2.5.6 → 3.0.0.alpha8

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

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

@@ -16,10 +16,6 @@ module UiBibz::Ui::Core::Navigations
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
   class NavLinkList < UiBibz::Ui::Core::Component
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
-
     # Render html tag
     def pre_render
       content_tag :li, content, html_options

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

@@ -20,9 +20,6 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavLinkSpan < 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
@@ -44,7 +41,7 @@ module UiBibz::Ui::Core::Navigations
 
     def component_html_data
       super
-      add_html_data 'link', options[:link] if options[:link]
+      add_html_data 'link', value: options[:link] if options[:link]
     end
   end
 end

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

@@ -20,9 +20,6 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavText < 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

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

@@ -17,9 +17,6 @@ module UiBibz::Ui::Core::Navigations
   # You can pass arguments in options attribute:
   class NavbarBrand < 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/navigations/components/navbar_form.rb

@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Navigations
       @content      = block
       @model_or_url = model_or_url
       @options      = options
-      @html_options = !%i[form_for ui_form_for].include?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
+      @html_options = %i[form_for ui_form_for].exclude?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
     end
 
     # Render html tag
@@ -64,8 +64,8 @@ module UiBibz::Ui::Core::Navigations
       when :ui_form_for
         begin
           @form = ui_form_for(@model_or_url, html_options, &@content)
-          ## rescue
-          ## raise 'You must install simple form to use ui_form_for.'
+        rescue e
+          raise 'You must install simple form to use ui_form_for.'
         end
       else
         @form = form_tag_with_body(html_options, capture(&@content))
@@ -75,7 +75,7 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def new_option
-      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('navbar-form', 'form-inline', 'my-lg-0', 'my-2', @options[:class]) })
+      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('d-flex', @options[:class]) })
     end
 
     def protect_against_forgery?

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

@@ -32,16 +32,13 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Navigations::NavbarNav.new().tap do |n|
+  #   UiBibz::Ui::Core::Navigations::NavbarNav.new.tap do |n|
   #     n.link 'Test', url: '#test'
   #     n.link 'Test2', url: '#test2', state: :active
   #   end.render
   #
   class NavbarNav < UiBibz::Ui::Core::Navigations::Nav
     # See UiBibz::Ui::Core::Navigations::Nav.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

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

@@ -34,9 +34,6 @@ module UiBibz::Ui::Core::Navigations
   #
   class NavbarText < 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/navigations/components/pagination_link.rb

@@ -39,9 +39,6 @@ module UiBibz::Ui::Core::Navigations
   #
   class PaginationLink < 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/navigations/components/toolbar_form.rb

@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Navigations
       @content      = block
       @model_or_url = model_or_url
       @options      = options
-      @html_options = !%i[form_for ui_form_for].include?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
+      @html_options = %i[form_for ui_form_for].exclude?(type) ? html_options_for_form(@model_or_url, new_option) : new_option
     end
 
     # Render html tag
@@ -64,8 +64,8 @@ module UiBibz::Ui::Core::Navigations
       when :ui_form_for
         begin
           @form = ui_form_for(@model_or_url, html_options, &@content)
-          ## rescue
-          ## raise 'You must install simple form to use ui_form_for.'
+        rescue e
+          raise 'You must install simple form to use ui_form_for.'
         end
       else
         @form = form_tag_with_body(html_options, capture(&@content))

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

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

@@ -52,7 +52,7 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Helper
   #
-  #   nav(options = { tap: true }, html_options = {}) do |n|
+  #   nav(options = {}, html_options = {}) do |n|
   #     n.link(content, options = {}, html_options = {})
   #     n.link(options = {}, html_options = {}) do
   #       content
@@ -66,6 +66,8 @@ module UiBibz::Ui::Core::Navigations
   #   end
   #
   class Nav < 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
@@ -74,18 +76,24 @@ module UiBibz::Ui::Core::Navigations
 
     # Render html tag
     def pre_render
-      content_tag tag, @items.map(&:render).join.html_safe, html_options
+      content_tag htlm_tag, @items.map(&:render).join.html_safe, html_options
     end
 
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def link(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content.merge!({ nav_type: type, nav_tags: nav_tags }) : options.merge!({ nav_type: type, nav_tags: nav_tags })
+      if block_given?
+        content[:nav_type] = type
+        content[:nav_tags] = nav_tags
+      else
+        options[:nav_type] = type
+        options[:nav_tags] = nav_tags
+      end
       @items << NavLink.new(content, options, html_options, &block)
     end
 
     def text(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content.merge!({ nav_type: type }) : options.merge!({ nav_type: type })
+      block_given? ? content[:nav_type] = type : options[:nav_type] = type
       @items << NavText.new(content, options, html_options, &block)
     end
 
@@ -108,12 +116,20 @@ module UiBibz::Ui::Core::Navigations
     protected
 
     def component_html_classes
-      ['nav', type, position, stacked, justify, fill]
+      [nav_class, type, position, stacked, justify, fill]
+    end
+
+    def component_html_options
+      @options[:type] == :list ? { role: 'tablist' } : super
     end
 
     # tabs or pills
     def type
-      "nav-#{@options[:type]}" unless @options[:type].nil?
+      if @options[:type] == :list
+        'list-group'
+      else
+        "nav-#{@options[:type]}" unless @options[:type].nil?
+      end
     end
 
     def position
@@ -139,11 +155,22 @@ module UiBibz::Ui::Core::Navigations
       'flex-column' if @options[:stacked]
     end
 
-    def tag
-      if options[:tag]
-        options[:tag]
+    def htlm_tag
+      options[:tag] || tag_type
+    end
+
+    def nav_class
+      'nav' if type != 'list-group'
+    end
+
+    def tag_type
+      case type
+      when 'nav-links'
+        :nav
+      when 'list-group'
+        :div
       else
-        type == 'nav-links' ? :nav : :ul
+        :ul
       end
     end
 

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

@@ -29,6 +29,10 @@ module UiBibz::Ui::Core::Navigations
   # * +position_type+ - Symbol
   #   (+:fixed+, +:sticky+)
   # * +title+ - String
+  # * +container+ - Hash container options
+  # * +container_html+ - Hash container html options
+  # * +expand_size+ - Symbol size
+  # (+:sm+, +:md+, +:lg+, +:xl+, +:xxl+)
   #
   # ==== Signatures
   #
@@ -58,8 +62,8 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Helper
   #
-  #   ui_navbar(options = { tap: true }, html_options = {}) do |nb|
-  #     nb.nav(options = { tap: true }, html_options = {}) do |n|
+  #   ui_navbar(options = {}, html_options = {}) do |nb|
+  #     nb.nav(options = {}, html_options = {}) do |n|
   #       n.link(content, options = {}, html_options = {})
   #       n.link(options = {}, html_options = {}) do
   #         content
@@ -70,6 +74,8 @@ module UiBibz::Ui::Core::Navigations
   #   end
   #
   class Navbar < 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
@@ -79,10 +85,18 @@ module UiBibz::Ui::Core::Navigations
     # Render html tag
     def pre_render
       content_tag :nav, html_options do
-        concat title if brand_position == :left
-        concat navbar_toggle_button_html
-        concat title if brand_position == :right
-        concat body_html
+        UiBibz::Ui::Core::Layouts::Container.new(options[:container], options[:container_html]) do
+          if brand_position == :left
+            concat title
+            concat @navbar_toggle_html
+          end
+          concat navbar_toggle_button_html
+          if brand_position == :right
+            concat title
+            concat @navbar_toggle_html
+          end
+          concat body_html
+        end.render
       end
     end
 
@@ -119,6 +133,15 @@ module UiBibz::Ui::Core::Navigations
       @id ||= generate_id('navbar-id')
     end
 
+    def navbar_toggle_html(content = nil, &block)
+      @navbar_toggle_html = if block.nil?
+                              content
+                            else
+                              context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
+                              context.capture(&block)
+                            end
+    end
+
     private
 
     def component_html_classes
@@ -134,7 +157,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def body_html
-      content_tag :div, class: 'navbar-collapse', id: id do
+      content_tag :div, class: 'navbar-collapse collapse', id: id do
         concat @items.map(&:render).join.html_safe
       end
     end
@@ -144,7 +167,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def expand_size
-      "navbar-expand-#{@options[:expand_size] || :lg}" # unless @options[:expand_size].nil?
+      "navbar-expand-#{@options[:expand_size] || :lg}" unless options[:collapsible] == false
     end
 
     def position

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

@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Helper
   #
-  #   ui_pagination(options = { tap: true }, html_options = {}) do |n|
+  #   ui_pagination(options = {}, html_options = {}) do |n|
   #     n.link(content, options = {}, html_options = {})
   #     n.link(options = {}, html_options = {}) do
   #       content
@@ -53,6 +53,8 @@ module UiBibz::Ui::Core::Navigations
   #   end
   #
   class Pagination < 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/tab_group.rb

@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Navigations
   #
   # ==== Helper
   #
-  #   ui_tab_group(options = { tap: true }, html_options = {}) do |n|
+  #   ui_tab_group(options = {}, html_options = {}) do |n|
   #     n.tab(content, options = {}, html_options = {})
   #     n.tab(options = {}, html_options = {}) do
   #       content
@@ -60,15 +60,20 @@ module UiBibz::Ui::Core::Navigations
   #   end
   #
   class TabGroup < UiBibz::Ui::Core::Navigations::Nav
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def tab(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content.merge!({ nav_type: type, tag_type: @options[:tag_type] }) : options.merge!({ nav_type: type, tag_type: @options[:tag_type] })
+      if block_given?
+        content[:nav_type] = type
+        content[:tag_type] = @options[:tag_type]
+      else
+        options[:nav_type] = type
+        options[:tag_type] = @options[:tag_type]
+      end
       @items << NavLink.new(content, options, html_options, &block)
     end
 

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

@@ -52,6 +52,8 @@ module UiBibz::Ui::Core::Navigations
   #   end
   #
   class Toolbar < 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