bootstrap-navbar 1.0.0.pre8 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32dd31868e0ace9697468bd0705c163ee94265e
-  data.tar.gz: 87c339d440b1fff10aa4a0540b6089f42b67bb62
+  metadata.gz: 0486f20fd1cce816f2193140268cecc4d586e043
+  data.tar.gz: 2b581e4521985b728f3b72ae5341d219459529d9
 SHA512:
-  metadata.gz: 526f6c444e4a3a4a89b924ea8702c28de5138891d0f9608c760339ca5e64f1e691c1210e3c831f464ea28f5ba9e090b1e4b98bb3d029b0f8339cd4c3ca8d0c12
-  data.tar.gz: 9db4133c32ad30c4d7ab29bea5ebd3c7faf9943f1d200aac4248d5b236a525acd06b1176b053676e955a5cf0f677548e898e27cf1f253bb515d323585782ecc3
+  metadata.gz: 53f00d99073df7999fd2e7f4e2ce02029730d964d5e647a6c0968d93e7cf068bc362b2a6421c3a61a0ec2519c08bd7b0ce5d5058565019777331eb7e8fb6ebfc
+  data.tar.gz: 8c6a54de102d5777e22e692fbbdcbc102358c329797cdb2f012297d43e5a2110b3a38a11dd2dc05865a21a1371a108bee3dce66a0bb615383c6e77b4db34acfd

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

@@ -2,7 +2,7 @@ module BootstrapNavbar::Helpers::Bootstrap3
   def navbar(options = {}, &block)
     container = options.has_key?(:container) ? options[:container] : true
     navbar_content =
-      header(options[:brand], options[:brand_link]) <<
+      header(options.delete(:brand), options.delete(:brand_link)) <<
       collapsable(&block)
     wrapper options do
       if container
@@ -15,7 +15,8 @@ module BootstrapNavbar::Helpers::Bootstrap3
 
   def navbar_group(options = {}, &block)
     css_classes = %w(nav navbar-nav).tap do |css_classes|
-      css_classes << "navbar-#{options[:align]}" if options.has_key?(:align)
+      css_classes << "navbar-#{options.delete(:align)}" if options.has_key?(:align)
+      css_classes << options.delete(:class) if options.has_key?(:class)
     end
     attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
     prepare_html <<-HTML.chomp!
@@ -25,35 +26,38 @@ module BootstrapNavbar::Helpers::Bootstrap3
 HTML
   end
 
-  def navbar_item(text, url)
-    attributes = {}
-    attributes[:class] = 'active' if current_url?(url)
-    attributes = attributes_for_tag(attributes)
-    prepare_html <<-HTML.chomp!
-<li#{attributes}>
-  <a href="#{url}">#{text}</a>
-</li>
-HTML
-  end
+  def navbar_item(text, url = nil, list_item_options = nil, link_options = nil, &block)
+    text, url, list_item_options, link_options = capture(&block), text, list_item_options if block_given?
+    url               ||= '#'
+    list_item_options ||= {}
+    link_options      ||= {}
 
-  def navbar_dropdown(text, &block)
+    list_item_css_classes = [].tap do |css_classes|
+      css_classes << 'active' if current_url?(url)
+      css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
+    end
+    list_item_attributes = attributes_for_tag(
+      { class: list_item_css_classes.join(' ') }
+        .delete_if { |k, v| v.empty? }
+        .merge(list_item_options)
+    )
+    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>
-  <ul class="dropdown-menu">
-    #{capture(&block) if block_given?}
-  </ul>
+<li#{list_item_attributes}>
+  <a href="#{url}"#{link_attributes}>
+    #{text}
+  </a>
 </li>
 HTML
   end
 
   def navbar_form(options = {}, &block)
     css_classes = %w(navbar-form).tap do |css_classes|
-      css_classes << "navbar-#{options[:align]}" if options.has_key?(:align)
+      css_classes << "navbar-#{options.delete(:align)}" if options.has_key?(:align)
+      css_classes << options.delete(:class) if options.has_key?(:class)
     end
-    role = options[:role] || 'form'
-    attribute_hash = { class: css_classes.join(' '), role: role }
-    attributes = attributes_for_tag(attribute_hash)
+    role = options.delete(:role) || 'form'
+    attributes = attributes_for_tag({ class: css_classes.join(' '), role: role }.merge(options))
     prepare_html <<-HTML.chomp!
 <form#{attributes}>
   #{capture(&block) if block_given?}
@@ -61,31 +65,54 @@ HTML
 HTML
   end
 
-  def navbar_divider
-    prepare_html <<-HTML.chomp!
-<li class="divider"></li>
-HTML
-  end
-
-  def navbar_text(text = nil, &block)
+  def navbar_text(text = nil, options = {}, &block)
     raise StandardError, 'Please provide either the "text" parameter or a block.' if (text.nil? && !block_given?) || (!text.nil? && block_given?)
     text ||= capture(&block)
+    css_classes = %w(navbar-text).tap do |css_classes|
+      css_classes << options.delete(:class) if options.has_key?(:class)
+    end
+    attributes = attributes_for_tag({ class: css_classes.join(' ') }.merge(options))
     prepare_html <<-HTML.chomp!
-<p class="navbar-text">#{text}</p>
+<p#{attributes}>#{text}</p>
 HTML
   end
 
   def navbar_button(text, options = {})
     css_classes = %w(btn navbar-btn).tap do |css_classes|
-      css_classes << options[:class] if options.has_key?(:class)
+      css_classes << options.delete(:class) if options.has_key?(:class)
     end
-    attribute_hash = { class: css_classes.join(' '), type: 'button' }
-    attributes = attributes_for_tag(attribute_hash)
+    type = options.delete(:type) || 'button'
+    attributes = attributes_for_tag({ class: css_classes.join(' '), type: type }.merge(options))
     prepare_html <<-HTML.chomp!
 <button#{attributes}>#{text}</button>
 HTML
   end
 
+  def navbar_dropdown(text, &block)
+    prepare_html <<-HTML.chomp!
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{text} <b class="caret"></b></a>
+  <ul class="dropdown-menu">
+    #{capture(&block) if block_given?}
+  </ul>
+</li>
+HTML
+  end
+
+  def navbar_dropdown_header(text)
+    prepare_html <<-HTML.chomp!
+<li class="dropdown-header">
+  #{text}
+</li>
+HTML
+  end
+
+  def navbar_dropdown_divider
+    prepare_html <<-HTML.chomp!
+<li class="divider"></li>
+HTML
+  end
+
   private
 
   def container(content)
@@ -105,7 +132,7 @@ HTML
     <span class="icon-bar"></span>
     <span class="icon-bar"></span>
   </button>
-  #{brand_link brand, brand_link}
+  #{brand_link brand, brand_link unless brand.nil?}
 </div>
 HTML
   end
@@ -119,19 +146,24 @@ HTML
   end
 
   def brand_link(name, url = nil)
-    prepare_html %(<a href="#{url || '/'}" class="navbar-brand">#{name}</a>)
+    url ||= '/'
+    prepare_html <<-HTML.chomp!
+<a href="#{url}" class="navbar-brand">
+  #{name}
+</a>
+HTML
   end
 
   def wrapper(options, &block)
-    style = options[:inverse] ? 'inverse' : 'default'
+    style = options.delete(:inverse) ? 'inverse' : 'default'
     css_classes = %w(navbar).tap do |css_classes|
-      css_classes << "navbar-fixed-#{options[:fixed]}" if options.has_key?(:fixed)
-      css_classes << 'navbar-static-top' if options[:static]
-      css_classes << 'navbar-inverse' if options[:inverse]
+      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 << "navbar-#{style}"
     end
-    attribute_hash = { class: css_classes.join(' '), role: 'navigation' }
-    attributes = attributes_for_tag(attribute_hash)
+    role = options.delete(:role) || 'navigation'
+    attributes = attributes_for_tag({ class: css_classes.join(' '), role: role }.merge(options))
     prepare_html <<-HTML.chomp!
 <nav#{attributes}>
   #{capture(&block) if block_given?}

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '1.0.0.pre8'
+  VERSION = '1.0.1'
 end

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

@@ -40,7 +40,6 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
                     with_tag :span, with: { class: 'icon-bar' }
                   end
                 end
-                with_tag :a, with: { class: 'navbar-brand', href: '/' }
               end
               with_tag :div, with: { class: 'collapse navbar-collapse', id: 'navbar-collapsable' }, text: /foo/
             end
@@ -92,7 +91,6 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
         with_all_3_dot_x_versions do
           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
     end
@@ -215,14 +213,6 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     end
   end
 
-  describe '#navbar_divider' do
-    it 'generates the correct HTML' do
-      with_all_3_dot_x_versions do
-        expect(renderer.navbar_divider).to have_tag(:li, with: { class: 'divider' })
-      end
-    end
-  end
-
   describe '#navbar_text' do
     context 'without parameters' do
       it 'raises an error' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre8
+  version: 1.0.1
 platform: ruby
 authors:
 - Manuel Meurer
@@ -132,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.5