bootstrap-navbar 3.0.7 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c1c11b16764f02d05e907c90ec1485dc0ca435032b1492d873f3d79c3818c6
-  data.tar.gz: 1e8dfe8093cc0455703c9ce05eb80590ade4bcb93f8b01fc53d8fd7f3b41595d
+  metadata.gz: 5ccbc5a37579d9b5af476053a83aa4afcb9fde6f440d434a625a1417ded422d3
+  data.tar.gz: c65fee68a97969d1b79250ed8a5d91a3ce8f75fe3ab54587d0d45620f125b90b
 SHA512:
-  metadata.gz: 1f5b2f052f44d4c98533712ed45e6fe323c1d15a6f041d7e1a67cb8590122bc12cbbc9b4564995da40280c194b58500855609257be197f08928013547b011064
-  data.tar.gz: 65ceeca8fe2f44d3ca81fecc926876936bf7b1907adbd35061befddea130d7d4593e8a8726b0d3e79701c21c64d8320792c419465e83a5b31013a97c9fca5e9a
+  metadata.gz: 4d7d31ee966cc6d4e38be6ac10bd30487f546f5ffb4ce98692f87882e00edd95477104e301cea43f95821d2d82414930ed9416349e81bb66868983d30e3fc266
+  data.tar.gz: ca5b478631da2d7545688a8c2a5c78b0061bd3de6d3ca14c9a60bcef4a62b2babfe9c1ac9a56e5e20a85e7d92ff28ba0612cde82db5e284c49c109a24ed4ee5b

data/lib/bootstrap-navbar/helpers/bootstrap4.rb

@@ -3,10 +3,14 @@ module BootstrapNavbar::Helpers::Bootstrap4
     options = options.dup
     container = options.key?(:container) ? options.delete(:container) : false
     brand = if options[:brand]
+      brand_url           = options.delete(:brand_url)
+      element, attributes = brand_url == false ? ['span', {}] : ['a', { href: brand_url || '/' }]
+      attributes[:class]  = 'navbar-brand'
+
       prepare_html <<~HTML
-                     <a href="#{options.delete(:brand_url) || '/'}" class="navbar-brand">
+                     <#{element}#{attributes_for_tag(attributes)}>
                        #{options.delete(:brand)}
-                     </a>
+                     </#{element}>
                    HTML
     end
     wrapper options do
@@ -62,8 +66,12 @@ module BootstrapNavbar::Helpers::Bootstrap4
                  HTML
   end
 
+  def navbar_text(text)
+    %(<span class="navbar-text">#{text}</span>)
+  end
+
   def navbar_item(text, url = nil, list_item_options = nil, link_options = nil, &block)
-    text, url, list_item_options, link_options = capture(&block), text, url, list_item_options if block_given?
+    text, url, list_item_options, link_options = capture(&block), text, (url || {}), list_item_options if block_given?
     url ||= '#'
     list_item_options   = list_item_options ? list_item_options.dup : {}
     link_options        = link_options      ? link_options.dup      : {}
@@ -82,25 +90,30 @@ module BootstrapNavbar::Helpers::Bootstrap4
                  HTML
   end
 
-  def navbar_dropdown(text, id = '', list_item_options = {}, link_options = {}, &block)
+  def navbar_dropdown(text, list_item_options = {}, link_options = {}, wrapper_options = {}, &block)
     list_item_options, link_options = list_item_options.dup, link_options.dup
     list_item_options[:class] = [list_item_options[:class], 'nav-item', 'dropdown'].compact.join(' ')
-    wrapper_class = [*list_item_options.delete(:wrapper_class), 'dropdown-menu'].compact.join(' ')
     list_item_attributes = attributes_for_tag(list_item_options)
     link_options[:class] = [link_options[:class], 'nav-link', 'dropdown-toggle'].compact.join(' ')
-    id ||= "navbarDropdownMenuLink#{text}"
     link_attributes = attributes_for_tag(link_options)
+    wrapper_options = { class: [*wrapper_options.delete(:class), 'dropdown-menu'].compact.join(' ') }
+    if id = link_options[:id]
+      wrapper_options[:'aria-labelledby'] = id
+    end
+    wrapper_attributes = attributes_for_tag(wrapper_options)
     prepare_html <<~HTML
                    <li#{list_item_attributes}>
-                     <a href="#" data-toggle="dropdown" id="##{id}" aria-haspopup="true" aria-expanded="false" role="button" #{link_attributes}>#{text}</a>
-                     <div class="#{wrapper_class}" aria-labelledby="#{id}">
+                     <a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" role="button"#{link_attributes}>#{text}</a>
+                     <div#{wrapper_attributes}>
                        #{capture(&block) if block_given?}
                      </div>
                    </li>
                  HTML
   end
 
-  def navbar_dropdown_item(text, url = '#', link_options = {}, &block)
+  def navbar_dropdown_item(text, url = nil, link_options = {}, &block)
+    text, url, link_options = capture(&block), text, (url || {}) if block_given?
+    url ||= '#'
     link_options = link_options.dup
     link_options[:class] = [link_options[:class], 'dropdown-item'].compact
     link_options[:class] << 'active' if current_url_or_sub_url?(url)
@@ -144,7 +157,10 @@ module BootstrapNavbar::Helpers::Bootstrap4
     elsif options.key?(:placement)
       options[:class] << "fixed-#{options.delete(:placement)}"
     end
-    options[:class] << "navbar-expand-#{options.delete(:expand_at) || 'sm'}"
+    expand_at = options.delete(:expand_at)
+    unless expand_at == true
+      options[:class] << "navbar-expand#{"-#{expand_at}" if expand_at}"
+    end
     options[:class] = options[:class].join(' ')
     attributes = attributes_for_tag(options)
     prepare_html <<~HTML

data/lib/bootstrap-navbar/helpers/bootstrap5.rb

@@ -0,0 +1,169 @@
+module BootstrapNavbar::Helpers::Bootstrap5
+  def navbar(options = {}, &block)
+    options = options.dup
+    unless container = options.key?(:container) ? options.delete(:container) : true
+      raise "container cannot be false."
+    end
+    brand = if options[:brand]
+      brand_url           = options.delete(:brand_url)
+      element, attributes = brand_url == false ? ['span', {}] : ['a', { href: brand_url || '/' }]
+      attributes[:class]  = 'navbar-brand'
+
+      prepare_html <<~HTML
+                     <#{element}#{attributes_for_tag(attributes)}>
+                       #{options.delete(:brand)}
+                     </#{element}>
+                   HTML
+    end
+    wrapper options do
+      container container do
+        prepare_html <<~HTML
+                       #{brand}
+                       #{capture(&block) if block_given?}
+                     HTML
+      end
+    end
+  end
+
+  def navbar_collapse(options = {}, &block)
+    options = options.dup
+    options[:class] = [options[:class], 'collapse', 'navbar-collapse'].compact
+    options[:class] = options[:class].join(' ')
+    options[:id] ||= 'navbar-collapsable'
+    attributes = attributes_for_tag(options)
+    toggler_attributes = attributes_for_tag(
+      class:              'navbar-toggler',
+      type:               'button',
+      'data-bs-toggle' => 'collapse',
+      'data-bs-target' => "##{options[:id]}",
+      'aria-controls'  => options[:id],
+      'aria-expanded'  => false,
+      'aria-label'     => 'Toggle navigation'
+    )
+    prepare_html <<~HTML
+                   <button#{toggler_attributes}>
+                     <span class="navbar-toggler-icon"></span>
+                   </button>
+                   <div#{attributes}>
+                     #{capture(&block) if block_given?}
+                   </div>
+                 HTML
+  end
+
+  def navbar_group(options = {}, &block)
+    options = options.dup
+    options[:class] = [options[:class], 'navbar-nav'].compact.join(' ')
+    attributes = attributes_for_tag(options)
+    prepare_html <<~HTML
+                   <ul#{attributes}>
+                     #{capture(&block) if block_given?}
+                   </ul>
+                 HTML
+  end
+
+  def navbar_text(text)
+    %(<span class="navbar-text">#{text}</span>)
+  end
+
+  def navbar_item(text, url = nil, list_item_options = nil, link_options = nil, &block)
+    text, url, list_item_options, link_options = capture(&block), text, (url || {}), list_item_options if block_given?
+    url ||= '#'
+    list_item_options   = list_item_options ? list_item_options.dup : {}
+    link_options        = link_options      ? link_options.dup      : {}
+    list_item_options[:class] = [list_item_options[:class], 'nav-item'].compact.join(' ')
+    link_options[:class] = [link_options[:class], 'nav-link'].compact
+    link_options[:class] << 'active' if current_url_or_sub_url?(url)
+    link_options[:class] = link_options[:class].join(' ')
+    list_item_attributes = attributes_for_tag(list_item_options)
+    link_attributes      = attributes_for_tag(link_options)
+    prepare_html <<~HTML
+                   <li#{list_item_attributes}>
+                     <a href="#{url}"#{link_attributes}>
+                       #{text}
+                     </a>
+                   </li>
+                 HTML
+  end
+
+  def navbar_dropdown(text, list_item_options = {}, link_options = {}, wrapper_options = {}, &block)
+    list_item_options, link_options = list_item_options.dup, link_options.dup
+    list_item_options[:class] = [list_item_options[:class], 'nav-item', 'dropdown'].compact.join(' ')
+    list_item_attributes = attributes_for_tag(list_item_options)
+    link_options[:class] = [link_options[:class], 'nav-link', 'dropdown-toggle'].compact.join(' ')
+    link_attributes = attributes_for_tag(link_options)
+    wrapper_options = { class: [*wrapper_options.delete(:class), 'dropdown-menu'].compact.join(' ') }
+    if id = link_options[:id]
+      wrapper_options[:'aria-labelledby'] = id
+    end
+    wrapper_attributes = attributes_for_tag(wrapper_options)
+    prepare_html <<~HTML
+                   <li#{list_item_attributes}>
+                     <a href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" role="button"#{link_attributes}>#{text}</a>
+                     <ul#{wrapper_attributes}>
+                       #{capture(&block) if block_given?}
+                     </div>
+                   </li>
+                 HTML
+  end
+
+  def navbar_dropdown_item(text, url = nil, link_options = {}, &block)
+    text, url, link_options = capture(&block), text, (url || {}) if block_given?
+    url ||= '#'
+    link_options = link_options.dup
+    link_options[:class] = [link_options[:class], 'dropdown-item'].compact
+    link_options[:class] << 'active' if current_url_or_sub_url?(url)
+    link_options[:class] = link_options[:class].join(' ')
+    link_attributes = attributes_for_tag(link_options)
+    prepare_html <<~HTML
+                   <li>
+                     <a href="#{url}"#{link_attributes}>
+                       #{text}
+                     </a>
+                   </li>
+                 HTML
+  end
+
+  def navbar_dropdown_divider
+    '<div class="dropdown-divider"></div>'
+  end
+
+  private
+
+  def container(container, &block)
+    container_class = [
+      'container',
+      (container unless container == true)
+    ].compact.join('-')
+    attributes = attributes_for_tag(class: container_class)
+    prepare_html <<~HTML
+                    <div#{attributes}>
+                      #{capture(&block) if block_given?}
+                    </div>
+                  HTML
+  end
+
+  def wrapper(options, &block)
+    options = options.dup
+    options[:class] = [options[:class], 'navbar'].compact
+    options[:class] << "navbar-#{options.key?(:color_scheme) ? options.delete(:color_scheme) : 'dark'}"
+    if bg = options.delete(:bg)
+      options[:class] << "bg-#{bg == true ? 'dark' : bg}"
+    end
+    if options.key?(:sticky) && options.delete(:sticky) === true
+      options[:class] << 'sticky-top'
+    elsif options.key?(:placement)
+      options[:class] << "fixed-#{options.delete(:placement)}"
+    end
+    expand_at = options.delete(:expand_at)
+    unless expand_at == true
+      options[:class] << "navbar-expand#{"-#{expand_at}" if expand_at}"
+    end
+    options[:class] = options[:class].join(' ')
+    attributes = attributes_for_tag(options)
+    prepare_html <<~HTML
+                    <nav#{attributes}>
+                      #{capture(&block) if block_given?}
+                    </nav>
+                  HTML
+  end
+end

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '3.0.7'
+  VERSION = '3.2.0'
 end

data/lib/bootstrap-navbar.rb

@@ -15,3 +15,4 @@ require_relative 'bootstrap-navbar/helpers'
 require_relative 'bootstrap-navbar/helpers/bootstrap2'
 require_relative 'bootstrap-navbar/helpers/bootstrap3'
 require_relative 'bootstrap-navbar/helpers/bootstrap4'
+require_relative 'bootstrap-navbar/helpers/bootstrap5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.2.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,6 +142,7 @@ files:
 - lib/bootstrap-navbar/helpers/bootstrap2.rb
 - lib/bootstrap-navbar/helpers/bootstrap3.rb
 - lib/bootstrap-navbar/helpers/bootstrap4.rb
+- lib/bootstrap-navbar/helpers/bootstrap5.rb
 - lib/bootstrap-navbar/version.rb
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar