bootstrap-navbar 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12efe71c10acf6e7a31ab0d80f5e3cdb1a7f5c54
-  data.tar.gz: a409b702eefe55702101a13f4ba8e9e0676c61ab
+  metadata.gz: ee57fde2f640775cbb3cbae9df69ae7932b60f0b
+  data.tar.gz: b098b58bb91ded0c2a9af753c48d371048310c41
 SHA512:
-  metadata.gz: 552d1c79457f6fbe40b19da71974d775ca118f41dc966a6fe8e4b04705d1d630928d9fd57d9001e92e8e1bf500cf919102978e42b227cd396c49e965a1ecc0eb
-  data.tar.gz: eb3bf53ef76c9ddfa5908a9258383a3f9c0645bac9f053ba80484d238b8f3157b8b305d917f1fea53ad631fd15429421c6172b90045d3ff33f3bd03b07782c0c
+  metadata.gz: 350e000fa6733c652464e35402059ce1601e9cc6d1ca396e864014102a9dd4b7dda9bcbc61d77f1239a4de75f86deaf754a1f56a35e384561c6a87ac043227fc
+  data.tar.gz: 63ce3f7f33c9f93330f9a76c29e5ae7faad029182e013d2bcc0a3e6fb0fd64c0827f1918a46d2d06ab5fb835ea183e964fb41117ab2424e4076562d9b60037e6

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

@@ -123,10 +123,15 @@ HTML
 HTML
   end
 
-  def navbar_dropdown(text, &block)
+  def navbar_dropdown(text, list_item_options = {}, link_options = {}, &block)
+    list_item_options, link_options = list_item_options.dup, link_options.dup
+    list_item_options[:class] = [list_item_options[:class], 'dropdown'].compact.join(' ')
+    list_item_attributes = attributes_for_tag(list_item_options)
+    link_options[:class] = [link_options[:class], 'dropdown-toggle'].compact.join(' ')
+    link_attributes = attributes_for_tag(link_options)
     prepare_html <<-HTML.chomp!
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{text} <b class="caret"></b></a>
+<li#{list_item_attributes}>
+  <a href="#" data-toggle="dropdown"#{link_attributes}>#{text} <b class="caret"></b></a>
   <ul class="dropdown-menu">
     #{capture(&block) if block_given?}
   </ul>
@@ -176,7 +181,6 @@ HTML
       css_classes << "navbar-#{options.delete(:inverse) ? 'inverse' : 'default'}"
       css_classes << "navbar-fixed-#{options.delete(:fixed)}" if options.has_key?(:fixed)
       css_classes << 'navbar-static-top' if options.delete(:static)
-      css_classes << 'navbar-inverse' if options.delete(:inverse)
       css_classes << options.delete(:class) if options.has_key?(:class)
     end
     role = options.delete(:role) || 'navigation'

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

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

@@ -114,13 +114,51 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   end
 
   describe '#navbar_dropdown' do
-    it 'generates the correct HTML' 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' }
+    context 'without parameters' do
+      it 'generates the correct HTML' 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_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
+        end
+      end
+    end
+
+    context 'with list item parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_dropdown('foo', class: 'list-item-class', id: 'list-item-id') { 'bar' }).to have_tag(:li, with: { class: 'dropdown list-item-class', id: 'list-item-id' }) do
+          with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
+            with_text 'foo '
+            with_tag :b, with: { class: 'caret' }
+          end
+          with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
+        end
+      end
+    end
+
+    context 'with link parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_dropdown('foo', {}, class: 'link-class', id: 'link-id') { 'bar' }).to have_tag(:li, with: { class: 'dropdown' }) do
+          with_tag :a, with: { href: '#', class: 'dropdown-toggle link-class', id: 'link-id', :'data-toggle' => 'dropdown' } do
+            with_text 'foo '
+            with_tag :b, with: { class: 'caret' }
+          end
+          with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
+        end
+      end
+    end
+
+    context 'with list item parameters and link parameters' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_dropdown('foo', { class: 'list-item-class', id: 'list-item-id' }, class: 'link-class', id: 'link-id') { 'bar' }).to have_tag(:li, with: { class: 'dropdown list-item-class', id: 'list-item-id' }) do
+          with_tag :a, with: { href: '#', class: 'dropdown-toggle link-class', id: 'link-id', :'data-toggle' => 'dropdown' } do
+            with_text 'foo '
+            with_tag :b, with: { class: 'caret' }
+          end
+          with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
         end
-        with_tag :ul, with: { class: 'dropdown-menu' }, text: /bar/
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake