alacarte 0.0.6 → 0.0.7

data/README.textile

@@ -73,7 +73,8 @@ YourApplication::Application.menus.draw do
        link :other_site, 'http://someurl.com'
        # ...
        
-       link :my_account, account_path(:current), :if => lambda{ current_user }
+       # add menu items with runtime methods for path generation
+       link :my_account, lambda { account_path(current_user) }, :if => lambda{ current_user }
        
     end
     
@@ -101,4 +102,4 @@ The output is generated as a ul-li list with anchor elements. If there is an ele
     <li><a href="/" class="nl active">nl</a></li>
     <li><a href="/" class="fr">fr</a></li>
 </ul>
-</pre>
+</pre>

data/app/helpers/alacarte_helper.rb

@@ -20,7 +20,8 @@ module AlacarteHelper
       
         _item = case item.type
           when :link
-            link_to(item.label.html_safe, item.path, _html_options)
+            _path = item.path.respond_to?(:call) ? item.path.call : item.path
+            link_to(item.label.html_safe, _path, _html_options)
           else
             content_tag(item.type, item.label, _html_options)
         end

data/lib/alacarte/menu.rb

@@ -3,10 +3,10 @@ module Alacarte
   # Alacarte::Menu is the base class for defining menu items.
   class Menu
     
-    VALID_ELEMENTS = [:link, :span]
+    VALID_ELEMENTS = [:link, :span, :separator, :title, :subtitle, :line]
     @@env = nil
     
-    attr_reader :parent, :type, :name, :deep_name, :path, :as, :label, :options, :items, :block, :html_options, :group_options, :wrapper_options, :translation_key
+    attr_reader :parent, :type, :name, :deep_name, :path, :as, :label, :options, :items, :blocks, :html_options, :group_options, :wrapper_options, :translation_key
     
     # Tests if an environment was set to the Alacarte::Menu
     def self.env?
@@ -49,7 +49,8 @@ module Alacarte
       @translation_key = (block_given? && @type != :menu) ? "#{deep_name}.root" : "#{deep_name}"
       @label = options[:label] || I18n.t("alacarte.menus.#{@translation_key}", :default => @translation_key.to_s)
       @as = options[:as] || @name
-      @block = block if block_given?
+      @blocks = []
+      @blocks << block if block_given?
       @html_options = options[:html]
       @group_options = options[:group]
       @wrapper_options = options[:wrapper]
@@ -57,9 +58,13 @@ module Alacarte
       build
     end
     
+    def extend(&block)
+      @blocks << block if block_given?
+    end
+    
     # Tests if a block was passed to the Alacarte::Menu object
     def block?
-      !!@block
+      (@blocks.size > 0)
     end
     
     # Builds the menu, based on the environment that is passed.
@@ -67,7 +72,11 @@ module Alacarte
       @@env = env if env
       @items = []
 
-      self.instance_eval(&@block) if Menu.env? && self.block?
+      if Menu.env? && self.block?
+        @blocks.each do |block|
+          self.instance_eval(&block)
+        end
+      end
     end
     
     # Tests to see if the current menu item is valid in the current setting

data/lib/alacarte/menus.rb

@@ -9,7 +9,11 @@ module Alacarte
 
     # Define a menu in a draw block
     def menu(name, *args, &block)
-      self[name] = Menu.new(nil, :menu, name, *args, &block)
+      if self[name]
+        self[name].extend(&block)
+      else
+        self[name] = Menu.new(nil, :menu, name, *args, &block)
+      end
     end
 
   end

data/lib/alacarte/version.rb

@@ -1,3 +1,3 @@
 module Alacarte
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alacarte
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Stijn Mathysen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: []
 
 description: This Rails plugin allows you to create a menu system, using a dsl (similar to routes).
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: alacarte
-rubygems_version: 1.8.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provides a generic menu system for Rails