menu_helper 0.2.0 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.3.0 / 2009-04-18
+
+* Add ui-state-active and level-specific menu css classes
+* Change class css naming conventions to follow the new jQuery UI guidelines
+
 == 0.2.0 / 2008-12-14
 
 * Remove the PluginAWeek namespace

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2008 Aaron Pfeifer
+Copyright (c) 2006-2009 Aaron Pfeifer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -62,18 +62,18 @@ _menu_bar.html.erb:
   %>
 
 Output (formatted for sanity):
-  <ul class="menubar menubar-1">
-    <li><a href="http://example.com/"><span>Home</span></a></li>
-    <li><a href="http://example.com/products"><span>Products</span></a></li>
-    <li><a href="http://example.com/services"><span>Services</span></a></li>
-    <li class="menubar-selected"><a href="http://example.com/about_us"><span>About Us</span></a>
-      <ul class="menubar menubar-2 menubar-selected">
-        <li><a href="http://example.com/about_us"><span>Overview</span></a></li>
-        <li class="menubar-selected"><a href="http://example.com/about_us/who_we_are"><span>Who We Are</span></a></li>
-        <li class="menubar-last"><a href="http://example.com/about_us/contact"><span>Contact Us</span></a></li>
+  <ul class="ui-menubar ui-menubar-1">
+    <li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://example.com/"><span>Home</span></a></li>
+    <li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://example.com/products"><span>Products</span></a></li>
+    <li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://example.com/services"><span>Services</span></a></li>
+    <li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="http://example.com/about_us"><span>About Us</span></a>
+      <ul class="ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected">
+        <li class="ui-menubar-menu ui-menubar-menu-2"><a href="http://example.com/about_us"><span>Overview</span></a></li>
+        <li class="ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected"><a href="http://example.com/about_us/who_we_are"><span>Who We Are</span></a></li>
+        <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://example.com/about_us/contact"><span>Contact Us</span></a></li>
       </ul>
     </li>
-    <li class="ir menubar-last"><a href="http://www.google.com"><span>Search!</span></a></li>
+    <li class="ir ui-menubar-menu ui-menubar-menu-1 ui-menubar-last"><a href="http://www.google.com"><span>Search!</span></a></li>
   </ul>
 
 === Caveat Emptor

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'menu_helper'
-  s.version           = '0.2.0'
+  s.version           = '0.3.0'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds a helper method for generating a menubar'
   

data/lib/menu_helper.rb

@@ -10,9 +10,13 @@ module MenuHelper
   # optional.
   # 
   # Configuration options:
-  # * +auto_set_ids+ - Whether or not to automatically add ids to each menu/menu bar.  Default is true.
-  # * +attach_active_submenus+ - Whether any active sub-menu bar should be rendered as part of its parent menu.  Default is true.
-  # * +content_for+ - The base block name to use when detaching active submenus.  Default is "menu_bar".  For example, this will render sub-menu bars to menu_bar_level_2
+  # * <tt>:auto_set_ids</tt> - Whether or not to automatically add ids to each
+  #   menu/menu bar.  Default is true.
+  # * <tt>:attach_active_submenus</tt> - Whether any active sub-menu bar should
+  #   be rendered as part of its parent menu.  Default is true.
+  # * <tt>:content_for</tt> - The base block name to use when detaching active
+  #   submenus.  Default is "menu_bar".  For example, this will render
+  #   sub-menu bars to menu_bar_level_2.
   # 
   # == Examples
   # 
@@ -28,13 +32,13 @@ module MenuHelper
   # 
   # ...generates the following html if +about_us+ is selected...
   # 
-  #   <ul id="nav" class="pretty menubar menubar-1">
-  #     <li id="nav-home"><a href="/"><span>Home</span></a></li>
-  #     <li id="nav-about_us" class="menubar-selected"><a href="/about_us"><span>About Us</span></a>
-  #       <ul class="menubar menubar-2" class="menubar-selected">
-  #         <li id="nav-about_us-who_we_are"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
-  #         <li id="nav-about_us-what_we_do"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
-  #         <li id="nav-about_us-contact"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
+  #   <ul id="nav" class="pretty ui-menubar ui-menubar-1">
+  #     <li id="nav-home" class="ui-menubar-menu ui-menubar-menu-1"><a href="/"><span>Home</span></a></li>
+  #     <li id="nav-about_us" class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="/about_us"><span>About Us</span></a>
+  #       <ul class="ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected">
+  #         <li id="nav-about_us-who_we_are" class="ui-menubar-menu ui-menubar-menu-2"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
+  #         <li id="nav-about_us-what_we_do" class="ui-menubar-menu ui-menubar-menu-2"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
+  #         <li id="nav-about_us-contact" class="ui-menubar-menu ui-menubar-menu-2"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
   #       </ul>
   #     </li>
   #   </ul>
@@ -57,16 +61,16 @@ module MenuHelper
   # 
   # ...generates the following html if +about_us+ is selected...
   # 
-  #   <ul id="nav" class="menubar menubar-1">
-  #     <li id="nav-home"><a href="/"><span>Home</span></a></li>
-  #     <li id="nav-about_us" class="menubar-selected"><a href="/about_us"><span>About Us</span></a></li>
+  #   <ul id="nav" class="ui-menubar ui-menubar-1">
+  #     <li id="nav-home" class="ui-menubar-menu ui-menubar-menu-1"><a href="/"><span>Home</span></a></li>
+  #     <li id="nav-about_us" class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="/about_us"><span>About Us</span></a></li>
   #   </ul>
   #   
   #   <div id="subnav">
-  #     <ul class="menubar menubar-2 menubar-selected">
-  #       <li id="nav-about_us-who_we_are"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
-  #       <li id="nav-about_us-what_we_do"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
-  #       <li id="nav-about_us-contact"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
+  #     <ul class="ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected">
+  #       <li id="nav-about_us-who_we_are" class="ui-menubar-menu ui-menubar-menu-2"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
+  #       <li id="nav-about_us-what_we_do" class="ui-menubar-menu ui-menubar-menu-2"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
+  #       <li id="nav-about_us-contact" class="ui-menubar-menu ui-menubar-menu-2"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
   #     </ul>
   #   </div>
   # 
@@ -87,13 +91,13 @@ module MenuHelper
   # For example, if a sub-menu like +who_we_are+ is selected, the html
   # generated from the above full example would look like so:
   # 
-  #   <ul id="nav" class="pretty menubar menubar-1">
-  #     <li id="nav-home"><a href="/"><span>Home</span></a></li>
-  #     <li id="nav-about_us" class="menubar-selected"><span>About Us</span>
+  #   <ul id="nav" class="pretty ui-menubar ui-menubar-1">
+  #     <li id="nav-home" class="ui-menubar-menu ui-menubar-menu-1"><a href="/"><span>Home</span></a></li>
+  #     <li id="nav-about_us" class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><span>About Us</span>
   #       <ul class="menubar menubar-2 menubar-selected">
-  #         <li id="nav-about_us-who_we_are" class="menubar-selected"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
-  #         <li id="nav-about_us-what_we_do"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
-  #         <li id="nav-about_us-contact"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
+  #         <li id="nav-about_us-who_we_are" class="ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected"><a href="/about_us/who_we_are"><span>Who We Are</span></a></li>
+  #         <li id="nav-about_us-what_we_do" class="ui-menubar-menu ui-menubar-menu-2"><a href="/about_us/what_we_do"><span>What We Do</span></a></li>
+  #         <li id="nav-about_us-contact" class="ui-menubar-menu ui-menubar-menu-2"><a href="mailto:contact@us.com"><span>Contact</span></a></li>
   #       </ul>
   #     </li>
   #   </ul>

data/lib/menu_helper/html_element.rb

@@ -17,9 +17,7 @@ module MenuHelper
   class HtmlElement
     include ActionView::Helpers::TagHelper
     
-    delegate  :[],
-              :[]=,
-                :to => '@html_options'
+    delegate :[], :[]=, :to => '@html_options'
     
     def initialize(html_options = {}) #:nodoc:
       @html_options = html_options.symbolize_keys

data/lib/menu_helper/menu.rb

@@ -3,13 +3,17 @@ module MenuHelper
   class Menu < HtmlElement
     include ActionView::Helpers::UrlHelper
     
+    # The css class to apply for each menu
+    cattr_accessor :menu_class
+    @@menu_class = 'ui-menubar-menu'
+    
     # The css class to apply when a menu is selected
     cattr_accessor :selected_class
-    @@selected_class = 'menubar-selected'
+    @@selected_class = 'ui-state-active ui-menubar-selected'
     
     # The css class for the last menu in the menu bar
     cattr_accessor :last_class
-    @@last_class = 'menubar-last'
+    @@last_class = 'ui-menubar-last'
     
     # The unique name assigned to this menu
     attr_reader :name
@@ -22,15 +26,12 @@ module MenuHelper
     attr_reader :parent_menu_bar
     
     # Add shortcuts to the menu bar configuration
-    delegate  :request_controller,
-              :parent_menu,
-              :auto_set_ids?,
+    delegate  :request_controller, :parent_menu, :level, :auto_set_ids?,
               :attach_active_submenus?,
                 :to => :parent_menu_bar
     
     # Add ability to add menus *after* creation
-    delegate  :menu,
-                :to => '@menu_bar'
+    delegate  :menu, :to => '@menu_bar'
     
     def initialize(parent_menu_bar, name, content = nil, url_options = {}, html_options = {}) #:nodoc
       # Allow the content parameter to be skipped
@@ -59,6 +60,7 @@ module MenuHelper
       # Set up default html options
       id_prefix = parent_menu_bar[:id] || parent_menu && parent_menu[:id]
       self[:id] ||= "#{id_prefix}-#{@name}" if auto_set_ids? && id_prefix
+      self[:class] = "#{self[:class]} #{menu_class} #{menu_class}-#{level}".strip
       
       # Create the menu bar for sub-menus in case any are generated.  Use the
       # same configuration as the parent menu bar.

data/lib/menu_helper/menu_bar.rb

@@ -4,11 +4,11 @@ module MenuHelper
   class MenuBar < HtmlElement
     # The css class to apply for all menu bars
     cattr_accessor :menu_bar_class
-    @@menu_bar_class = 'menubar'
+    @@menu_bar_class = 'ui-menubar'
     
     # The css class to apply when a sub-menu bar is selected
     cattr_accessor :selected_class
-    @@selected_class = 'menubar-selected'
+    @@selected_class = 'ui-state-active ui-menubar-selected'
     
     # The request context in which this menu bar is being rendered
     attr_reader :request_controller
@@ -159,10 +159,10 @@ module MenuHelper
     # version of the menu's id.  Examples of menus which customize the
     # content and/or html attributes are below:
     # 
-    #   home.menu :contact                                          # => <li id="contact"><a href="/contact">Contact</a></li>
-    #   home.menu :contact, 'Contact Us'                            # => <li id="contact"><a href="/contact">Contact Us</a></li>
-    #   home.menu :contact, {}, :class => 'pretty'                  # => <li id="contact" class="pretty"><a href="/contact">Contact</a></li>
-    #   home.menu :contact, 'Get in touch!', {}, :class => 'pretty' # => <li id="contact" class="pretty"><a href="/contact">Contact Us</a></li>
+    #   home.menu :contact                                          # => <li id="contact" class="ui-menubar-menu ui-menubar-menu-1"><a href="/contact">Contact</a></li>
+    #   home.menu :contact, 'Contact Us'                            # => <li id="contact" class="ui-menubar-menu ui-menubar-menu-1"><a href="/contact">Contact Us</a></li>
+    #   home.menu :contact, {}, :class => 'pretty'                  # => <li id="contact" class="pretty ui-menubar-menu ui-menubar-menu-1"><a href="/contact">Contact</a></li>
+    #   home.menu :contact, 'Get in touch!', {}, :class => 'pretty' # => <li id="contact" class="pretty ui-menubar-menu ui-menubar-menu-1"><a href="/contact">Get in touch!</a></li>
     # 
     # == Sub-menus
     # 

data/test/helpers/menu_helper_test.rb

@@ -14,15 +14,15 @@ class MenuHelperTest < ActionView::TestCase
     end
     
     expected = <<-eos
-<ul class="pretty menubar menubar-1">
-  <li><a href="http://test.host/home"><span>Home</span></a>
-    <ul class="menubar menubar-2">
-      <li><a href="http://test.host/home/browse"><span>Browse</span></a></li>
-      <li class="menubar-last"><a href="http://test.host/home/search"><span>Search</span></a></li>
+<ul class="pretty ui-menubar ui-menubar-1">
+  <li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a>
+    <ul class="ui-menubar ui-menubar-2">
+      <li class="ui-menubar-menu ui-menubar-menu-2"><a href="http://test.host/home/browse"><span>Browse</span></a></li>
+      <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/home/search"><span>Search</span></a></li>
     </ul>
   </li>
-  <li class="menubar-selected"><a href="http://test.host/contact"><span>Contact Us</span></a></li>
-  <li class="menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="http://test.host/contact"><span>Contact Us</span></a></li>
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), menu_bar_html

data/test/unit/menu_bar_test.rb

@@ -49,15 +49,15 @@ class MenuBarByDefaultTest < Test::Unit::TestCase
   end
   
   def test_should_set_css_classes
-    assert_equal 'menubar menubar-1', @menu_bar[:class]
+    assert_equal 'ui-menubar ui-menubar-1', @menu_bar[:class]
   end
   
   def test_should_allow_css_classes_to_be_customized
     @original_menu_bar_class = MenuHelper::MenuBar.menu_bar_class
-    MenuHelper::MenuBar.menu_bar_class = 'menus'
+    MenuHelper::MenuBar.menu_bar_class = 'ui-menus'
     
     menu_bar = MenuHelper::MenuBar.new(@controller)
-    assert_equal 'menus menus-1', menu_bar[:class]
+    assert_equal 'ui-menus ui-menus-1', menu_bar[:class]
   ensure
     MenuHelper::MenuBar.menu_bar_class = @original_menu_bar_class
   end
@@ -89,7 +89,7 @@ class MenuBarTest < Test::Unit::TestCase
   
   def test_should_not_modify_html_options_after_building_hml
     @menu_bar.html
-    assert_equal 'menubar menubar-1', @menu_bar[:class]
+    assert_equal 'ui-menubar ui-menubar-1', @menu_bar[:class]
   end
   
   def test_should_allow_menus_to_be_created
@@ -118,7 +118,7 @@ class MenuBarWithoutMenusTest < Test::Unit::TestCase
   end
   
   def test_should_not_render_menus
-    assert_equal '<ul class="menubar menubar-1"></ul>', @menu_bar.html
+    assert_equal '<ul class="ui-menubar ui-menubar-1"></ul>', @menu_bar.html
   end
 end
 
@@ -130,7 +130,7 @@ class MenuBarWithCustomHtmlOptionsTest < Test::Unit::TestCase
   end
   
   def test_should_render_with_custom_options
-    assert_equal '<ul class="pretty menubar menubar-1" id="menus"></ul>', @menu_bar.html
+    assert_equal '<ul class="pretty ui-menubar ui-menubar-1" id="menus"></ul>', @menu_bar.html
   end
 end
 
@@ -158,9 +158,9 @@ class MenuBarWithMenusTest < Test::Unit::TestCase
   
   def test_should_render_menus
     expected = <<-eos
-<ul class="menubar menubar-1" id="menus">
-  <li id="menus-home"><a href="http://test.host/home"><span>Home</span></a></li>
-  <li class="menubar-last" id="menus-about_us"><a href="http://test.host/about_us"><span>About</span></a></li>
+<ul class="ui-menubar ui-menubar-1" id="menus">
+  <li class="ui-menubar-menu ui-menubar-menu-1" id="menus-home"><a href="http://test.host/home"><span>Home</span></a></li>
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-last" id="menus-about_us"><a href="http://test.host/about_us"><span>About</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -182,8 +182,8 @@ class MenuBarWithSelectedMenuTest < Test::Unit::TestCase
   
   def test_should_not_include_selected_css_class_in_html
     expected = <<-eos
-<ul class="menubar menubar-1">
-  <li class="menubar-selected menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
+<ul class="ui-menubar ui-menubar-1">
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected ui-menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -201,8 +201,8 @@ class MenuBarWithoutAutoIdSettingTest < Test::Unit::TestCase
   
   def test_should_not_set_default_id_for_menus
     expected = <<-eos
-<ul class="menubar menubar-1" id="menus">
-  <li class="menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>
+<ul class="ui-menubar ui-menubar-1" id="menus">
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -222,10 +222,10 @@ class MenuBarUnselectedWithDetachedActiveSubmenus < Test::Unit::TestCase
   
   def test_should_render_sub_menu_bars
     expected = <<-eos
-<ul class="menubar menubar-1">
-  <li class="menubar-last"><a href="http://test.host/home"><span>Home</span></a>
-    <ul class="menubar menubar-2">
-      <li class="menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
+<ul class="ui-menubar ui-menubar-1">
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-last"><a href="http://test.host/home"><span>Home</span></a>
+    <ul class="ui-menubar ui-menubar-2">
+      <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
     </ul>
   </li>
 </ul>
@@ -251,8 +251,8 @@ class MenuBarSelectedWithDetachedActiveSubmenus < Test::Unit::TestCase
   
   def test_should_not_render_sub_menu_bars
     expected = <<-eos
-<ul class="menubar menubar-1">
-  <li class="menubar-selected menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
+<ul class="ui-menubar ui-menubar-1">
+  <li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected ui-menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -263,8 +263,8 @@ eos
     @menu_bar.html
     
     expected = <<-eos
-<ul class="menubar menubar-2">
-  <li class="menubar-last"><a href="http://test.host/contact/investors"><span>Investors</span></a></li>
+<ul class="ui-menubar ui-menubar-2">
+  <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/contact/investors"><span>Investors</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @controller.instance_variable_get('@content_for_menu_bar_level_2')
@@ -306,8 +306,8 @@ class MenuBarWithParentMenuAndSelectedMenuTest < Test::Unit::TestCase
   
   def test_should_include_selected_css_class_in_html
     expected = <<-eos
-<ul class="menubar menubar-2 menubar-selected">
-  <li class="menubar-selected menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
+<ul class="ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected">
+  <li class="ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected ui-menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html

data/test/unit/menu_test.rb

@@ -32,12 +32,16 @@ class MenuByDefaultTest < Test::Unit::TestCase
     assert @menu.attach_active_submenus?
   end
   
+  def test_should_not_be_selected
+    assert !@menu.selected?
+  end
+  
   def test_should_not_add_an_html_id
     assert_nil @menu[:id]
   end
   
-  def test_should_not_be_selected
-    assert !@menu.selected?
+  def test_should_set_css_classes
+    assert_equal 'ui-menubar-menu ui-menubar-menu-1', @menu[:class]
   end
 end
 
@@ -58,27 +62,37 @@ class MenuTest < Test::Unit::TestCase
     assert in_block
   end
   
+  def test_should_allow_menu_class_to_be_customized
+    @original_menu_class = MenuHelper::Menu.menu_class
+    MenuHelper::Menu.menu_class = 'ui-menubar-item'
+    
+    @menu = MenuHelper::Menu.new(@menu_bar, :home)
+    assert_equal '<li class="ui-menubar-item ui-menubar-item-1"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
+  ensure
+    MenuHelper::Menu.menu_class = @original_menu_class
+  end
+  
   def test_should_include_last_class_in_html_if_last_menu
-    assert_equal '<li class="menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
   end
   
   def test_should_append_last_class_if_class_attribute_already_exists
     @menu[:class] = 'pretty'
-    assert_equal '<li class="pretty menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
+    assert_equal '<li class="pretty ui-menubar-last"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
   end
   
   def test_should_allow_last_class_to_be_customized
     @original_last_class = MenuHelper::Menu.last_class
-    MenuHelper::Menu.last_class = 'menubar-end'
+    MenuHelper::Menu.last_class = 'ui-menubar-end'
     
-    assert_equal '<li class="menubar-end"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-end"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html(true)
   ensure
     MenuHelper::Menu.last_class = @original_last_class
   end
   
   def test_should_not_modify_html_options_after_building_html
     @menu.html(true)
-    assert_nil @menu[:class]
+    assert_equal @menu[:class], 'ui-menubar-menu ui-menubar-menu-1'
   end
 end
 
@@ -189,7 +203,7 @@ class MenuWithoutContentTest < Test::Unit::TestCase
   end
   
   def test_should_use_titleized_version_of_name_as_content
-    assert_equal '<li><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
   end
 end
 
@@ -202,7 +216,7 @@ class MenuWithCustomContentTest < Test::Unit::TestCase
   end
   
   def test_should_use_custom_content_as_content
-    assert_equal '<li><a href="http://test.host/home"><span>My Home</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>My Home</span></a></li>', @menu.html
   end
 end
 
@@ -215,7 +229,7 @@ class MenuWithoutLinkingTest < Test::Unit::TestCase
   end
   
   def test_should_not_linkify_html
-    assert_equal '<li><span>Home</span></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1"><span>Home</span></li>', @menu.html
   end
 end
 
@@ -245,7 +259,7 @@ class MenuWhenNotCurrentPageTest < Test::Unit::TestCase
   end
   
   def test_should_not_include_selected_css_class_in_html
-    assert_equal '<li><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
   end
 end
 
@@ -262,18 +276,18 @@ class MenuWhenCurrentPageTest < Test::Unit::TestCase
   end
   
   def test_should_include_selected_css_class_in_html
-    assert_equal '<li class="menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
   end
   
   def test_should_append_selected_class_if_class_attribute_already_exists
     @menu[:class] = 'pretty'
-    assert_equal '<li class="pretty menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
+    assert_equal '<li class="pretty ui-state-active ui-menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
   end
   
   def test_should_allow_selected_class_to_be_customized
     @original_selected_class = MenuHelper::Menu.selected_class
-    MenuHelper::Menu.selected_class = 'menubar-active'
-    assert_equal '<li class="menubar-active"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
+    MenuHelper::Menu.selected_class = 'ui-menubar-active'
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1 ui-menubar-active"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
   ensure
     MenuHelper::Menu.selected_class = @original_selected_class
   end
@@ -288,7 +302,7 @@ class MenuWithoutSubmenusTest < Test::Unit::TestCase
   end
   
   def test_should_not_render_a_menu_bar
-    assert_equal '<li><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a></li>', @menu.html
   end
 end
 
@@ -306,11 +320,11 @@ class MenuWithSubmenusTest < Test::Unit::TestCase
   
   def test_should_render_a_menu_bar
     expected = <<-eos
-<li><a href="http://test.host/home"><span>Home</span></a>
-  <ul class="menubar menubar-2">
-    <li class="menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a>
-      <ul class="menubar menubar-3">
-        <li class="menubar-last"><a href="http://test.host/about_us/who_we_are"><span>Who We Are</span></a></li>
+<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a>
+  <ul class="ui-menubar ui-menubar-2">
+    <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a>
+      <ul class="ui-menubar ui-menubar-3">
+        <li class="ui-menubar-menu ui-menubar-menu-3 ui-menubar-last"><a href="http://test.host/about_us/who_we_are"><span>Who We Are</span></a></li>
       </ul>
     </li>
   </ul>
@@ -332,9 +346,9 @@ class MenuUnselectedWithDetachedActiveSubmenusTest < Test::Unit::TestCase
   
   def test_should_render_a_menu_bar
     expected = <<-eos
-<li><a href="http://test.host/home"><span>Home</span></a>
-  <ul class="menubar menubar-2">
-    <li class="menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
+<li class="ui-menubar-menu ui-menubar-menu-1"><a href="http://test.host/home"><span>Home</span></a>
+  <ul class="ui-menubar ui-menubar-2">
+    <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/about_us"><span>About Us</span></a></li>
   </ul>
 </li>
 eos
@@ -357,7 +371,7 @@ class MenuSelectedWithDetachedActiveSubmenusTest < Test::Unit::TestCase
   end
   
   def test_should_not_render_a_menu_bar
-    assert_equal '<li class="menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
+    assert_equal '<li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="http://test.host/contact"><span>Contact</span></a></li>', @menu.html
   end
   
   def test_should_store_a_menu_bar_in_content_variable
@@ -365,8 +379,8 @@ class MenuSelectedWithDetachedActiveSubmenusTest < Test::Unit::TestCase
     @menu.html
     
     expected = <<-eos
-<ul class="menubar menubar-2">
-  <li class="menubar-last"><a href="http://test.host/contact/investors"><span>Investors</span></a></li>
+<ul class="ui-menubar ui-menubar-2">
+  <li class="ui-menubar-menu ui-menubar-menu-2 ui-menubar-last"><a href="http://test.host/contact/investors"><span>Investors</span></a></li>
 </ul>
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @controller.instance_variable_get('@content_for_menu_bar_level_2')
@@ -389,9 +403,9 @@ class MenuWithSubmenuAsCurrentPageTest < Test::Unit::TestCase
   
   def test_should_include_selected_css_class_in_html
     expected = <<-eos
-<li class="menubar-selected"><a href="http://test.host/about_us"><span>About Us</span></a>
-  <ul class="menubar menubar-2 menubar-selected">
-    <li class="menubar-selected menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
+<li class="ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected"><a href="http://test.host/about_us"><span>About Us</span></a>
+  <ul class="ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected">
+    <li class="ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected ui-menubar-last"><a href="http://test.host/contact"><span>Contact</span></a></li>
   </ul>
 </li>
 eos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: menu_helper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -05:00
+date: 2009-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Adds a helper method for generating a menubar