menu_maker 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762e776957a11f8346961c2c9e1d18a61982a735
-  data.tar.gz: 58fe8eb9c5e1f3d1ba658acf102de6f644930d6a
+  metadata.gz: 9a4923f33929c3532d9abb35368c8068996c61ab
+  data.tar.gz: a17f276b14a200735d44f482ccf982fbac830609
 SHA512:
-  metadata.gz: 3b1fcb4239f1584b1dbde0dc8ef43dbd5b369dd14e3a69f38fcf960f40977a6b552885fade391bbb21a45c09ba552a63544d8cb250f12d51134cec3103f36859
-  data.tar.gz: 56b9c2c19d7d7d6fa87ca76a6fbcfe61be1d48e1e3ef8dfc3b2f83343b60c27d3e628e9f6b0a98970c5c3041b0b8c8d7492cddbd32dbcf5d3c4262794371a017
+  metadata.gz: 68fa806dfe5e5a74366d8e810fbcf56382402e3af6ad2976bdbff32e7ec6ec4b5e1914eab395f75f69e02aa27040db50d29a8131454ca792e5e1e13aeaacd788
+  data.tar.gz: d548a02b709d6661fca1a12e42ccea7fb175f6a1cc5cab1fa63dafde4f45c3d46074c64ddfafab181574cb218f9025ef04e1e0392b78c462c9422543eb56fcd8

data/lib/menu_maker/custom_menu_renderer.rb

@@ -1,27 +1,17 @@
 module MenuMaker
   class CustomMenuRenderer < MenuRenderer
     render do
-      out = build_menu do |item, css_class|
-        output = build_html do |html|
-          html << render_link(item)
+      output = build_menu do |item, css_class|
+        html = build_html { render_link(item) + item.render_submenu }
 
-          if item.has_submenu?
-            css_class << 'dropdown'
-            html << item.submenu.render
-          end
+        css_class << 'dropdown'    if item.has_submenu?
+        css_class << 'active open' if item.has_path? current_path
 
-          html
-        end
-
-        if item.has_path? current_path
-          css_class << 'active open'
-        end
-
-        options = css_class.any? ? { class: css_class.join(' ') } : {}
-        h.li(output, nil, options)
+        options = { class: css_class.join(' ') } if css_class.any?
+        h.li(html, nil, options || {})
       end
 
-      h.content_tag(:ul, out, class: 'nav navbar-nav side-nav')
+      h.content_tag(:ul, output, class: 'nav navbar-nav side-nav')
     end
 
     private
@@ -37,15 +27,10 @@ module MenuMaker
 
     def render_link(item)
       if item.has_submenu?
-        options = {
-          class: 'dropdown-toggle',
-          data: { toggle: 'dropdown' }
-        }
-      else
-        options = {}
+        options = { class: 'dropdown-toggle', data: { toggle: 'dropdown' } }
       end
 
-      h.link_to(render_title(item), item.path, options)
+      h.link_to(render_title(item), item.path, options || {})
     end
   end
 end

data/lib/menu_maker/custom_submenu_renderer.rb

@@ -2,13 +2,8 @@ module MenuMaker
   class CustomSubmenuRenderer < MenuRenderer
     render do
       output = build_menu do |item|
-        options = if item.path == current_path
-          { link: { class: 'active' } }
-        else
-          {}
-        end
-
-        h.li(item.title, item.path, options)
+        options = { link: { class: 'active' } } if item.path == current_path
+        h.li(item.title, item.path, options || {})
       end
 
       h.content_tag(:ul, output, class: 'dropdown-menu')

data/lib/menu_maker/menu.rb

@@ -92,6 +92,10 @@ module MenuMaker
       def respond_to_missing?(method)
         !!(options && options[method])
       end
+
+      def render_submenu
+        has_submenu? ? submenu.render : ''
+      end
     end
 
     class MenuError < StandardError; end

data/lib/menu_maker/menu_renderer.rb

@@ -44,7 +44,7 @@ module MenuMaker
     private
 
     def find_current_path(current_path)
-      @current_path = current_path || request_path || ''
+      current_path || request_path || ''
     end
 
     def helpers_has_request?

data/lib/menu_maker/version.rb

@@ -1,3 +1,3 @@
 module MenuMaker
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/log/test.log

@@ -633,3 +633,63 @@ MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_
 -----------------------------------------------------------------------------------------
 MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
 -----------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_menu_helper_that_maps_to_Menu_class
+-------------------------------------------------------------------
+-------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_active
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_active
+--------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
+-----------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_menu_helper_that_maps_to_Menu_class
+-------------------------------------------------------------------
+-------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_active
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_active
+--------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
+-----------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_menu_helper_that_maps_to_Menu_class
+-------------------------------------------------------------------
+-------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_active
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_active
+--------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
+-----------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_menu_helper_that_maps_to_Menu_class
+-------------------------------------------------------------------
+-------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_active
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_active
+--------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
+-----------------------------------------------------------------------------------------
+-------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_menu_helper_that_maps_to_Menu_class
+-------------------------------------------------------------------
+-------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_active
+-------------------------------------------------------------------------
+--------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_first_li_submenu_item_active
+--------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+MenuMaker::MenuHelperTest: test_outputs_the_menu_with_the_second_li_submenu_item_selected
+-----------------------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menu_maker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thiago A. Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,6 @@ files:
 - lib/menu_maker.rb
 - lib/menu_maker/custom_menu_renderer.rb
 - lib/menu_maker/custom_submenu_renderer.rb
-- lib/menu_maker/default_menu_renderer.rb
 - lib/menu_maker/engine.rb
 - lib/menu_maker/menu.rb
 - lib/menu_maker/menu_renderer.rb

data/lib/menu_maker/default_menu_renderer.rb

@@ -1,51 +0,0 @@
-module MenuMaker
-  class DefaultMenuRenderer < MenuRenderer
-    render do
-      out = build_menu do |item, css_class|
-        output = build_html do |html|
-          html << render_link(item)
-
-          if item.has_submenu?
-            css_class << 'dropdown'
-            html << item.submenu.render
-          end
-
-          html
-        end
-
-        if item.has_path? current_path
-          css_class << 'active open'
-        end
-
-        options = css_class.any? ? { class: css_class.join(' ') } : {}
-        h.li(output, nil, options)
-      end
-
-      h.content_tag(:ul, out, class: 'nav navbar-nav side-nav')
-    end
-
-    private
-
-    def render_title(item)
-      build_html do
-        caret = item.has_submenu? ? ' <b class="caret"></b>' : ''
-        i = %{<i class="#{item.icon}"></i>}
-
-        "#{i} #{item.title}#{caret}"
-      end
-    end
-
-    def render_link(item)
-      if item.has_submenu?
-        options = {
-          class: 'dropdown-toggle',
-          data: { toggle: 'dropdown' }
-        }
-      else
-        options = {}
-      end
-
-      h.link_to(render_title(item), item.path, options)
-    end
-  end
-end