bootstrap-navbar 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 048ac7040b82f5137e124b8b88c643f29f201e02
-  data.tar.gz: e136412ed6a30340559891cf75dd817017b0eb3f
+  metadata.gz: 39d96cc530fbfb4f919a8f6dfcafef9baa39f5c4
+  data.tar.gz: 437335478231cfe02af2f423cd90782fe7c8969d
 SHA512:
-  metadata.gz: a386f61fc104b587b99477a2688abff2bef7763ef625e6534ab80a43a7b09d6356e93665f2d488ef8b38c2e143bb63c0d3b6ff51680f774334fa36797f8880c5
-  data.tar.gz: e35fa7f421ba27835024c8639f731a4021968d38607d2e935979f61be794a6efd7ce5019fda1eb27c2f17a22432a493d9b2b8842a3dcc772fb7c432b732323e2
+  metadata.gz: 6288289ddefc98e80f50215bb7d728b0290044ecd74bcfd7056bd65bc971411770e7d9e1804cc02131eda053113e9f2dcec3c6a9dcebea12cbc3569b55edbfc6
+  data.tar.gz: 8f86fbc80f213f2547cc90de2915f32dabf8f50ecd1d45faff594cdda0af26c50d459b803513b5d9b12a2be44ebd327ad002469f0dee6f973c02123f619de08e

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', cli: '--drb --profile', all_after_pass: false do
+guard 'rspec', cmd: 'bundle exec rspec', failed_mode: :none, all_after_pass: true, all_on_start: true do
   # Specs
   watch(%r(^spec/.+_spec\.rb$))
   watch('spec/spec_helper.rb')       { 'spec' }

data/lib/bootstrap-navbar/helpers.rb

@@ -23,8 +23,12 @@ module BootstrapNavbar::Helpers
   end
 
   def current_url_or_sub_url?(url)
-    normalized_path, normalized_current_path = [url, current_url].map do |url|
-      URI.parse(url).path.sub(%r(/\z), '')
+    uri, current_uri = [url, current_url].map do |url|
+      URI.parse(url)
+    end
+    return false if !uri.host.nil? && uri.host != current_uri.host
+    normalized_path, normalized_current_path = [uri, current_uri].map do |uri|
+      uri.path.sub(%r(/\z), '')
     end
     if normalized_path.empty?
       normalized_current_path.empty?

data/lib/bootstrap-navbar/version.rb

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

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

@@ -121,7 +121,7 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   end
 
   describe '#navbar_item' do
-    it_behaves_like 'marking the menu items as active correctly'
+    it_behaves_like 'marking the navbar items as active correctly'
 
     context 'with root URL' do
       context 'with list item options' do

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

@@ -126,7 +126,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   end
 
   describe '#navbar_item' do
-    it_behaves_like 'marking the menu items as active correctly'
+    it_behaves_like 'marking the navbar items as active correctly'
 
     context 'without current URL' do
       it 'generates the correct HTML' do

data/spec/support/helpers.rb

@@ -17,9 +17,9 @@ module Helpers
   end
 end
 
-shared_examples 'marking the menu items as active correctly' do
-  context 'when URL is the root URL' do
-    it_behaves_like 'marking current URLs as current and non-current ones not' do
+shared_examples 'marking the navbar items as active correctly' do
+  context 'when the navbar item URL is the current root URL or root path' do
+    it_behaves_like 'marking current URLs as current and non-current URLs as not-current' do
       let(:navbar_item_urls) do
         %w(
           http://www.foobar.com/
@@ -31,20 +31,18 @@ shared_examples 'marking the menu items as active correctly' do
         %w(
           http://www.foobar.com/
           http://www.foobar.com
-          /
         )
       end
       let(:non_current_urls) do
         %w(
           http://www.foobar.com/foo
-          /foo
         )
       end
     end
   end
 
-  context 'when URL is a sub URL' do
-    it_behaves_like 'marking current URLs as current and non-current ones not' do
+  context 'when the navbar item URL is a sub URL of the current URL' do
+    it_behaves_like 'marking current URLs as current and non-current URLs as not-current' do
       let(:navbar_item_urls) do
         %w(
           http://www.foobar.com/foo/
@@ -57,39 +55,53 @@ shared_examples 'marking the menu items as active correctly' do
         %w(
           http://www.foobar.com/foo/
           http://www.foobar.com/foo
-          /foo
-          /foo/
-
           http://www.foobar.com/foo/bar/
           http://www.foobar.com/foo/bar
-          /foo/bar
-          /foo/bar/
         )
       end
       let(:non_current_urls) do
         %w(
           http://www.foobar.com/
           http://www.foobar.com
-          /
-
           http://www.foobar.com/bar/
           http://www.foobar.com/bar
-          /bar
-          /bar/
+        )
+      end
+    end
+  end
+
+  context 'when the navbar item URL is an external URL' do
+    it_behaves_like 'marking current URLs as current and non-current URLs as not-current' do
+      let(:navbar_item_urls) do
+        %w(
+          http://www.barfoo.com/
+          http://www.barfoo.com
+        )
+      end
+      let(:current_urls) { [] }
+      let(:non_current_urls) do
+        %w(
+          http://www.foobar.com/
+          http://www.foobar.com
+          http://www.foobar.com/foo/
+          http://www.foobar.com/foo
         )
       end
     end
   end
 end
 
-shared_examples 'marking current URLs as current and non-current ones not' do
+shared_examples 'marking current URLs as current and non-current URLs as not-current' do
   it 'generates the correct HTML' do
     navbar_item_urls.each do |navbar_item_url|
+      puts "Testing navbar item with URL #{navbar_item_url}..."
       current_urls.each do |current_url|
+        puts "...should be marked as active when current URL is #{current_url}"
         BootstrapNavbar.configuration.current_url_method = "'#{current_url}'"
         expect(renderer.navbar_item('foo', navbar_item_url)).to have_tag(:li, with: { class: 'active' })
       end
       non_current_urls.each do |non_current_url|
+        puts "...should not be marked as active when current URL is #{non_current_url}"
         BootstrapNavbar.configuration.current_url_method = "'#{non_current_url}'"
         expect(renderer.navbar_item('foo', navbar_item_url)).to have_tag(:li, without: { class: 'active' })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helpers to generate a Twitter Bootstrap style navbar