bootstrap-navbar 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c1c11b16764f02d05e907c90ec1485dc0ca435032b1492d873f3d79c3818c6
-  data.tar.gz: 1e8dfe8093cc0455703c9ce05eb80590ade4bcb93f8b01fc53d8fd7f3b41595d
+  metadata.gz: 1c052de755ae4a79228172a5542806fcbc43b938203d6d9791d210543bb14d72
+  data.tar.gz: 46311e56c6a5e5dc824db02ca9377c8c1798d046807103aaf7428960b696b3bf
 SHA512:
-  metadata.gz: 1f5b2f052f44d4c98533712ed45e6fe323c1d15a6f041d7e1a67cb8590122bc12cbbc9b4564995da40280c194b58500855609257be197f08928013547b011064
-  data.tar.gz: 65ceeca8fe2f44d3ca81fecc926876936bf7b1907adbd35061befddea130d7d4593e8a8726b0d3e79701c21c64d8320792c419465e83a5b31013a97c9fca5e9a
+  metadata.gz: 14629006361ae67397f55ba652a84845ba4ef1ae505a52c29f3c7486b19e078e8d796453cb880921b393dbe157e80ac7020438e040d49222bc363d13cafb04c6
+  data.tar.gz: 61cdb5083e9b9421df76db12078d3ef12faf735fe53ecafd3fdfaece19502a040314ae6615d0f390e77a715431198ac42a926260e7e1d7f46f4d3415994e723e

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

@@ -63,7 +63,7 @@ module BootstrapNavbar::Helpers::Bootstrap4
   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 +82,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 +149,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake