bootstrap-navbar 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5218185e5ba6cc70a64c3911abedebdc32a2297f80ad22ab4049e8738a65ff
-  data.tar.gz: 102ec9fcf068836389359a03e3092d401287cc003e40e2f3c114d030f284c643
+  metadata.gz: 503df312703c1b1e21ba7c001b5cb57eb622f265e25c4387459c792375b2202a
+  data.tar.gz: 15d6d53635832ca900705bec6363c8823d1e0c17da181bdba4d0e0a507d02b13
 SHA512:
-  metadata.gz: fa3f5f64c868a3e5dff75a2f379181cd5a7b47b2a271fe1fcd30b56c20941b67009978f832376adcad285b21b45eb97692b0bedb5408660636d61abd5f8d5731
-  data.tar.gz: a62bd84aac9b3776d481643dbcbc162391ec2863a4194d226c88f9bb1849821307045e2f414c8dc7e4ece4c1ed324f0bba43109a3cb039e135f57fb4a1452b67
+  metadata.gz: e60999f19b6ed1f441d1886db34118a4c92f98b13856ecddd50061b2dd1445e1e62c3c0f04ffbcf5664df83bc054e0650a8ce21178d0b8b472386dc097f4cb95
+  data.tar.gz: b6ae2867cd7d0c87de839fa16676b35917c4500fb9063f8c83532da7e727e2f1a441840b22999978c34c2901d41860d1321c630b5bd0fe1bfc74c3ec50aa418a

data/lib/bootstrap-navbar/helpers.rb

@@ -15,7 +15,7 @@ module BootstrapNavbar::Helpers
   def attributes_for_tag(hash)
     string = hash.map { |k, v| %(#{k}="#{v}") }.join(' ')
     if string.length > 0
-      ' ' << string
+      ' '.dup << string
     else
       string
     end

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

@@ -2,11 +2,26 @@ module BootstrapNavbar::Helpers::Bootstrap4
   def navbar(options = {}, &block)
     options = options.dup
     container = options.key?(:container) ? options.delete(:container) : false
+    brand = if options[:brand]
+      prepare_html <<~HTML
+                     <a href="#{options.delete(:brand_url) || '/'}" class="navbar-brand">
+                       #{options.delete(:brand)}
+                     </a>
+                   HTML
+    end
     wrapper options do
       if container
-        container(&block)
+        container container do
+          prepare_html <<~HTML
+                         #{brand}
+                         #{capture(&block) if block_given?}
+                       HTML
+        end
       else
-        capture(&block) if block_given?
+        prepare_html <<~HTML
+                       #{brand}
+                       #{capture(&block) if block_given?}
+                     HTML
       end
     end
   end
@@ -26,25 +41,25 @@ module BootstrapNavbar::Helpers::Bootstrap4
       'aria-expanded' => false,
       'aria-label'    => 'Toggle navigation'
     )
-    prepare_html <<-HTML.chomp!
-<button#{toggler_attributes}>
-  <span class="navbar-toggler-icon"></span>
-</button>
-<div#{attributes}>
-  #{capture(&block) if block_given?}
-</div>
-HTML
+    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.chomp!
-<ul#{attributes}>
-  #{capture(&block) if block_given?}
-</ul>
-HTML
+    prepare_html <<~HTML
+                   <ul#{attributes}>
+                     #{capture(&block) if block_given?}
+                   </ul>
+                 HTML
   end
 
   def navbar_item(text, url = nil, list_item_options = nil, link_options = nil, &block)
@@ -58,13 +73,13 @@ HTML
     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.chomp!
-<li#{list_item_attributes}>
-  <a href="#{url}"#{link_attributes}>
-    #{text}
-  </a>
-</li>
-HTML
+    prepare_html <<~HTML
+                   <li#{list_item_attributes}>
+                     <a href="#{url}"#{link_attributes}>
+                       #{text}
+                     </a>
+                   </li>
+                 HTML
   end
 
   def navbar_dropdown(text, id = '', list_item_options = {}, link_options = {}, &block)
@@ -75,14 +90,14 @@ HTML
     link_options[:class] = [link_options[:class], 'nav-link', 'dropdown-toggle'].compact.join(' ')
     id ||= "navbarDropdownMenuLink#{text}"
     link_attributes = attributes_for_tag(link_options)
-    prepare_html <<-HTML.chomp!
-<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}">
-    #{capture(&block) if block_given?}
-  </div>
-</li>
-HTML
+    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}">
+                       #{capture(&block) if block_given?}
+                     </div>
+                   </li>
+                 HTML
   end
 
   def navbar_dropdown_item(text, url = '#', link_options = {}, &block)
@@ -91,42 +106,39 @@ HTML
     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.chomp!
-<a href="#{url}"#{link_attributes}>
-  #{text}
-</a>
-    HTML
+    prepare_html <<~HTML
+                   <a href="#{url}"#{link_attributes}>
+                     #{text}
+                   </a>
+                 HTML
   end
 
   def navbar_dropdown_divider
-    prepare_html <<-HTML.chomp!
-<div class="dropdown-divider"></div>
-HTML
+    '<div class="dropdown-divider"></div>'
   end
 
   private
 
-  def container(&block)
-    prepare_html <<-HTML.chomp!
-<div class="container">
-  #{capture(&block) if block_given?}
-</div>
-HTML
-  end
-
-  def brand_link(text, url = nil)
-    prepare_html <<-HTML.chomp!
-<a href="#{url || '/'}" class="navbar-brand">
-  #{text}
-</a>
-HTML
+  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'}"
-    options[:class] << "bg-#{options.delete(:bg) || 'dark'}" unless options[:bg] == false
+    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)
@@ -134,13 +146,12 @@ HTML
     end
     options[:class] << "navbar-expand-#{options.delete(:expand_at) || 'sm'}"
     options[:class] = options[:class].join(' ')
-    brand = brand_link(options.delete(:brand), options.delete(:brand_url)) if options[:brand]
     attributes = attributes_for_tag(options)
-    prepare_html <<-HTML.chomp!
-<nav#{attributes}>
-  #{brand}
-  #{capture(&block) if block_given?}
-</nav>
-HTML
+    prepare_html <<~HTML
+                    <nav#{attributes}>
+                      #{brand}
+                      #{capture(&block) if block_given?}
+                    </nav>
+                  HTML
   end
 end

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Manuel Meurer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,7 +153,7 @@ homepage: http://bootstrap-ruby.github.io/bootstrap-navbar
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar
 test_files: