middleman-navigation 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e8146944ab4c5853ae3fe4d0106502989ff09d2
+  data.tar.gz: 5ffdcb52c074ff2a1c93f52349d58ff7959a26fc
+SHA512:
+  metadata.gz: 4c0d9007d78cac92bd08561dd6198f09a59f8d57b1224c36ca696591180f311348bce048879cd7a9f18f9e0fe975f9ab7add5011df275a33e0b957a5553e401b
+  data.tar.gz: db154566d081220a51c738f7651734dec72ee1efc854703dc42810ab8c5c9aa98e18fb916200f38a91d27255199b7591a33de47c8838e66728b57f2fa4681ae8

data/features/basic.feature

@@ -12,3 +12,9 @@ Feature: Simple flat navigation
     Then I should see "Subpage."
     Then the Another menu item should be selected
     Then the Subpage menu item should not be selected
+
+  Scenario: Child menu should render
+    Given the Server is running at "basic-app"
+    When I go to "/another/child.html"
+    Then I should see "Child."
+    Then the Child menu item should be selected

data/features/empty.feature

@@ -0,0 +1,5 @@
+Feature: No navigation
+  Scenario: Navigation should not error if none is defined
+    Given the Server is running at "empty-app"
+    When I go to "/index.html"
+    Then I should see "Home."

data/fixtures/basic-app/source/another/child.erb

@@ -0,0 +1,7 @@
+---
+title: Child
+---
+
+Child.
+
+<%= render_navigation :expand_all => true %>

data/fixtures/empty-app/config.rb

@@ -0,0 +1 @@
+activate :navigation

data/fixtures/empty-app/source/index.erb

@@ -0,0 +1,8 @@
+---
+navigation: 
+  hidden: true
+---
+
+Home.
+
+<%= render_navigation %>

data/lib/middleman-navigation/tree.rb

@@ -7,7 +7,9 @@ module Middleman
 
         unless @root.blank?
           SimpleNavigation::Configuration.run do |navigation|
-            traverse(@root, navigation)
+            navigation.items do |level|
+              traverse(@root, level)
+            end
           end
         end
       end
@@ -18,19 +20,13 @@ module Middleman
       end
 
       def self.traverse(resource, navigation)
-        children = visible_children(resource)
-
-        navigation.items do |level|
-          if resource == @root
-            options = with_defaults @root.data.navigation
-            add_navigation_node @root, level unless options[:hidden]
-          end
+        if resource == @root
+          add_navigation_node resource, navigation
+        end
 
-          unless children.blank?
-            children.each do |child|
-              add_navigation_node child, level
-              traverse child, level
-            end
+        visible_children(resource).each do |child|
+          add_navigation_node child, navigation do |subnav|
+            traverse child, subnav
           end
         end
       end
@@ -46,8 +42,11 @@ module Middleman
         options = with_defaults(node.data.navigation)
         title = options[:title] || node.data.title
         url = options[:destination] || node.url
-
-        level.item node.destination_path, title, url, :highlights_on => %r(^#{url}(#{@app.index_file})?$)
+        unless options[:hidden]
+          level.item node.destination_path, title, url, :highlights_on => %r(^#{url}(#{@app.index_file})?$) do |subnav|
+            yield(subnav) if block_given?
+          end
+        end
       end
     end
   end

data/lib/middleman-navigation/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Navigation
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-navigation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Giovanni Cangiani
@@ -15,7 +14,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,23 +28,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,49 +56,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Add simple navigation helpers for your Middleman project
@@ -122,12 +109,16 @@ files:
 - README.markdown
 - Rakefile
 - features/basic.feature
+- features/empty.feature
 - features/step_definitions/nav_steps.rb
 - features/support/env.rb
 - fixtures/basic-app/config.rb
 - fixtures/basic-app/source/another.erb
+- fixtures/basic-app/source/another/child.erb
 - fixtures/basic-app/source/index.erb
 - fixtures/basic-app/source/subpage.erb
+- fixtures/empty-app/config.rb
+- fixtures/empty-app/source/index.erb
 - lib/middleman-navigation.rb
 - lib/middleman-navigation/resource_list_manipulator.rb
 - lib/middleman-navigation/tree.rb
@@ -139,27 +130,30 @@ files:
 - middleman-navigation.gemspec
 homepage: https://github.com/multiscan/middleman-navigation
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: middleman-navigation
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add simple navigation helpers for your Middleman project
-test_files: []
+test_files:
+- features/basic.feature
+- features/empty.feature
+- features/step_definitions/nav_steps.rb
+- features/support/env.rb
 has_rdoc: