makandra-navy 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 042a20d0c59984e62efe693961036f2d1c423066
-  data.tar.gz: a0087236f413976189fcb476ee5bf07649dc6d1b
+  metadata.gz: 7b6fe9ffcfac9fce4076eb3134ee479123c201c7
+  data.tar.gz: 153953b1f453894f2daeb4b17852f8a1542847e5
 SHA512:
-  metadata.gz: fec0da5f8f3f17cd025fe95260a2fe0467bddf2c5d11c65047283d4af07fdceb1fa81825f3510dbaf6e584af63686734ed778dd2c6bb0d25c967ed0dedf2cb24
-  data.tar.gz: d74929409cfbb95dfb033b14dfde6ec1299ce83611e48c50a7a4022b109811eb42602262f03f03e542f685f835987a8e39bab8b14de5f5fe3d1148206177f103
+  metadata.gz: 39d41688c171d912dcf1098a7674aa07376021ebb4e6803b30fd62195f4f5df61ddf30af33d0bee09832a1823608f799f665d4f6da5bb97976a4e9e7f71c9f2c
+  data.tar.gz: 4b197625f5443e335709e7cacb0d40d29583795c6c8074ac2d308d48c20d872ca83693737b8309f9ccc367982bdc8a18cefbda3590727e45c94e2cee23fd4ef7

data/lib/navy/renderer.rb

@@ -22,7 +22,7 @@ module Navy
     def render_navigation(navigation)
       name = @name || navigation.name
       html = ''.html_safe
-      html << render_section_container(navigation, 1)
+      html << render_section_container(navigation, navigation.sections(@context), 1)
       @html_to_append.each do |append|
         html << append
       end
@@ -38,16 +38,7 @@ module Navy
       @html_to_append << html
     end
 
-    def render_section_containers
-      html = ''.html_safe
-      while @section_containers_to_render.any?
-        html << render_section_container(*@section_containers_to_render.shift)
-      end
-      html
-    end
-
-    def render_section_container(section_container, level, parent_id = nil, parent_url = nil)
-      sections = section_container.sections(@context)
+    def render_section_container(section_container, sections, level, parent_id = nil, parent_url = nil)
       section_classes = ["navy-level-#{level}", "navy-navigation-bar"]
       section_classes << (section_container.active? ? 'navy-current' : 'navy-hidden')
       unless sections.size == 0 or (sections.size == 1 and sections.first.url == parent_url)
@@ -82,8 +73,15 @@ module Navy
       link_classes = ['navy-section', link_to_options.delete(:class)].compact
       link_classes << 'navy-current navy-active' if section.active?
       label = ''.html_safe
+      url = section.url
       if section.children?
-        children_html = render_section_container(section, level + 1, id, section.url)
+        children_sections = section.sections(@context)
+        if (first_child = children_sections.first)
+          url ||= first_child.url
+        else
+          url ||= '#'
+        end
+        children_html = render_section_container(section, children_sections, level + 1, id, url)
         if children_html.present?
           append(children_html)
           label << ' <span class="navy-section-expander">▾</span>'.html_safe
@@ -91,7 +89,7 @@ module Navy
       end
       label << section.label
       label = content_tag(:span, label, :class => 'navy-section-inner')
-      link_to(label, section.url, link_to_options.merge(:class => link_classes.join(' '), :"data-navy-opens" => id, 'data-navy-section' => section.name))
+      link_to(label, url, link_to_options.merge(:class => link_classes.join(' '), :"data-navy-opens" => id, 'data-navy-section' => section.name))
     end
 
     

data/lib/navy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Navy
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makandra-navy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: navy
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Comprehensive solution for multi-level horizontal navigation bars.