bootstrap-navbar 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 781cad4ac31fafee2286b64f3724c8b5cd4a3ed2
-  data.tar.gz: b0d3f73b9c98ed24f2f65216d3ff313249964e56
+  metadata.gz: 048ac7040b82f5137e124b8b88c643f29f201e02
+  data.tar.gz: e136412ed6a30340559891cf75dd817017b0eb3f
 SHA512:
-  metadata.gz: 88d37fed5dd7c408fb4e69cae5ee66c476dca8b96967afce12ed6d21b3a4770ac2457c6677700ba2ef5c2ea8ee670a96b8454635976d79355d9d732383be5ba8
-  data.tar.gz: a33caba3b1d44fedba100e33ccb2c7e167b88dbc87ddbd6a4ddae14a3be19fd5d9ed2d2dde8772550321f4deaec4a1d99a036370f42c3686a1aa22626abd7207
+  metadata.gz: a386f61fc104b587b99477a2688abff2bef7763ef625e6534ab80a43a7b09d6356e93665f2d488ef8b38c2e143bb63c0d3b6ff51680f774334fa36797f8880c5
+  data.tar.gz: e35fa7f421ba27835024c8639f731a4021968d38607d2e935979f61be794a6efd7ce5019fda1eb27c2f17a22432a493d9b2b8842a3dcc772fb7c432b732323e2

data/bootstrap-navbar.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |gem|
   # Listen >= 2.0.0 only works with Ruby >= 1.9.3
   gem.add_development_dependency 'listen', '< 2.0.0' if RUBY_VERSION < '1.9.3'
   gem.add_development_dependency 'bootstrap-sass', '3.0.2.0'
-  gem.add_runtime_dependency 'gem_config', '~> 0.2.4'
+  gem.add_runtime_dependency 'gem_config', '~> 0.3.0'
 end

data/lib/bootstrap-navbar.rb

@@ -4,7 +4,7 @@ module BootstrapNavbar
   include GemConfig::Base
 
   with_configuration do
-    has :bootstrap_version, classes: [String, NilClass]
+    has :bootstrap_version, classes: String
     has :current_url_method, classes: String
   end
 end

data/lib/bootstrap-navbar/helpers.rb

@@ -22,11 +22,15 @@ module BootstrapNavbar::Helpers
     end
   end
 
-  def current_url?(url)
+  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), '') rescue nil
+      URI.parse(url).path.sub(%r(/\z), '')
+    end
+    if normalized_path.empty?
+      normalized_current_path.empty?
+    else
+      normalized_current_path =~ %r(#{Regexp.escape(normalized_path)}(/.+)?)
     end
-    normalized_path == normalized_current_path
   end
 
   def current_url

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

@@ -27,7 +27,7 @@ HTML
     list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
     link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
-      css_classes << 'active' if current_url?(path)
+      css_classes << 'active' if current_url_or_sub_url?(path)
       css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
     end
     list_item_attributes = attributes_for_tag(

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

@@ -65,7 +65,7 @@ HTML
     list_item_options   = list_item_options.nil? ? {} : list_item_options.dup
     link_options        = link_options.nil?      ? {} : link_options.dup
     list_item_css_classes = [].tap do |css_classes|
-      css_classes << 'active' if current_url?(url)
+      css_classes << 'active' if current_url_or_sub_url?(url)
       css_classes << list_item_options.delete(:class) if list_item_options.has_key?(:class)
     end
     list_item_attributes = attributes_for_tag(

data/lib/bootstrap-navbar/version.rb

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

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

@@ -1,16 +1,5 @@
 require 'spec_helper'
 
-shared_examples 'active menu item' do
-  it 'generates the correct HTML' do
-    paths_and_urls.each do |current_path_or_url|
-      paths_and_urls.each do |menu_path_or_url|
-        BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
-        expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' })
-      end
-    end
-  end
-end
-
 describe BootstrapNavbar::Helpers::Bootstrap2 do
   before do
     BootstrapNavbar.configure do |config|
@@ -132,51 +121,9 @@ describe BootstrapNavbar::Helpers::Bootstrap2 do
   end
 
   describe '#navbar_item' do
-    context 'with current URL or path' do
-      # With root URL or path
-      it_behaves_like 'active menu item' do
-        let(:paths_and_urls) do
-          %w(
-            http://www.foobar.com/
-            http://www.foobar.com
-            /
-            http://www.foobar.com/?foo=bar
-            http://www.foobar.com?foo=bar
-            /?foo=bar
-            http://www.foobar.com/#foo
-            http://www.foobar.com#foo
-            /#foo
-            http://www.foobar.com/#foo?foo=bar
-            http://www.foobar.com#foo?foo=bar
-            /#foo?foo=bar
-          )
-        end
-      end
-
-      # With sub URL or path
-      it_behaves_like 'active menu item' do
-        let(:paths_and_urls) do
-          %w(
-            http://www.foobar.com/foo
-            http://www.foobar.com/foo/
-            /foo
-            /foo/
-            http://www.foobar.com/foo?foo=bar
-            http://www.foobar.com/foo/?foo=bar
-            /foo?foo=bar
-            /foo/?foo=bar
-            http://www.foobar.com/foo#foo
-            http://www.foobar.com/foo/#foo
-            /foo#foo
-            /foo/#foo
-            http://www.foobar.com/foo#foo?foo=bar
-            http://www.foobar.com/foo/#foo?foo=bar
-            /foo#foo?foo=bar
-            /foo/#foo?foo=bar
-          )
-        end
-      end
+    it_behaves_like 'marking the menu items as active correctly'
 
+    context 'with root URL' do
       context 'with list item options' do
         it 'generates the correct HTML' do
           BootstrapNavbar.configuration.current_url_method = '"/"'

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

@@ -1,18 +1,5 @@
 require 'spec_helper'
 
-shared_examples 'active navbar link' do
-  it 'generates the correct HTML' do
-    paths_and_urls.each do |current_path_or_url|
-      paths_and_urls.each do |menu_path_or_url|
-        BootstrapNavbar.configuration.current_url_method = "'#{current_path_or_url}'"
-        expect(renderer.navbar_item('foo', menu_path_or_url)).to have_tag(:li, with: { class: 'active' }) do
-          with_tag :a, with: { href: menu_path_or_url }, text: /foo/
-        end
-      end
-    end
-  end
-end
-
 describe BootstrapNavbar::Helpers::Bootstrap3 do
   before do
     BootstrapNavbar.configure do |config|
@@ -67,10 +54,9 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
         end
       end
     end
-
   end
 
-  describe '#navbar_header',:focus do
+  describe '#navbar_header' do
     context 'without parameters' do
       it 'generates the correct HTML' do
         expect(renderer.navbar_header { 'foo' }).to have_tag :div, with: { class: 'navbar-header' } do
@@ -98,7 +84,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
     end
   end
 
-  describe '#navbar_collapse',:focus do
+  describe '#navbar_collapse' do
     context 'without parameters' do
       it 'generates the correct HTML' do
         expect(renderer.navbar_collapse { 'foo' }).to have_tag :div, with: { class: 'collapse navbar-collapse', id: 'navbar-collapsable' }, text: /foo/
@@ -140,51 +126,7 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
   end
 
   describe '#navbar_item' do
-    context 'with current URL or path' do
-      # With root URL or path
-      it_behaves_like 'active navbar link' do
-        let(:paths_and_urls) do
-          %w(
-            http://www.foobar.com/
-            http://www.foobar.com
-            /
-            http://www.foobar.com/?foo=bar
-            http://www.foobar.com?foo=bar
-            /?foo=bar
-            http://www.foobar.com/#foo
-            http://www.foobar.com#foo
-            /#foo
-            http://www.foobar.com/#foo?foo=bar
-            http://www.foobar.com#foo?foo=bar
-            /#foo?foo=bar
-          )
-        end
-      end
-
-      # With sub URL or path
-      it_behaves_like 'active navbar link' do
-        let(:paths_and_urls) do
-          %w(
-            http://www.foobar.com/foo
-            http://www.foobar.com/foo/
-            /foo
-            /foo/
-            http://www.foobar.com/foo?foo=bar
-            http://www.foobar.com/foo/?foo=bar
-            /foo?foo=bar
-            /foo/?foo=bar
-            http://www.foobar.com/foo#foo
-            http://www.foobar.com/foo/#foo
-            /foo#foo
-            /foo/#foo
-            http://www.foobar.com/foo#foo?foo=bar
-            http://www.foobar.com/foo/#foo?foo=bar
-            /foo#foo?foo=bar
-            /foo/#foo?foo=bar
-          )
-        end
-      end
-    end
+    it_behaves_like 'marking the menu items as active correctly'
 
     context 'without current URL' do
       it 'generates the correct HTML' do

data/spec/bootstrap-navbar/helpers_spec.rb

@@ -18,7 +18,7 @@ describe BootstrapNavbar::Helpers do
 
     context 'when Bootstrap version is not set' do
       before do
-        BootstrapNavbar.configuration.bootstrap_version = nil
+        BootstrapNavbar.configuration.unset :bootstrap_version
       end
 
       context 'when bootstrap-sass gem is not loaded' do

data/spec/support/helpers.rb

@@ -16,3 +16,83 @@ module Helpers
     end
   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
+      let(:navbar_item_urls) do
+        %w(
+          http://www.foobar.com/
+          http://www.foobar.com
+          /
+        )
+      end
+      let(:current_urls) 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
+      let(:navbar_item_urls) do
+        %w(
+          http://www.foobar.com/foo/
+          http://www.foobar.com/foo
+          /foo
+          /foo/
+        )
+      end
+      let(:current_urls) 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
+end
+
+shared_examples 'marking current URLs as current and non-current ones not' do
+  it 'generates the correct HTML' do
+    navbar_item_urls.each do |navbar_item_url|
+      current_urls.each do |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|
+        BootstrapNavbar.configuration.current_url_method = "'#{non_current_url}'"
+        expect(renderer.navbar_item('foo', navbar_item_url)).to have_tag(:li, without: { class: 'active' })
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Manuel Meurer
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 description: Helpers to generate a Twitter Bootstrap style navbar
 email: manuel@krautcomputing.com
 executables: []