bootstrap-navbar 3.0.1 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b5f788ee43d7dfc722cf75c28e91c2cb363a36f9a58ca6968301eae9977302
-  data.tar.gz: a2ab4b37f4a2de21dc662ab916849b62aff4ed9dbfea4f04dae19a9206a9464c
+  metadata.gz: 503df312703c1b1e21ba7c001b5cb57eb622f265e25c4387459c792375b2202a
+  data.tar.gz: 15d6d53635832ca900705bec6363c8823d1e0c17da181bdba4d0e0a507d02b13
 SHA512:
-  metadata.gz: 934a989f958b5e39c052e524ebeb49f061f6798bb02957fc464fee322848a918440efc61a6bbea102a728a7102ee784bb1decc8120a9504f58462154abb4eff6
-  data.tar.gz: 3d0d23275914693b2936406a955f9df128e9964e4e2361bf61c09b28b8bfca9502acd9ce4b3e84ac940f0075c91b271adc3b99f86e2cd5a0087307c96004792e
+  metadata.gz: e60999f19b6ed1f441d1886db34118a4c92f98b13856ecddd50061b2dd1445e1e62c3c0f04ffbcf5664df83bc054e0650a8ce21178d0b8b472386dc097f4cb95
+  data.tar.gz: b6ae2867cd7d0c87de839fa16676b35917c4500fb9063f8c83532da7e727e2f1a441840b22999978c34c2901d41860d1321c630b5bd0fe1bfc74c3ec50aa418a

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,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,30 +73,31 @@ 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)
     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)
-    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
+    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)
@@ -90,36 +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
 
-  private
-
-  def container(&block)
-    prepare_html <<-HTML.chomp!
-<div class="container">
-  #{capture(&block) if block_given?}
-</div>
-HTML
+  def navbar_dropdown_divider
+    '<div class="dropdown-divider"></div>'
   end
 
-  def brand_link(text, url = nil)
-    prepare_html <<-HTML.chomp!
-<a href="#{url || '/'}" class="navbar-brand">
-  #{text}
-</a>
-HTML
+  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'}"
-    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)
@@ -127,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.1'
+  VERSION = '3.0.6'
 end

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

@@ -38,7 +38,7 @@ describe BootstrapNavbar::Helpers::Bootstrap4 do
 
     context 'with "placement" parameter' do
       it 'generates the correct HTML' do
-        %w(full fixed-top fixed-bottom).each do |placement|
+        %w(top bottom).each do |placement|
           expect(renderer.navbar(placement: placement)).to have_tag(:nav, with: { class: "navbar navbar-dark bg-dark fixed-#{placement}" })
         end
       end
@@ -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.1
+  version: 3.0.6
 platform: ruby
 authors:
 - Manuel Meurer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-14 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,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar
 test_files: