bootstrap-navbar 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a421815116b33ad3262adff74491b84a01e9c4c1
-  data.tar.gz: 046bf583a2e69c7f74bb0c4a2a9ebfb30f0d6fc9
+  metadata.gz: 982a971198be58abfb4bca9437f239d32649042a
+  data.tar.gz: ce65e2dfd1f6a41baae61ae60ced9e19a3b0d649
 SHA512:
-  metadata.gz: 3ffdf3ceb3ba44969ac9a10822fb7b5e68ae38ce39918a972e8911608fd1c07aa695966eec0cf812c8c022a7e60ee2d6575179f7d95faa631c47c88d0e65fe74
-  data.tar.gz: 2d6bd5ffd751227cbfb499b7e998ce0eca545c2be247d4465664465e1a479dc219ab8d78ed3a34c68bf6920fdc0023a06793b61ad60794f8335ae590031a2cb3
+  metadata.gz: 440b131c834bccd2fa760c715e0a956a933ffad6f1d1e37ddf8f03e710bb4a2f53426285c378a579d1c63d39c54c9fbb46cf29812eb7c89f00596dc7f5d5554f
+  data.tar.gz: c801f1ba40965ef2479e8bf1d44bb9b4ded164891cb1a79f77e0eaa6db7e0c187083353aa95e271cb451f343f51f94452dd2fbb5b5ed76bba35ae34fb011a018

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - jruby
+  - 2.2.5
+  - 2.3.1
+before_install:
+  - gem update --system
+  - gem update bundler
+sudo: false

data/CHANGELOG.md

@@ -1,7 +1,15 @@
-## 2.2.3
+## 2.3.0
+
+* Add support for Bootstrap 4
+
+## 2.2.4
 
 * Never mark menu item with path "#" as active
 
+## 2.2.3
+
+* Allow navbar dropdown to receive list item and link parameters
+
 ## 2.2.2
 
 * Fix marking menu items as active... again

data/README.md

@@ -5,13 +5,13 @@
 [![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 Twitter Bootstrap style navbar
+Helpers to generate a Bootstrap style navbar
 
 ## Installation
 
 This gem only provides a helper module with methods to generate HTML. It can be used by other gems to make these helpers available to a framework's rendering engine, e.g.:
 
-* For Rails: https://github.com/julescopeland/Rails-Bootstrap-Navbar
+* For Rails: https://github.com/bootstrap-ruby/rails-bootstrap-navbar
 * For [Middleman](http://middlemanapp.com/): https://github.com/bootstrap-ruby/middleman-bootstrap-navbar
 
 In short: __Unless you know what you're doing, do not use this gem directly in your app!__
@@ -28,7 +28,7 @@ BootstrapNavbar needs to know what version of Bootstrap it's dealing with since
 
 ```ruby
 BootstrapNavbar.configure do |config|
-  config.bootstrap_version = '3.0.0'
+  config.bootstrap_version = '4.0.0'
 end
 ```
 
@@ -67,11 +67,13 @@ ActionView::Base.send :include, BootstrapNavbar::Helpers
 
 ## Usage
 
-Since the navbar format changed quite a bit between Bootstrap 2.x and 3.x, generating them using this gem is quite different as well. Check out the Wiki pages for detailed instructions:
+Since the navbar format differs quite a bit between Bootstrap 2, 3 and 4, generating them using this gem works quite differently as well. Check out the Wiki pages for detailed instructions:
 
-[Usage with Bootstrap 2.x](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-2.x)
+[Usage with Bootstrap 2](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-2)
 
-[Usage with Bootstrap 3.x](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-3.x)
+[Usage with Bootstrap 3](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-3)
+
+[Usage with Bootstrap 4](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-4)
 
 ## Changes
 

data/bootstrap-navbar.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |gem|
   gem.platform      = Gem::Platform::RUBY
   gem.author        = 'Manuel Meurer'
   gem.email         = 'manuel@krautcomputing.com'
-  gem.summary       = 'Helpers to generate a Twitter Bootstrap style navbar'
-  gem.description   = 'Helpers to generate a Twitter Bootstrap style navbar'
-  gem.homepage      = 'http://krautcomputing.github.io/bootstrap-navbar'
+  gem.summary       = 'Helpers to generate a Bootstrap style navbar'
+  gem.description   = 'Helpers to generate a Bootstrap style navbar'
+  gem.homepage      = 'http://bootstrap-ruby.github.io/bootstrap-navbar'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
@@ -26,8 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-html-matchers', '~> 0.6'
   gem.add_development_dependency 'guard-rspec', '~> 4.2'
   gem.add_development_dependency 'padrino-helpers', '~> 0.12'
-  # Listen >= 2.0.0 only works with Ruby >= 1.9.3
-  gem.add_development_dependency 'listen', '< 2.0.0' if RUBY_VERSION < '1.9.3'
   gem.add_development_dependency 'bootstrap-sass', '3.0.2.0'
   gem.add_runtime_dependency 'gem_config', '~> 0.3'
 end

data/lib/bootstrap-navbar.rb

@@ -13,3 +13,4 @@ require_relative 'bootstrap-navbar/version'
 require_relative 'bootstrap-navbar/helpers'
 require_relative 'bootstrap-navbar/helpers/bootstrap2'
 require_relative 'bootstrap-navbar/helpers/bootstrap3'
+require_relative 'bootstrap-navbar/helpers/bootstrap4'

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

@@ -10,8 +10,8 @@ module BootstrapNavbar::Helpers::Bootstrap2
   def navbar_group(options = {}, &block)
     options = options.dup
     css_classes = %w(nav).tap do |css_classes|
-      css_classes << "pull-#{options.delete(:pull)}" if options.has_key?(:pull)
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << "pull-#{options.delete(:pull)}" if options.key?(:pull)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
     prepare_html <<-HTML.chomp!
@@ -28,7 +28,7 @@ HTML
     link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
       css_classes << 'active' if current_url_or_sub_url?(path)
-      css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
+      css_classes << list_item_options.delete(:class) if list_item_options.key?(:class)
     end
     list_item_attributes = attributes_for_tag(
       { class: list_item_css_classes.join(' ') }
@@ -59,7 +59,7 @@ HTML
   def navbar_sub_dropdown(name, list_item_options = {}, link_options = {}, &block)
     list_item_options, link_options = list_item_options.dup, link_options.dup
     list_item_css_classes = %w(dropdown-submenu).tap do |css_classes|
-      css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
+      css_classes << list_item_options.delete(:class) if list_item_options.key?(:class)
     end
     list_item_attributes = attributes_for_tag({ class: list_item_css_classes.join(' ') }.merge(list_item_options))
     link_attributes = attributes_for_tag(link_options)
@@ -105,9 +105,9 @@ HTML
   def wrapper(options, html_options, &block)
     options, html_options = options.dup, html_options.dup
     position = case
-    when options.has_key?(:static)
+    when options.key?(:static)
       "static-#{options[:static]}"
-    when options.has_key?(:fixed)
+    when options.key?(:fixed)
       "fixed-#{options[:fixed]}"
     end
     css_classes = %w(navbar).tap do |css_classes|

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

@@ -1,7 +1,7 @@
 module BootstrapNavbar::Helpers::Bootstrap3
   def navbar(options = {}, &block)
     options = options.dup
-    container = options.has_key?(:container) ? options.delete(:container) : true
+    container = options.key?(:container) ? options.delete(:container) : true
     wrapper options do
       if container
         container(container, &block)
@@ -15,7 +15,7 @@ module BootstrapNavbar::Helpers::Bootstrap3
     options = options.dup
     brand, brand_link = options.delete(:brand), options.delete(:brand_link)
     css_classes = %w(navbar-header).tap do |css_classes|
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
     prepare_html <<-HTML.chomp!
@@ -35,7 +35,7 @@ HTML
   def navbar_collapse(options = {}, &block)
     options = options.dup
     css_classes = %w(collapse navbar-collapse).tap do |css_classes|
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), id: 'navbar-collapsable'))
     prepare_html <<-HTML.chomp!
@@ -48,8 +48,8 @@ HTML
   def navbar_group(options = {}, &block)
     options = options.dup
     css_classes = %w(nav navbar-nav).tap do |css_classes|
-      css_classes << "navbar-#{options.delete(:align)}" if options.has_key?(:align)
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << "navbar-#{options.delete(:align)}" if options.key?(:align)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
     prepare_html <<-HTML.chomp!
@@ -66,7 +66,7 @@ HTML
     link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
       css_classes << 'active' if current_url_or_sub_url?(url)
-      css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
+      css_classes << list_item_options.delete(:class) if list_item_options.key?(:class)
     end
     list_item_attributes = attributes_for_tag(
       { class: list_item_css_classes.join(' ') }
@@ -86,8 +86,8 @@ HTML
   def navbar_form(url, options = {}, &block)
     options = options.dup
     css_classes = %w(navbar-form).tap do |css_classes|
-      css_classes << "navbar-#{options.delete(:align)}" if options.has_key?(:align)
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << "navbar-#{options.delete(:align)}" if options.key?(:align)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     role = options.delete(:role) || 'form'
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), role: role))
@@ -103,7 +103,7 @@ HTML
     options = options.dup
     text ||= capture(&block)
     css_classes = %w(navbar-text).tap do |css_classes|
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
     prepare_html <<-HTML.chomp!
@@ -114,7 +114,7 @@ HTML
   def navbar_button(text, options = {})
     options = options.dup
     css_classes = %w(btn navbar-btn).tap do |css_classes|
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     type = options.delete(:type) || 'button'
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), type: type))
@@ -179,9 +179,9 @@ HTML
     options = options.dup
     css_classes = %w(navbar).tap do |css_classes|
       css_classes << "navbar-#{options.delete(:inverse) ? 'inverse' : 'default'}"
-      css_classes << "navbar-fixed-#{options.delete(:fixed)}" if options.has_key?(:fixed)
+      css_classes << "navbar-fixed-#{options.delete(:fixed)}" if options.key?(:fixed)
       css_classes << 'navbar-static-top' if options.delete(:static)
-      css_classes << options.delete(:class) if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.key?(:class)
     end
     role = options.delete(:role) || 'navigation'
     attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), role: role))

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

@@ -0,0 +1,137 @@
+module BootstrapNavbar::Helpers::Bootstrap4
+  def navbar(options = {}, &block)
+    options = options.dup
+    container = options.key?(:container) ? options.delete(:container) : false
+    wrapper options do
+      if container
+        container(&block)
+      else
+        capture(&block) if block_given?
+      end
+    end
+  end
+
+  def navbar_collapse(options = {}, &block)
+    options = options.dup
+    if options.key?(:toggleable)
+      toggleable = options.delete(:toggleable)
+      toggleable = 'xs' if toggleable == true
+    end
+    css_classes = %w(collapse).tap do |css_classes|
+      css_classes << options.delete(:class) if options.key?(:class)
+      css_classes << "navbar-toggleable-#{toggleable}" if toggleable
+    end
+    toggler_css_classes = %w(navbar-toggler).tap do |css_classes|
+      if toggleable
+        following_grid_size = case toggleable
+        when 'xs' then 'sm'
+        when 'sm' then 'md'
+        when 'md' then 'lg'
+        when 'lg' then 'xl'
+        else
+          fail %(Unexpected "toggleable" parameter: #{toggleable}. Must be "xs", "sm", "md", "lg" or `true` (equals "xs").)
+        end
+        css_classes << "hidden-#{following_grid_size}-up"
+      end
+    end
+    id = options.delete(:id) || 'navbar-collapsable'
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), id: id))
+    toggler_attributes = attributes_for_tag(
+      class:             toggler_css_classes.join(' '),
+      type:              'button',
+      'data-toggle'   => 'collapse',
+      'data-target'   => "##{id}",
+      'aria-controls' => id,
+      'aria-expanded' => false,
+      'aria-label'    => 'Toggle navigation'
+    )
+    prepare_html <<-HTML.chomp!
+<button#{toggler_attributes}>
+  &#9776;
+</button>
+<div#{attributes}>
+  #{capture(&block) if block_given?}
+</div>
+HTML
+  end
+
+  def navbar_group(options = {}, &block)
+    options = options.dup
+    css_classes = %w(nav navbar-nav).tap do |css_classes|
+      css_classes << options.delete(:class) if options.key?(:class)
+    end
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    prepare_html <<-HTML.chomp!
+<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?
+    url               ||= '#'
+    list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
+    link_options        = link_options.nil?      ? {} : link_options.dup
+    list_item_css_classes = %w(nav-item).tap do |css_classes|
+      css_classes << 'active' if current_url_or_sub_url?(url)
+      css_classes << list_item_options.delete(:class) if list_item_options.key?(:class)
+    end
+    link_css_classes = %w(nav-link).tap do |css_classes|
+      css_classes << link_options.delete(:class) if link_options.key?(:class)
+    end
+    list_item_attributes = attributes_for_tag(
+      { class: list_item_css_classes.join(' ') }
+        .delete_if { |k, v| v.empty? }
+        .merge(list_item_options)
+    )
+    link_attributes = attributes_for_tag(
+      { class: link_css_classes.join(' ') }
+        .delete_if { |k, v| v.empty? }
+        .merge(link_options)
+    )
+    prepare_html <<-HTML.chomp!
+<li#{list_item_attributes}>
+  <a href="#{url}"#{link_attributes}>
+    #{text}
+  </a>
+</li>
+HTML
+  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
+  end
+
+  def wrapper(options, &block)
+    options = options.dup
+    css_classes = %w(navbar).tap do |css_classes|
+      css_classes << "navbar-#{options.key?(:color_scheme) ? options.delete(:color_scheme) : 'dark'}"
+      css_classes << "bg-#{options.delete(:bg) || 'primary'}" unless options[:bg] == false
+      css_classes << "navbar-#{options.delete(:placement)}" if options.key?(:placement)
+      css_classes << options.delete(:class) if options.key?(:class)
+    end
+    brand = brand_link(options[:brand], options[:brand_url]) if options[:brand]
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    prepare_html <<-HTML.chomp!
+<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 = '2.2.4'
+  VERSION = '2.3.0'
 end

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

@@ -0,0 +1,161 @@
+require 'spec_helper'
+
+describe BootstrapNavbar::Helpers::Bootstrap4 do
+  before do
+    BootstrapNavbar.configure do |config|
+      config.current_url_method = '"/"'
+      config.bootstrap_version  = '4.0.0'
+    end
+  end
+
+  it 'includes the correct module' do
+    expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap3)
+    expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap2)
+    expect(renderer.class.ancestors).to include(BootstrapNavbar::Helpers::Bootstrap4)
+  end
+
+  describe '#navbar' do
+    context 'without parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }, text: /foo/)
+      end
+    end
+
+    context 'with "color_scheme" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(color_scheme: 'light')).to have_tag(:nav, with: { class: 'navbar navbar-light bg-primary' })
+        expect(renderer.navbar(color_scheme: 'dark')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' })
+      end
+    end
+
+    context 'with "bg" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(bg: 'primary')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' })
+        expect(renderer.navbar(bg: 'inverse')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-inverse' })
+        expect(renderer.navbar(bg: false)).to have_tag(:nav, with: { class: 'navbar navbar-dark' }, without: { class: 'bg-primary' })
+      end
+    end
+
+    context 'with "placement" parameter' do
+      it 'generates the correct HTML' do
+        %w(full fixed-top fixed-bottom).each do |placement|
+          expect(renderer.navbar(placement: placement)).to have_tag(:nav, with: { class: "navbar navbar-dark bg-primary navbar-#{placement}" })
+        end
+      end
+    end
+
+    context 'with "container" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(container: true)).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }) do
+          with_tag :div, with: { class: 'container' }
+        end
+        expect(renderer.navbar(container: false)).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }) do
+          without_tag :div, with: { class: 'container' }
+        end
+      end
+    end
+
+    context 'with "class" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(class: 'foo')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary foo' })
+      end
+    end
+
+    context 'with "brand" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(brand: 'Huhu')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }) do
+          with_tag :a, with: { class: 'navbar-brand' }, text: /Huhu/
+        end
+        expect(renderer.navbar(brand: false)).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }) do
+          without_tag :a, with: { class: 'navbar-brand' }
+        end
+      end
+    end
+
+    context 'with "brand_url" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(brand: true, brand_url: '/huhu')).to have_tag(:nav, with: { class: 'navbar navbar-dark bg-primary' }) do
+          with_tag :a, with: { class: 'navbar-brand', href: '/huhu' }
+        end
+      end
+    end
+  end
+
+  describe '#navbar_collapse' do
+    context 'without parameters' do
+      it 'generates the correct HTML' do
+        output = renderer.navbar_collapse { 'foo' }
+        expect(output).to have_tag :div, with: { class: 'collapse', id: 'navbar-collapsable' }, text: /foo/
+        button_attributes = {
+          class:             'navbar-toggler',
+          type:              'button',
+          'data-toggle'   => 'collapse',
+          'data-target'   => "#navbar-collapsable",
+          'aria-controls' => 'navbar-collapsable',
+          'aria-expanded' => false,
+          'aria-label'    => 'Toggle navigation'
+        }
+        expect(output).to have_tag :button, with: button_attributes
+      end
+    end
+
+    context 'with "toggleable" parameter' do
+      it 'generates the correct HTML' do
+        output = renderer.navbar_collapse(toggleable: true) { 'foo' }
+        expect(output).to have_tag :div, with: { class: 'collapse navbar-toggleable-xs', id: 'navbar-collapsable' }, text: /foo/
+        button_attributes = {
+          class:             'navbar-toggler hidden-sm-up',
+          type:              'button',
+          'data-toggle'   => 'collapse',
+          'data-target'   => "#navbar-collapsable",
+          'aria-controls' => 'navbar-collapsable',
+          'aria-expanded' => false,
+          'aria-label'    => 'Toggle navigation'
+        }
+        expect(output).to have_tag :button, with: button_attributes
+      end
+    end
+  end
+
+  describe '#navbar_group' do
+    context 'without parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_group).to have_tag(:ul, with: { class: 'nav navbar-nav' })
+      end
+    end
+
+    context 'with "class" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_group(class: 'foo')).to have_tag(:ul, with: { class: 'nav navbar-nav foo' })
+      end
+    end
+  end
+
+  describe '#navbar_item' do
+    it_behaves_like 'marking the navbar items as active correctly'
+
+    context 'with block' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_item('/foo', { class: 'list-item' }, class: 'link') { 'link-text' }).to have_tag(:li, with: { class: 'nav-item list-item' }) do
+          with_tag :a, with: { href: '/foo', class: 'nav-link link' }, text: /link-text/
+        end
+      end
+    end
+
+    context 'without current URL' do
+      it 'generates the correct HTML' do
+        BootstrapNavbar.configuration.current_url_method = '"/foo"'
+        expect(renderer.navbar_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
+          with_tag :a, with: { href: '/' }, text: /foo/
+        end
+        expect(renderer.navbar_item('foo', '/bar')).to have_tag(:li, without: { class: 'active' }) do
+          with_tag :a, with: { href: '/bar' }, text: /foo/
+        end
+        BootstrapNavbar.configuration.current_url_method = '"/"'
+        expect(renderer.navbar_item('foo', '/foo')).to have_tag(:li, without: { class: 'active' }) do
+          with_tag :a, with: { href: '/foo' }, text: /foo/
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,12 +108,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-description: Helpers to generate a Twitter Bootstrap style navbar
+description: Helpers to generate a Bootstrap style navbar
 email: manuel@krautcomputing.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -126,13 +127,15 @@ files:
 - lib/bootstrap-navbar/helpers.rb
 - lib/bootstrap-navbar/helpers/bootstrap2.rb
 - lib/bootstrap-navbar/helpers/bootstrap3.rb
+- lib/bootstrap-navbar/helpers/bootstrap4.rb
 - lib/bootstrap-navbar/version.rb
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
+- spec/bootstrap-navbar/helpers/bootstrap4_spec.rb
 - spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-homepage: http://krautcomputing.github.io/bootstrap-navbar
+homepage: http://bootstrap-ruby.github.io/bootstrap-navbar
 licenses:
 - MIT
 metadata: {}
@@ -152,13 +155,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: Helpers to generate a Twitter Bootstrap style navbar
+summary: Helpers to generate a Bootstrap style navbar
 test_files:
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
+- spec/bootstrap-navbar/helpers/bootstrap4_spec.rb
 - spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb