<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,8 @@
 == master
 
+* 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</diff>
      <filename>CHANGELOG.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -62,18 +62,18 @@ _menu_bar.html.erb:
   %&gt;
 
 Output (formatted for sanity):
-  &lt;ul class=&quot;menubar menubar-1&quot;&gt;
-    &lt;li&gt;&lt;a href=&quot;http://example.com/&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href=&quot;http://example.com/products&quot;&gt;&lt;span&gt;Products&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href=&quot;http://example.com/services&quot;&gt;&lt;span&gt;Services&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-    &lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://example.com/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
-      &lt;ul class=&quot;menubar menubar-2 menubar-selected&quot;&gt;
-        &lt;li&gt;&lt;a href=&quot;http://example.com/about_us&quot;&gt;&lt;span&gt;Overview&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-        &lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://example.com/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-        &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://example.com/about_us/contact&quot;&gt;&lt;span&gt;Contact Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  &lt;ul class=&quot;ui-menubar ui-menubar-1&quot;&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://example.com/&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://example.com/products&quot;&gt;&lt;span&gt;Products&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://example.com/services&quot;&gt;&lt;span&gt;Services&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://example.com/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
+      &lt;ul class=&quot;ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected&quot;&gt;
+        &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2&quot;&gt;&lt;a href=&quot;http://example.com/about_us&quot;&gt;&lt;span&gt;Overview&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+        &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://example.com/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+        &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://example.com/about_us/contact&quot;&gt;&lt;span&gt;Contact Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
       &lt;/ul&gt;
     &lt;/li&gt;
-    &lt;li class=&quot;ir menubar-last&quot;&gt;&lt;a href=&quot;http://www.google.com&quot;&gt;&lt;span&gt;Search!&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+    &lt;li class=&quot;ir ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://www.google.com&quot;&gt;&lt;span&gt;Search!&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
 
 === Caveat Emptor</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -32,13 +32,13 @@ module MenuHelper
   # 
   # ...generates the following html if +about_us+ is selected...
   # 
-  #   &lt;ul id=&quot;nav&quot; class=&quot;pretty menubar menubar-1&quot;&gt;
-  #     &lt;li id=&quot;nav-home&quot;&gt;&lt;a href=&quot;/&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-  #     &lt;li id=&quot;nav-about_us&quot; class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
-  #       &lt;ul class=&quot;menubar menubar-2&quot; class=&quot;menubar-selected&quot;&gt;
-  #         &lt;li id=&quot;nav-about_us-who_we_are&quot;&gt;&lt;a href=&quot;/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-  #         &lt;li id=&quot;nav-about_us-what_we_do&quot;&gt;&lt;a href=&quot;/about_us/what_we_do&quot;&gt;&lt;span&gt;What We Do&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-  #         &lt;li id=&quot;nav-about_us-contact&quot;&gt;&lt;a href=&quot;mailto:contact@us.com&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  #   &lt;ul id=&quot;nav&quot; class=&quot;pretty ui-menubar ui-menubar-1&quot;&gt;
+  #     &lt;li id=&quot;nav-home&quot; class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;/&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  #     &lt;li id=&quot;nav-about_us&quot; class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
+  #       &lt;ul class=&quot;ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected&quot;&gt;
+  #         &lt;li id=&quot;nav-about_us-who_we_are&quot; class=&quot;ui-menubar-menu ui-menubar-menu-2&quot;&gt;&lt;a href=&quot;/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  #         &lt;li id=&quot;nav-about_us-what_we_do&quot; class=&quot;ui-menubar-menu ui-menubar-menu-2&quot;&gt;&lt;a href=&quot;/about_us/what_we_do&quot;&gt;&lt;span&gt;What We Do&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  #         &lt;li id=&quot;nav-about_us-contact&quot; class=&quot;ui-menubar-menu ui-menubar-menu-2&quot;&gt;&lt;a href=&quot;mailto:contact@us.com&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
   #       &lt;/ul&gt;
   #     &lt;/li&gt;
   #   &lt;/ul&gt;</diff>
      <filename>lib/menu_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,13 +3,17 @@ module MenuHelper
   class Menu &lt; 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
@@ -24,6 +28,7 @@ module MenuHelper
     # Add shortcuts to the menu bar configuration
     delegate  :request_controller,
               :parent_menu,
+              :level,
               :auto_set_ids?,
               :attach_active_submenus?,
                 :to =&gt; :parent_menu_bar
@@ -59,6 +64,7 @@ module MenuHelper
       # Set up default html options
       id_prefix = parent_menu_bar[:id] || parent_menu &amp;&amp; parent_menu[:id]
       self[:id] ||= &quot;#{id_prefix}-#{@name}&quot; if auto_set_ids? &amp;&amp; id_prefix
+      self[:class] = &quot;#{self[:class]} #{menu_class} #{menu_class}-#{level}&quot;.strip
       
       # Create the menu bar for sub-menus in case any are generated.  Use the
       # same configuration as the parent menu bar.</diff>
      <filename>lib/menu_helper/menu.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,11 +4,11 @@ module MenuHelper
   class MenuBar &lt; 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                                          # =&gt; &lt;li id=&quot;contact&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact&lt;/a&gt;&lt;/li&gt;
-    #   home.menu :contact, 'Contact Us'                            # =&gt; &lt;li id=&quot;contact&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact Us&lt;/a&gt;&lt;/li&gt;
-    #   home.menu :contact, {}, :class =&gt; 'pretty'                  # =&gt; &lt;li id=&quot;contact&quot; class=&quot;pretty&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact&lt;/a&gt;&lt;/li&gt;
-    #   home.menu :contact, 'Get in touch!', {}, :class =&gt; 'pretty' # =&gt; &lt;li id=&quot;contact&quot; class=&quot;pretty&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact Us&lt;/a&gt;&lt;/li&gt;
+    #   home.menu :contact                                          # =&gt; &lt;li id=&quot;contact&quot; class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact&lt;/a&gt;&lt;/li&gt;
+    #   home.menu :contact, 'Contact Us'                            # =&gt; &lt;li id=&quot;contact&quot; class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact Us&lt;/a&gt;&lt;/li&gt;
+    #   home.menu :contact, {}, :class =&gt; 'pretty'                  # =&gt; &lt;li id=&quot;contact&quot; class=&quot;pretty ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Contact&lt;/a&gt;&lt;/li&gt;
+    #   home.menu :contact, 'Get in touch!', {}, :class =&gt; 'pretty' # =&gt; &lt;li id=&quot;contact&quot; class=&quot;pretty ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;/contact&quot;&gt;Get in touch!&lt;/a&gt;&lt;/li&gt;
     # 
     # == Sub-menus
     # </diff>
      <filename>lib/menu_helper/menu_bar.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,15 +14,15 @@ class MenuHelperTest &lt; ActionView::TestCase
     end
     
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;pretty menubar menubar-1&quot;&gt;
-  &lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
-    &lt;ul class=&quot;menubar menubar-2&quot;&gt;
-      &lt;li&gt;&lt;a href=&quot;http://test.host/home/browse&quot;&gt;&lt;span&gt;Browse&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-      &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home/search&quot;&gt;&lt;span&gt;Search&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;pretty ui-menubar ui-menubar-1&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
+    &lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+      &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2&quot;&gt;&lt;a href=&quot;http://test.host/home/browse&quot;&gt;&lt;span&gt;Browse&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+      &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home/search&quot;&gt;&lt;span&gt;Search&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
     &lt;/ul&gt;
   &lt;/li&gt;
-  &lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-  &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), menu_bar_html</diff>
      <filename>test/helpers/menu_helper_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -49,15 +49,15 @@ class MenuBarByDefaultTest &lt; 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 &lt; 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 &lt; Test::Unit::TestCase
   end
   
   def test_should_not_render_menus
-    assert_equal '&lt;ul class=&quot;menubar menubar-1&quot;&gt;&lt;/ul&gt;', @menu_bar.html
+    assert_equal '&lt;ul class=&quot;ui-menubar ui-menubar-1&quot;&gt;&lt;/ul&gt;', @menu_bar.html
   end
 end
 
@@ -130,7 +130,7 @@ class MenuBarWithCustomHtmlOptionsTest &lt; Test::Unit::TestCase
   end
   
   def test_should_render_with_custom_options
-    assert_equal '&lt;ul class=&quot;pretty menubar menubar-1&quot; id=&quot;menus&quot;&gt;&lt;/ul&gt;', @menu_bar.html
+    assert_equal '&lt;ul class=&quot;pretty ui-menubar ui-menubar-1&quot; id=&quot;menus&quot;&gt;&lt;/ul&gt;', @menu_bar.html
   end
 end
 
@@ -158,9 +158,9 @@ class MenuBarWithMenusTest &lt; Test::Unit::TestCase
   
   def test_should_render_menus
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-1&quot; id=&quot;menus&quot;&gt;
-  &lt;li id=&quot;menus-home&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-  &lt;li class=&quot;menubar-last&quot; id=&quot;menus-about_us&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-1&quot; id=&quot;menus&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot; id=&quot;menus-home&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot; id=&quot;menus-about_us&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -182,8 +182,8 @@ class MenuBarWithSelectedMenuTest &lt; Test::Unit::TestCase
   
   def test_should_not_include_selected_css_class_in_html
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-1&quot;&gt;
-  &lt;li class=&quot;menubar-selected menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-1&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -201,8 +201,8 @@ class MenuBarWithoutAutoIdSettingTest &lt; Test::Unit::TestCase
   
   def test_should_not_set_default_id_for_menus
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-1&quot; id=&quot;menus&quot;&gt;
-  &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-1&quot; id=&quot;menus&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -222,10 +222,10 @@ class MenuBarUnselectedWithDetachedActiveSubmenus &lt; Test::Unit::TestCase
   
   def test_should_render_sub_menu_bars
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-1&quot;&gt;
-  &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
-    &lt;ul class=&quot;menubar menubar-2&quot;&gt;
-      &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-1&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
+    &lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+      &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
     &lt;/ul&gt;
   &lt;/li&gt;
 &lt;/ul&gt;
@@ -251,8 +251,8 @@ class MenuBarSelectedWithDetachedActiveSubmenus &lt; Test::Unit::TestCase
   
   def test_should_not_render_sub_menu_bars
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-1&quot;&gt;
-  &lt;li class=&quot;menubar-selected menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-1&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html
@@ -263,8 +263,8 @@ eos
     @menu_bar.html
     
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-2&quot;&gt;
-  &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact/investors&quot;&gt;&lt;span&gt;Investors&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact/investors&quot;&gt;&lt;span&gt;Investors&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @controller.instance_variable_get('@content_for_menu_bar_level_2')
@@ -306,8 +306,8 @@ class MenuBarWithParentMenuAndSelectedMenuTest &lt; Test::Unit::TestCase
   
   def test_should_include_selected_css_class_in_html
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-2 menubar-selected&quot;&gt;
-  &lt;li class=&quot;menubar-selected menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @menu_bar.html</diff>
      <filename>test/unit/menu_bar_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -32,12 +32,16 @@ class MenuByDefaultTest &lt; 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 &lt; 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 '&lt;li class=&quot;ui-menubar-item ui-menubar-item-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+  ensure
+    MenuHelper::Menu.menu_class = @original_menu_class
+  end
+  
   def test_should_include_last_class_in_html_if_last_menu
-    assert_equal '&lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html(true)
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html(true)
   end
   
   def test_should_append_last_class_if_class_attribute_already_exists
     @menu[:class] = 'pretty'
-    assert_equal '&lt;li class=&quot;pretty menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html(true)
+    assert_equal '&lt;li class=&quot;pretty ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @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 '&lt;li class=&quot;menubar-end&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html(true)
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-end&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @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 &lt; Test::Unit::TestCase
   end
   
   def test_should_use_titleized_version_of_name_as_content
-    assert_equal '&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
 end
 
@@ -202,7 +216,7 @@ class MenuWithCustomContentTest &lt; Test::Unit::TestCase
   end
   
   def test_should_use_custom_content_as_content
-    assert_equal '&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;My Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;My Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
 end
 
@@ -215,7 +229,7 @@ class MenuWithoutLinkingTest &lt; Test::Unit::TestCase
   end
   
   def test_should_not_linkify_html
-    assert_equal '&lt;li&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/li&gt;', @menu.html
   end
 end
 
@@ -245,7 +259,7 @@ class MenuWhenNotCurrentPageTest &lt; Test::Unit::TestCase
   end
   
   def test_should_not_include_selected_css_class_in_html
-    assert_equal '&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
 end
 
@@ -262,18 +276,18 @@ class MenuWhenCurrentPageTest &lt; Test::Unit::TestCase
   end
   
   def test_should_include_selected_css_class_in_html
-    assert_equal '&lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
   
   def test_should_append_selected_class_if_class_attribute_already_exists
     @menu[:class] = 'pretty'
-    assert_equal '&lt;li class=&quot;pretty menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;pretty ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @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 '&lt;li class=&quot;menubar-active&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    MenuHelper::Menu.selected_class = 'ui-menubar-active'
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-menubar-active&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   ensure
     MenuHelper::Menu.selected_class = @original_selected_class
   end
@@ -288,7 +302,7 @@ class MenuWithoutSubmenusTest &lt; Test::Unit::TestCase
   end
   
   def test_should_not_render_a_menu_bar
-    assert_equal '&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
 end
 
@@ -306,11 +320,11 @@ class MenuWithSubmenusTest &lt; Test::Unit::TestCase
   
   def test_should_render_a_menu_bar
     expected = &lt;&lt;-eos
-&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
-  &lt;ul class=&quot;menubar menubar-2&quot;&gt;
-    &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
-      &lt;ul class=&quot;menubar menubar-3&quot;&gt;
-        &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
+  &lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
+      &lt;ul class=&quot;ui-menubar ui-menubar-3&quot;&gt;
+        &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-3 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us/who_we_are&quot;&gt;&lt;span&gt;Who We Are&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
       &lt;/ul&gt;
     &lt;/li&gt;
   &lt;/ul&gt;
@@ -332,9 +346,9 @@ class MenuUnselectedWithDetachedActiveSubmenusTest &lt; Test::Unit::TestCase
   
   def test_should_render_a_menu_bar
     expected = &lt;&lt;-eos
-&lt;li&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
-  &lt;ul class=&quot;menubar menubar-2&quot;&gt;
-    &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1&quot;&gt;&lt;a href=&quot;http://test.host/home&quot;&gt;&lt;span&gt;Home&lt;/span&gt;&lt;/a&gt;
+  &lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
 &lt;/li&gt;
 eos
@@ -357,7 +371,7 @@ class MenuSelectedWithDetachedActiveSubmenusTest &lt; Test::Unit::TestCase
   end
   
   def test_should_not_render_a_menu_bar
-    assert_equal '&lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
+    assert_equal '&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;', @menu.html
   end
   
   def test_should_store_a_menu_bar_in_content_variable
@@ -365,8 +379,8 @@ class MenuSelectedWithDetachedActiveSubmenusTest &lt; Test::Unit::TestCase
     @menu.html
     
     expected = &lt;&lt;-eos
-&lt;ul class=&quot;menubar menubar-2&quot;&gt;
-  &lt;li class=&quot;menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact/investors&quot;&gt;&lt;span&gt;Investors&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;ul class=&quot;ui-menubar ui-menubar-2&quot;&gt;
+  &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact/investors&quot;&gt;&lt;span&gt;Investors&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 eos
     assert_equal expected.gsub(/\n\s*/, ''), @controller.instance_variable_get('@content_for_menu_bar_level_2')
@@ -389,9 +403,9 @@ class MenuWithSubmenuAsCurrentPageTest &lt; Test::Unit::TestCase
   
   def test_should_include_selected_css_class_in_html
     expected = &lt;&lt;-eos
-&lt;li class=&quot;menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
-  &lt;ul class=&quot;menubar menubar-2 menubar-selected&quot;&gt;
-    &lt;li class=&quot;menubar-selected menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li class=&quot;ui-menubar-menu ui-menubar-menu-1 ui-state-active ui-menubar-selected&quot;&gt;&lt;a href=&quot;http://test.host/about_us&quot;&gt;&lt;span&gt;About Us&lt;/span&gt;&lt;/a&gt;
+  &lt;ul class=&quot;ui-menubar ui-menubar-2 ui-state-active ui-menubar-selected&quot;&gt;
+    &lt;li class=&quot;ui-menubar-menu ui-menubar-menu-2 ui-state-active ui-menubar-selected ui-menubar-last&quot;&gt;&lt;a href=&quot;http://test.host/contact&quot;&gt;&lt;span&gt;Contact&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
 &lt;/li&gt;
 eos</diff>
      <filename>test/unit/menu_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4f26170f412df4cbd9627ff73e07a575e4951dcf</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </author>
  <url>http://github.com/pluginaweek/menu_helper/commit/af926c719185eef1de236176db1aa9af7dbc8ecb</url>
  <id>af926c719185eef1de236176db1aa9af7dbc8ecb</id>
  <committed-date>2009-04-12T20:21:16-07:00</committed-date>
  <authored-date>2009-04-12T20:21:16-07:00</authored-date>
  <message>Change class css naming conventions to follow the new jQuery UI guidelines
Add ui-state-active and level-specific menu css classes</message>
  <tree>5c8873a41fc55e8bd44df26d3b3d4231097a7885</tree>
  <committer>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </committer>
</commit>
