bootstrap-navbar 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcaa232c9de0ba3888c8f87b6dc1c15b14edbb7
-  data.tar.gz: 7c4a7698d6211e01f89e42f93a144c19dd3532a0
+  metadata.gz: 781cad4ac31fafee2286b64f3724c8b5cd4a3ed2
+  data.tar.gz: b0d3f73b9c98ed24f2f65216d3ff313249964e56
 SHA512:
-  metadata.gz: 43ab97ee7b8af682f3f754c99f06beb5e8da86a17188d07939a1e63a5c582541c8bc32ee67c79004d4a54781e1edc6d4ae1532cc8e60e3a02dded4e0939d8e0c
-  data.tar.gz: 963c39652f38113cae133e98f66f14e7756c003eb97c59bfe1d568a16b07f22f1fc94cd083713c09e8a413cff1c292f3817077ad8d3e3a75202e01723ea5a687
+  metadata.gz: 88d37fed5dd7c408fb4e69cae5ee66c476dca8b96967afce12ed6d21b3a4770ac2457c6677700ba2ef5c2ea8ee670a96b8454635976d79355d9d732383be5ba8
+  data.tar.gz: a33caba3b1d44fedba100e33ccb2c7e167b88dbc87ddbd6a4ddae14a3be19fd5d9ed2d2dde8772550321f4deaec4a1d99a036370f42c3686a1aa22626abd7207

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+
+* Refactor: Add navbar_header and navbar_collapse to make it possible to insert content outside of header and collapse sections.
+* Refactor: remove internal list of Bootstrap versions which had to be updated every time a new Bootstrap version was released.
+* Fix: make sure options that are passed into methods are not altered

data/README.md

@@ -73,6 +73,10 @@ Since the navbar format changed quite a bit between Bootstrap 2.x and 3.x, gener
 
 [Usage with Bootstrap 3.x](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-3.x)
 
+## Changes
+
+See [CHANGELOG](CHANGELOG.md)
+
 ## Contributing
 
 1. Fork it

data/lib/bootstrap-navbar.rb

@@ -3,10 +3,8 @@ require 'gem_config'
 module BootstrapNavbar
   include GemConfig::Base
 
-  BOOTSTRAP_VERSIONS = %w(3.1.0 3.0.3 3.0.2 3.0.1 3.0.0 2.3.2 2.3.1 2.3.0 2.2.2 2.2.1 2.2.0 2.1.1 2.1.0 2.0.4 2.0.3 2.0.2 2.0.1 2.0.0)
-
   with_configuration do
-    has :bootstrap_version, classes: [String, NilClass], values: BOOTSTRAP_VERSIONS.unshift(nil)
+    has :bootstrap_version, classes: [String, NilClass]
     has :current_url_method, classes: String
   end
 end

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

@@ -8,6 +8,7 @@ module BootstrapNavbar::Helpers::Bootstrap2
   end
 
   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)
@@ -23,9 +24,8 @@ HTML
   def navbar_item(name = nil, path = nil, list_item_options = nil, link_options = nil, &block)
     name, path, list_item_options, link_options = capture(&block), name, path, list_item_options if block_given?
     path              ||= '#'
-    list_item_options ||= {}
-    link_options      ||= {}
-
+    list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
+    link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
       css_classes << 'active' if current_url?(path)
       css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
@@ -57,6 +57,7 @@ HTML
   end
 
   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)
     end
@@ -102,13 +103,13 @@ HTML
   private
 
   def wrapper(options, html_options, &block)
+    options, html_options = options.dup, html_options.dup
     position = case
     when options.has_key?(:static)
       "static-#{options[:static]}"
     when options.has_key?(:fixed)
       "fixed-#{options[:fixed]}"
     end
-
     css_classes = %w(navbar).tap do |css_classes|
       css_classes << "navbar-#{position}" if position
       css_classes << 'navbar-inverse' if options[:inverse]
@@ -116,7 +117,6 @@ HTML
     end
     attribute_hash = { class: css_classes.join(' ') }.merge(html_options)
     attributes = attributes_for_tag(attribute_hash)
-
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
   #{capture(&block) if block_given?}

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

@@ -1,23 +1,57 @@
 module BootstrapNavbar::Helpers::Bootstrap3
   def navbar(options = {}, &block)
-    navbar_content =
-      header(options.delete(:brand), options.delete(:brand_link)) <<
-      collapsable(&block)
+    options = options.dup
+    container = options.has_key?(:container) ? options.delete(:container) : true
     wrapper options do
-      unless options[:container] == false
-        container(options[:container], navbar_content)
+      if container
+        container(container, &block)
       else
-        navbar_content
+        capture(&block)
       end
     end
   end
 
+  def navbar_header(options = {}, &block)
+    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)
+    end
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    prepare_html <<-HTML.chomp!
+<div#{attributes}>
+  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapsable">
+    <span class="sr-only">Toggle navigation</span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+  </button>
+  #{brand_link brand, brand_link unless brand.nil?}
+  #{capture(&block) if block_given?}
+</div>
+HTML
+  end
+
+  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)
+    end
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), id: 'navbar-collapsable'))
+    prepare_html <<-HTML.chomp!
+<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 << "navbar-#{options.delete(:align)}" if options.has_key?(:align)
       css_classes << options.delete(:class) if options.has_key?(:class)
     end
-    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
     prepare_html <<-HTML.chomp!
 <ul#{attributes}>
   #{capture(&block) if block_given?}
@@ -28,9 +62,8 @@ HTML
   def navbar_item(text, url = nil, list_item_options = nil, link_options = nil, &block)
     text, url, list_item_options, link_options = capture(&block), text, list_item_options if block_given?
     url               ||= '#'
-    list_item_options ||= {}
-    link_options      ||= {}
-
+    list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
+    link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
       css_classes << 'active' if current_url?(url)
       css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
@@ -51,12 +84,13 @@ HTML
   end
 
   def navbar_form(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)
     end
     role = options.delete(:role) || 'form'
-    attributes = attributes_for_tag({ class: css_classes.join(' '), role: role }.merge(options))
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), role: role))
     prepare_html <<-HTML.chomp!
 <form#{attributes}>
   #{capture(&block) if block_given?}
@@ -66,22 +100,24 @@ HTML
 
   def navbar_text(text = nil, options = {}, &block)
     raise StandardError, 'Please provide either the "text" parameter or a block.' if (text.nil? && !block_given?) || (!text.nil? && block_given?)
+    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)
     end
-    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
     prepare_html <<-HTML.chomp!
 <p#{attributes}>#{text}</p>
 HTML
   end
 
   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)
     end
     type = options.delete(:type) || 'button'
-    attributes = attributes_for_tag({ class: css_classes.join(' '), type: type }.merge(options))
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), type: type))
     prepare_html <<-HTML.chomp!
 <button#{attributes}>#{text}</button>
 HTML
@@ -114,34 +150,12 @@ HTML
 
   private
 
-  def container(type, content)
+  def container(type, &block)
     css_class = 'container'
     css_class << "-#{type}" if type.is_a?(String)
     attributes = attributes_for_tag(class: css_class)
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
-  #{content}
-</div>
-HTML
-  end
-
-  def header(brand, brand_link)
-    prepare_html <<-HTML.chomp!
-<div class="navbar-header">
-  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapsable">
-    <span class="sr-only">Toggle navigation</span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-  </button>
-  #{brand_link brand, brand_link unless brand.nil?}
-</div>
-HTML
-  end
-
-  def collapsable(&block)
-    prepare_html <<-HTML.chomp!
-<div class="collapse navbar-collapse" id="navbar-collapsable">
   #{capture(&block) if block_given?}
 </div>
 HTML
@@ -157,15 +171,16 @@ HTML
   end
 
   def wrapper(options, &block)
-    style = options.delete(:inverse) ? 'inverse' : 'default'
+    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-static-top' if options.delete(:static)
       css_classes << 'navbar-inverse' if options.delete(:inverse)
-      css_classes << "navbar-#{style}"
+      css_classes << options.delete(:class) if options.has_key?(:class)
     end
     role = options.delete(:role) || 'navigation'
-    attributes = attributes_for_tag({ class: css_classes.join(' '), role: role }.merge(options))
+    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), role: role))
     prepare_html <<-HTML.chomp!
 <nav#{attributes}>
   #{capture(&block) if block_given?}

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

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

@@ -2,12 +2,10 @@ require 'spec_helper'
 
 shared_examples 'active menu item' do
   it 'generates the correct HTML' do
-    with_all_2_dot_x_versions do
-      paths_and_urls.each do |current_path_or_url|
-        paths_and_urls.each do |menu_path_or_url|
-          BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
-          expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' })
-        end
+    paths_and_urls.each do |current_path_or_url|
+      paths_and_urls.each do |menu_path_or_url|
+        BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
+        expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' })
       end
     end
   end
@@ -15,24 +13,23 @@ end
 
 describe BootstrapNavbar::Helpers::Bootstrap2 do
   before do
-    BootstrapNavbar.configuration.current_url_method = '"/"'
+    BootstrapNavbar.configure do |config|
+      config.current_url_method = '"/"'
+      config.bootstrap_version  = '2.0.0'
+    end
   end
 
   it 'includes the correct module' do
-    with_all_2_dot_x_versions do
-      expect(renderer.class.ancestors).to include(BootstrapNavbar::Helpers::Bootstrap2)
-      expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap3)
-    end
+    expect(renderer.class.ancestors).to include(BootstrapNavbar::Helpers::Bootstrap2)
+    expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap3)
   end
 
   describe '#navbar' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar).to have_tag(:div, with: { class: 'navbar' }) do
-            with_tag :div, with: { class: 'navbar-inner' } do
-              with_tag :div, with: { class: 'container' }
-            end
+        expect(renderer.navbar).to have_tag(:div, with: { class: 'navbar' }) do
+          with_tag :div, with: { class: 'navbar-inner' } do
+            with_tag :div, with: { class: 'container' }
           end
         end
       end
@@ -40,61 +37,49 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
     context 'with a block' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar { 'foo' }).to have_tag(:div, with: { class: 'navbar' }, text: /foo/)
-        end
+        expect(renderer.navbar { 'foo' }).to have_tag(:div, with: { class: 'navbar' }, text: /foo/)
       end
     end
 
     context 'with "static" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(static: 'top')).to have_tag(:div, with: { class: 'navbar navbar-static-top' })
-          expect(renderer.navbar(static: 'bottom')).to have_tag(:div, with: { class: 'navbar navbar-static-bottom' })
-        end
+        expect(renderer.navbar(static: 'top')).to have_tag(:div, with: { class: 'navbar navbar-static-top' })
+        expect(renderer.navbar(static: 'bottom')).to have_tag(:div, with: { class: 'navbar navbar-static-bottom' })
       end
     end
 
     context 'with "fixed" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(fixed: 'top')).to have_tag(:div, with: { class: 'navbar navbar-fixed-top' })
-          expect(renderer.navbar(fixed: 'bottom')).to have_tag(:div, with: { class: 'navbar navbar-fixed-bottom' })
-        end
+        expect(renderer.navbar(fixed: 'top')).to have_tag(:div, with: { class: 'navbar navbar-fixed-top' })
+        expect(renderer.navbar(fixed: 'bottom')).to have_tag(:div, with: { class: 'navbar navbar-fixed-bottom' })
       end
     end
 
     context 'with "inverse" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(inverse: true)).to have_tag(:div, with: { class: 'navbar navbar-inverse' })
-        end
+        expect(renderer.navbar(inverse: true)).to have_tag(:div, with: { class: 'navbar navbar-inverse' })
       end
     end
 
     context 'with "brand" and "brank_link" parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'brand' }, text: /foo/)
-          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' }, text: /foo/)
-          expect(renderer.navbar(brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' })
-        end
+        expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'brand' }, text: /foo/)
+        expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' }, text: /foo/)
+        expect(renderer.navbar(brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' })
       end
     end
 
     context 'with "responsive" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(responsive: true)).to have_tag(:a, with: { class: 'btn btn-navbar', :'data-toggle' => 'collapse', :'data-target' => '.nav-collapse' }) do
-            3.times do
-              with_tag :span, with: { class: 'icon-bar' }
-            end
+        expect(renderer.navbar(responsive: true)).to have_tag(:a, with: { class: 'btn btn-navbar', :'data-toggle' => 'collapse', :'data-target' => '.nav-collapse' }) do
+          3.times do
+            with_tag :span, with: { class: 'icon-bar' }
           end
         end
-        with_versions '2.2.0'...'3' do
+        with_bootstrap_versions %w(2.2.0 2.2.1 2.2.2 2.3.0 2.3.1 2.3.2) do
           expect(renderer.navbar(responsive: true)).to have_tag(:div, with: { class: 'nav-collapse collapse' })
         end
-        with_versions '0'...'2.2.0' do
+        with_bootstrap_versions %w(2.0.0 2.0.1 2.0.2 2.0.3 2.0.4 2.1.0 2.1.1) do
           expect(renderer.navbar(responsive: true)).to have_tag(:div, with: { class: 'nav-collapse' })
         end
       end
@@ -102,17 +87,13 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
     context 'with "fluid" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar(fluid: true)).to have_tag(:div, with: { class: 'container-fluid' })
-        end
+        expect(renderer.navbar(fluid: true)).to have_tag(:div, with: { class: 'container-fluid' })
       end
     end
 
     context 'with wrapper parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar({}, class: 'my-wrapper-class', id: 'my-wrapper-id')).to have_tag(:div, with: { class: 'navbar my-wrapper-class', id: 'my-wrapper-id' })
-        end
+        expect(renderer.navbar({}, class: 'my-wrapper-class', id: 'my-wrapper-id')).to have_tag(:div, with: { class: 'navbar my-wrapper-class', id: 'my-wrapper-id' })
       end
     end
   end
@@ -120,42 +101,32 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#navbar_group' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_group).to have_tag(:ul, with: { class: 'nav' })
-          expect(renderer.navbar_group { 'foo' }).to have_tag(:ul, with: { class: 'nav' }, text: /foo/)
-        end
+        expect(renderer.navbar_group).to have_tag(:ul, with: { class: 'nav' })
+        expect(renderer.navbar_group { 'foo' }).to have_tag(:ul, with: { class: 'nav' }, text: /foo/)
       end
     end
 
     context 'with "pull" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_group(pull: 'right')).to have_tag(:ul, with: { class: 'nav pull-right' })
-        end
+        expect(renderer.navbar_group(pull: 'right')).to have_tag(:ul, with: { class: 'nav pull-right' })
       end
     end
 
     context 'with "class" parameter' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_group(class: 'foo')).to have_tag(:ul, with: { class: 'nav foo' })
-        end
+        expect(renderer.navbar_group(class: 'foo')).to have_tag(:ul, with: { class: 'nav foo' })
       end
     end
 
     context 'with random parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_group(:'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav', :'data-foo' => 'bar' })
-        end
+        expect(renderer.navbar_group(:'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav', :'data-foo' => 'bar' })
       end
     end
 
     context 'with many parameters' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_group(pull: 'right', class: 'foo', :'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav foo pull-right', :'data-foo' => 'bar' })
-        end
+        expect(renderer.navbar_group(pull: 'right', class: 'foo', :'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav foo pull-right', :'data-foo' => 'bar' })
       end
     end
   end
@@ -208,31 +179,25 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
       context 'with list item options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'active bar', id: 'baz' })
-          end
+          BootstrapNavbar.configuration.current_url_method = '"/"'
+          expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'active bar', id: 'baz' })
         end
       end
 
       context 'with link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.navbar_item('foo', '/', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active' }) do
-              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
-            end
+          BootstrapNavbar.configuration.current_url_method = '"/"'
+          expect(renderer.navbar_item('foo', '/', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active' }) do
+            with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
           end
         end
       end
 
       context 'with list item options and link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.navbar_item('foo', '/', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active bar', id: 'baz' }) do
-              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
-            end
+          BootstrapNavbar.configuration.current_url_method = '"/"'
+          expect(renderer.navbar_item('foo', '/', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active bar', id: 'baz' }) do
+            with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
           end
         end
       end
@@ -240,69 +205,57 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
     context 'without current URL' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions 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', '/')).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
+        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', '/')).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
 
       context 'with list item options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            BootstrapNavbar.configuration.current_url_method = '"/foo"'
-            expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, without: { class: 'active' }, with: { class: 'bar', id: 'baz' })
-          end
+          BootstrapNavbar.configuration.current_url_method = '"/foo"'
+          expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, without: { class: 'active' }, with: { class: 'bar', id: 'baz' })
         end
       end
     end
 
     context 'with a block' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_item { 'bar' }).to have_tag(:li) do
-            with_tag :a, with: { href: '#' }, text: /bar/
-          end
+        expect(renderer.navbar_item { 'bar' }).to have_tag(:li) do
+          with_tag :a, with: { href: '#' }, text: /bar/
         end
       end
 
       context 'with list item options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_item('/foo', class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li, with: { class: 'pelle', id: 'fant' }) do
-              with_tag :a, with: { href: '/foo' }, text: /bar/
-            end
+          expect(renderer.navbar_item('/foo', class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li, with: { class: 'pelle', id: 'fant' }) do
+            with_tag :a, with: { href: '/foo' }, text: /bar/
           end
         end
       end
 
       context 'with link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_item('/foo', {}, class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li) do
-              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /bar/
-            end
+          expect(renderer.navbar_item('/foo', {}, class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li) do
+            with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /bar/
           end
         end
       end
 
       context 'with list item options and link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_item('/foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant') { 'shnoo' }).to have_tag(:li, with: { class: 'bar', id: 'baz' }) do
-              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /shnoo/
-            end
+          expect(renderer.navbar_item('/foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant') { 'shnoo' }).to have_tag(:li, with: { class: 'bar', id: 'baz' }) do
+            with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /shnoo/
           end
         end
       end
@@ -318,67 +271,57 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
     describe '#navbar_dropdown' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_dropdown('foo')).to have_tag(:li, with: { class: 'dropdown' }) do
-            with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
-              with_text /foo/
-              with_tag :b, with: { class: 'caret' }
-            end
-            with_dropdown_menu
+        expect(renderer.navbar_dropdown('foo')).to have_tag(:li, with: { class: 'dropdown' }) do
+          with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
+            with_text /foo/
+            with_tag :b, with: { class: 'caret' }
           end
+          with_dropdown_menu
+        end
 
-          expect(renderer.navbar_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) do
-            with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
-              with_text /foo/
-              with_tag :b, with: { class: 'caret' }
-            end
-            with_dropdown_menu('bar')
+        expect(renderer.navbar_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) do
+          with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
+            with_text /foo/
+            with_tag :b, with: { class: 'caret' }
           end
+          with_dropdown_menu('bar')
         end
       end
     end
 
     describe '#navbar_sub_dropdown' do
       it 'generates the correct HTML' do
-        with_all_2_dot_x_versions do
-          expect(renderer.navbar_sub_dropdown('foo')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
-            with_tag :a, with: { href: '#' }, text: /foo/
-            with_dropdown_menu
-          end
+        expect(renderer.navbar_sub_dropdown('foo')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
+          with_tag :a, with: { href: '#' }, text: /foo/
+          with_dropdown_menu
+        end
 
-          expect(renderer.navbar_sub_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
-            with_tag :a, with: { href: '#' }, text: /foo/
-            with_dropdown_menu('bar')
-          end
+        expect(renderer.navbar_sub_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
+          with_tag :a, with: { href: '#' }, text: /foo/
+          with_dropdown_menu('bar')
         end
       end
 
       context 'with list item options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_sub_dropdown('foo', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) do
-              with_tag :a, with: { href: '#' }, text: /foo/
-            end
+          expect(renderer.navbar_sub_dropdown('foo', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) do
+            with_tag :a, with: { href: '#' }, text: /foo/
           end
         end
       end
 
       context 'with link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_sub_dropdown('foo', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
-              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
-            end
+          expect(renderer.navbar_sub_dropdown('foo', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
+            with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
           end
         end
       end
 
       context 'with list item options and link options' do
         it 'generates the correct HTML' do
-          with_all_2_dot_x_versions do
-            expect(renderer.navbar_sub_dropdown('foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) do
-              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
-            end
+          expect(renderer.navbar_sub_dropdown('foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) do
+            with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
           end
         end
       end
@@ -387,45 +330,35 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
 
   describe '#navbar_dropdown_divider' do
     it 'generates the correct HTML' do
-      with_all_2_dot_x_versions do
-        expect(renderer.navbar_dropdown_divider).to have_tag(:li, with: { class: 'divider' }, text: '')
-      end
+      expect(renderer.navbar_dropdown_divider).to have_tag(:li, with: { class: 'divider' }, text: '')
     end
   end
 
   describe '#navbar_dropdown_header' do
     it 'generates the correct HTML' do
-      with_all_2_dot_x_versions do
-        expect(renderer.navbar_dropdown_header('foo')).to have_tag(:li, with: { class: 'nav-header' }, text: /foo/)
-      end
+      expect(renderer.navbar_dropdown_header('foo')).to have_tag(:li, with: { class: 'nav-header' }, text: /foo/)
     end
   end
 
   describe '#navbar_divider' do
     it 'generates the correct HTML' do
-      with_all_2_dot_x_versions do
-        expect(renderer.navbar_divider).to have_tag(:li, with: { class: 'divider-vertical' }, text: '')
-      end
+      expect(renderer.navbar_divider).to have_tag(:li, with: { class: 'divider-vertical' }, text: '')
     end
   end
 
   describe '#navbar_text' do
     it 'generates the correct HTML' do
-      with_all_2_dot_x_versions do
-        expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        expect(renderer.navbar_text('foo', 'right')).to have_tag(:p, with: { class: 'navbar-text pull-right' }, text: /foo/)
-        expect(renderer.navbar_text(nil, 'left') { 'foo' }).to have_tag(:p, with: { class: 'navbar-text pull-left' }, text: /foo/)
-      end
+      expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
+      expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
+      expect(renderer.navbar_text('foo', 'right')).to have_tag(:p, with: { class: 'navbar-text pull-right' }, text: /foo/)
+      expect(renderer.navbar_text(nil, 'left') { 'foo' }).to have_tag(:p, with: { class: 'navbar-text pull-left' }, text: /foo/)
     end
   end
 
   describe '#navbar_brand_link' do
     it 'generates the correct HTML' do
-      with_all_2_dot_x_versions do
-        expect(renderer.navbar_brand_link('foo')).to have_tag(:a, with: { class: 'brand', href: '/' }, text: /foo/)
-        expect(renderer.navbar_brand_link('foo', '/foo')).to have_tag(:a, with: { class: 'brand', href: '/foo' }, text: /foo/)
-      end
+      expect(renderer.navbar_brand_link('foo')).to have_tag(:a, with: { class: 'brand', href: '/' }, text: /foo/)
+      expect(renderer.navbar_brand_link('foo', '/foo')).to have_tag(:a, with: { class: 'brand', href: '/foo' }, text: /foo/)
     end
   end
 end

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

@@ -2,13 +2,11 @@ require 'spec_helper'
 
 shared_examples 'active navbar link' do
   it 'generates the correct HTML' do
-    with_all_3_dot_x_versions do
-      paths_and_urls.each do |current_path_or_url|
-        paths_and_urls.each do |menu_path_or_url|
-          BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
-          expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' }) do
-            with_tag :a, with: { href: menu_path_or_url }, text: /foo/
-          end
+    paths_and_urls.each do |current_path_or_url|
+      paths_and_urls.each do |menu_path_or_url|
+        BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
+        expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' }) do
+          with_tag :a, with: { href: menu_path_or_url }, text: /foo/
         end
       end
     end
@@ -17,56 +15,52 @@ end
 
 describe BootstrapNavbar::Helpers::Bootstrap3 do
   before do
-    BootstrapNavbar.configuration.current_url_method = '"/"'
+    BootstrapNavbar.configure do |config|
+      config.current_url_method = '"/"'
+      config.bootstrap_version  = '3.0.0'
+    end
   end
 
   it 'includes the correct module' do
-    with_all_3_dot_x_versions do
-      expect(renderer.class.ancestors).to include(BootstrapNavbar::Helpers::Bootstrap3)
-      expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap2)
-    end
+    expect(renderer.class.ancestors).to include(BootstrapNavbar::Helpers::Bootstrap3)
+    expect(renderer.class.ancestors).to_not include(BootstrapNavbar::Helpers::Bootstrap2)
   end
 
   describe '#navbar' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-default', role: 'navigation' }) do
-            with_tag :div, with: { class: 'container' } do
-              with_tag :div, with: { class: 'navbar-header' } do
-                with_tag :button, with: { type: 'button', class: 'navbar-toggle', :'data-toggle' => 'collapse', :'data-target' => '#navbar-collapsable' } do
-                  with_tag :span, with: { class: 'sr-only' }, text: /Toggle navigation/
-                  3.times do
-                    with_tag :span, with: { class: 'icon-bar' }
-                  end
-                end
-              end
-              with_tag :div, with: { class: 'collapse navbar-collapse', id: 'navbar-collapsable' }, text: /foo/
-            end
-          end
-        end
+        expect(renderer.navbar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-default', role: 'navigation' }, text: /foo/)
+      end
+    end
+
+    context 'with "inverse" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(inverse: true)).to have_tag(:nav, with: { class: 'navbar navbar-inverse' })
+      end
+    end
+
+    context 'with "fixed" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar(fixed: 'top')).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-fixed-top' })
+        expect(renderer.navbar(fixed: 'bottom')).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-fixed-bottom' })
       end
     end
 
     context 'with "static" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar(static: true)).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-static-top' })
-        end
+        expect(renderer.navbar(static: true)).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-static-top' })
       end
     end
 
     context 'with "container" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar(container: true)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
-            with_tag :div, with: { class: 'container' }
-          end
-          expect(renderer.navbar(container: false)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
-            without_tag :div, with: { class: 'container' }
-          end
+        expect(renderer.navbar(container: true)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
+          with_tag :div, with: { class: 'container' }
         end
-        with_version '3.1.0' do
+        expect(renderer.navbar(container: false)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
+          without_tag :div, with: { class: 'container' }
+        end
+        with_bootstrap_versions %w(3.1.0) do
           expect(renderer.navbar(container: 'fluid')).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
             with_tag :div, with: { class: 'container-fluid' }
           end
@@ -74,29 +68,46 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
       end
     end
 
-    context 'with "fixed" parameter' do
+  end
+
+  describe '#navbar_header',:focus do
+    context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar(fixed: 'top')).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-fixed-top' })
-          expect(renderer.navbar(fixed: 'bottom')).to have_tag(:nav, with: { class: 'navbar navbar-default navbar-fixed-bottom' })
+        expect(renderer.navbar_header { 'foo' }).to have_tag :div, with: { class: 'navbar-header' } do
+          with_tag :button, with: { type: 'button', class: 'navbar-toggle', :'data-toggle' => 'collapse', :'data-target' => '#navbar-collapsable' } do
+            with_tag :span, with: { class: 'sr-only' }, text: /Toggle navigation/
+            3.times do
+              with_tag :span, with: { class: 'icon-bar' }
+            end
+          end
         end
       end
     end
 
-    context 'with "inverse" parameter' do
+    context 'with "brand" and "brank_link" parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar(inverse: true)).to have_tag(:nav, with: { class: 'navbar navbar-inverse' })
-        end
+        expect(renderer.navbar_header(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'navbar-brand' }, text: /foo/)
+        expect(renderer.navbar_header(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'navbar-brand' }, text: /foo/)
       end
     end
 
-    context 'with "brand" and "brank_link" parameters' do
+    context 'with "class" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'navbar-brand' }, text: /foo/)
-          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'navbar-brand' }, text: /foo/)
-        end
+        expect(renderer.navbar_header(class: 'bar')).to have_tag :div, with: { class: 'navbar-header bar' }
+      end
+    end
+  end
+
+  describe '#navbar_collapse',:focus do
+    context 'without parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_collapse { 'foo' }).to have_tag :div, with: { class: 'collapse navbar-collapse', id: 'navbar-collapsable' }, text: /foo/
+      end
+    end
+
+    context 'with "class" parameter' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_collapse(class: 'bar')).to have_tag :div, with: { class: 'collapse navbar-collapse bar', id: 'navbar-collapsable' }
       end
     end
   end
@@ -104,32 +115,26 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   describe '#navbar_group' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_group).to have_tag(:ul, with: { class: 'nav navbar-nav' })
-        end
+        expect(renderer.navbar_group).to have_tag(:ul, with: { class: 'nav navbar-nav' })
       end
     end
 
     context 'with "align" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_group(align: 'right')).to have_tag(:ul, with: { class: 'nav navbar-nav navbar-right' })
-          expect(renderer.navbar_group(align: 'left')).to have_tag(:ul, with: { class: 'nav navbar-nav navbar-left' })
-        end
+        expect(renderer.navbar_group(align: 'right')).to have_tag(:ul, with: { class: 'nav navbar-nav navbar-right' })
+        expect(renderer.navbar_group(align: 'left')).to have_tag(:ul, with: { class: 'nav navbar-nav navbar-left' })
       end
     end
   end
 
   describe '#navbar_dropdown' do
     it 'generates the correct HTML' do
-      with_all_3_dot_x_versions do
-        expect(renderer.navbar_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) do
-          with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
-            with_text 'foo '
-            with_tag :b, with: { class: 'caret' }
-          end
-          with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
+      expect(renderer.navbar_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) do
+        with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
+          with_text 'foo '
+          with_tag :b, with: { class: 'caret' }
         end
+        with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
       end
     end
   end
@@ -183,18 +188,16 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
 
     context 'without current URL' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions 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
+        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
@@ -203,17 +206,13 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   describe '#navbar_form' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_form { 'foo' }).to have_tag(:form, with: { class: 'navbar-form', role: 'form' }, text: /foo/)
-        end
+        expect(renderer.navbar_form { 'foo' }).to have_tag(:form, with: { class: 'navbar-form', role: 'form' }, text: /foo/)
       end
     end
 
     context 'with "align" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_form(align: 'left') { 'foo' }).to have_tag(:form, with: { class: 'navbar-form navbar-left', role: 'form' }, text: /foo/)
-        end
+        expect(renderer.navbar_form(align: 'left') { 'foo' }).to have_tag(:form, with: { class: 'navbar-form navbar-left', role: 'form' }, text: /foo/)
       end
     end
   end
@@ -221,33 +220,25 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   describe '#navbar_text' do
     context 'without parameters' do
       it 'raises an error' do
-        with_all_3_dot_x_versions do
-          expect { renderer.navbar_text }.to raise_error(StandardError, 'Please provide either the "text" parameter or a block.')
-        end
+        expect { renderer.navbar_text }.to raise_error(StandardError, 'Please provide either the "text" parameter or a block.')
       end
     end
 
     context 'with "text" parameter and a block' do
       it 'raises an error' do
-        with_all_3_dot_x_versions do
-          expect { renderer.navbar_text }.to raise_error(StandardError, 'Please provide either the "text" parameter or a block.')
-        end
+        expect { renderer.navbar_text }.to raise_error(StandardError, 'Please provide either the "text" parameter or a block.')
       end
     end
 
     context 'with "text" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        end
+        expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
       end
     end
 
     context 'with block' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        end
+        expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
       end
     end
   end
@@ -255,17 +246,13 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   describe '#navbar_button' do
     context 'without parameters' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_button('foo')).to have_tag(:button, with: { class: 'btn navbar-btn', type: 'button' }, text: /foo/)
-        end
+        expect(renderer.navbar_button('foo')).to have_tag(:button, with: { class: 'btn navbar-btn', type: 'button' }, text: /foo/)
       end
     end
 
     context 'with "class" parameter' do
       it 'generates the correct HTML' do
-        with_all_3_dot_x_versions do
-          expect(renderer.navbar_button('foo', class: 'bar')).to have_tag(:button, with: { class: 'btn navbar-btn bar', type: 'button' }, text: /foo/)
-        end
+        expect(renderer.navbar_button('foo', class: 'bar')).to have_tag(:button, with: { class: 'btn navbar-btn bar', type: 'button' }, text: /foo/)
       end
     end
   end

data/spec/support/helpers.rb

@@ -8,22 +8,9 @@ module Helpers
     end.new
   end
 
-  def with_all_2_dot_x_versions(&block)
-    with_versions '2'...'3', &block
-  end
-
-  def with_all_3_dot_x_versions(&block)
-    with_versions '3'...'4', &block
-  end
-
-  def with_version(version, &block)
-    with_versions version..version, &block
-  end
-
-  def with_versions(versions, &block)
-    BootstrapNavbar::BOOTSTRAP_VERSIONS.each do |version|
-      next unless versions.cover?(version)
-      puts "Testing version #{version}..."
+  def with_bootstrap_versions(versions, &block)
+    versions.each do |version|
+      puts "Testing Bootstrap version #{version}..."
       BootstrapNavbar.configuration.bootstrap_version = version
       block.call
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt