xebec 2.3.0 → 2.4.0

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/xebec/nav_bar_renderer.rb

@@ -12,7 +12,7 @@ module Xebec
     # render the NavBar as an HTML list.
     #
     # @param [Xebec::NavBar] bar the navigation bar to renderer
-    # @param [#tag AND #content_tag AND #link_to] helper the ActionView helper
+    # @param [#tag AND #content_tag AND #link_to AND #current_page?] helper the ActionView helper
     def initialize(bar, helper)
       raise ArgumentError.new("#{bar || '<nil>'} is not a NavBar") unless bar.kind_of?(NavBar)
       raise ArgumentError.new("#{helper || '<nil>'} does not seem to be a view helper") unless
@@ -90,10 +90,15 @@ module Xebec
     def render_nav_item(item)
       text = text_for_nav_item item
       href = href_for_nav_item item
+      is_current = is_current_nav_item?(item, href)
       klass = item.name.to_s
-      klass << " #{Xebec.currently_selected_nav_item_class}" if is_current_nav_item?(item, href)
+      klass << " #{Xebec.currently_selected_nav_item_class}" if is_current
       helper.content_tag :li, :class => klass do
-        helper.link_to_unless_current text, href
+        if is_current
+          helper.content_tag :span, text
+        else  
+          helper.link_to text, href
+        end
       end
     end
     

data/test/nav_bar_renderer_test.rb

@@ -92,7 +92,7 @@ class NavBarRendererTest < Test::Unit::TestCase
       end
       should 'render a navigation bar with the item marked as current' do
         assert_select_from @renderer.to_s, 'ul' do
-          assert_select 'li.foo.current', 'Foo'
+          assert_select 'li.foo.current span', 'Foo'
         end
       end
       context 'when Xebec is configured to use a different "current" class' do
@@ -102,7 +102,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
         should 'use the configured CSS class' do
           assert_select_from @renderer.to_s, 'ul' do
-            assert_select 'li.foo.active', 'Foo'
+            assert_select 'li.foo.active span', 'Foo'
           end
         end
         teardown do
@@ -162,7 +162,7 @@ class NavBarRendererTest < Test::Unit::TestCase
       end
       should 'add the "current" class to the current item' do
         assert_select_from @renderer.to_s, 'ul' do
-          assert_select 'li.home.current', 'Home'
+          assert_select 'li.home.current span', 'Home'
         end
       end
     end

data/xebec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xebec}
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James A. Rosen"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-03-31}
   s.description = %q{Helpers for generating navigation bars}
   s.email = %q{james.a.rosen@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - James A. Rosen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -05:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency