bootstrap-navbar 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6cb5d7ab4f17cc09849836050063a1759811c1
-  data.tar.gz: 4f4ed9a21184025348dc77eb803b93a3a18fa1b1
+  metadata.gz: c1bf017cd13c884bc254a7d2c1d52f62544fe429
+  data.tar.gz: 74035cc23f029cb5fae56f2d1089e03435453357
 SHA512:
-  metadata.gz: 589e6877047fdc0dcf224219d9a89ecca22ef1e1b8efdffadedabf918f0e02a4e57778f35bfc9d62b72fb3df35f6e6d5f31085d36011d4189f707348c70cce3a
-  data.tar.gz: 8def888b261d8445b59bcc2ee7010fd44b9aec41fdc48f6ec1144f75e3c189692cd08f89f474b891b45de7c2795a6da0bff43067a0a263ea9d2a6b3e4ae8a6ac
+  metadata.gz: d98ebb16e693c825e5daf3b0b41ac32e8d33e2093d2031be02e40c6945523e0ec49d3632610ca28ec753598f9d38da1d5f02233f10bed157360788437631a5ed
+  data.tar.gz: 243b505a37bfca17f9bc5335b4537a661bbd96e59c1affc7006881ba8b2cddc0ee7ea039699706d52f27c7c005042718ef3eb3bd9a6fdde158fc5ac1fbee3880

data/README.md

@@ -67,477 +67,11 @@ ActionView::Base.send :include, BootstrapNavbar::Helpers
 
 ## Usage
 
-Check out the [Twitter Bootstrap docs](http://twitter.github.io/bootstrap/components.html#navbar) for how a navbar can be constructed. All components and options mentioned there should be supported by this gem, so you don't need to write any HTML by hand. If there is something missing or wrong HTML is generated, please [open an issue](https://github.com/krautcomputing/bootstrap-navbar/issues).
+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:
 
-Let's assume you have mixed in the helper in your rendering engine and use Haml.
+[Usage with Bootstrap 2.x](https://github.com/krautcomputing/bootstrap-navbar/wiki/Usage-with-Bootstrap-2.x)
 
-### Full example
-
-```ruby
-= navbar brand: 'My great app', brand_link: '/home', fixed: :top, responsive: true do
-  = menu_group class: 'foo', id: 'menu' do
-    = menu_text 'Pick an option:'
-    = menu_item "Home", root_path
-    = menu_item "About Us", about_us_path
-    = menu_item contact_path do
-      = image_tag 'contact.jpg'
-      Contact Us!
-    = menu_divider
-    = drop_down "Stuff" do
-      = drop_down_header 'Great stuff!'
-      = menu_item "One", one_path
-      = menu_item "Two", two_path
-      = menu_item "Three", three_path
-      - if current_user.admin?
-        = drop_down_divider
-        = sub_drop_down 'Admin Stuff' do
-          = menu_item "Admin Dashboard", admin_path
-          = menu_item "Users", admin_users_path
-  = menu_group pull: 'right' do
-    - if current_user
-      = menu_item "Log Out", log_out_path
-    - else
-      = menu_item "Log In", log_in_path
-```
-
-### Methods
-
-#### navbar
-
-This method sets up the basic structure of a navbar.
-
-```haml
-= navbar
-```
-
-generates:
-
-```html
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
-  </div>
-</div>
-```
-
-The content of the navbar is supplied by the block and the available options:
-
-```haml
-= navbar do
-  Yay!
-```
-
-generates:
-
-```html
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      Yay!
-    </div>
-  </div>
-</div>
-```
-
-Options `brand` and `brand_link` autogenerate the brand link:
-
-```haml
-= navbar brand: 'My great app', brand_link: '/start'
-```
-
-generates:
-
-```html
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a href="/start" class="brand">My great app</a>
-    </div>
-  </div>
-</div>
-```
-
-If only `brand` is defined, `brand_link` defaults to `/`.
-
-Option `responsive` generates a responsive navbar:
-
-```haml
-= navbar responsive: true
-```
-
-generates:
-
-```html
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-        <span class='icon-bar'></span>
-      </a>
-      <div class="nav-collapse collapse">
-      </div>
-    </div>
-  </div>
-</div>
-```
-
-**Attention: when using the `responsive` option, the brand link should not be added through the `brand_link` method but directly supplied to the `navbar` call.**
-
-Don't do this:
-
-```haml
-= navbar responsive: true do
-  = brand_link 'My great app', '/home'
-```
-
-Do this:
-
-```haml
-= navbar responsive: true, brand: 'My great app', brand_link: '/home'
-```
-
-Otherwise the brand link will be nested incorrectly and will disappear when resizing the window to a smaller size.
-
-Option `fluid` changes the grid system to be [fluid](http://twitter.github.io/bootstrap/scaffolding.html#fluidGridSystem):
-
-```haml
-= navbar fluid: true
-```
-
-generates:
-
-```html
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container-fluid">
-    </div>
-  </div>
-</div>
-```
-
-#### brand_link
-
-This method generates a menu divider, to be used in a `navbar`.
-
-```haml
-= brand_link 'My App', '/home'
-```
-
-generates:
-
-```html
-<a href="/home" class="brand">My App</a>
-```
-
-If the path (`/home` in this case) is not specified, it defaults to `/`.
-
-#### menu_text
-
-This method generates some menu text, to be used in a `navbar`.
-
-```haml
-= menu_text 'Select a option:'
-```
-
-generates:
-
-```html
-<p class="navbar-text">
-  Select a option:
-</p>
-```
-
-A option can be supplied to make the text float to the right or left:
-
-```haml
-= menu_text 'Select a option:', :right
-```
-
-generates:
-
-```html
-<p class="navbar-text pull-right">
-  Select a option:
-</p>
-```
-
-The content can alternatively be supplied in a block:
-
-```haml
-= menu_text do
-  Current country:
-  = image_text 'flags/en.jpg'
-```
-
-generates:
-
-```html
-<p class="navbar-text">
-  Current country:
-  <img src="/images/flags/en.jpg">
-</p>
-```
-
-#### menu_group
-
-This method generates a menu group, to be used in a `navbar`.
-
-```haml
-= menu_group
-```
-
-generates:
-
-```html
-<ul class="nav">
-</ul>
-```
-
-The content of the menu group is supplied by the blocks:
-
-```haml
-= menu_group do
-  Yay!
-```
-
-generates:
-
-```html
-<ul class="nav">
-  Yay!
-</ul>
-```
-
-You can add a `pull` option to make the group float to the right or left, and add more classes and other attributes:
-
-```haml
-= menu_group pull: 'right', class: 'large', id: 'menu'
-```
-
-generates:
-
-```html
-<ul class="nav pull-right large" id="menu">
-</ul>
-```
-
-#### menu_item
-
-This method generates a menu item, to be used in a `menu_group`.
-
-```haml
-= menu_item 'Home', '/home'
-```
-
-generates:
-
-```html
-<li>
-  <a href="/home">
-    Home
-  </a>
-</li>
-```
-
-If the path (`/home` in this case) is not specified, it defaults to `#`.
-
-You can also use a block (e.g., in case the link name is more than a single word):
-
-```haml
-= menu_item /home' do
-  = image_tag 'home.png'
-  Home
-```
-
-generates:
-
-```html
-<li>
-  <a href="/home">
-    <img src="/images/home.png">
-    Home
-  </a>
-</li>
-```
-
-You can add options that will be passed on to the `li` and `a` elements:
-
-```haml
-= menu_item 'Home', '/home', { class: 'list-item' }, { id: 'home' }
-```
-
-generates:
-
-```html
-<li class="list-item">
-  <a href="/home" id="home">
-    Home
-  </a>
-</li>
-```
-
-If the specified path/URL is the [current url](#set-current_url_method-required), it will be marked as `active`. Note that it doesn't matter if you link to a full URL or just the path, or if `BootstrapNavbar.configuration.current_url_method` returns a full URL or just the path, it will work regardless.
-
-```haml
-= menu_item 'Home', '/home'
-```
-
-generates:
-
-```html
-<!-- If the current path is /home -->
-
-<li class="active">
-  <a href="/home">
-    Home
-  </a>
-</li>
-```
-
-#### menu_divider
-
-This method generates a menu divider, to be used in a `menu_group`.
-
-```haml
-= menu_divider
-```
-
-generates:
-
-```html
-<li class="divider-vertical"></li>
-```
-
-#### drop_down
-
-This method generates a dropdown, to be used in a `menu_group`.
-
-```haml
-= drop_down 'Settings'
-```
-
-generates:
-
-```html
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-    Settings <b class="caret"></b>
-  </a>
-  <ul class="dropdown-menu">
-  </ul>
-</li>
-```
-
-The content of the dropdown can be defined in the block using `menu_item`s:
-
-```haml
-= drop_down 'Settings' do
-  = menu_item 'Basic', '/settings/basic'
-  = menu_item 'Advanced', '/settings/advanced'
-```
-
-generates:
-
-```html
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-    Settings <b class="caret"></b>
-  </a>
-  <ul class="dropdown-menu">
-    <li>
-      <a href="/settings/basic">
-        Basic
-      </a>
-    </li>
-    <li>
-      <a href="/settings/advanced">
-        Advanced
-      </a>
-    </li>
-  </ul>
-</li>
-```
-
-#### sub_drop_down
-
-This method generates a sub dropdown, to be used in a `drop_down`.
-
-```haml
-= sub_drop_down 'Admin Settings'
-```
-
-generates:
-
-```html
-<li class="dropdown-submenu">
-  <a href="#">
-    Admin Settings
-  </a>
-  <ul class="dropdown-menu">
-  </ul>
-</li>
-```
-
-Just like in the `drop_down`, the content of the sub dropdown is defined in the block:
-
-```haml
-= sub_drop_down 'Admin Settings' do
-  = menu_item 'Users', '/settings/admin/users'
-  = menu_item 'Stats', '/settings/admin/stats'
-```
-
-generates:
-
-```html
-<li class="dropdown-submenu">
-  <a href="#">
-    Admin Settings
-  </a>
-  <ul class="dropdown-menu">
-    <li>
-      <a href="/settings/admin/users">
-        Users
-      </a>
-    </li>
-    <li>
-      <a href="/settings/admin/stats">
-        Stats
-      </a>
-    </li>
-  </ul>
-</li>
-```
-
-#### drop_down_divider
-
-This method generates a dropdown divider, to be used in a `drop_down` or `sub_drop_down`.
-
-```haml
-= drop_down_divider
-```
-
-generates:
-
-```html
-<li class="divider"></li>
-```
-
-#### drop_down_header
-
-This method generates a dropdown header, to be used in a `drop_down` or `sub_drop_down`.
-
-```haml
-= drop_down_header 'Important!'
-```
-
-generates:
-
-```html
-<li class="nav-header">Important!</li>
-```
+[Usage with Bootstrap 3.x](https://github.com/krautcomputing/bootstrap-navbar/wiki/Usage-with-Bootstrap-3.x)
 
 ## Contributing
 

data/lib/bootstrap-navbar/helpers.rb

@@ -1,15 +1,16 @@
 module BootstrapNavbar::Helpers
   def self.included(base)
-    helper_version = BootstrapNavbar.configuration.bootstrap_version.split('.').first
-    base.send :include, const_get("BootstrapNavbar::Helpers::Bootstrap#{helper_version}")
+    helper_version = BootstrapNavbar.configuration.bootstrap_version[0]
+    base.send :include, const_get("Bootstrap#{helper_version}")
   end
 
-  def with_preceding_space(attributes)
-    ' ' << attributes unless [nil, ''].include?(attributes)
-  end
-
-  def attribute_hash_to_string(hash)
-    hash.map { |k, v| %(#{k}="#{v}") }.join(' ')
+  def attributes_for_tag(hash)
+    string = hash.map { |k, v| %(#{k}="#{v}") }.join(' ')
+    if string.length > 0
+      ' ' << string
+    else
+      string
+    end
   end
 
   def current_url?(url)

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

@@ -1,26 +1,26 @@
 module BootstrapNavbar::Helpers::Bootstrap2
   def navbar(options = {}, &block)
-    navbar_wrapper options do
-      navbar_inner_div do
-        container_div options[:brand], options[:brand_link], options[:responsive], options[:fluid], &block
+    wrapper options do
+      inner_wrapper do
+        container options[:brand], options[:brand_link], options[:responsive], options[:fluid], &block
       end
     end
   end
 
-  def menu_group(options = {}, &block)
+  def navbar_group(options = {}, &block)
     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)
     end
-    attributes = attribute_hash_to_string({ class: css_classes.join(' ') }.merge(options))
+    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
     prepare_html <<-HTML.chomp!
-<ul#{with_preceding_space attributes}>
+<ul#{attributes}>
   #{capture(&block) if block_given?}
 </ul>
 HTML
   end
 
-  def menu_item(name = nil, path = nil, list_item_options = nil, link_options = nil, &block)
+  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 ||= {}
@@ -30,61 +30,61 @@ HTML
       css_classes << 'active' if current_url?(path)
       css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
     end
-    list_item_attributes = attribute_hash_to_string(
+    list_item_attributes = attributes_for_tag(
       { class: list_item_css_classes.join(' ') }
         .delete_if { |k, v| v.empty? }
         .merge(list_item_options)
     )
-    link_attributes = attribute_hash_to_string(link_options)
+    link_attributes = attributes_for_tag(link_options)
     prepare_html <<-HTML.chomp!
-<li#{with_preceding_space list_item_attributes}>
-  <a href="#{path}"#{with_preceding_space link_attributes}>
+<li#{list_item_attributes}>
+  <a href="#{path}"#{link_attributes}>
     #{name}
   </a>
 </li>
 HTML
   end
 
-  def drop_down(name, &block)
+  def navbar_dropdown(name, &block)
     prepare_html <<-HTML.chomp!
 <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">
     #{name} <b class="caret"></b>
   </a>
-  #{drop_down_menu(&block)}
+  #{dropdown_menu(&block)}
 </li>
 HTML
   end
 
-  def sub_drop_down(name, list_item_options = {}, link_options = {}, &block)
+  def navbar_sub_dropdown(name, list_item_options = {}, link_options = {}, &block)
     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
-    list_item_attributes = attribute_hash_to_string({ class: list_item_css_classes.join(' ') }.merge(list_item_options))
-    link_attributes = attribute_hash_to_string(link_options)
+    list_item_attributes = attributes_for_tag({ class: list_item_css_classes.join(' ') }.merge(list_item_options))
+    link_attributes = attributes_for_tag(link_options)
     prepare_html <<-HTML.chomp!
-<li#{with_preceding_space list_item_attributes}>
-  <a href="#"#{with_preceding_space link_attributes}>
+<li#{list_item_attributes}>
+  <a href="#"#{link_attributes}>
     #{name}
   </a>
-  #{drop_down_menu(&block)}
+  #{dropdown_menu(&block)}
 </li>
 HTML
   end
 
-  def drop_down_divider
+  def navbar_dropdown_divider
     prepare_html %(<li class="divider"></li>)
   end
 
-  def drop_down_header(text)
+  def navbar_dropdown_header(text)
     prepare_html %(<li class="nav-header">#{text}</li>)
   end
 
-  def menu_divider
+  def navbar_divider
     prepare_html %(<li class="divider-vertical"></li>)
   end
 
-  def menu_text(text = nil, pull = nil, &block)
+  def navbar_text(text = nil, pull = nil, &block)
     css_classes = %w(navbar-text).tap do |css_classes|
       css_classes << "pull-#{pull}" if pull
     end
@@ -95,13 +95,13 @@ HTML
 HTML
   end
 
-  def brand_link(name, url = nil)
+  def navbar_brand_link(name, url = nil)
     prepare_html %(<a href="#{url || '/'}" class="brand">#{name}</a>)
   end
 
   private
 
-  def navbar_wrapper(options, &block)
+  def wrapper(options, &block)
     position = case
     when options.has_key?(:static)
       "static-#{options[:static]}"
@@ -114,16 +114,16 @@ HTML
       css_classes << 'navbar-inverse' if options[:inverse]
     end
     attribute_hash = { class: css_classes.join(' ') }
-    attributes = attribute_hash_to_string(attribute_hash)
+    attributes = attributes_for_tag(attribute_hash)
 
     prepare_html <<-HTML.chomp!
-<div#{with_preceding_space attributes}>
+<div#{attributes}>
   #{capture(&block) if block_given?}
 </div>
 HTML
   end
 
-  def navbar_inner_div(&block)
+  def inner_wrapper(&block)
     prepare_html <<-HTML.chomp!
 <div class="navbar-inner">
   #{capture(&block) if block_given?}
@@ -131,11 +131,11 @@ HTML
 HTML
   end
 
-  def container_div(brand, brand_link, responsive, fluid, &block)
+  def container(brand, brand_link, responsive, fluid, &block)
     css_class = fluid ? 'container-fluid' : 'container'
     content = [].tap do |content|
       content << responsive_button if responsive
-      content << brand_link(brand, brand_link) if brand || brand_link
+      content << navbar_brand_link(brand, brand_link) if brand || brand_link
       content << if responsive
         responsive_wrapper(&block)
       else
@@ -153,9 +153,9 @@ HTML
     css_classes = %w(nav-collapse).tap do |css_classes|
       css_classes << 'collapse' if BootstrapNavbar.configuration.bootstrap_version >= '2.2.0'
     end
-    attributes = attribute_hash_to_string({ class: css_classes.join(' ') })
+    attributes = attributes_for_tag({ class: css_classes.join(' ') })
     prepare_html <<-HTML.chomp!
-<div#{with_preceding_space attributes}>
+<div#{attributes}>
   #{capture(&block) if block_given?}
 </div>
 HTML
@@ -171,7 +171,7 @@ HTML
 HTML
   end
 
-  def drop_down_menu(&block)
+  def dropdown_menu(&block)
     prepare_html <<-HTML.chomp!
 <ul class="dropdown-menu">
   #{capture(&block) if block_given?}

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

@@ -2,11 +2,11 @@ module BootstrapNavbar::Helpers::Bootstrap3
   def navbar(options = {}, &block)
     container = options.has_key?(:container) ? options[:container] : true
     navbar_content =
-      navbar_header(options[:brand], options[:brand_link]) <<
-      navbar_collapsable(&block)
-    navbar_wrapper options do
+      header(options[:brand], options[:brand_link]) <<
+      collapsable(&block)
+    wrapper options do
       if container
-        navbar_container(navbar_content)
+        container(navbar_content)
       else
         navbar_content
       end
@@ -17,14 +17,25 @@ module BootstrapNavbar::Helpers::Bootstrap3
     css_classes = %w(nav navbar-nav).tap do |css_classes|
       css_classes << "navbar-#{options[:align]}" if options.has_key?(:align)
     end
-    attributes = attribute_hash_to_string({ class: css_classes.join(' ') }.merge(options))
+    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
     prepare_html <<-HTML.chomp!
-<ul#{with_preceding_space attributes}>
+<ul#{attributes}>
   #{capture(&block) if block_given?}
 </ul>
 HTML
   end
 
+  def navbar_group_item(text, url)
+    attributes = {}
+    attributes[:class] = 'active' if current_url?(url)
+    attributes = attributes_for_tag(attributes)
+    prepare_html <<-HTML.chomp!
+<li#{attributes}>
+  <a href="#{url}">#{text}</a>
+</li>
+HTML
+  end
+
   def navbar_dropdown(text, &block)
     prepare_html <<-HTML.chomp!
 <li class="dropdown">
@@ -36,25 +47,14 @@ HTML
 HTML
   end
 
-  def navbar_group_item(text, url)
-    attributes = {}
-    attributes[:class] = 'active' if current_url?(url)
-    attributes = attribute_hash_to_string(attributes)
-    prepare_html <<-HTML.chomp!
-<li#{with_preceding_space attributes}>
-  <a href="#{url}">#{text}</a>
-</li>
-HTML
-  end
-
   def navbar_form(options = {}, &block)
     css_classes = %w(navbar-form).tap do |css_classes|
       css_classes << "navbar-#{options[:align]}" if options.has_key?(:align)
     end
     attribute_hash = { class: css_classes.join(' '), role: 'form' }
-    attributes = attribute_hash_to_string(attribute_hash)
+    attributes = attributes_for_tag(attribute_hash)
     prepare_html <<-HTML.chomp!
-<form#{with_preceding_space attributes}>
+<form#{attributes}>
   #{capture(&block) if block_given?}
 </form>
 HTML
@@ -79,15 +79,15 @@ HTML
       css_classes << options[:class] if options.has_key?(:class)
     end
     attribute_hash = { class: css_classes.join(' '), type: 'button' }
-    attributes = attribute_hash_to_string(attribute_hash)
+    attributes = attributes_for_tag(attribute_hash)
     prepare_html <<-HTML.chomp!
-<button#{with_preceding_space attributes}>#{text}</button>
+<button#{attributes}>#{text}</button>
 HTML
   end
 
   private
 
-  def navbar_container(content)
+  def container(content)
     prepare_html <<-HTML.chomp!
 <div class="container">
   #{content}
@@ -95,7 +95,7 @@ HTML
 HTML
   end
 
-  def navbar_header(brand, brand_link)
+  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">
@@ -109,7 +109,7 @@ HTML
 HTML
   end
 
-  def navbar_collapsable(&block)
+  def collapsable(&block)
     prepare_html <<-HTML.chomp!
 <div class="collapse navbar-collapse" id="navbar-collapsable">
   #{capture(&block) if block_given?}
@@ -121,7 +121,7 @@ HTML
     prepare_html %(<a href="#{url || '/'}" class="navbar-brand">#{name}</a>)
   end
 
-  def navbar_wrapper(options, &block)
+  def wrapper(options, &block)
     style = options[:inverse] ? 'inverse' : 'default'
     css_classes = %w(navbar).tap do |css_classes|
       css_classes << "navbar-fixed-#{options[:fixed]}" if options.has_key?(:fixed)
@@ -130,9 +130,9 @@ HTML
       css_classes << "navbar-#{style}"
     end
     attribute_hash = { class: css_classes.join(' '), role: 'navigation' }
-    attributes = attribute_hash_to_string(attribute_hash)
+    attributes = attributes_for_tag(attribute_hash)
     prepare_html <<-HTML.chomp!
-<nav#{with_preceding_space attributes}>
+<nav#{attributes}>
   #{capture(&block) if block_given?}
 </nav>
 HTML

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '1.0.0.pre2'
+  VERSION = '1.0.0.pre3'
 end

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

@@ -6,7 +6,7 @@ shared_examples 'active menu item' 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.menu_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' })
+          expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' })
         end
       end
     end
@@ -109,12 +109,12 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     end
   end
 
-  describe '#menu_group' do
+  describe '#navbar_group' do
     context 'without parameters' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.menu_group).to have_tag(:ul, with: { class: 'nav' })
-          expect(renderer.menu_group { 'foo' }).to have_tag(:ul, with: { class: 'nav' }, text: /foo/)
+          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
     end
@@ -122,7 +122,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     context 'with "pull" parameter' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.menu_group(pull: 'right')).to have_tag(:ul, with: { class: 'nav pull-right' })
+          expect(renderer.navbar_group(pull: 'right')).to have_tag(:ul, with: { class: 'nav pull-right' })
         end
       end
     end
@@ -130,7 +130,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     context 'with "class" parameter' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.menu_group(class: 'foo')).to have_tag(:ul, with: { class: 'nav foo' })
+          expect(renderer.navbar_group(class: 'foo')).to have_tag(:ul, with: { class: 'nav foo' })
         end
       end
     end
@@ -138,7 +138,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     context 'with random parameters' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.menu_group(:'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav', :'data-foo' => 'bar' })
+          expect(renderer.navbar_group(:'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav', :'data-foo' => 'bar' })
         end
       end
     end
@@ -146,13 +146,13 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     context 'with many parameters' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.menu_group(pull: 'right', class: 'foo', :'data-foo' => 'bar')).to have_tag(:ul, with: { class: 'nav foo pull-right', :'data-foo' => 'bar' })
+          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
   end
 
-  describe '#menu_item' do
+  describe '#navbar_item' do
     context 'with current URL or path' do
       # With root URL or path
       it_behaves_like 'active menu item' do
@@ -202,7 +202,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
             BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.menu_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'active bar', id: 'baz' })
+            expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'active bar', id: 'baz' })
           end
         end
       end
@@ -211,7 +211,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
             BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.menu_item('foo', '/', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active' }) do
+            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
@@ -222,7 +222,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
             BootstrapNavbar.configuration.current_url_method = '"/"'
-            expect(renderer.menu_item('foo', '/', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'active bar', id: 'baz' }) do
+            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
@@ -234,17 +234,17 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
           BootstrapNavbar.configuration.current_url_method = '"/foo"'
-          expect(renderer.menu_item('foo')).to have_tag(:li, without: { class: 'active' }) do
+          expect(renderer.navbar_item('foo')).to have_tag(:li, without: { class: 'active' }) do
             with_tag :a, with: { href: '#' }, text: /foo/
           end
-          expect(renderer.menu_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
+          expect(renderer.navbar_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
             with_tag :a, with: { href: '/' }, text: /foo/
           end
-          expect(renderer.menu_item('foo', '/bar')).to have_tag(:li, without: { class: 'active' }) do
+          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.menu_item('foo', '/foo')).to have_tag(:li, without: { class: 'active' }) do
+          expect(renderer.navbar_item('foo', '/foo')).to have_tag(:li, without: { class: 'active' }) do
             with_tag :a, with: { href: '/foo' }, text: /foo/
           end
         end
@@ -254,7 +254,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
             BootstrapNavbar.configuration.current_url_method = '"/foo"'
-            expect(renderer.menu_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, without: { class: 'active' }, with: { class: 'bar', id: 'baz' })
+            expect(renderer.navbar_item('foo', '/', class: 'bar', id: 'baz')).to have_tag(:li, without: { class: 'active' }, with: { class: 'bar', id: 'baz' })
           end
         end
       end
@@ -263,7 +263,7 @@ 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.menu_item { 'bar' }).to have_tag(:li) do
+          expect(renderer.navbar_item { 'bar' }).to have_tag(:li) do
             with_tag :a, with: { href: '#' }, text: /bar/
           end
         end
@@ -272,7 +272,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with list item options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.menu_item('/foo', class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li, with: { class: 'pelle', id: 'fant' }) 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
           end
@@ -282,7 +282,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with link options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.menu_item('/foo', {}, class: 'pelle', id: 'fant') { 'bar' }).to have_tag(:li) 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
           end
@@ -292,7 +292,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with list item options and link options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.menu_item('/foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant') { 'shnoo' }).to have_tag(:li, with: { class: 'bar', id: 'baz' }) 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
           end
@@ -301,46 +301,46 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     end
   end
 
-  context 'drop downs' do
-    def with_drop_down_menu(content = nil)
+  context 'dropdowns' do
+    def with_dropdown_menu(content = nil)
       options = { with: { class: 'dropdown-menu' } }
       options[:content] = content unless content.nil?
       with_tag :ul, options
     end
 
-    describe '#drop_down' do
+    describe '#navbar_dropdown' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.drop_down('foo')).to have_tag(:li, with: { class: 'dropdown' }) 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_drop_down_menu
+            with_dropdown_menu
           end
 
-          expect(renderer.drop_down('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) 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_drop_down_menu('bar')
+            with_dropdown_menu('bar')
           end
         end
       end
     end
 
-    describe '#sub_drop_down' do
+    describe '#navbar_sub_dropdown' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.sub_drop_down('foo')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
+          expect(renderer.navbar_sub_dropdown('foo')).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
             with_tag :a, with: { href: '#' }, text: /foo/
-            with_drop_down_menu
+            with_dropdown_menu
           end
 
-          expect(renderer.sub_drop_down('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
+          expect(renderer.navbar_sub_dropdown('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
             with_tag :a, with: { href: '#' }, text: /foo/
-            with_drop_down_menu('bar')
+            with_dropdown_menu('bar')
           end
         end
       end
@@ -348,7 +348,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with list item options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.sub_drop_down('foo', class: 'bar', id: 'baz')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) 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
           end
@@ -358,7 +358,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with link options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.sub_drop_down('foo', {}, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu' }) 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
           end
@@ -368,7 +368,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       context 'with list item options and link options' do
         it 'generates the correct HTML' do
           with_all_2_dot_x_versions do
-            expect(renderer.sub_drop_down('foo', { class: 'bar', id: 'baz' }, class: 'pelle', id: 'fant')).to have_tag(:li, with: { class: 'dropdown-submenu bar', id: 'baz' }) 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
           end
@@ -377,46 +377,46 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     end
   end
 
-  describe '#drop_down_divider' do
+  describe '#navbar_dropdown_divider' do
     it 'generates the correct HTML' do
       with_all_2_dot_x_versions do
-        expect(renderer.drop_down_divider).to have_tag(:li, with: { class: 'divider' }, text: '')
+        expect(renderer.navbar_dropdown_divider).to have_tag(:li, with: { class: 'divider' }, text: '')
       end
     end
   end
 
-  describe '#drop_down_header' do
+  describe '#navbar_dropdown_header' do
     it 'generates the correct HTML' do
       with_all_2_dot_x_versions do
-        expect(renderer.drop_down_header('foo')).to have_tag(:li, with: { class: 'nav-header' }, text: /foo/)
+        expect(renderer.navbar_dropdown_header('foo')).to have_tag(:li, with: { class: 'nav-header' }, text: /foo/)
       end
     end
   end
 
-  describe '#menu_divider' do
+  describe '#navbar_divider' do
     it 'generates the correct HTML' do
       with_all_2_dot_x_versions do
-        expect(renderer.menu_divider).to have_tag(:li, with: { class: 'divider-vertical' }, text: '')
+        expect(renderer.navbar_divider).to have_tag(:li, with: { class: 'divider-vertical' }, text: '')
       end
     end
   end
 
-  describe '#menu_text' do
+  describe '#navbar_text' do
     it 'generates the correct HTML' do
       with_all_2_dot_x_versions do
-        expect(renderer.menu_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        expect(renderer.menu_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
-        expect(renderer.menu_text('foo', 'right')).to have_tag(:p, with: { class: 'navbar-text pull-right' }, text: /foo/)
-        expect(renderer.menu_text(nil, 'left') { 'foo' }).to have_tag(:p, with: { class: 'navbar-text pull-left' }, text: /foo/)
+        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
   end
 
-  describe '#brand_link' do
+  describe '#navbar_brand_link' do
     it 'generates the correct HTML' do
       with_all_2_dot_x_versions do
-        expect(renderer.brand_link('foo')).to have_tag(:a, with: { class: 'brand', href: '/' }, text: /foo/)
-        expect(renderer.brand_link('foo', '/foo')).to have_tag(:a, with: { class: 'brand', href: '/foo' }, text: /foo/)
+        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

@@ -6,7 +6,7 @@ shared_examples 'active navbar link' 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_group_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' }) do
+          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
@@ -131,7 +131,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     end
   end
 
-  describe '#navbar_group_item' do
+  describe '#navbar_item' do
     context 'with current URL or path' do
       # With root URL or path
       it_behaves_like 'active navbar link' do
@@ -182,14 +182,14 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
           BootstrapNavbar.configuration.current_url_method = '"/foo"'
-          expect(renderer.navbar_group_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
+          expect(renderer.navbar_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
             with_tag :a, with: { href: '/' }, text: /foo/
           end
-          expect(renderer.navbar_group_item('foo', '/bar')).to have_tag(:li, without: { class: 'active' }) do
+          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_group_item('foo', '/foo')).to have_tag(:li, without: { class: 'active' }) do
+          expect(renderer.navbar_item('foo', '/foo')).to have_tag(:li, without: { class: 'active' }) do
             with_tag :a, with: { href: '/foo' }, text: /foo/
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - Manuel Meurer
@@ -114,7 +114,6 @@ files:
 - lib/bootstrap-navbar/version.rb
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
-- spec/bootstrap-navbar/helpers_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
 homepage: https://github.com/krautcomputing/bootstrap-navbar
@@ -144,7 +143,6 @@ summary: Helpers to generate a Twitter Bootstrap style navbar
 test_files:
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
-- spec/bootstrap-navbar/helpers_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
 has_rdoc: