bootstrap-navbar 1.0.0.pre5 → 1.0.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce035a6d2d9f6e1e92fcf991c1776b4e2b837b6e
-  data.tar.gz: 777ec660ec7e53ef8ccbb75874e767b6aa679312
+  metadata.gz: 747804f867d7733cc7d2017d150c251c697f7d7b
+  data.tar.gz: 52bb44678ab9b4d832892e10bbf40c3626f48a25
 SHA512:
-  metadata.gz: 9455ae0897b3e174650316cec70ab8ab037b9a83888ec6254aa68651919cbbf35f1bf821a2a084ef11d2b68442a4da6932995fd0fc445ed8590626d7c33138d0
-  data.tar.gz: 53455168eb7fd09d7eb87df1b86d67225a8b61a6326b73625acabb50ab7897f0b10cc3c937ba1f0d5fdb60619cf0c2efa107f35625a7e1940ff230d7f7fe2430
+  metadata.gz: f489bfdef9f57536f29361de3f3b362e6b286f7e6b8f35aea252d9c96ef1997163a57c8ef6d15c0bc116b530944e2c1c931cda365257da4b29073b0404cbc36a
+  data.tar.gz: cd3160ef9e88939818289d9ecb1d45ed29151d62c46f9cb3613d8e39a6caabd881d0912f0f5937520add2a45d8728eef723cbdaf8c8b9a00e77ff279dc21a234

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

@@ -1,6 +1,6 @@
 module BootstrapNavbar::Helpers::Bootstrap2
-  def navbar(options = {}, &block)
-    wrapper options do
+  def navbar(options = {}, wrapper_options = {}, &block)
+    wrapper options, wrapper_options do
       inner_wrapper do
         container options[:brand], options[:brand_link], options[:responsive], options[:fluid], &block
       end
@@ -101,7 +101,7 @@ HTML
 
   private
 
-  def wrapper(options, &block)
+  def wrapper(options, html_options, &block)
     position = case
     when options.has_key?(:static)
       "static-#{options[:static]}"
@@ -112,8 +112,9 @@ HTML
     css_classes = %w(navbar).tap do |css_classes|
       css_classes << "navbar-#{position}" if position
       css_classes << 'navbar-inverse' if options[:inverse]
+      css_classes << html_options.delete(:class)
     end
-    attribute_hash = { class: css_classes.join(' ') }
+    attribute_hash = { class: css_classes.join(' ') }.merge(html_options)
     attributes = attributes_for_tag(attribute_hash)
 
     prepare_html <<-HTML.chomp!

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '1.0.0.pre5'
+  VERSION = '1.0.0.pre6'
 end

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

@@ -107,6 +107,14 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
         end
       end
     end
+
+    context 'with wrapper parameters' do
+      it 'generates the correct HTML' do
+        with_all_2_dot_x_versions do
+          expect(renderer.navbar({}, class: 'my-wrapper-class', id: 'my-wrapper-id')).to have_tag(:div, with: { class: 'navbar my-wrapper-class', id: 'my-wrapper-id' })
+        end
+      end
+    end
   end
 
   describe '#navbar_group' do

metadata

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