bootstrap-navbar 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d96cc530fbfb4f919a8f6dfcafef9baa39f5c4
-  data.tar.gz: 437335478231cfe02af2f423cd90782fe7c8969d
+  metadata.gz: d93877380d2a9f9168bbe199ceb778bb325d1a24
+  data.tar.gz: 1b480d6ec0d98e9f08588aa907af3f125fd53606
 SHA512:
-  metadata.gz: 6288289ddefc98e80f50215bb7d728b0290044ecd74bcfd7056bd65bc971411770e7d9e1804cc02131eda053113e9f2dcec3c6a9dcebea12cbc3569b55edbfc6
-  data.tar.gz: 8f86fbc80f213f2547cc90de2915f32dabf8f50ecd1d45faff594cdda0af26c50d459b803513b5d9b12a2be44ebd327ad002469f0dee6f973c02123f619de08e
+  metadata.gz: 805730b18b0af14e0af9195ed11d738a6026ca6fa88c6e91aa3b21383afe29394930faef32b7b0dfa0e1f4fac9176fd62c03ed3935b88142240594dd286ec64b
+  data.tar.gz: c22faae34bcef0c29526567e38cebd9c7b08e736230cea1d750cf1ef7283e60391dfb2e074894da7eff8caab8724f26e4ead465ba15a4ab893c165767311f5c0

data/.travis.yml

@@ -3,5 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.2
+
+* Fixed bug when using Bootstrap 3 and `navbar_item` with block
+
 ## 2.0.0
 
 * Refactor: Add navbar_header and navbar_collapse to make it possible to insert content outside of header and collapse sections.

data/bootstrap-navbar.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.name          = 'bootstrap-navbar'
   gem.version       = BootstrapNavbar::VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.authors       = ['Manuel Meurer']
+  gem.author        = 'Manuel Meurer'
   gem.email         = 'manuel@krautcomputing.com'
   gem.summary       = 'Helpers to generate a Twitter Bootstrap style navbar'
   gem.description   = 'Helpers to generate a Twitter Bootstrap style navbar'
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r(^(test|spec|features)/))
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'rake', '>= 10.0.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.13.0'
   gem.add_development_dependency 'rspec-html-matchers', '~> 0.4.3'
   gem.add_development_dependency 'guard-rspec', '~> 3.0'

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

@@ -60,7 +60,7 @@ 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?
+    text, url, list_item_options, link_options = capture(&block), text, url, list_item_options if block_given?
     url               ||= '#'
     list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
     link_options        = link_options.nil?      ? {} : link_options.dup

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

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

@@ -128,6 +128,14 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   describe '#navbar_item' do
     it_behaves_like 'marking the navbar items as active correctly'
 
+    context 'with block' do
+      it 'generates the correct HTML' do
+        expect(renderer.navbar_item('/foo', { class: 'list-item '}, class: 'link') { 'link-text' }).to have_tag(:li, with: { class: 'list-item' }) do
+          with_tag :a, with: { href: '/foo', class: 'link' }, text: /link-text/
+        end
+      end
+    end
+
     context 'without current URL' do
       it 'generates the correct HTML' do
         BootstrapNavbar.configuration.current_url_method = '"/foo"'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement