activemenu 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca64f356d92dc4cd07df9bc37032f002b169a547
-  data.tar.gz: f0ba8f51a9adbba6b53469d30314310cd8d86358
+  metadata.gz: 93755f43aa9964d6ccdf71ecc44bffc069ac70df
+  data.tar.gz: 64c21a172ed17c5d7f116f05e6a4a640ad74bea6
 SHA512:
-  metadata.gz: 3a3f824c1043ae8228d91d0ddb86c2aea5f001ddc168eb018f2d4b4f68f7cfecd15e42af8d6409f02cc5a88780f109d48b1df372ea036ae5431190c2c9618975
-  data.tar.gz: 2cc46332660dca894c0c89e524ac22c033a6ec14df0611302a7245e638dd0bb655d83dfc40846e34b0cad8550bf64190da082071c68e1d2d95885ff6affb0fc2
+  metadata.gz: 25ff9d89be8614cc30fcede3e61b98e334637bbaf2259e41fe3ed99e0db089d30eeb836394d25e15462e288ad2ddff01eb87b90a764e5760af5fc0a204700d12
+  data.tar.gz: 4fb6b175ec9878e116708362285456b639bcec476e4d52a84061036a7bd6fb868355bcde8c08e6e89dc1dd911c02a1f28c274f6e879e351e88f53b32dcc3ef91

data/lib/active_menu/menu.rb

@@ -1,28 +1,4 @@
-class ActiveMenu::Menu
-  
-  attr_accessor :id, :submenus, :parent, :options
-  
-  def initialize(id, options={}, &block)
-    @id = id.to_sym
-    @options = options
-    @submenus = []
-    yield(self) if block_given?
-  end
-
-  def submenu(id, options={}, &block)
-    sm = self.class.new(id, options, &block)
-    sm.parent = self
-    @submenus << sm
-    sm
-  end
-
-  def option(key, value=nil)
-    if value.nil?
-      @options[key]
-    else
-      @options[key] = value
-    end
-  end
+class ActiveMenu::Menu < ActiveMenu::Node
 
   def text(value = nil)
     self.option(:text, value)
@@ -32,8 +8,4 @@ class ActiveMenu::Menu
     self.option(:href, value)
   end  
 
-  def tag(value=nil)
-    self.option(:tag, value)
-  end
-
 end

data/lib/active_menu/node.rb

@@ -0,0 +1,69 @@
+class ActiveMenu::Node
+  
+  attr_accessor :id, :parent, :children, :options
+
+  def initialize(id, options={}, &block)
+    @id = id.to_sym
+    @parent = nil
+    @children = []
+    @options = options
+    yield(self) if block_given?
+  end
+
+
+  def option(key, value=nil)
+    if value.nil?
+      @options[key]
+    else
+      @options[key] = value
+    end
+  end
+
+  def tag(value=nil)
+    self.option(:tag, value)
+  end
+
+  def child(id, options={}, &block)
+    new_child = self.class.new(id, options)
+    new_child.parent = self
+    @children << new_child
+    yield(new_child) if block_given?
+    new_child
+  end
+
+  def get(id, &block)
+    id = id.to_sym
+    selected = @children.select {|m| m.id == id}
+    if selected.length >= 1
+      first_element = selected.first
+      yield(first_element) if block_given?
+      first_element
+    else
+      false
+    end
+  end 
+
+  def exists?(id)
+    id = id.to_sym
+    if self.get(id)
+      true
+    else
+      false
+    end
+  end
+
+  def leave_children!
+    @children = []
+  end
+
+  def exists?(id)
+    id = id.to_sym
+    if self.get(id)
+      true
+    else
+      false
+    end
+  end
+
+
+end

data/lib/active_menu/registry.rb

@@ -2,40 +2,30 @@ require 'singleton'
 class ActiveMenu::Registry
   include Singleton
 
-  attr_accessor :menus
+  attr_accessor :main_node
 
   def initialize
-    @menus = []
+    @main_node = ActiveMenu::Menu.new(:main_node)
   end
 
   def create(id, options={}, &block)
-    menu = ActiveMenu::Menu.new(id, options, &block)
-    @menus << menu
-    menu
+    @main_node.child(id, options, &block)
   end
 
   def reset
-    @menus = []
+    @main_node.leave_children!
   end
 
   def get(id, &block)
-    id = id.to_sym
-    selected = @menus.select {|m| m.id == id}
-    if selected.length >= 1
-      yield(selected.first) if block_given?
-      selected.first
-    else
-      false
-    end
-  end 
+    @main_node.get(id, &block)
+  end
+
+  def menus
+    @main_node.children
+  end
 
   def exists?(id)
-    id = id.to_sym
-    if self.get(id)
-      true
-    else
-      false
-    end
+    @main_node.exists?(id)
   end
 
 end

data/lib/active_menu/version.rb

@@ -1,3 +1,3 @@
 module ActiveMenu
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/lib/active_menu.rb

@@ -1,4 +1,5 @@
 require "active_menu/version"
+require "active_menu/node"
 require "active_menu/menu"
 require "active_menu/registry"
 

data/spec/lib/active_menu/menu_spec.rb

@@ -5,11 +5,11 @@ describe ActiveMenu::Menu do
   subject {ActiveMenu::Menu.new(:idtest)}
 
   it {should respond_to(:id)}
-  it {should respond_to(:submenus)}
+  it {should respond_to(:children)}
   it {should respond_to(:parent)}
   it {should respond_to(:options)}
   
-  its(:submenus) {should  be_a(Array)}
+  its(:children) {should  be_a(Array)}
 
   before :each do
     @menu = ActiveMenu::Menu.new(:idtest, href: "http://example.com", text: "My menu")
@@ -23,33 +23,33 @@ describe ActiveMenu::Menu do
     @menu.href.should == "http://example.com"
   end
 
-  it 'can add submenus' do
-    @submenu = ActiveMenu::Menu.new(:mysubmenu, href: '#an_anchor', text: "My submenu")
-    @menu.submenus << @submenu
-    @menu.submenus.length.should == 1
+  it 'can add children' do
+    @child = ActiveMenu::Menu.new(:mychild, href: '#an_anchor', text: "My child")
+    @menu.children << @child
+    @menu.children.length.should == 1
   end
 
-  it 'can add submenus directly' do
-    submenu =  @menu.submenu(:mysubmenu, href: '#an_anchor', text: "My submenu")
-    @menu.submenus.length.should == 1
-    submenu.parent.should == @menu
-    submenu.parent.id.should == @menu.id
+  it 'can add children directly' do
+    child =  @menu.child(:mychild, href: '#an_anchor', text: "My child")
+    @menu.children.length.should == 1
+    child.parent.should == @menu
+    child.parent.id.should == @menu.id
   end
 
 
   it 'have a flexible DSL for menus' do
-    @menu.submenu(:mysubmenu, text: "test") do |sm|
+    @menu.child(:mychild, text: "test") do |sm|
       @sm = sm
-      sm.text 'My submenu'
-      sm.submenu(:mysubsubmenu, text: 'test 2') do |ssm|
+      sm.text 'My child'
+      sm.child(:mysubchild, text: 'test 2') do |ssm|
         @ssm = ssm
-        ssm.text == 'My subsubmenu'
+        ssm.text == 'My subchild'
       end
     end
 
-    @menu.submenus.length.should == 1
-    @sm.submenus.length.should == 1
-    @ssm.submenus.length.should == 0
+    @menu.children.length.should == 1
+    @sm.children.length.should == 1
+    @ssm.children.length.should == 0
 
   end
 

data/spec/lib/active_menu/node_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ActiveMenu::Node do
+  subject {ActiveMenu::Node.new(:idtest)}
+
+  it {should respond_to(:id)}
+  it {should respond_to(:parent)}
+  it {should respond_to(:children)}
+  it {should respond_to(:options)}
+  
+  its(:parent) {should be_nil}
+  its(:children) {should  be_a(Array)}
+
+
+  before :each do
+    @node = ActiveMenu::Node.new(:mainnode)
+  end
+
+  it 'can add childs with #child method' do
+    @node.child :childid do |c|
+      c.parent.should == @node
+    end
+  end
+
+  context "with a node with children" do
+    
+    subject do
+      @node.child :childid do |c|
+        c.parent.should == @node
+      end
+    end
+
+    it 'can leave the children!' do
+      @node.leave_children!
+    end
+
+  end
+
+end

data/spec/lib/active_menu/registry_spec.rb

@@ -6,19 +6,19 @@ describe 'ActiveMenu::Registry' do
   it {should be_a_kind_of(Singleton)}
 
 
-   before :each do
+  before :each do
     ActiveMenu::Registry.instance.reset
   end
 
   it 'can reset the menus to zero' do
-    ActiveMenu::Registry.instance.create(:idmenu, 'http://example.com')
+    ActiveMenu::Registry.instance.create(:idmenu, href: 'http://example.com')
     ActiveMenu::Registry.instance.menus.length == 1
     ActiveMenu::Registry.instance.reset
     ActiveMenu::Registry.instance.menus.length == 0
   end
 
   it 'can get a menu and yield it to a block' do
-    ActiveMenu::Registry.instance.create(:idmenu, 'http://example.com')
+    ActiveMenu::Registry.instance.create(:idmenu, href: 'http://example.com')
     ActiveMenu::get(:idmenu) do |m|
       m.id.should == :idmenu
     end

data/spec/lib/active_menu_spec.rb

@@ -35,14 +35,56 @@ describe ActiveMenu do
   it 'can create menus with lambdas' do
     ActiveMenu::create('admix-nav') do |nav|
       nav.tag :div
-      
-      nav.submenu :dashboard do |d|
+      nav.child :dashboard do |d|
         d.text 'dashboard.dashboard'
         d.href lambda { admix_root_url }
         d.option :icon, 'icon-flag'
       end
+    end
+  end
+
+
+  context 'with a child with lambda' do 
+    
+    before :each do
+      @dashboard = nil
+      @nav = ActiveMenu::create('admix-nav') do |nav|
+        nav.tag :div
+        @dashboard = nav.child :dashboard do |d|
+          d.text 'dashboard.dashboard'
+          d.href lambda { admix_root_url }
+          d.option :icon, 'icon-flag'
+        end
+      end
+    end
+
+    it 'can retrieve the admix nav' do
+      ActiveMenu::get('admix-nav').should == @nav
+    end
+
+    it 'can retrieve the child and add a child' do
       
+      ActiveMenu::get(:'admix-nav').get(:dashboard).should == @dashboard
+
+      @testchild = nil
+
+      ActiveMenu::get(:'admix-nav') do |nav|
+        nav.get(:dashboard) do |d|          
+          d.child :testchild do |sub|
+            @testchild = sub
+            sub.text "My child"
+          end
+        end
+      end
+
+      ActiveMenu::get(:'admix-nav').get(:dashboard).get(:testchild).should == @testchild
+
+      ActiveMenu::get(:'admix-nav').get(:dashboard).get(:testchild).text.should == "My child"
+
     end
+
+
   end
 
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemenu
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Sadjow Medeiros Leão
@@ -54,10 +54,12 @@ files:
 - activemenu.gemspec
 - lib/active_menu.rb
 - lib/active_menu/menu.rb
+- lib/active_menu/node.rb
 - lib/active_menu/registry.rb
 - lib/active_menu/version.rb
 - lib/activemenu.rb
 - spec/lib/active_menu/menu_spec.rb
+- spec/lib/active_menu/node_spec.rb
 - spec/lib/active_menu/registry_spec.rb
 - spec/lib/active_menu_spec.rb
 - spec/spec_helper.rb
@@ -87,6 +89,7 @@ specification_version: 4
 summary: A toolkit for menus.
 test_files:
 - spec/lib/active_menu/menu_spec.rb
+- spec/lib/active_menu/node_spec.rb
 - spec/lib/active_menu/registry_spec.rb
 - spec/lib/active_menu_spec.rb
 - spec/spec_helper.rb