xebec 2.6.1 → 2.7.0

data/lib/xebec.rb

@@ -13,6 +13,19 @@ module Xebec
     #
     # @see Xebec::NavBarRenderer
     attr_accessor :renderer_class
+    
+    # Chooses the behavior of NavBarRenderers when dealing with
+    # the current item.  By default, they are rendered in a span
+    # tag; however, if this flag is set to true, they will be
+    # rendered as links (as they would be if they weren't the
+    # current item).  Even with this flag set, the current item
+    # will still get the CSS class set by 
+    # currently_selected_nav_item_class.
+    #
+    # This setting can be overridden on a per-navbar basis.
+    #
+    # @see Xebec::NavBar#current_is_link
+    attr_accessor :current_is_link
 
   end
   self.currently_selected_nav_item_class = :current

data/lib/xebec/nav_bar.rb

@@ -10,6 +10,7 @@ module Xebec
     attr_reader :items
     attr_reader :html_attributes
     attr_accessor :current
+    attr_accessor :current_is_link
 
     # Create a new NavBar object.
     #
@@ -21,20 +22,22 @@ module Xebec
       @html_attributes = html_attributes || {}
       @items = []
       @current = nil
+      @current_is_link = Xebec.current_is_link
     end
 
     # Add a navigation item to this bar.
     #
     # @param [String, Symbol] name the name of the item
     # @param [String, Proc] href the URL of the item; optional
+    # @param [Hash] html_options additional html_options to be passed to link_to
     #
     # To customize the link text, set the internationalization key
     # <tt>navbar.{{nav bar name}}.{{nav item name}}</tt>.
     #
     # @see Xebec::NavBarHelper#nav_bar
     # @see Xebec::NavBarProxy#to_s
-    def nav_item(name, href = nil)
-      items << Xebec::NavItem.new(name, href)
+    def nav_item(name, href = nil, html_options = {})
+      items << Xebec::NavItem.new(name, href, html_options)
     end
 
     def empty?

data/lib/xebec/nav_bar_renderer.rb

@@ -94,10 +94,10 @@ module Xebec
       klass = '' << item.name.to_s
       klass << " #{Xebec.currently_selected_nav_item_class}" if is_current
       helper.content_tag(*list_item_tag(item, klass, text, href, is_current)) do
-        if is_current
+        if is_current && !bar.current_is_link
           helper.content_tag :span, text
         else
-          helper.link_to text, href
+          helper.link_to text, href, item.html_options
         end
       end
     end

data/lib/xebec/nav_item.rb

@@ -2,18 +2,19 @@ module Xebec
 
   class NavItem
 
-    attr_reader :name, :href
+    attr_reader :name, :href, :html_options
 
     # Create a new navigation item.
     #
     # @param [String, Symbol] name the name of the item
     # @param [String, Hash, ActiveRecord::Base] href whither the navigation item links;
     #         defaults to the named route, "#{name}_path"
+    # @param [Hash] html_options to be passed to the link_to helper method
     #
     # @see ActionView::Helpers::UrlHelper#url_for
-    def initialize(name, href = nil)
+    def initialize(name, href = nil, html_options = {})
       raise ArgumentError.new("#{name || '<nil>'} is not a valid name for a navigation item") if name.blank?
-      @name, @href = name, href
+      @name, @href, @html_options = name, href, html_options
     end
 
   end

data/test/nav_bar_renderer_test.rb

@@ -156,6 +156,19 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
+    
+    context 'with a NavBar that has a navigation item with html_options' do
+      setup do
+        @bar.nav_item :foo, 'http://foo.com', :method => :delete
+      end
+      should 'render a navigation bar with the appropriate items' do
+        assert_select_from @renderer.to_s, 'ul' do
+          assert_select 'li.foo' do
+            assert_select 'a[href="http://foo.com"][data-method=delete]', 'Foo'
+          end
+        end
+      end
+    end
 
     context 'with a NavBar that has a navigation item that links to the current page' do
       setup do
@@ -182,6 +195,26 @@ class NavBarRendererTest < Test::Unit::TestCase
           assert_select 'li.home.current span', 'Home'
         end
       end
+      
+      context 'with current_is_link set' do
+        setup do
+          @bar.current_is_link = true
+        end
+        
+        should 'render all items as links' do
+          assert_select_from @renderer.to_s, 'ul' do
+            assert_select 'li.home.current', 'Home' do
+              assert_select 'a', 1
+            end
+          end
+          
+          assert_select_from @renderer.to_s, 'ul' do
+            assert_select 'li.sign_up' do
+              assert_select 'a[href="/sign_up"]', 'Sign Up'
+            end
+          end
+        end
+      end
     end
 
     context "with a NavBar that has a navigation item with an i18n'd title" do

data/test/nav_bar_test.rb

@@ -16,6 +16,10 @@ class NavBarTest < Test::Unit::TestCase
     should 'use a specified name' do
       assert_equal 'fazbot', Xebec::NavBar.new('fazbot').name
     end
+    
+    should 'have current_is_link set to false by default' do
+      assert !@bar.current_is_link
+    end
 
     should 'be empty by default' do
       assert @bar.empty?
@@ -45,5 +49,16 @@ class NavBarTest < Test::Unit::TestCase
     end
 
   end
+  
+  context 'a NavBar with Xebec.current_is_link set to true' do
+    setup do
+      Xebec.current_is_link = true
+      @bar = Xebec::NavBar.new
+    end
+    
+    should 'have_current_is_link set to true by default' do
+      assert @bar.current_is_link
+    end
+  end
 
 end

data/xebec.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xebec}
-  s.version = "2.6.1"
+  s.version = "2.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James A. Rosen"]

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: xebec
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 6
-  - 1
-  version: 2.6.1
+  prerelease: 
+  version: 2.7.0
 platform: ruby
 authors: 
 - James A. Rosen
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -08:00
-default_executable: 
+date: 2011-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 3
         version: 2.10.3
   type: :development
   version_requirements: *id001
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   version_requirements: *id002
@@ -55,9 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :development
   version_requirements: *id003
@@ -120,7 +104,6 @@ files:
 - test/title_enhanced_nav_bar_renderer_test.rb
 - test/web_app_theme_renderer_test.rb
 - xebec.gemspec
-has_rdoc: true
 homepage: http://github.com/jamesarosen/xebec
 licenses: []
 
@@ -139,21 +122,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Navigation helpers