jekyll-theme-guides-mbland 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f412b8db3eb8f740064eb498ffe3e74084f410
-  data.tar.gz: b3a22424800423dce81d05059021627510bf0169
+  metadata.gz: e579a12a87de02f5a9c1969c6c36e613bfce795c
+  data.tar.gz: b67f5d052e169b7f632a14a13484f33692fca7e5
 SHA512:
-  metadata.gz: 53107a48182ade21d5c248f9a9f587a584c16564419bf58b293b315ae5c8ddce706a4a51dfad72905dd3e96b49baddfc7948840e13dda86805a34ca02b22af2c
-  data.tar.gz: '08f6b7345e8fca15e3c4e28e2ac723818c7c29c648092da58a4cb1abfb58a08712aebddd1e7ba200de17de786952a674b9953babc576e792bd72cca07f95d4a7'
+  metadata.gz: b9557bafc54d8148157cecc4759c2615311281b790d7f5e3088da0bed992a9eb5779a8013a12cee2c87a3bf7e62c9ce8ad5eb51a8b237c86318858d3fe943ce5
+  data.tar.gz: 3a708fbd8ff3be6a0ab7c617c1ec06993beddab235505b14fe8690baf01982a0873a952ac9e7a0196e82a3f2b168913b40eda2fa071d69ff15c26efd86e75585

data/_includes/sidebar-children.html

@@ -6,12 +6,12 @@
 <ul class="nav-children" id="nav-collapsible-{{ forloop.index }}"
     aria-hidden="{% if expand_nav == 'true' %}false{% else %}true{% endif %}">
   {% if site.flat_namespace %}{% assign parent_url = '/' %}{% endif %}{% for child in parent.children %}
-  {% capture child_url %}{{ parent_url }}{{ child.url }}{% endcapture %}
+  {% capture child_url %}{% if child.internal == true %}{{ parent_url }}{% endif %}{{ child.url }}{% endcapture %}
     <li class="{% if page.url == child_url %}sidebar-nav-active{% endif %}">
       <a href="{% if child.internal == true %}{{ site.baseurl }}{{ child_url }}{% else %}{{ child.url }}{% endif %}"
         title="{% if page.url == child_url %}Current Page{% else %}{{ child.text }}{% endif %}">{{ child.text }}</a>
-      {% assign parent = child %}{% assign parent_url = child_url %}
+      {% if child.children %}{% assign parent = child %}{% assign parent_url = child_url %}
       {% include sidebar-children.html %}
-      {% capture parent_url %}{% jekyll_theme_guides_mbland_pop_last_url_component parent_url %}{% endcapture %}
+      {% capture parent_url %}{% jekyll_theme_guides_mbland_pop_last_url_component parent_url %}{% endcapture %}{% endif %}
     </li>{% endfor %}
 </ul>{% endif %}

data/lib/jekyll-theme-guides-mbland/navigation.rb

@@ -129,12 +129,31 @@ module JekyllThemeGuidesMbland
     config_data = SafeYAML.load_file config_path, safe: true
     return unless config_data
     nav_data = config_data['navigation'] || []
+    NavigationMenu.validate_existing_data(nav_data)
     NavigationMenu.update_navigation_data(nav_data, basedir, config_data)
     NavigationMenuWriter.write_navigation_data_to_config_file(config_path,
       nav_data)
   end
 
   module NavigationMenu
+    def self.validate_existing_data(nav_data)
+      errors = []
+      validate_existing_data_impl(nav_data, errors)
+      err_msg = "Existing navigation entries contain errors:\n  " +
+        errors.join("\n  ") + "\n_config.yml not updated"
+      abort err_msg unless errors.empty?
+    end
+
+    def self.validate_existing_data_impl(nav_data, errors)
+      nav_data.each do |nav|
+        if !nav['internal'] && nav['children']
+          errors << "#{nav['text']}: external navigation URLs " \
+            'cannot have children'
+        end
+        validate_existing_data_impl(nav['children'] || [], errors)
+      end
+    end
+
     def self.update_navigation_data(nav_data, basedir, config_data)
       original = map_nav_items_by_url('/', nav_data).to_h
       updated = updated_nav_data(basedir)
@@ -229,7 +248,7 @@ module JekyllThemeGuidesMbland
     def self.write_navigation_data_to_config_file(config_path, nav_data)
       lines = []
       in_navigation = false
-      open(config_path).each_line do |line|
+      File.open(config_path).each_line do |line|
         in_navigation = process_line line, lines, nav_data, in_navigation
       end
       File.write config_path, lines.join

data/lib/jekyll-theme-guides-mbland/tags.rb

@@ -8,7 +8,7 @@ module JekyllThemeGuidesMbland
 
     attr_reader :parent_reference, :url_reference
 
-    def initialize(_tag_name, markup, _)
+    def initialize(_tag_name, markup, _tokens)
       references = markup.split(',').map(&:strip)
       @parent_reference = references.shift
       @url_reference = references.shift
@@ -37,7 +37,7 @@ module JekyllThemeGuidesMbland
 
     attr_reader :reference
 
-    def initialize(_tag_name, markup, _)
+    def initialize(_tag_name, markup, _tokens)
       @reference = markup.strip
     end
 

data/lib/jekyll-theme-guides-mbland/version.rb

@@ -1,3 +1,3 @@
 module JekyllThemeGuidesMbland
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-guides-mbland
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Guides style elements for Jekyll