bootstrap-navbar 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db92ce40b7a8185abc9893f93030a213ab8d8601
-  data.tar.gz: 1d0d60b6f459a56b2bd0c8c1631db31095bf3523
+  metadata.gz: 1e6cb5d7ab4f17cc09849836050063a1759811c1
+  data.tar.gz: 4f4ed9a21184025348dc77eb803b93a3a18fa1b1
 SHA512:
-  metadata.gz: 2930350b4b5b9976adcefda73fc0bafb4f0d197dfc3b7e3bad8608b27e0582a98bc41dabad861f9b6d1c549e0ea2526c34a21fde57e9494c9e6c93f441c2b1b9
-  data.tar.gz: 5b8fcf722a72a1581a1be65ee1c991f5bf277f5d176656f0aa70f5b88a63c201e440f02f2db591c6d36b6968878eecdb35ecfd09acb8b112ebd0391e3a022e11
+  metadata.gz: 589e6877047fdc0dcf224219d9a89ecca22ef1e1b8efdffadedabf918f0e02a4e57778f35bfc9d62b72fb3df35f6e6d5f31085d36011d4189f707348c70cce3a
+  data.tar.gz: 8def888b261d8445b59bcc2ee7010fd44b9aec41fdc48f6ec1144f75e3c189692cd08f89f474b891b45de7c2795a6da0bff43067a0a263ea9d2a6b3e4ae8a6ac

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

@@ -1,7 +1,15 @@
 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
-      navbar_header options[:brand], options[:brand_link]
+      if container
+        navbar_container(navbar_content)
+      else
+        navbar_content
+      end
     end
   end
 
@@ -79,6 +87,14 @@ HTML
 
   private
 
+  def navbar_container(content)
+    prepare_html <<-HTML.chomp!
+<div class="container">
+  #{content}
+</div>
+HTML
+  end
+
   def navbar_header(brand, brand_link)
     prepare_html <<-HTML.chomp!
 <div class="navbar-header">
@@ -93,6 +109,14 @@ HTML
 HTML
   end
 
+  def navbar_collapsable(&block)
+    prepare_html <<-HTML.chomp!
+<div class="collapse navbar-collapse" id="navbar-collapsable">
+  #{capture(&block) if block_given?}
+</div>
+HTML
+  end
+
   def brand_link(name, url = nil)
     prepare_html %(<a href="#{url || '/'}" class="navbar-brand">#{name}</a>)
   end

data/lib/bootstrap-navbar/version.rb

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

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

@@ -41,7 +41,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.navbar { 'foo' }).to have_tag(:div, with: { class: 'navbar' }, content: 'foo')
+          expect(renderer.navbar { 'foo' }).to have_tag(:div, with: { class: 'navbar' }, text: /foo/)
         end
       end
     end
@@ -75,8 +75,8 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
     context 'with "brand" and "brank_link" parameters' do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
-          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'brand' }, content: 'foo')
-          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' }, content: 'foo')
+          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'brand' }, text: /foo/)
+          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' }, text: /foo/)
           expect(renderer.navbar(brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'brand' })
         end
       end
@@ -114,7 +114,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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' }, content: 'foo')
+          expect(renderer.menu_group { 'foo' }).to have_tag(:ul, with: { class: 'nav' }, text: /foo/)
         end
       end
     end
@@ -212,7 +212,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, content: 'foo'
+              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
             end
           end
         end
@@ -223,7 +223,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, content: 'foo'
+              with_tag :a, with: { href: '/', class: 'pelle', id: 'fant' }, text: /foo/
             end
           end
         end
@@ -235,18 +235,17 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-            with_tag :a, with: { href: '#' }, content: 'foo'
+            with_tag :a, with: { href: '#' }, text: /foo/
           end
           expect(renderer.menu_item('foo', '/')).to have_tag(:li, without: { class: 'active' }) do
-            with_tag :a, with: { href: '/' }, content: 'foo'
+            with_tag :a, with: { href: '/' }, text: /foo/
           end
           expect(renderer.menu_item('foo', '/bar')).to have_tag(:li, without: { class: 'active' }) do
-            with_tag :a, with: { href: '/bar' }, content: 'foo'
+            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
-            with_tag :a, with: { href: '/foo' }, content: 'foo'
+            with_tag :a, with: { href: '/foo' }, text: /foo/
           end
         end
       end
@@ -265,7 +264,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
       it 'generates the correct HTML' do
         with_all_2_dot_x_versions do
           expect(renderer.menu_item { 'bar' }).to have_tag(:li) do
-            with_tag :a, with: { href: '#' }, content: 'bar'
+            with_tag :a, with: { href: '#' }, text: /bar/
           end
         end
       end
@@ -274,7 +273,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '/foo' }, content: 'bar'
+              with_tag :a, with: { href: '/foo' }, text: /bar/
             end
           end
         end
@@ -284,7 +283,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, content: 'bar'
+              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /bar/
             end
           end
         end
@@ -294,7 +293,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, content: 'shnoo'
+              with_tag :a, with: { href: '/foo', class: 'pelle', id: 'fant' }, text: /shnoo/
             end
           end
         end
@@ -335,12 +334,12 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-            with_tag :a, with: { href: '#' }, content: 'foo'
+            with_tag :a, with: { href: '#' }, text: /foo/
             with_drop_down_menu
           end
 
           expect(renderer.sub_drop_down('foo') { 'bar' }).to have_tag(:li, with: { class: 'dropdown-submenu' }) do
-            with_tag :a, with: { href: '#' }, content: 'foo'
+            with_tag :a, with: { href: '#' }, text: /foo/
             with_drop_down_menu('bar')
           end
         end
@@ -350,7 +349,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '#' }, content: 'foo'
+              with_tag :a, with: { href: '#' }, text: /foo/
             end
           end
         end
@@ -360,7 +359,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, content: 'foo'
+              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
             end
           end
         end
@@ -370,7 +369,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 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
-              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, content: 'foo'
+              with_tag :a, with: { href: '#', class: 'pelle', id: 'fant' }, text: /foo/
             end
           end
         end
@@ -381,7 +380,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#drop_down_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' }, content: '')
+        expect(renderer.drop_down_divider).to have_tag(:li, with: { class: 'divider' }, text: '')
       end
     end
   end
@@ -389,7 +388,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#drop_down_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' }, content: 'foo')
+        expect(renderer.drop_down_header('foo')).to have_tag(:li, with: { class: 'nav-header' }, text: /foo/)
       end
     end
   end
@@ -397,7 +396,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#menu_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' }, content: '')
+        expect(renderer.menu_divider).to have_tag(:li, with: { class: 'divider-vertical' }, text: '')
       end
     end
   end
@@ -405,10 +404,10 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#menu_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' }, content: 'foo')
-        expect(renderer.menu_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, content: 'foo')
-        expect(renderer.menu_text('foo', 'right')).to have_tag(:p, with: { class: 'navbar-text pull-right' }, content: 'foo')
-        expect(renderer.menu_text(nil, 'left') { 'foo' }).to have_tag(:p, with: { class: 'navbar-text pull-left' }, content: 'foo')
+        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/)
       end
     end
   end
@@ -416,8 +415,8 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   describe '#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: '/' }, content: 'foo')
-        expect(renderer.brand_link('foo', '/foo')).to have_tag(:a, with: { class: 'brand', href: '/foo' }, content: 'foo')
+        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/)
       end
     end
   end

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

@@ -7,7 +7,7 @@ shared_examples 'active navbar link' do
         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
-            with_tag :a, with: { href: menu_path_or_url }, content: 'foo'
+            with_tag :a, with: { href: menu_path_or_url }, text: /foo/
           end
         end
       end
@@ -32,16 +32,18 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
           expect(renderer.navbar { 'foo' }).to have_tag(:nav, with: { class: 'navbar navbar-default', role: 'navigation' }) do
-            with_tag :div, with: { class: 'navbar-header' } do
-              with_tag :button, with: { type: 'button', class: 'navbar-toggle', :'data-toggle' => 'collapse', :'data-target' => '#navbar-collapsable' } do
-                with_tag :span, class: 'sr-only', content: 'Toggle navigation'
-                3.times do
-                  with_tag :span, class: 'icon-bar'
+            with_tag :div, with: { class: 'container' } do
+              with_tag :div, with: { class: 'navbar-header' } do
+                with_tag :button, with: { type: 'button', class: 'navbar-toggle', :'data-toggle' => 'collapse', :'data-target' => '#navbar-collapsable' } do
+                  with_tag :span, with: { class: 'sr-only' }, text: /Toggle navigation/
+                  3.times do
+                    with_tag :span, with: { class: 'icon-bar' }
+                  end
                 end
+                with_tag :a, with: { class: 'navbar-brand', href: '/' }
               end
-              with_tag :a, class: 'navbar-brand', href: '#'
+              with_tag :div, with: { class: 'collapse navbar-collapse', id: 'navbar-collapsable' }, text: /foo/
             end
-            with_tag :div, class: 'collapse navbar-collapse', id: 'navbar-collapsable', content: 'foo'
           end
         end
       end
@@ -55,6 +57,19 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
       end
     end
 
+    context 'with "container" parameter' do
+      it 'generates the correct HTML' do
+        with_all_3_dot_x_versions do
+          expect(renderer.navbar(container: true)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
+            with_tag :div, with: { class: 'container' }
+          end
+          expect(renderer.navbar(container: false)).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
+            without_tag :div, with: { class: 'container' }
+          end
+        end
+      end
+    end
+
     context 'with "fixed" parameter' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
@@ -75,8 +90,8 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'with "brand" and "brank_link" parameters' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'navbar-brand' }, content: 'foo')
-          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'navbar-brand' }, content: 'foo')
+          expect(renderer.navbar(brand: 'foo')).to have_tag(:a, with: { href: '/', class: 'navbar-brand' }, text: /foo/)
+          expect(renderer.navbar(brand: 'foo', brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'navbar-brand' }, text: /foo/)
           expect(renderer.navbar(brand_link: 'http://google.com')).to have_tag(:a, with: { href: 'http://google.com', class: 'navbar-brand' })
         end
       end
@@ -110,7 +125,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
             with_text 'foo '
             with_tag :b, with: { class: 'caret' }
           end
-          with_tag :ul, with: { class: 'dropdown-menu' }, content: 'bar'
+          with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
         end
       end
     end
@@ -168,15 +183,14 @@ describe BootstrapNavbar::Helpers::Bootstrap3 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
-            with_tag :a, with: { href: '/' }, content: 'foo'
+            with_tag :a, with: { href: '/' }, text: /foo/
           end
           expect(renderer.navbar_group_item('foo', '/bar')).to have_tag(:li, without: { class: 'active' }) do
-            with_tag :a, with: { href: '/bar' }, content: 'foo'
+            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
-            with_tag :a, with: { href: '/foo' }, content: 'foo'
+            with_tag :a, with: { href: '/foo' }, text: /foo/
           end
         end
       end
@@ -187,7 +201,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'without parameters' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_form { 'foo' }).to have_tag(:form, with: { class: 'navbar-form', role: 'form' }, content: 'foo')
+          expect(renderer.navbar_form { 'foo' }).to have_tag(:form, with: { class: 'navbar-form', role: 'form' }, text: /foo/)
         end
       end
     end
@@ -195,7 +209,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'with "align" parameter' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_form(align: 'left') { 'foo' }).to have_tag(:form, with: { class: 'navbar-form navbar-left', role: 'form' }, content: 'foo')
+          expect(renderer.navbar_form(align: 'left') { 'foo' }).to have_tag(:form, with: { class: 'navbar-form navbar-left', role: 'form' }, text: /foo/)
         end
       end
     end
@@ -229,7 +243,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'with "text" parameter' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, content: 'foo')
+          expect(renderer.navbar_text('foo')).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
         end
       end
     end
@@ -237,7 +251,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'with block' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, content: 'foo')
+          expect(renderer.navbar_text { 'foo' }).to have_tag(:p, with: { class: 'navbar-text' }, text: /foo/)
         end
       end
     end
@@ -247,7 +261,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'without parameters' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_button('foo')).to have_tag(:button, with: { class: 'btn navbar-btn', type: 'button' }, content: 'foo')
+          expect(renderer.navbar_button('foo')).to have_tag(:button, with: { class: 'btn navbar-btn', type: 'button' }, text: /foo/)
         end
       end
     end
@@ -255,7 +269,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     context 'with "class" parameter' do
       it 'generates the correct HTML' do
         with_all_3_dot_x_versions do
-          expect(renderer.navbar_button('foo', class: 'bar')).to have_tag(:button, with: { class: 'btn navbar-btn bar', type: 'button' }, content: 'foo')
+          expect(renderer.navbar_button('foo', class: 'bar')).to have_tag(:button, with: { class: 'btn navbar-btn bar', type: 'button' }, text: /foo/)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Manuel Meurer