bootstrap-navbar 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b50125e5cfbaeefeb0532a526446e435e9c3a6741a73f674ca44063a3cb6a6
-  data.tar.gz: 1c6af44914b1aee007b6e47d544f106db2d61a7a36a28a93a04489bc7fc7c77c
+  metadata.gz: 1c052de755ae4a79228172a5542806fcbc43b938203d6d9791d210543bb14d72
+  data.tar.gz: 46311e56c6a5e5dc824db02ca9377c8c1798d046807103aaf7428960b696b3bf
 SHA512:
-  metadata.gz: 19b33b5f6c6c5d51520d124fb18f9e71fd1f873cad6187cb06b8f1d7c16a67747482210e928f9538880b58c41e66b4d7970d93b5fac9346ccfc84f5e83383583
-  data.tar.gz: 4a5c150fffcb612bfe1a1df5f4b2b2f79a5701fe60f81514233145e4e78c567938d369b1afb89a7ec8f591c7ce2aca9e18769cca600626af9a8450baa368c7f3
+  metadata.gz: 14629006361ae67397f55ba652a84845ba4ef1ae505a52c29f3c7486b19e078e8d796453cb880921b393dbe157e80ac7020438e040d49222bc363d13cafb04c6
+  data.tar.gz: 61cdb5083e9b9421df76db12078d3ef12faf735fe53ecafd3fdfaece19502a040314ae6615d0f390e77a715431198ac42a926260e7e1d7f46f4d3415994e723e

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/bootstrap-navbar.png)](http://badge.fury.io/rb/bootstrap-navbar)
 [![Build Status](https://secure.travis-ci.org/bootstrap-ruby/bootstrap-navbar.png)](http://travis-ci.org/bootstrap-ruby/bootstrap-navbar)
-[![Dependency Status](https://gemnasium.com/bootstrap-ruby/bootstrap-navbar.png)](https://gemnasium.com/bootstrap-ruby/bootstrap-navbar)
 [![Code Climate](https://codeclimate.com/github/bootstrap-ruby/bootstrap-navbar.png)](https://codeclimate.com/github/bootstrap-ruby/bootstrap-navbar)
 
 Helpers to generate a Bootstrap style navbar
@@ -103,3 +102,7 @@ See [CHANGELOG](CHANGELOG.md)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Support
+
+If you like this project, consider [buying me a coffee](https://www.buymeacoffee.com/279lcDtbF)! :)

data/lib/bootstrap-navbar/helpers.rb

@@ -15,14 +15,14 @@ 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
   end
 
   def current_url_or_sub_url?(url)
-    return false if url == '#'
+    return false if url == '#' || url =~ /\Atel:/
     uri, current_uri = [url, current_url].map do |url|
       URI.parse(url)
     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,29 +41,29 @@ 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)
-    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      : {}
@@ -58,88 +73,92 @@ 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)
+  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(' ')
-    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="dropdown-menu" aria-labelledby="#{id}">
-    #{capture(&block) if block_given?}
-  </div>
-</li>
-HTML
+    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" 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)
     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)
       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(' ')
-    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}>
+                      #{capture(&block) if block_given?}
+                    </nav>
+                  HTML
   end
 end

data/lib/bootstrap-navbar/version.rb

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

data/spec/bootstrap-navbar/helpers/bootstrap4_spec.rb

@@ -141,4 +141,22 @@ describe BootstrapNavbar::Helpers::Bootstrap4 do
       end
     end
   end
+
+  describe '#navbar_dropdown' do
+    context 'with block' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_dropdown('Foo', 'foo') { 'link-text' }).to have_tag(:li, with: { class: 'nav-item dropdown'}) do
+          with_tag :div, with: { class: 'dropdown-menu' }
+        end
+      end
+    end
+
+    context 'with right aligned menu' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_dropdown('Foo', 'foo', { wrapper_class: 'dropdown-menu-right' }) { 'link-text' }).to have_tag(:li, with: { class: 'nav-item dropdown' }) do
+          with_tag :div, with: { class: 'dropdown-menu dropdown-menu-right' }
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Manuel Meurer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2020-10-14 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,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar
 test_files: