twitter-bootstrap-rails 2.2.8 → 3.2.0

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

@@ -19,9 +19,9 @@ table class="table table-striped"
         <%- end -%>
         td=l <%= resource_name %>.created_at
         td
-          = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
+          = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs'
           '
-          = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-mini btn-danger'
+          = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger'
 
 = link_to t('.new', :default => t("helpers.links.new")), new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'
 

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

@@ -10,14 +10,12 @@
 <%- end -%>
 </dl>
 
-<div class="form-actions">
-  <%%= link_to t('.back', :default => t("helpers.links.back")),
-              <%= controller_routing_path %>_path, :class => 'btn'  %>
-  <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-              edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn' %>
-  <%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
+<%%= link_to t('.back', :default => t("helpers.links.back")),
+              <%= controller_routing_path %>_path, :class => 'btn btn-default'  %>
+<%%= link_to t('.edit', :default => t("helpers.links.edit")),
+              edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default' %>
+<%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
               <%= singular_controller_routing_path %>_path(@<%= resource_name %>),
               :method => 'delete',
               :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
               :class => 'btn btn-danger' %>
-</div>

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

@@ -9,7 +9,7 @@
   = @<%= resource_name %>.<%= column.name %>
 <%- end -%>
 
-.form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn'
-  = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger'
+
+= link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
+= link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default'
+= link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger'

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

@@ -9,9 +9,8 @@ p
   = @<%= resource_name %>.<%= column.name %>
 <%- end -%>
 
-.form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn'
-  '
-  = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  '
-  = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger'
+= link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
+'
+= link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default'
+'
+= link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger'

data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.erb

@@ -1,14 +1,14 @@
 <%%= simple_form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
   <%- columns.each do |column| -%>
   <%%= f.input :<%= column.name %> %>
+  <%%= error_span(@<%= resource_name %>[:<%= column.name %>]) %>
   <%- end -%>
   <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   <%%= f.button :wrapped, :cancel => <%= controller_routing_path %>_path %>
   <%- else -%>
-  <div class="form-actions">
-    <%%= f.button :submit, :class => 'btn-primary' %>
-    <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-                <%= controller_routing_path %>_path, :class => 'btn' %>
-  </div>
+
+  <%%= f.button :submit, :class => 'btn-primary' %>
+  <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
+                <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
   <%- end -%>
 <%% end %>

data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.haml

@@ -1,11 +1,11 @@
 = simple_form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
 <%- columns.each do |column| -%>
   = f.input :<%= column.name %>
+  = error_span(@<%= resource_name %>[:<%= column.name %>])
 <%- end -%>
 <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   = f.button :wrapped, :cancel => <%= controller_routing_path %>_path
 <%- else -%>
-  .form-actions
-    = f.button :submit, :class => 'btn-primary'
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.button :submit, :class => 'btn-primary'
+  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
 <%- end -%>

data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.slim

@@ -1,12 +1,12 @@
 = simple_form_for @<%= resource_name %>, :html => { :class => "form-horizontal" } do |f|
 <%- columns.each do |column| -%>
   = f.input :<%= column.name %>
+  = error_span(@<%= resource_name %>[:<%= column.name %>])
 <%- end -%>
 <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   = f.button :wrapped, :cancel => <%= controller_routing_path %>_path
 <%- else -%>
-  .form-actions
-    = f.button :submit, :class => 'btn-primary'
-    '
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.button :submit, :class => 'btn-primary'
+  '
+  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
 <%- end -%>

data/lib/generators/bootstrap/themed/themed_generator.rb

@@ -31,11 +31,11 @@ module Bootstrap
       end
 
       def controller_routing_path
-        @controller_routing_path
+        ActiveModel::Naming.route_key(@model_name.constantize)
       end
 
       def singular_controller_routing_path
-        @controller_routing_path.singularize
+        ActiveModel::Naming.singular_route_key(@model_name.constantize)
       end
 
       def model_name

data/lib/twitter/bootstrap/rails/{twitter-bootstrap-breadcrumbs.rb → breadcrumbs.rb}

@@ -1,16 +1,15 @@
 module Twitter
   module Bootstrap
-    module BreadCrumbs
+    module Breadcrumbs
       def self.included(base)
         base.extend(ClassMethods)
       end
 
       module ClassMethods
-        def add_breadcrumb(name, url, options = {})
-          class_name = self.name
+        def add_breadcrumb(name, url = '', options = {})
+          options.merge! :klass => self.name
           before_filter options do |controller|
-            name = controller.send :translate_breadcrumb, name, class_name if name.is_a?(Symbol)
-            controller.send :add_breadcrumb, name, url
+            controller.send :add_breadcrumb, name, url, options
           end
         end
       end
@@ -19,9 +18,26 @@ module Twitter
 
       def add_breadcrumb(name, url = '', options = {})
         @breadcrumbs ||= []
-        name = translate_breadcrumb(name, self.class.name) if name.is_a?(Symbol)
-        url = eval(url.to_s) if url =~ /_path|_url|@/
-          @breadcrumbs << {:name => name, :url => url, :options => options}
+
+        class_name = options.delete(:klass) || self.class.name
+
+        if name.is_a? Symbol
+          if url.blank?
+            url_helper = :"#{name}_path"
+            url = url_helper if respond_to?(url_helper)
+          end
+
+          name = translate_breadcrumb name, class_name
+        end
+
+        unless name.is_a? String
+          url = polymorphic_path name if url.blank?
+          name = name.to_s
+        end
+
+        url = eval(url.to_s) if url.is_a?(Symbol) && url =~ /_path|_url|@/
+
+        @breadcrumbs << {:name => name, :url => url, :options => options}
       end
 
       def translate_breadcrumb(name, class_name)

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

@@ -1,9 +1,10 @@
 require 'rails'
 
-require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
+require File.dirname(__FILE__) + '/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'
+require File.dirname(__FILE__) + '/../../../../app/helpers/bootstrap_flash_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -19,8 +20,10 @@ module Twitter
 
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
           app.config.to_prepare do
-            ActionController::Base.send :include, BreadCrumbs
+            ActionController::Base.send :include, Breadcrumbs
             ActionController::Base.send :helper, FlashBlockHelper
+            ActionController::Base.send :helper, BootstrapFlashHelper
+            ActionController::Base.send :helper, FormErrorsHelper
             ActionController::Base.send :helper, ModalHelper
             ActionController::Base.send :helper, NavbarHelper
             ActionController::Base.send :helper, BadgeLabelHelper

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

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.2.8"
+      VERSION = "3.2.0"
     end
   end
-end
+end

data/spec/lib/breadcrumbs_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Breadcrumbs do
+  class TestModel
+    include ActiveModel::Model
+
+    def to_s
+      "test_model"
+    end
+  end
+
+  class BaseTestController < AbstractController::Base
+    include Twitter::Bootstrap::Breadcrumbs
+    include AbstractController::Callbacks
+    include AbstractController::UrlFor
+
+    add_breadcrumb 'base', '/base'
+    add_breadcrumb :base_i18n, '/base_i18n'
+
+    def breadcrumbs
+      @breadcrumbs
+    end
+  end
+
+  class TestController < BaseTestController
+    add_breadcrumb 'class', '/class'
+    add_breadcrumb :class_i18n, '/class_i18n'
+
+    def show
+      add_breadcrumb 'instance', '/instance'
+      add_breadcrumb :instance_i18n, '/instance_i18n'
+
+      test_model = TestModel.new
+      add_breadcrumb test_model
+
+      add_breadcrumb :symbolized
+      add_breadcrumb :show
+    end
+
+    def symbolized_path
+      '/symbolized'
+    end
+
+    def test_models_path
+      '/test_model'
+    end
+  end
+
+  before do
+    options = { :scope => [:breadcrumbs, 'test'] }
+    [:class_i18n, :instance_i18n, :show, :symbolized].each do |name|
+      I18n.expects(:t).with(name, options).returns(name.to_s)
+    end
+
+    name = :base_i18n
+    options = { :scope => [:breadcrumbs, 'base_test'] }
+    I18n.expects(:t).with(name, options).returns(name)
+
+    @controller = TestController.new
+    @controller.process(:show)
+  end
+
+  it "have breadcrumbs" do
+    [:base, :base_i18n, :class, :class_i18n, :instance, :instance_i18n, :test_model, :symbolized].each do |name|
+      path = "/#{name}"
+      idx = @controller.breadcrumbs.index { |b| b[:name] == name.to_s && b[:url] == path }
+      idx.should be, -> { name }
+    end
+
+    idx = @controller.breadcrumbs.index { |b| b[:name] == "show" && b[:url] == '' }
+    idx.should be
+  end
+
+end

data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb

@@ -10,11 +10,13 @@ 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)
+    expect(badge('test').gsub(/\s/, '').downcase)
+      .to 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)
+    expect(badge('waning', :warning).gsub(/\s/, '').downcase)
+      .to eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
   end
 end
 

data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb

@@ -11,49 +11,49 @@ describe ModalHelper, :type => :helper do
   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')
+                           :body   => { content: 'This is the body' },
+                           :footer => { content: content_tag(:button, 'Save', :class => 'btn') }
   }
 
   it 'returns a complete modal' do
-    modal_dialog(options).gsub(/\n/, "").should eql BASIC_MODAL.gsub(/\n/, "")
+    expect(modal_dialog(options).gsub(/\n/, "")).to 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/, "")
+    expect(modal_header(header_with_close).gsub(/\n/, "")).to 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/, "")
+    expect(modal_header(header_without_close).gsub(/\n/, "")).to 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>"
+		expect(close_button('modal')).to eql "<button class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">&times;</button>"
 	end
 
   it 'renders a modal toggle button' do
-		modal_toggle('Save', :href => "#modal").gsub(/\n/, "").should eql MODAL_TOGGLE.gsub(/\n/, "")
+    expect(modal_toggle('Save', :href => "#modal").gsub(/\n/, "")).to 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
-
+  it 'renders a cancel button' do
+    expect(modal_cancel_button("Cancel", :href => "#modal", :data => {:dismiss => 'modal'}).gsub(/\n/, "")).to 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>
+<div class=\"bootstrap-modal modal fade\" id=\"modal\"><div class=\"modal-dialog \"><div class=\"modal-content\"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"true\" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\"></h4></div><div class=\"modal-body\"></div><div class=\"modal-footer\"></div></div></div></div>
 HTML
 
 MODAL_HEADER_WITHOUT_CLOSE = <<-HTML
-<div class="modal-header"><h3>Modal header</h3></div>
+<div class="modal-header"><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_HEADER_WITH_CLOSE = <<-HTML
-<div class="modal-header"><button class="close" data-dismiss="modal">&times;</button><h3>Modal header</h3></div>
+<div class="modal-header"><button class="close" data-dismiss="modal" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_TOGGLE = <<-HTML
-<a class="btn" data-toggle="modal" href="#modal">Save</a>
+<a class="btn btn-default" data-toggle="modal" href="#modal">Save</a>
 HTML
 
 MODAL_CANCEL_BUTTON = <<-HTML

data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb

@@ -11,161 +11,182 @@ include NavbarHelper
 
 describe NavbarHelper, :type => :helper do
   before do
-    self.stub!("uri_state").and_return(:inactive)
-    self.stub!("root_url").and_return("/")
+    allow(self).to receive(:uri_state) { :inactive }
+    allow(self).to receive(:root_url) { '/' }
   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)
+      expect(nav_bar.gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:fixed => :top).gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:static => :top).gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:fixed => :bottom).gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:inverse => true).gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:brand => "Ninety Ten").gsub(/\s/, '').downcase)
+        .to 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)
+      expect(nav_bar(:brand => "Ninety Ten", :brand_link => "http://www.ninetyten.com").gsub(/\s/, '').downcase)
+        .to eql(NAVBAR_WITH_BRAND_AND_LINK.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)
+      expect(nav_bar(:responsive => true).gsub(/\s/, '').downcase).to 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
+      ele = 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
+      expect(ele.gsub(/\s/, '').downcase).to eql(RESPONSIVE_NAVBAR_WITH_BLOCK.gsub(/\s/, '').downcase)
     end
 
     it "should render contained items" do
-      nav_bar do
+      ele = 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
+      expect(ele.gsub(/\s/, '').downcase).to 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
+      ele = 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
+      expect(ele.gsub(/\s/, '').downcase).to 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
+      ele = 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
+      expect(ele).to eql '<ul class="nav navbar-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
+    it "should return a ul with class .navbar-left when passed the {:pull => :left} option" do
+      ele = menu_group(:pull => :left) do
         menu_item("Home", "/")
-      end.should eql('<ul class="nav pull-left"><li><a href="/">Home</a></li></ul>')
+      end
+      expect(ele).to eql('<ul class="nav navbar-nav navbar-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>')
+      allow(self).to receive(:current_page?) { false }
+      expect(menu_item("Home", "/")).to 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>')
+      allow(self).to receive(:uri_state) { :active }
+      expect(menu_item("Home", "/")).to 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>')
+      self.stub("uri_state").and_return(:active)
+      expect(menu_item("Log out", "/users/sign_out", :class => "home_link", :method => :delete)).to eql('<li class="active"><a class="home_link" data-method="delete" href="/users/sign_out" rel="nofollow">Log out</a></li>')
     end
     it "should pass a block but no name if a block is present" do
-      self.stub!("current_page?").and_return(false)
-      menu_item("/"){content_tag("i", "", :class => "icon-home") + " Home"}.should eql('<li><a href="/"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:current_page?) { false }
+      expect(menu_item("/"){content_tag("i", "", :class => "icon-home") + " Home"}).to eql('<li><a href="/"><i class="icon-home"></i> Home</a></li>')
     end
     it "should work with just a block" do
-      self.stub!("current_page?").and_return(false)
-      menu_item{ content_tag("i", "", :class => "icon-home") + " Home" }.should eql('<li><a href="#"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:current_page?) { false }
+      expect(menu_item{ content_tag("i", "", :class => "icon-home") + " Home" }).to eql('<li><a href="#"><i class="icon-home"></i> Home</a></li>')
     end
     it "should return the link with class 'active' if on current page with a block" do
-      self.stub!("uri_state").and_return(:active)
-      menu_item("/"){ content_tag("i", "", :class => "icon-home") + " Home" }.should eql('<li class="active"><a href="/"><i class="icon-home"></i> Home</a></li>')
+      allow(self).to receive(:uri_state) { :active }
+      expect(menu_item("/"){ content_tag("i", "", :class => "icon-home") + " Home" }).to eql('<li class="active"><a href="/"><i class="icon-home"></i> Home</a></li>')
     end
   end
 
   describe "drop_down" do
     it "should do render the proper drop down code" do
-      drop_down "Products" do
+      ele = drop_down "Products" do
         menu_item "Latest", "/"
-      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU.gsub(/\s/, '').downcase)
+      end
+      expect(ele).to have_tag(:li, with: {class: 'dropdown'})
+      expect(ele).to have_tag(:a, with: {class: 'dropdown-toggle'})
     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", "/"
+      ele = drop_down_with_submenu "Products" do
+          drop_down_submenu "Latest" do
+            menu_item "Option1", "/"
+          end
         end
-      end.gsub(/\s/, '').downcase.should eql(DROPDOWN_MENU_WITH_SUBMENU.gsub(/\s/, '').downcase)
+      expect(ele).to have_tag(:li, with: {class: 'dropdown'})
+      expect(ele).to have_tag(:a, with: {class: 'dropdown-toggle'})
+      expect(ele).to have_tag(:ul, with: {class: 'dropdown-menu'})
     end
   end
 
   describe "menu_divider" do
     it "should render <li class='divider-vertical'></li>" do
-      menu_divider.should eql '<li class="divider-vertical"></li>'
+      expect(menu_divider).to match '<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>")
+      expect(menu_text("Strapline!")).to match("<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>")
+      expect(menu_text("I am being pulled right", :pull => :right)).to match("<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>")
+      expect(menu_text("I am classy!", :class => "classy", :id => "classy_text")).to match("<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>")
+      ele = menu_text("I have been rendered programmatically!")
+      expect(ele).to have_tag(:p, with: {class: "navbar-text"})
+      expect(ele).to match "I have been rendered programmatically!"
     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"
+      expect(
+        nav_bar do
+          form_tag "/", :method => 'get' do |f|
+            f.text_field :search, "stub"
+          end
         end
-      end.gsub(/\s/, '').downcase.should eql(PLAIN_NAVBAR_WITH_FORM.gsub(/\s/, '').downcase)
+        ).to have_tag(:form)
+    end
+  end
+
+  describe "default navbar" do
+    it "renders a navbar" do
+      expect(nav_bar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-default', role: 'navigation' }, text: /foo/)
     end
   end
 
@@ -174,167 +195,132 @@ end
 # HTML output
 
 BASIC_NAVBAR = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 FIXED_TOP_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 STATIC_TOP_NAVBAR = <<-HTML
-<div class="navbar navbar-static-top">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-static-top" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 FIXED_BOTTOM_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-bottom">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
+<nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 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>
+<nav class="navbar navbar-default navbar-inverse" role="navigation">
+  <div class="container">
   </div>
-</div>
+</nav>
 HTML
 
 NAVBAR_WITH_BRAND = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-			<a href="/" class="brand">
-			  Ninety Ten
-			</a>
-    </div>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="/">
+      Ninety Ten
+    </a>
   </div>
-</div>
+</nav>
 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>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="http://www.ninetyten.com">
+      Ninety Ten
+    </a>
   </div>
-</div>
+</nav>
 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">
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle Navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse">
-      </div>
+      </button>
+    </div>
+    <div class="navbar-collapse collapse">
     </div>
   </div>
-</div>
+</nav>
 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">
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle Navigation</span>
         <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>
+      </button>
+    </div>
+    <div class="navbar-collapse collapse">
+              <p>Passing a block</p>
     </div>
   </div>
-</div>
+</nav>
 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>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <ul class="nav navbar-nav">
+      <li>
+        <a href="/">Home</a>
+      </li>
+      <li>
+        <a href="/products">Products</a>
+      </li>
+    </ul>
+  </div>
+</nav>
 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>
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <a class="navbar-brand" href="/">
+      Something
+    </a>
+    <ul class="nav navbar-nav">
+      <li>
+        <a href="/">Home</a>
+      </li>
+    </ul>
+  </div>
+</nav>
 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>
+<li class="dropdown"> <a class="dropdown-toggle"data-toggle="dropdown"href="#"> 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>
+  <a class="dropdown-toggle" data-toggle="dropdown" href="#">Products <b class="caret"></b></a>
   <ul class="dropdown-menu">
     <li class="dropdown-submenu">
       <a href="">Latest</a>
@@ -347,16 +333,14 @@ DROPDOWN_MENU_WITH_SUBMENU = <<-HTML
 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>
+<nav class=\"navbar navbar-default\"role=\"navigation\">
+  <div class=\"container\">
+    <form accept-charset=\"utf-8\" action=\"/\" method=\"get\">
+      <div style=\"display:none\">
+        <input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\"/>
+      </div>
+      <input id=\"search_stub\" name=\"search[stub]\" type=\"text\"/>
+    </form>
+  </div>
+</nav>
 HTML