merb-menus 0.1.0 → 0.2.0

data/README

@@ -1,4 +1 @@
-menu_generator
-==============
-
-A plugin for the Merb framework that provides ...
+this is awful and shouldn't be used

data/lib/merb-menus/item.rb

@@ -1,13 +1,13 @@
 module Merb::Menus
   class Item
-    def initialize(opts)
+    def initialize(opts, &data)
       @submenu = opts[:submenu]
       @name = opts[:name]
       @anchor = opts[:anchor] || build_anchor
       @href = opts[:href] || build_url
     end
 
-    attr_reader :name, :anchor, :href, :submenu
+    attr_reader :name, :anchor, :submenu, :data
 
     def inspect
       "<Merb::Menus::Item> - name~>#{name}"
@@ -17,6 +17,14 @@ module Merb::Menus
       anchor.to_s
     end
 
+    def needs_generation?
+      Proc === @href
+    end
+
+    def href
+      needs_generation? ? @href[] : @href
+    end
+
     private
 
     def build_url

data/lib/merb-menus/menu.rb

@@ -46,8 +46,15 @@ module Merb::Menus
         @collection.first
       end
 
-      def reset
-        each{ |e| e.submenus.each{ |menu| menu.current_item = nil} ; e.current_submenu = nil}
+      def reset!
+        each do |e|
+          e.submenus.each do |menu|
+            menu.current_item = nil
+            menu.items.clear
+          end
+
+          e.current_submenu = nil
+        end
       end
     end
 
@@ -66,9 +73,8 @@ module Merb::Menus
     attr_accessor :current_submenu, :default_display_style, :default_url_generator
     attr_reader :name, :submenus
 
-    def submenu(name, opts={}, &blk)
-      submenu = Submenu.new(name, self, opts)
-      submenu.instance_eval(&blk) if block_given?
+    def submenu(name, opts={}, &data)
+      submenu = Submenu.new(name, self, opts, &data)
       @submenus << submenu
       self
     end

data/lib/merb-menus/merb_controller.rb

@@ -1,57 +1,25 @@
 class Merb::Controller
-  before do
-    Merb::Menus.reset
+  before do; Merb::Menus.reset! end
+  before :generate_default_menu
 
-    self.class.instance_variable_set(:@callback, nil)
-
-    controller = params['controller']
-    action = params['action']
-
-    if top = Merb::Menus.current_menu = Merb::Menus.default
-      if menu = top.current_submenu = get_submenu(top,controller)
-        menu.current_item = get_item(menu,action)
-      end
+  class << self
+    def create_menu(name, &data)
+      Merb::Menus::Menu.new(name).instance_eval &data
     end
 
-    callback = self.class.instance_variable_get(:@callback)
-    callback.call if callback
-  end
-
-  def self.create_menu(name, &blk)
-    Merb::Menus::Menu.new(name).instance_eval(&blk)
-  end
-
-  def self.set_current
-  end
-
-  # FIXME: if only one arg is given, we probably want to set submenu only? maybe? grr
-  def self.use_menu(*args)
-    @callback = lambda{
-      menu, submenu = *args
-      top = Merb::Menus[menu]
-      Merb::Menus.current_menu = top
-      raise Merb::Menus::NoMenuError.new("Menu '#{menu}' does not exist") unless top
-
-      if submenu
-        top.current_submenu = get_submenu(top, submenu)
-        raise Merb::Menus::NoMenuError.new("Menu '#{submenu}' does not exist") unless top.current_submenu
-      end
-    }
-    @callback.call
-  end
-
-  # ==== Parameters
-  # top<Merb::Menus::Menu>::
-  # sub<Symbol>:: name of desired submenu
-  def self.get_submenu(top, sub)
-    top.submenus.find {|m| m.name.to_s == sub.to_s}
-  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 self.get_item(menu, item)
-    menu.items.find{|e| e.name.to_s == item.to_s}
+    # ==== 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
   end
 
   def get_submenu(top, sub)
@@ -63,27 +31,20 @@ class Merb::Controller
   end
 
   def menu_item(*args)
-    case args.size
-    when 3
-      menu, submenu, item = *args
-      self.class.use_menu(menu, submenu)
-      top = Merb::Menus[menu]
-      menu = get_submenu(top,submenu)
-      menu.current_item = get_item(menu,item)
-    when 2
-      submenu, item = *args
-      top = Merb::Menus.default
-      self.class.use_menu(top.name,submenu)
-      menu = get_submenu(top,submenu)
-      menu.current_item = get_item(menu,item)
-    when 1
-      item = *args
-      top = Merb::Menus.default
-      menu = top.current_submenu
-      menu.current_item = get_item(menu,item)
-    else
-      raise ArgumentError.new("Wrong number of arguments given (#{args.size} for 1)")
+    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
 
   def current_menu
@@ -98,5 +59,30 @@ class Merb::Controller
     Merb::Menus.current_item
   end
 
+  # Generate items in the context of our current controller instance
+  # so that we can generate urls with merb's url helpers
+  def item(*args)
+    @__submenu_generation__.item(*args)
+  end
+
+  def generate_menu(menu)
+    menu.submenus.each do |m|
+      @__submenu_generation__ = m
+      instance_eval &m.data
+      m.generated!
+    end
+  end
+
+  private
+
+  def generate_default_menu
+    if top = Merb::Menus.current_menu = Merb::Menus.default
+      generate_menu(top)
+
+      if menu = top.current_submenu = get_submenu(top, controller_name)
+        menu.current_item = get_item(menu, action_name)
+      end
+    end
+  end
 end
 

data/lib/merb-menus/submenu.rb

@@ -1,16 +1,17 @@
 module Merb::Menus
   class Submenu
-    def initialize(name, menu, opts={})
+    def initialize(name, menu, opts={}, &data)
       @name          = name
       @menu          = menu
       @display_style = @menu.default_display_style
       @url_generator = @menu.default_url_generator
       @details       = Item.new(opts.merge({:name => name, :submenu => self}))
       @items         = []
+      @data          = data
     end
 
     attr_accessor :current_item
-    attr_reader :name, :items, :menu, :display_style, :url_generator
+    attr_reader :name, :items, :menu, :display_style, :url_generator, :data
 
     def anchor
       @details.anchor
@@ -21,7 +22,8 @@ module Merb::Menus
     end
 
     def item(name, opts={})
-      @items << Item.new(opts.merge({:name => name, :submenu => self}))
+      @items << Item.new(opts.merge({:name => name, :submenu => self})) unless
+        @items.any? {|i| i.name == name}
       self
     end
 
@@ -40,6 +42,22 @@ module Merb::Menus
     def to_s
       anchor
     end
+
+    def generated!
+      @generated = true
+    end
+
+    def generated?
+      !!@generated
+    end
+
+    private
+
+    # Don't generate the URLs until the action is hit
+    # when using merb url/resource helpers
+    def method_missing(meth, *args, &block)
+      lambda {Merb::Menus.controller.send(meth, *args, &block)}
+    end
   end
 end
 

data/lib/merb-menus/version.rb

@@ -1,10 +1,6 @@
 module Merb
   module Menus
-    BIG = "0"
-    SMALL = "1"
-    TINY = "0"
-
-    VERSION = [BIG, SMALL, TINY].join(".")
+    VERSION = "0.2.0" unless defined?(::Merb::Menus::VERSION)
   end
 end
 

data/lib/merb-menus.rb

@@ -22,7 +22,7 @@ if defined?(Merb::Plugins)
   Merb::Plugins.add_rakefiles "merb-menus/merbtasks"
 
   module Merb::Menus
-    class << self; attr_accessor :current_menu; end
+    class << self; attr_accessor :current_menu, :controller end
 
     class NoMenuError < StandardError;end
 
@@ -34,8 +34,8 @@ if defined?(Merb::Plugins)
       Menu.find{|menu| menu.default?} || Menu.first
     end
 
-    def self.reset
-      Menu.reset
+    def self.reset!
+      Menu.reset!
     end
 
     def self.current_submenu

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-menus
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jonah honeyman
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +02:00
+date: 2011-01-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,24 +29,18 @@ extra_rdoc_files:
 - LICENSE
 - TODO
 files: 
-- LICENSE
-- README
-- Rakefile
-- TODO
 - lib/merb-menus/version.rb
-- lib/merb-menus/merb_controller.rb
-- lib/merb-menus/submenu.rb
-- lib/merb-menus/item.rb
 - lib/merb-menus/merbtasks.rb
-- lib/merb-menus/rule.rb
+- lib/merb-menus/submenu.rb
 - lib/merb-menus/menu.rb
+- lib/merb-menus/rule.rb
+- lib/merb-menus/item.rb
+- lib/merb-menus/merb_controller.rb
 - lib/merb-menus.rb
-- spec/merb-menus/submenu_spec.rb
-- spec/merb-menus/item_spec.rb
-- spec/merb-menus/rule.rb
-- spec/merb-menus/menu_spec.rb
-- spec/spec_helper.rb
-- spec/merb-menus_spec.rb
+- LICENSE
+- README
+- Rakefile
+- TODO
 has_rdoc: true
 homepage: http://github.com/jonuts/merb-menus
 licenses: []
@@ -52,21 +51,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides dot dot dot uh menus

data/spec/merb-menus/item_spec.rb

@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Merb::Menus::Item do
-  before do
-    @menu = Merb::Menus::Menu.new(:foo)
-    @menu.display_style(:split) {|thing| thing.to_s.split("_").join(" ")}
-
-    @submenu = Merb::Menus::Submenu.new(:cakes, @menu)
-    @submenu.use_display_style(:split)
-
-    @cheesecake = Merb::Menus::Item.new(:name => :cheese_cake, :submenu => @submenu)
-    @spongecake = Merb::Menus::Item.new(:name => :sponge, :submenu => @submenu, :anchor => "sPOnge cAkE")
-    @poundcake = Merb::Menus::Item.new(:name => :pound, :submenu => @submenu, :href => "http://bettercakesite")
-  end
-
-  it "has a unique key"
-  it "has a submenu" do
-    @cheesecake.submenu.should == @submenu
-  end
-
-  it "sets the anchor based on display rule in submenu" do
-    @cheesecake.anchor.should == "cheese cake"
-  end
-
-  it "overrides default display style if given in opts" do
-    @spongecake.anchor.should == "sPOnge cAkE"
-  end
-
-  it "generates a url" do
-    @cheesecake.href.should == "/cakes/cheese_cake"
-    @spongecake.href.should == "/cakes/sponge"
-    @poundcake.href.should == "http://bettercakesite"
-  end
-
-end
-
-

data/spec/merb-menus/menu_spec.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Merb::Menus::Menu do
-  before do
-    @menu = Merb::Menus::Menu.new(:foo)
-    @menu.submenu(:wutup){}
-    @menu.submenu(:dog){}
-  end
-
-  it "tracks submenus" do
-    @menu.submenus.should have(2).things
-  end
-
-  it "stores different display rules"
-  it "defines a url generator"
-  it "has a default url generation method"
-end
-
-describe Merb::Menus::Menu, "#submenu" do
-  before do
-    @menu = Merb::Menus::Menu.new(:hellothar)
-  end
-
-  it "creates a submenu without taking a block" do
-    lambda{@menu.submenu(:foo)}.should_not raise_error(ArgumentError)
-    @menu.submenus.should have(1).item
-    @menu.submenus.first.name.should == :foo
-  end
-end
-

data/spec/merb-menus/rule.rb

@@ -1,23 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Menus::DisplayStyle do
-  before do
-    @menu = Merb::Menus::Menu.new(:foo)
-    @split_rule = Merb::Menus::DisplayStyle.new(:split,@menu){|thing| thing.to_s.split("_").join(" ")}
-    @splitncap = Merb::Menus::DisplayStyle.new(:split,@menu){|thing| thing.to_s.split("_").join(" ")}
-    @dollarfy = Merb::Menus::DisplayStyle.new(:dollar,@menu){|thing| "$#{thing.to_s.gsub(/_/,',')}"}
-  end
-
-  it "has a unique key" do
-    @split_rule.key.should == :split
-    @splitncap.key.should == :split
-
-    @split_rule.rule.call("hello_thar").should == "hello thar"
-    @splitncap.rule.call("wut_the_deal").should == "wut the deal"
-  end
-
-  it "has a styling rule" do
-    Merb::Menus::DisplayStyle.add_rule(:feh).should be_nil
-  end
-end
-

data/spec/merb-menus/submenu_spec.rb

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Merb::Menus::Submenu do
-  before do
-    Merb::Menus::Menu.new :foo
-    @submenu = Merb::Menus::Submenu.new(:berries, Merb::Menus::Menu[:foo])
-    @submenu.item(:straw)
-    @submenu.item(:rasp)
-    @submenu.item(:black, :anchor => "HELLOTHAR", :url => "eek")
-  end
-
-  it "has a unique key" do
-    @submenu.name.should == :berries
-  end
-
-  it "has a collection of items" do
-    @submenu.items.should have(3).things
-  end
-
-  it 'sets item properly' do
-    item = @submenu.items.first
-    item.name.should == :straw
-    item.submenu.should == @submenu
-    item.anchor.should == "straw"
-    item.href.should == "/berries/straw"
-  end
-end
-

data/spec/merb-menus_spec.rb

@@ -1,137 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-class Application < Merb::Controller
-  create_menu :main do
-    submenu :cakes, :href => "/cakes" do
-      item :cheese
-      item :chocolate
-      item :devils_food, :anchor => "Devil's Food"
-    end
-
-    submenu :beers, :href => "/beers" do
-      item :budweiser
-      item :rolling_rock
-      item :fosters, :anchor => "Foster's"
-      item :fat_tire
-    end
-
-    submenu :drinks, :href => "/drinks" do
-      item :soda
-    end
-     
-  end
-end
-
-class Cakes < Application
-  use_menu :main
-
-  # this should be associated with item :cheese
-  def cheese
-    'hello'
-  end
-
-  def chocolate
-    menu_item :beers, :budweiser
-
-    'word up'
-  end
-
-  def not_devils_food
-    # associate this action with item :devils_food
-    menu_item :devils_food
-
-    ':)'
-  end
-end
-
-class Beers < Application
-  def fat_tire
-    'yoink'
-  end
-end
-
-class Snack < Application
-  use_menu :main, :cakes
-
-  def cheese_cake
-    menu_item :cheese
-    
-    [current_menu, current_submenu, current_item].join(" ")
-  end
-
-  def pistachios
-    [current_menu, current_submenu, current_item].join(" ")
-  end
-end
-
-class Drinks < Application
-  def soda
-    "#{current_menu}/#{current_submenu}/#{current_item}"
-  end
-end
-
-describe "menu generator", "Merb::Controller" do
-  before do
-    @menu = Merb::Menus[:main]
-  end
-
-  it "should create the menu" do
-    @menu.name.should == :main
-  end
-
-  it "should create all the submenus" do
-    @menu.submenus.should have(3).things
-    @menu.submenus.first.name.should == :cakes
-  end
-
-  it "should create the submenu items" do
-    @menu.submenus.first.items.should have(3).things
-    @menu.submenus.first.items.map{|e| e.name}.should == [:cheese, :chocolate, :devils_food]
-
-    @menu.submenus[1].items.should have(4).things
-    @menu.submenus[1].items.map{|e| e.name}.should == [:budweiser, :rolling_rock, :fosters, :fat_tire]
-  end
-
-  it "is accessible from child controllers"
-
-  it "sets the current menu properly" do
-    request('/cakes/cheese')
-    top = Merb::Menus[:main]
-    top.current_submenu.name.should == :cakes
-    top.current_submenu.current_item.name.should == :cheese
-  end
-
-  it "overrides actions default menu item" do
-    request('/cakes/chocolate')
-    top = Merb::Menus[:main]
-    top.current_submenu.name.should == :beers
-    top.current_submenu.current_item.name.should == :budweiser
-  end
-
-  it "finds the correct controller/action combo automagically" do
-    request '/beers/fat_tire'
-    Merb::Menus.current_menu.name.should == :main
-    Merb::Menus.current_menu.current_submenu.name.should == :beers
-    Merb::Menus.current_menu.current_submenu.current_item.name.should == :fat_tire
-  end
-
-  it "has helpers to access current menu data" do
-    req = request '/drinks/soda'
-
-    req.body.to_s.should == "main/drinks/soda"
-  end
-
-  it do
-    req = request '/snack/cheese_cake'
-    req.body.to_s.should == "main cakes cheese"
-  end
-
-  it "resets all current menus before each request" do
-    req = request '/snack/pistachios'
-    req.body.to_s.should_not == "main cakes cheese" #this would happen w/o the reset
-    req.body.to_s.should == "main cakes "
-  end
-
-   
-end
-

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'rubygems'
-require 'spec'
-require 'merb-core'
-require 'merb-core/test'
-require 'merb-menus'
-
-Merb::Router.prepare {default_routes}
-
-Merb.start :environment => "test", :adapter => "runner"
-
-Spec::Runner.configure {|config| 
-  config.include(Merb::Test::RouteHelper)
-}
-