menu_builder 0.4.1 → 0.4.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/lib/menu_builder/helper.rb

@@ -1,23 +1,71 @@
 module MenuBuilder
   module ViewHelpers
-    class Menu
-      def initialize(context)
-        @context = context
-        @menu_items = @context.instance_variable_get('@menu_items')
-      end
+    def menu(options={}, &block)
+      content_tag :ul, Menu.new(self, &block).render, options
+    end
 
-      def included_in_current_items?(item)
-        @menu_items.present? && @menu_items.include?(item.to_sym)
-      end
+    private
+
+      class MenuItem
+        attr_reader :item, :args, :block
 
-      def method_missing(item, *args, &block)
-        css_class = "current" if included_in_current_items? item
-        @context.content_tag :li, @context.link_to(*args, &block), :class=>css_class
+        def initialize(item, args, block)
+          @item, @args, @block = item, args, block
+        end
+
+        def link_to_in_context context
+          context.link_to *@args, &@block
+        end
+
+        def to_sym
+          item.to_sym
+        end
       end
-    end
 
-    def menu(options={}, &block)
-      content_tag :ul, capture(Menu.new(self), &block), options
-    end
+      class Menu
+        def initialize(context, &block)
+          @context      = context
+          @menu_items   = context.instance_variable_get('@menu_items')
+          @actual_items = []
+          @block        = block
+        end
+
+        def method_missing item, *args, &block
+          @actual_items << MenuItem.new(item, args, block)
+          nil
+        end
+
+        def render
+          @block.call(self)
+          @actual_items.map { |item| render_one item }.join.html_safe
+        end
+
+        def render_one item
+          @context.content_tag :li, item.link_to_in_context(@context), html_options_for(item)
+        end
+
+        def html_options_for item
+          css_classes = []
+          css_classes << "current" if included_in_current_items? item
+          css_classes << "first"   if first? item
+          css_classes << "last"    if last? item
+
+          options = {}
+          options[:class] = css_classes.join(" ") if css_classes.any?
+          options
+        end
+
+        def included_in_current_items?(item)
+          @menu_items.present? && @menu_items.include?(item.to_sym)
+        end
+
+        def last? item
+          @actual_items.last == item
+        end
+
+        def first? item
+          @actual_items.first == item
+        end
+      end
   end
-end
+end

data/lib/menu_builder/version.rb

@@ -1,3 +1,3 @@
 module MenuBuilder
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/helper_test.rb

@@ -6,9 +6,9 @@ class HelperTest < ActionView::TestCase
   attr_accessor :controller, :request
 
   test "menu yields an instance of Menu" do
-    concat(menu do |m|
+    concat(menu { |m|
       assert m.instance_of?(MenuBuilder::ViewHelpers::Menu)
-    end)
+    })
   end
 
   test "menu create an unordered list" do
@@ -17,7 +17,7 @@ class HelperTest < ActionView::TestCase
   end
 
   test "menu accept html options like classes and id" do
-    concat(menu :id=>"menu", :class=>"tabs" do |m| end)
+    concat(menu(:id=>"menu", :class=>"tabs") { |m| })
     assert_select "ul#menu.tabs"
   end
 
@@ -28,16 +28,15 @@ class HelperTest < ActionView::TestCase
 
   test "create a link inside line item" do
     concat(menu { |m| concat m.home "Home", "/" })
-    expected = %(<ul><li><a href="/">Home</a></li></ul>)
-    assert_dom_equal expected, output_buffer
+    assert_select "ul > li > a"
   end
 
   test "set the class to the current item li" do
     @menu_items = [:home]
-    concat(menu do |m|
+    concat(menu { |m|
       concat m.home "Home", "/"
       concat m.contact "Store", "/store"
-    end)
+    })
 
     assert_select "li.current", 1
   end
@@ -45,11 +44,11 @@ class HelperTest < ActionView::TestCase
   test "accept more than one menu item" do
     @menu_items = [:settings, :notifications]
 
-    concat(menu do |m|
+    concat(menu { |m|
       concat m.home "Home", "/"
       concat m.notifications "Notifications", "/notifications"
       concat m.settings "Settings", "/settings"
-    end)
+    })
 
     assert_select "li.current", 2
   end
@@ -57,16 +56,43 @@ class HelperTest < ActionView::TestCase
   test "accept more than one menu" do
     @menu_items = [:settings, :notifications]
 
-    concat(menu do |m|
+    concat(menu { |m|
       concat m.home "Home", "/"
       concat m.notifications "Notifications", "/notifications"
-    end)
+    })
 
-    concat(menu do |m|
+    concat(menu { |m|
       concat m.home "Contact", "/contact"
       concat m.notifications "Settings", "/settings"
-    end)
+    })
 
     assert_select "li.current", 2
   end
-end
+
+  test "marks the first item with class .first" do
+    concat(menu { |m|
+      concat m.home    "Home", "/"
+      concat m.contact "Store", "/store"
+    })
+    assert_select "li.first", 1
+  end
+
+  test 'marks the last item with class .last' do
+    concat(menu { |m|
+      concat m.home    "Home", "/"
+      concat m.contact "Store", "/store"
+      concat m.notifications "Settings", "/settings"
+    })
+    assert_select "li.last", 1
+  end
+
+  test "pass a block to an item" do
+    concat(menu { |m|
+      concat(m.account("/account") {
+        concat tag(:img, nil, { :src => 'icon.jpg' })
+      })
+    })
+
+    assert_select "ul > li > a > img"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menu_builder
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Daniel Lopes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 Z
+date: 2011-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack