bootstrap-navbar 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982a971198be58abfb4bca9437f239d32649042a
-  data.tar.gz: ce65e2dfd1f6a41baae61ae60ced9e19a3b0d649
+  metadata.gz: ca443255cbdf271153acd52fa96e6d787f4cc391
+  data.tar.gz: 1450fb288c7eff37123cf59c4b6e4a1261f966d1
 SHA512:
-  metadata.gz: 440b131c834bccd2fa760c715e0a956a933ffad6f1d1e37ddf8f03e710bb4a2f53426285c378a579d1c63d39c54c9fbb46cf29812eb7c89f00596dc7f5d5554f
-  data.tar.gz: c801f1ba40965ef2479e8bf1d44bb9b4ded164891cb1a79f77e0eaa6db7e0c187083353aa95e271cb451f343f51f94452dd2fbb5b5ed76bba35ae34fb011a018
+  metadata.gz: 0ad5a23c193df18e26bbaec8b687a9697b1b1d165d626e50e424b1049764c381fa891de3771af7cf92fe5bc41c9c114cfb092968b852dd20fb5a1f6146b359fd
+  data.tar.gz: 47bd7e4873484fa597d5d2b378cda36c03f9a0815850987d7fbe4bed71a8ddc3d66188e9c141529c2351b750c8334ee3c255e9538b856b662896c836fba5e8bc

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install:
   - gem update --system
   - gem update bundler

data/README.md

@@ -58,6 +58,23 @@ module BootstrapNavbar::Helpers
 end
 ```
 
+### Set up root paths (optional)
+
+When deciding whether a navbar link is marked as current, the following steps are followed:
+
+* If the link target is one of the root paths (only "/" by default), the link is only marked as current if the target is the current path.
+* Otherwise the link is marked as current if the target is the current path or a sub path of the current path.
+
+In certain cases a website might want to treat more paths as root paths, e.g. when it has different locales mapped at /en, /de etc. This can be achieved by setting the `root_paths` configuration.
+
+```ruby
+BootstrapNavbar.configure do |config|
+  config.root_paths = ['/', '/en', '/de'] # default: ['/']
+end
+```
+
+With this configuration, if your brand link would be '/en' for example, it would not be marked as current if you are on '/en/some-page'.
+
 ### Mix in the helpers into the rendering engine (required)
 
 ```ruby

data/lib/bootstrap-navbar.rb

@@ -4,8 +4,9 @@ module BootstrapNavbar
   include GemConfig::Base
 
   with_configuration do
-    has :bootstrap_version, classes: String
+    has :bootstrap_version,  classes: String
     has :current_url_method, classes: String
+    has :root_paths,         classes: Array, default: %w(/)
   end
 end
 

data/lib/bootstrap-navbar/helpers.rb

@@ -31,8 +31,13 @@ module BootstrapNavbar::Helpers
     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?
+    normalized_root_paths = BootstrapNavbar.configuration.root_paths.map do |path|
+      path.sub(%r(/\z), '')
+    end
+    # If the URL is one of the root URLS, it's only current if it is the current URL.
+    # Otherwise it's current if we're currently on the URL or on a sub URL.
+    if normalized_root_paths.include?(normalized_path)
+      normalized_current_path == normalized_path
     else
       normalized_current_path =~ %r(\A#{Regexp.escape(normalized_path)}(/.+)?\z)
     end

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/spec/support/helpers.rb

@@ -16,7 +16,7 @@ module Helpers
 end
 
 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
+  context 'when the navbar item URL is the current root URL or path' do
     it_behaves_like 'marking current URLs as current and non-current URLs as not-current' do
       let(:navbar_item_urls) do
         %w(
@@ -39,14 +39,52 @@ shared_examples 'marking the navbar items as active correctly' do
     end
   end
 
+  context 'when another root path is configured and the navbar item URL is the corresponding root URL or path' do
+    before do
+      @_previous_root_paths = BootstrapNavbar.configuration.root_paths
+      BootstrapNavbar.configuration.root_paths = %w(/custom-root)
+    end
+
+    after do
+      BootstrapNavbar.configuration.root_paths = @_previous_root_paths
+    end
+
+    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/custom-root/
+          http://www.foobar.com/custom-root
+          /custom-root/
+          /custom-root
+        )
+      end
+      let(:current_urls) do
+        %w(
+          http://www.foobar.com/custom-root/
+          http://www.foobar.com/custom-root
+        )
+      end
+      let(:non_current_urls) do
+        %w(
+          http://www.foobar.com/
+          http://www.foobar.com
+          http://www.foobar.com/foo/
+          http://www.foobar.com/foo
+          http://www.foobar.com/custom-root/foo/
+          http://www.foobar.com/custom-root/foo
+        )
+      end
+    end
+  end
+
   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/
           http://www.foobar.com/foo
-          /foo
           /foo/
+          /foo
         )
       end
       let(:current_urls) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar
@@ -166,4 +166,3 @@ test_files:
 - spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-has_rdoc: