twitter-bootstrap-rails 2.2.6 → 2.2.7

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,5 +1,10 @@
 module TwitterBreadcrumbsHelper
-  def render_breadcrumbs(divider = '/')
-    render :partial => 'twitter-bootstrap/breadcrumbs', :locals => { :divider => divider }
+  def render_breadcrumbs(divider = '/', &block)
+    content = render :partial => 'twitter-bootstrap/breadcrumbs', :layout => false, :locals => { :divider => divider }
+    if block_given?
+      capture(content, &block)
+    else
+      content
+    end
   end
 end

data/lib/generators/bootstrap/install/install_generator.rb

@@ -10,20 +10,24 @@ module Bootstrap
 
       def add_assets
 
-        if File.exist?('app/assets/javascripts/application.js')
-          insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
+        js_manifest = 'app/assets/javascripts/application.js'
+
+        if File.exist?(js_manifest)
+          insert_into_file js_manifest, "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
         else
-          copy_file "application.js", "app/assets/javascripts/application.js"
+          copy_file "application.js", js_manifest
         end
 
-        if File.exist?('app/assets/stylesheets/application.css')
+        css_manifest = 'app/assets/stylesheets/application.css'
+
+        if File.exist?(css_manifest)
           # Add our own require:
-          content = File.read("app/assets/stylesheets/application.css")
+          content = File.read(css_manifest)
           if content.match(/require_tree\s+\.\s*$/)
             # Good enough - that'll include our bootstrap_and_overrides.css.less
           else
             style_require_block = " *= require bootstrap_and_overrides\n"
-            insert_into_file "app/assets/stylesheets/application.css", style_require_block, :after => "require_self\n"
+            insert_into_file css_manifest, style_require_block, :after => "require_self\n"
           end
         else
           copy_file "application.css", "app/assets/stylesheets/application.css"

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -2,19 +2,18 @@
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png");
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
-//       have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot?v=3.0.2");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot?#iefix&v=3.0.2");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff?v=3.0.2");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf?v=3.0.2");
+@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
+@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
 
 // Font Awesome
-@import "fontawesome";
+@import "fontawesome/font-awesome";
 
 // Glyphicons
 //@import "twitter/bootstrap/sprites.less";

data/lib/generators/bootstrap/install/templates/en.bootstrap.yml

@@ -10,6 +10,7 @@ en:
       confirm: "Are you sure?"
       destroy: "Delete"
       new: "New"
+      edit: "Edit"
     titles:
       edit: "Edit"
       save: "Save"

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -16,19 +16,19 @@
 
     <!-- For third-generation iPad with high-resolution Retina display: -->
     <!-- Size should be 144 x 144 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
+    <%%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
 
     <!-- For iPhone with high-resolution Retina display: -->
     <!-- Size should be 114 x 114 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
+    <%%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
 
     <!-- For first- and second-generation iPad: -->
     <!-- Size should be 72 x 72 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
+    <%%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
 
     <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
     <!-- Size should be 57 x 57 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
+    <%%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
 
     <!-- For all other devices -->
     <!-- Size should be 32 x 32 pixels -->

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -10,11 +10,11 @@
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
-    %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
-    %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
-    %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
-    %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
-    %link(href="favicon.ico" rel="shortcut icon")
+    = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
+    = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
+    = favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
+    = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
+    = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
 
 
   %body

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -11,11 +11,13 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
-    link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
-    link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
-    link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
-    link href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
-    link href="favicon.ico" rel="shortcut icon"
+    = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
+    = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
+    = favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
+    = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
+    = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
+
+
 
   body
     .navbar.navbar-<%= layout_type %>-top

data/lib/generators/bootstrap/themed/templates/edit.html.erb

@@ -1,5 +1,5 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human %></h1>
+  <h1><%%=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize %></h1>
 </div>
 <%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/edit.html.haml

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human
+  %h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/edit.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 div class="page-header"
-  h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human
+  h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/index.html.erb

@@ -1,6 +1,6 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
+  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize.titleize %></h1>
 </div>
 <table class="table table-striped">
   <thead>

data/lib/generators/bootstrap/themed/templates/index.html.haml

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => model_class.model_name.human.pluralize
+  %h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
 %table.table.table-striped
   %thead
     %tr

data/lib/generators/bootstrap/themed/templates/index.html.slim

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 div class="page-header"
-  h1=t '.title', :default => model_class.model_name.human.pluralize
+  h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
 table class="table table-striped"
   thead
     tr

data/lib/generators/bootstrap/themed/templates/new.html.erb

@@ -1,5 +1,5 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human %></h1>
+  <h1><%%=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize %></h1>
 </div>
 <%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/new.html.haml

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human
+  %h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/new.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 div class="page-header"
-  h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human
+  h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/show.html.erb

@@ -1,6 +1,6 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => model_class.model_name.human %></h1>
+  <h1><%%=t '.title', :default => model_class.model_name.human.titleize %></h1>
 </div>
 
 <dl class="dl-horizontal">

data/lib/generators/bootstrap/themed/templates/show.html.haml

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => model_class.model_name.human
+  %h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>
 %p

data/lib/generators/bootstrap/themed/templates/show.html.slim

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 div class="page-header"
-  h1=t '.title', :default => model_class.model_name.human
+  h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>
 p

data/lib/twitter-bootstrap-rails.rb

@@ -1,9 +1,9 @@
 module Twitter
   module Bootstrap
-      module Rails
-        require 'twitter/bootstrap/rails/engine' if defined?(Rails)
-      end
-   end
+    module Rails
+      require 'twitter/bootstrap/rails/engine' if defined?(Rails)
+    end
+  end
 end
 
 #require 'less-rails'

data/lib/twitter/bootstrap/rails/engine.rb

@@ -3,6 +3,7 @@ require 'rails'
 require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
 require File.dirname(__FILE__) + '/../../../../app/helpers/flash_block_helper.rb'
 require File.dirname(__FILE__) + '/../../../../app/helpers/modal_helper.rb'
+require File.dirname(__FILE__) + '/../../../../app/helpers/navbar_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -21,6 +22,8 @@ module Twitter
             ActionController::Base.send :include, BreadCrumbs
             ActionController::Base.send :helper, FlashBlockHelper
             ActionController::Base.send :helper, ModalHelper
+            ActionController::Base.send :helper, NavbarHelper
+            ActionController::Base.send :helper, BadgeLabelHelper
             #ActionController::Base.send :helper_method, :render_breadcrumbs
           end
         end

data/lib/twitter/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.2.6"
+      VERSION = "2.2.7"
     end
   end
 end

data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/badge_label_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include BadgeLabelHelper
+
+describe BadgeLabelHelper, :type => :helper do
+  it "should return a basic bootstrap badge" do
+    badge('test').gsub(/\s/, '').downcase.should eql(BASIC_BADGE.gsub(/\s/, '').downcase)
+  end
+
+  it "should return a bootstrap badge with class" do
+    badge('waning', :warning).gsub(/\s/, '').downcase.should eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
+  end
+end
+
+BASIC_BADGE = %{<span class="badge">test</span>}
+BADGE_WITH_CLASS = %{<span class="badge badge-warning">waning</span>}

data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+require 'spec_helper'
+require_relative '../../../app/helpers/modal_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include ModalHelper
+
+describe ModalHelper, :type => :helper do
+  header_with_close    = { :show_close => true, :dismiss => 'modal', :title => 'Modal header' }
+  header_without_close = { :show_close => false, :title => 'Modal header' }
+  options              = { :id => "modal",
+												 	 :header => header_with_close,
+                           :body   => 'This is the body',
+                           :footer => content_tag(:button, 'Save', :class => 'btn')
+  }
+
+  it 'returns a complete modal' do
+    modal_dialog(options).gsub(/\n/, "").should eql BASIC_MODAL.gsub(/\n/, "")
+  end
+
+  it 'returns a modal header with a close button if show_close is true' do
+    modal_header(header_with_close).gsub(/\n/, "").should eql MODAL_HEADER_WITH_CLOSE.gsub(/\n/, "")
+  end
+
+  it 'renders a modal header without a close button' do
+      modal_header(header_without_close).gsub(/\n/, "").should eql MODAL_HEADER_WITHOUT_CLOSE.gsub(/\n/, "")
+  end
+
+	it 'renders a close button' do
+		close_button('modal').should eql "<button class=\"close\" data-dismiss=\"modal\">&times;</button>"
+	end
+
+  it 'renders a modal toggle button' do
+		modal_toggle('Save', :href => "#modal").gsub(/\n/, "").should eql MODAL_TOGGLE.gsub(/\n/, "")
+  end
+
+	it 'renders a cancel button' do
+		modal_cancel_button("Cancel", :href => "#modal", :data => {:dismiss => 'modal'}).gsub(/\n/, "").should eql MODAL_CANCEL_BUTTON.gsub(/\n/, "")
+	end
+
+end
+BASIC_MODAL = <<-HTML
+<div class=\"bootstrap-modal modal hide fade\" id="modal"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\">&times;</button><h3>Modal header</h3></div><div class=\"modal-body\">This is the body</div><div class=\"modal-footer\"><button class=\"btn\">Save</button></div></div>
+HTML
+
+MODAL_HEADER_WITHOUT_CLOSE = <<-HTML
+<div class="modal-header"><h3>Modal header</h3></div>
+HTML
+
+MODAL_HEADER_WITH_CLOSE = <<-HTML
+<div class="modal-header"><button class="close" data-dismiss="modal">&times;</button><h3>Modal header</h3></div>
+HTML
+
+MODAL_TOGGLE = <<-HTML
+<a class="btn" data-toggle="modal" href="#modal">Save</a>
+HTML
+
+MODAL_CANCEL_BUTTON = <<-HTML
+<a class="btn bootstrap-modal-cancel-button" data-dismiss="modal" href="#modal">Cancel</a>
+HTML
+

data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb

@@ -0,0 +1,350 @@
+# encoding: utf-8
+#Credit for this goes to https://github.com/julescopeland/Rails-Bootstrap-Navbar
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/navbar_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include NavbarHelper
+
+describe NavbarHelper, :type => :helper do
+  before do
+    self.stub!("uri_state").and_return(:inactive)
+    self.stub!("root_url").and_return("/")
+  end
+  describe "nav_bar" do
+    it "should return a basic bootstrap navbar" do
+      nav_bar.gsub(/\s/, '').downcase.should eql(BASIC_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should set the fixed position to top" do
+      nav_bar(:fixed => :top).gsub(/\s/, '').downcase.should eql(FIXED_TOP_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should set the static position to top" do
+      nav_bar(:static => :top).gsub(/\s/, '').downcase.should eql(STATIC_TOP_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should set the fixed position to bottom" do
+      nav_bar(:fixed => :bottom).gsub(/\s/, '').downcase.should eql(FIXED_BOTTOM_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should set the style to inverse" do
+      nav_bar(:inverse => true).gsub(/\s/, '').downcase.should eql(INVERSE_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should add the brand name and link it to the home page" do
+      nav_bar(:brand => "Ninety Ten").gsub(/\s/, '').downcase.should eql(NAVBAR_WITH_BRAND.gsub(/\s/, '').downcase)
+    end
+
+    it "should be able to set the brand link url" do
+      nav_bar(:brand => "Ninety Ten", :brand_link => "http://www.ninetyten.com").gsub(/\s/, '').downcase.should eql(NAVBAR_WITH_BRAND_AND_LINK.gsub(/\s/, '').downcase)
+    end
+
+    it "should set the container to fluid" do
+      nav_bar(:fluid => :true).gsub(/\s/, '').downcase.should eql(BASIC_NAVBAR_FLUID.gsub(/\s/, '').downcase)
+    end
+
+    it "should add the buttons etc for a responsive layout with no block passed" do
+      nav_bar(:responsive => true).gsub(/\s/, '').downcase.should eql(RESPONSIVE_NAVBAR.gsub(/\s/, '').downcase)
+    end
+
+    it "should add the buttons etc for a responsive layout with block passed" do
+      nav_bar(:responsive => true) do
+        "<p>Passing a block</p>".html_safe
+      end.gsub(/\s/, '').downcase.should eql(RESPONSIVE_NAVBAR_WITH_BLOCK.gsub(/\s/, '').downcase)
+    end
+
+    it "should render contained items" do
+      nav_bar do
+        menu_group do
+          menu_item("Home", "/") + menu_item("Products", "/products")
+        end
+      end.gsub(/\s/, '').downcase.should eql(PLAIN_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
+    end
+
+    it "should still render the brand name even with other options turned on" do
+      nav_bar(:brand => "Something") do
+        menu_group do
+          menu_item "Home", "/"
+        end
+      end.gsub(/\s/, '').downcase.should eql(BRANDED_NAVBAR_WITH_ITEM.gsub(/\s/, '').downcase)
+    end
+  end
+
+  describe "menu_group" do
+    it "should return a ul with the class 'nav'" do
+      menu_group do
+        menu_item("Home", "/") + menu_item("Products", "/products")
+      end.should eql '<ul class="nav "><li><a href="/">Home</a></li><li><a href="/products">Products</a></li></ul>'
+    end
+
+    it "should return a ul with class .pull-left when passed the {:pull => :left} option" do
+      menu_group(:pull => :left) do
+        menu_item("Home", "/")
+      end.should eql('<ul class="nav pull-left"><li><a href="/">Home</a></li></ul>')
+    end
+  end
+
+  describe "menu_item" do
+    it "should return a link within an li tag" do
+      self.stub!("current_page?").and_return(false)
+      menu_item("Home", "/").should eql('<li><a href="/">Home</a></li>')
+    end
+    it "should return the link with class 'active' if on current page" do
+      self.stub!("uri_state").and_return(:active)
+      menu_item("Home", "/").should eql('<li class="active"><a href="/">Home</a></li>')
+    end
+    it "should pass any other options through to the link_to method" do
+      self.stub!("uri_state").and_return(:active)
+      menu_item("Log out", "/users/sign_out", :class => "home_link", :method => :delete).should eql('<li class="active"><a href="/users/sign_out" class="home_link" data-method="delete" rel="nofollow">Log out</a></li>')
+    end
+  end
+
+  describe "drop_down" do
+    it "should do render the proper drop down code" do
+      drop_down "Products" do
+        menu_item "Latest", "/"
+      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU.gsub(/\s/, '').downcase)
+    end
+  end
+
+  describe "drop_down_with_submenu" do
+    it "should do render the proper drop down code" do
+      drop_down_with_submenu "Products" do
+        drop_down_submenu "Latest" do
+          menu_item "Option1", "/"
+        end
+      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU_WITH_SUBMENU.gsub(/\s/, '').downcase)
+    end
+  end
+
+  describe "menu_divider" do
+    it "should render <li class='divider-vertical'></li>" do
+      menu_divider.should eql '<li class="divider-vertical"></li>'
+    end
+  end
+
+  describe "menu_text" do
+    it "should render text within p tags with class 'navbar-text" do
+      menu_text("Strapline!").should eql("<p class=\"navbar-text\">Strapline!</p>")
+    end
+
+    it "should be able to be pulled right or left" do
+      menu_text("I am being pulled right", :pull => :right).should eql("<p class=\"pull-right navbar-text\">I am being pulled right</p>")
+    end
+
+    it "should be able to cope with arbitrary options being passed to the p tag" do
+      menu_text("I am classy!", :class => "classy", :id => "classy_text").should eql("<p class=\"classy navbar-text\" id=\"classy_text\">I am classy!</p>")
+    end
+
+    it "should be able to cope with a block too" do
+      menu_text do
+        "I have been rendered programmatically!"
+      end.should eql("<p class=\"navbar-text\">I have been rendered programmatically!</p>")
+    end
+  end
+
+  describe "rendering forms ok" do
+    it "should not escape anything unexpectedly" do
+      nav_bar do
+        form_tag "/", :method => 'get' do |f|
+          f.text_field :search, "stub"
+        end
+      end.gsub(/\s/, '').downcase.should eql(PLAIN_NAVBAR_WITH_FORM.gsub(/\s/, '').downcase)
+    end
+  end
+
+end
+
+# HTML output
+
+BASIC_NAVBAR = <<-HTML
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container">
+    </div>
+  </div>
+</div>
+HTML
+
+FIXED_TOP_NAVBAR = <<-HTML
+<div class="navbar navbar-fixed-top">
+  <div class="navbar-inner">
+    <div class="container">
+    </div>
+  </div>
+</div>
+HTML
+
+STATIC_TOP_NAVBAR = <<-HTML
+<div class="navbar navbar-static-top">
+  <div class="navbar-inner">
+    <div class="container">
+    </div>
+  </div>
+</div>
+HTML
+
+FIXED_BOTTOM_NAVBAR = <<-HTML
+<div class="navbar navbar-fixed-bottom">
+  <div class="navbar-inner">
+    <div class="container">
+    </div>
+  </div>
+</div>
+HTML
+
+INVERSE_NAVBAR = <<-HTML
+<div class="navbar navbar-inverse">
+  <div class="navbar-inner">
+    <div class="container">
+    </div>
+  </div>
+</div>
+HTML
+
+BASIC_NAVBAR_FLUID= <<-HTML
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+    </div>
+  </div>
+</div>
+HTML
+
+NAVBAR_WITH_BRAND = <<-HTML
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container">
+			<a href="/" class="brand">
+			  Ninety Ten
+			</a>
+    </div>
+  </div>
+</div>
+HTML
+
+NAVBAR_WITH_BRAND_AND_LINK = <<-HTML
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container">
+			<a href="http://www.ninetyten.com" class="brand">
+			  Ninety Ten
+			</a>
+    </div>
+  </div>
+</div>
+HTML
+
+RESPONSIVE_NAVBAR = <<-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">
+      </div>
+    </div>
+  </div>
+</div>
+HTML
+
+RESPONSIVE_NAVBAR_WITH_BLOCK = <<-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">
+				<p>Passing a block</p>
+      </div>
+    </div>
+  </div>
+</div>
+HTML
+
+PLAIN_NAVBAR_WITH_ITEM = <<-HTML
+<div class="navbar">
+	<div class="navbar-inner">
+		<div class="container">
+			<ul class="nav">
+				<li>
+					<a href="/">Home</a>
+				</li>
+				<li>
+					<a href="/products">Products</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>
+HTML
+
+BRANDED_NAVBAR_WITH_ITEM = <<-HTML
+<div class="navbar">
+	<div class="navbar-inner">
+		<div class="container">
+			<a href="/" class="brand">
+			  Something
+			</a>
+			<ul class="nav">
+				<li>
+					<a href="/">Home</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>
+HTML
+
+DROPDOWN_MENU = <<-HTML
+<li class="dropdown">
+  <a href="#"
+        class="dropdown-toggle"
+        data-toggle="dropdown">
+        Products
+        <b class="caret"></b>
+  </a>
+  <ul class="dropdown-menu">
+    <li><a href="/">Latest</a></li>
+  </ul>
+</li>
+HTML
+
+DROPDOWN_MENU_WITH_SUBMENU = <<-HTML
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Products <b class="caret"></b></a>
+  <ul class="dropdown-menu">
+    <li class="dropdown-submenu">
+      <a href="">Latest</a>
+      <ul class="dropdown-menu">
+        <li><a href="/">Option1</a></li>
+      </ul>
+    </li>
+  </ul>
+</li>
+HTML
+
+PLAIN_NAVBAR_WITH_FORM = <<-HTML
+<div class="navbar">
+	<div class="navbar-inner">
+		<div class="container">
+			<form accept-charset="utf-8" action="/" method="get">
+				<div style="margin:0;padding:0;display:inline">
+					<input name="utf8" type="hidden" value="&#x2713;"/>
+				</div>
+				<input id="search_stub" name="search[stub]" size="30" type="text"/>
+			</form>
+		</div>
+	</div>
+</div>
+HTML