merb-menus 0.2.0 → 0.2.1

data/lib/merb-menus/merb_controller.rb

@@ -1,51 +1,11 @@
 class Merb::Controller
   before do; Merb::Menus.reset! end
-  before :generate_default_menu
 
-  class << self
-    def create_menu(name, &data)
-      Merb::Menus::Menu.new(name).instance_eval &data
-    end
-
-    # ==== Parameters
-    # top<Merb::Menus::Menu>::
-    # sub<Symbol>:: name of desired submenu
-    def get_submenu(top, sub)
-      top.submenus.find {|m| m.name.to_s == sub.to_s}
-    end
-
-    # ==== Parameters
-    # menu<Merb::Menus::Submenu>::
-    # item<Symbol>:: name of desired item
-    def get_item(menu, item)
-      item = menu.items.find{|e| e.name.to_s == item.to_s}
-    end
+  def self.create_menu(name, &data)
+    Merb::Menus::Menu.new(name).instance_eval &data
   end
 
-  def get_submenu(top, sub)
-    self.class.get_submenu(top, sub)
-  end
-
-  def get_item(menu, item)
-    self.class.get_item(menu, item)
-  end
-
-  def menu_item(*args)
-    menu, submenu, item = *args
-
-    if item.nil?
-      item = submenu
-      submenu = menu
-      menu = Merb::Menus.default.name
-    end
-
-    top = Merb::Menus[menu]
-    Merb::Menus.current_menu = top
-    generate_menu(top)
-    submenu = get_submenu(top, submenu)
-    top.current_submenu = submenu
-    submenu.current_item = get_item(submenu, item)
-  end
+  private
 
   def current_menu
     Merb::Menus.current_menu
@@ -65,24 +25,69 @@ class Merb::Controller
     @__submenu_generation__.item(*args)
   end
 
+  def get_submenu(top, sub)
+    top.submenus.find {|m| m.name.to_s == sub.to_s}
+  end
+
+  def get_item(submenu, item)
+    submenu.items.find {|e| e.name.to_s == item.to_s}
+  end
+
   def generate_menu(menu)
     menu.submenus.each do |m|
       @__submenu_generation__ = m
       instance_eval &m.data
       m.generated!
     end
+
+    menu_generated!
+  end
+  
+  def menu_generated!
+    @__menu_generated__ = true
   end
 
-  private
+  def menu_generated?
+    !!@__menu_generated__
+  end
 
-  def generate_default_menu
-    if top = Merb::Menus.current_menu = Merb::Menus.default
-      generate_menu(top)
+  def no_menu!
+    @__no_menu__ = true
+  end
+
+  def no_menu?
+    !!@__no_menu__
+  end
+
+  def _menu_setup(menu, sub, item)
+    raise ArgumentError, "#{menu} is not a Merb::Menu" unless Merb::Menus::Menu === menu
+
+    top = Merb::Menus.current_menu = menu
+    generate_menu(menu)
+    if submenu = top.current_submenu = get_submenu(top, sub)
+      submenu.current_item = get_item(submenu, item)
+    end
+  end
 
-      if menu = top.current_submenu = get_submenu(top, controller_name)
-        menu.current_item = get_item(menu, action_name)
-      end
+  def menu_item(*args)
+    menu, submenu, item = *args
+
+    if item.nil?
+      item    = submenu
+      submenu = menu
+      menu    = Merb::Menus.default.name
     end
+
+    top = Merb::Menus[menu]
+    raise Merb::Menus::NoMenuError, "Menu #{menu} does not exist" unless top
+
+    _menu_setup(top, submenu, item)
+  end
+
+  def generate_default_menu
+    return if no_menu? || menu_generated?
+
+    _menu_setup(Merb::Menus.default, controller_name, action_name)
   end
 end
 

data/lib/merb-menus/version.rb

@@ -1,6 +1,6 @@
 module Merb
   module Menus
-    VERSION = "0.2.0" unless defined?(::Merb::Menus::VERSION)
+    VERSION = "0.2.1" unless defined?(::Merb::Menus::VERSION)
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - jonah honeyman