bootstrap-navbar 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca443255cbdf271153acd52fa96e6d787f4cc391
-  data.tar.gz: 1450fb288c7eff37123cf59c4b6e4a1261f966d1
+  metadata.gz: edb6e5a1db3492adc9a4db8de92cc9d3e3b62350
+  data.tar.gz: 9ffa64927759a09172cad2abf3d54b71a071716a
 SHA512:
-  metadata.gz: 0ad5a23c193df18e26bbaec8b687a9697b1b1d165d626e50e424b1049764c381fa891de3771af7cf92fe5bc41c9c114cfb092968b852dd20fb5a1f6146b359fd
-  data.tar.gz: 47bd7e4873484fa597d5d2b378cda36c03f9a0815850987d7fbe4bed71a8ddc3d66188e9c141529c2351b750c8334ee3c255e9538b856b662896c836fba5e8bc
+  metadata.gz: 2e7765b69cb4cea0f7e3e67d00236da40fb1890c58fdf0739e3617d6f7c3402a859395cf4e8decb60d3e97fdf4d202dd4c50f2da7d4895ca97cecc8418a7bdc1
+  data.tar.gz: ff518322e2ff2da4e7990c42f987cd55745726ae2a1636bac0bbd18fff06b39aee64366d9123f40c238df3184499fb64c3f5be46c2fe667622f65df902d74f05

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 before_install:
   - gem update --system
   - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.0
+
+* Add support for `root_paths` configuration
+
 ## 2.3.0
 
 * Add support for Bootstrap 4

data/README.md

@@ -65,7 +65,7 @@ When deciding whether a navbar link is marked as current, the following steps ar
 * If the link target is one of the root paths (only "/" by default), the link is only marked as current if the target is the current path.
 * Otherwise the link is marked as current if the target is the current path or a sub path of the current path.
 
-In certain cases a website might want to treat more paths as root paths, e.g. when it has different locales mapped at /en, /de etc. This can be achieved by setting the `root_paths` configuration.
+In certain cases you might want to treat more paths as root paths, e.g. when different locales are mapped at "/en", "/de" etc. This can be achieved by setting the `root_paths` configuration.
 
 ```ruby
 BootstrapNavbar.configure do |config|
@@ -73,7 +73,7 @@ BootstrapNavbar.configure do |config|
 end
 ```
 
-With this configuration, if your brand link would be '/en' for example, it would not be marked as current if you are on '/en/some-page'.
+With this configuration, if your brand link would be "/en" for example, it would not be marked as current if you are on "/en/some-page".
 
 ### Mix in the helpers into the rendering engine (required)
 

data/bootstrap-navbar.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -25,7 +23,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.0'
   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'
+  gem.add_development_dependency 'padrino-helpers', '~> 0.13.3' # padrino-support 0.14.0 dropped the dependency on activesupport, which we need
   gem.add_development_dependency 'bootstrap-sass', '3.0.2.0'
+  gem.add_development_dependency 'bootstrap', '4.0.0.alpha6'
   gem.add_runtime_dependency 'gem_config', '~> 0.3'
 end

data/lib/bootstrap-navbar/helpers.rb

@@ -1,13 +1,12 @@
 module BootstrapNavbar::Helpers
   def self.included(base)
     if BootstrapNavbar.configuration.bootstrap_version.nil?
-      if Gem.loaded_specs.keys.include?('bootstrap-sass')
-        bootstrap_sass_version = Gem.loaded_specs['bootstrap-sass'].version
-        bootstrap_version = bootstrap_sass_version.segments.take(3).join('.')
-        BootstrapNavbar.configuration.bootstrap_version = bootstrap_version
-      else
+      unless bootstrap_gem = %w(bootstrap bootstrap-sass).detect { |gem| Gem.loaded_specs.keys.include?(gem) }
         raise 'Bootstrap version is not configured.'
       end
+      bootstrap_gem_version = Gem.loaded_specs[bootstrap_gem].version
+      bootstrap_version = bootstrap_gem_version.segments.take(3).join('.')
+      BootstrapNavbar.configuration.bootstrap_version = bootstrap_version
     end
     helper_version = BootstrapNavbar.configuration.bootstrap_version[0]
     base.send :include, const_get("Bootstrap#{helper_version}")

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

@@ -9,11 +9,10 @@ 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.key?(:pull)
-      css_classes << options.delete(:class) if options.key?(:class)
-    end
-    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
+    options[:class] = [options[:class], 'nav'].compact
+    options[:class] << "pull-#{options.delete(:pull)}" if options.key?(:pull)
+    options[:class] = options[:class].join(' ')
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <ul#{attributes}>
   #{capture(&block) if block_given?}
@@ -23,19 +22,14 @@ 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   = 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_or_sub_url?(path)
-      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(' ') }
-        .delete_if { |k, v| v.empty? }
-        .merge(list_item_options)
-    )
-    link_attributes = attributes_for_tag(link_options)
+    path ||= '#'
+    list_item_options   = list_item_options ? list_item_options.dup : {}
+    link_options        = link_options      ? link_options.dup      : {}
+    list_item_options[:class] = [list_item_options[:class]].compact
+    list_item_options[:class] << 'active' if current_url_or_sub_url?(path)
+    list_item_options[:class] = list_item_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="#{path}"#{link_attributes}>
@@ -58,11 +52,9 @@ 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.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)
+    list_item_options[:class] = [list_item_options.delete(:class), 'dropdown-submenu'].compact.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="#"#{link_attributes}>
@@ -86,9 +78,8 @@ HTML
   end
 
   def navbar_text(text = nil, pull = nil, &block)
-    css_classes = %w(navbar-text).tap do |css_classes|
-      css_classes << "pull-#{pull}" if pull
-    end
+    css_classes = %w(navbar-text)
+    css_classes << "pull-#{pull}" if pull
     prepare_html <<-HTML.chomp!
 <p class="#{css_classes.join(' ')}">
   #{block_given? ? capture(&block) : text}
@@ -105,18 +96,14 @@ HTML
   def wrapper(options, html_options, &block)
     options, html_options = options.dup, html_options.dup
     position = case
-    when options.key?(:static)
-      "static-#{options[:static]}"
-    when options.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]
-      css_classes << html_options.delete(:class)
-    end
-    attribute_hash = { class: css_classes.join(' ') }.merge(html_options)
-    attributes = attributes_for_tag(attribute_hash)
+               when options.key?(:static) then "static-#{options[:static]}"
+               when options.key?(:fixed)  then "fixed-#{options[:fixed]}"
+               end
+    html_options[:class] = [html_options[:class], 'navbar'].compact
+    html_options[:class] << "navbar-#{position}" if position
+    html_options[:class] << 'navbar-inverse'     if options[:inverse]
+    html_options[:class] = html_options[:class].join(' ')
+    attributes = attributes_for_tag(html_options)
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
   #{capture(&block) if block_given?}
@@ -134,14 +121,13 @@ HTML
 
   def container(brand, brand_link, responsive, fluid, &block)
     css_class = fluid ? 'container-fluid' : 'container'
-    content = [].tap do |content|
-      content << responsive_button if responsive
-      content << navbar_brand_link(brand, brand_link) if brand || brand_link
-      content << if responsive
-        responsive_wrapper(&block)
-      else
-        capture(&block) if block_given?
-      end
+    content = []
+    content << responsive_button if responsive
+    content << navbar_brand_link(brand, brand_link) if brand || brand_link
+    content << if responsive
+      responsive_wrapper(&block)
+    else
+      capture(&block) if block_given?
     end
     prepare_html <<-HTML.chomp!
 <div class="#{css_class}">
@@ -151,10 +137,9 @@ HTML
   end
 
   def responsive_wrapper(&block)
-    css_classes = %w(nav-collapse).tap do |css_classes|
-      css_classes << 'collapse' if BootstrapNavbar.configuration.bootstrap_version >= '2.2.0'
-    end
-    attributes = attributes_for_tag({ class: css_classes.join(' ') })
+    css_classes = %w(nav-collapse)
+    css_classes << 'collapse' if BootstrapNavbar.configuration.bootstrap_version >= '2.2.0'
+    attributes = attributes_for_tag(class: css_classes.join(' '))
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
   #{capture(&block) if block_given?}

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

@@ -14,10 +14,8 @@ module BootstrapNavbar::Helpers::Bootstrap3
   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.key?(:class)
-    end
-    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    options[:class] = [options[:class], 'navbar-header'].compact.join(' ')
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
   <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapsable">
@@ -34,10 +32,9 @@ 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.key?(:class)
-    end
-    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), id: 'navbar-collapsable'))
+    options[:class] = [options[:class], 'collapse', 'navbar-collapse'].compact.join(' ')
+    options[:id] ||= 'navbar-collapsable'
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <div#{attributes}>
   #{capture(&block) if block_given?}
@@ -47,11 +44,10 @@ 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.key?(:align)
-      css_classes << options.delete(:class) if options.key?(:class)
-    end
-    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    options[:class] = [options[:class], 'nav', 'navbar-nav'].compact
+    options[:class] << "navbar-#{options.delete(:align)}" if options.key?(:align)
+    options[:class] = options[:class].join(' ')
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <ul#{attributes}>
   #{capture(&block) if block_given?}
@@ -61,18 +57,13 @@ 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, 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 = [].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
-    list_item_attributes = attributes_for_tag(
-      { class: list_item_css_classes.join(' ') }
-        .delete_if { |k, v| v.empty? }
-        .merge(list_item_options)
-    )
+    url ||= '#'
+    list_item_options   = list_item_options ? list_item_options.dup : {}
+    link_options        = link_options      ? link_options.dup      : {}
+    list_item_options[:class] = [list_item_options[:class]].compact
+    list_item_options[:class] << 'active' if current_url_or_sub_url?(url)
+    list_item_options[:class] = list_item_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}>
@@ -85,12 +76,11 @@ 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.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))
+    options[:class] = [options[:class], 'navbar-form'].compact
+    options[:class] << "navbar-#{options.delete(:align)}" if options.key?(:align)
+    options[:class] = options[:class].join(' ')
+    options[:role] ||= 'form'
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <form action="#{url}" #{attributes}>
   #{capture(&block) if block_given?}
@@ -99,13 +89,11 @@ HTML
   end
 
   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?)
+    raise StandardError, 'Please provide either the "text" parameter or a block.' if !!text == block_given?
     options = options.dup
     text ||= capture(&block)
-    css_classes = %w(navbar-text).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(' ')))
+    options[:class] = [options[:class], 'navbar-text'].compact.join(' ')
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <p#{attributes}>#{text}</p>
 HTML
@@ -113,11 +101,9 @@ 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.key?(:class)
-    end
-    type = options.delete(:type) || 'button'
-    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' '), type: type))
+    options[:class] = [options[:class], 'btn', 'navbar-btn'].compact.join(' ')
+    options[:type] ||= 'button'
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <button#{attributes}>#{text}</button>
 HTML
@@ -177,14 +163,13 @@ HTML
 
   def wrapper(options, &block)
     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.key?(:fixed)
-      css_classes << 'navbar-static-top' if options.delete(:static)
-      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))
+    options[:class] = [options[:class], 'navbar'].compact
+    options[:class] << "navbar-#{options.delete(:inverse) ? 'inverse' : 'default'}"
+    options[:class] << "navbar-fixed-#{options.delete(:fixed)}" if options.key?(:fixed)
+    options[:class] << 'navbar-static-top' if options.delete(:static)
+    options[:class] = options[:class].join(' ')
+    options[:role] ||= 'navigation'
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <nav#{attributes}>
   #{capture(&block) if block_given?}

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

@@ -17,31 +17,29 @@ module BootstrapNavbar::Helpers::Bootstrap4
       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
+    options[:class] = [options[:class], 'collapse'].compact
+    options[:class] << "navbar-toggleable-#{toggleable}" if toggleable
+    options[:class] = options[:class].join(' ')
     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
+                              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))
+    options[:id] ||= 'navbar-collapsable'
+    attributes = attributes_for_tag(options)
     toggler_attributes = attributes_for_tag(
       class:             toggler_css_classes.join(' '),
       type:              'button',
       'data-toggle'   => 'collapse',
-      'data-target'   => "##{id}",
-      'aria-controls' => id,
+      'data-target'   => "##{options[:id]}",
+      'aria-controls' => options[:id],
       'aria-expanded' => false,
       'aria-label'    => 'Toggle navigation'
     )
@@ -57,10 +55,8 @@ HTML
 
   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(' ')))
+    options[:class] = [options[:class], 'nav', 'navbar-nav'].compact.join(' ')
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <ul#{attributes}>
   #{capture(&block) if block_given?}
@@ -70,26 +66,15 @@ 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, 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)
-    )
+    url ||= '#'
+    list_item_options   = list_item_options ? list_item_options.dup : {}
+    link_options        = link_options      ? link_options.dup      : {}
+    list_item_options[:class] = [list_item_options[:class], 'nav-item'].compact
+    list_item_options[:class] << 'active' if current_url_or_sub_url?(url)
+    list_item_options[:class] = list_item_options[:class].join(' ')
+    link_options[:class] = [link_options[:class], 'nav-link'].compact.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}>
@@ -119,14 +104,13 @@ HTML
 
   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
+    options[:class] = [options[:class], 'navbar'].compact
+    options[:class] << "navbar-#{options.key?(:color_scheme) ? options.delete(:color_scheme) : 'dark'}"
+    options[:class] << "bg-#{options.delete(:bg) || 'primary'}" unless options[:bg] == false
+    options[:class] << "navbar-#{options.delete(:placement)}" if options.key?(:placement)
+    options[:class] = options[:class].join(' ')
     brand = brand_link(options[:brand], options[:brand_url]) if options[:brand]
-    attributes = attributes_for_tag(options.reverse_merge(class: css_classes.join(' ')))
+    attributes = attributes_for_tag(options)
     prepare_html <<-HTML.chomp!
 <nav#{attributes}>
   #{brand}

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/spec/bootstrap-navbar/helpers_spec.rb

@@ -21,16 +21,20 @@ describe BootstrapNavbar::Helpers do
         BootstrapNavbar.configuration.unset :bootstrap_version
       end
 
-      context 'when bootstrap-sass gem is not loaded' do
+      def remove_gems_from_loaded_specs(*gems)
+        loaded_specs = Gem.loaded_specs.dup
+        gems.each do |gem|
+          loaded_specs.delete(gem)
+        end
+        allow(Gem).to receive(:loaded_specs).and_return(loaded_specs)
+      end
+
+      context 'when neither the bootstrap-sass gem nor the bootstrap gem is not loaded' do
         before do
-          # Remove bootstrap-sass from loaded specs
-          loaded_specs = Gem.loaded_specs.dup
-          loaded_specs.delete('bootstrap-sass')
-          allow(Gem).to receive(:loaded_specs).and_return(loaded_specs)
+          remove_gems_from_loaded_specs('bootstrap-sass', 'bootstrap')
         end
 
         it 'raises an exception' do
-          expect(Gem.loaded_specs.keys).to_not include('bootstrap-sass')
           expect do
             Class.new do
               include BootstrapNavbar::Helpers
@@ -39,9 +43,12 @@ describe BootstrapNavbar::Helpers do
         end
       end
 
-      context 'when bootstrap-sass gem is loaded' do
+      context 'when only the bootstrap-sass gem is loaded' do
+        before do
+          remove_gems_from_loaded_specs('bootstrap')
+        end
+
         it 'sniffs the Bootstrap version from bootstrap-sass' do
-          expect(Gem.loaded_specs.keys).to include('bootstrap-sass')
           expect do
             Class.new do
               include BootstrapNavbar::Helpers
@@ -50,6 +57,21 @@ describe BootstrapNavbar::Helpers do
           expect(BootstrapNavbar.configuration.bootstrap_version).to eq('3.0.2')
         end
       end
+
+      context 'when only the bootstrap gem is loaded' do
+        before do
+          remove_gems_from_loaded_specs('bootstrap-sass')
+        end
+
+        it 'sniffs the Bootstrap version from bootstrap-sass' do
+          expect do
+            Class.new do
+              include BootstrapNavbar::Helpers
+            end
+          end.to_not raise_exception
+          expect(BootstrapNavbar.configuration.bootstrap_version).to eq('4.0.0')
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.2.0
+- !ruby/object:Gem::Dependency
+  name: bootstrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.alpha6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.alpha6
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar