jekyll-theme-guides-mbland 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29934a58f4e2a89479b2df4e2d399ad911a8e854
-  data.tar.gz: 47be69db1434d7b7b57ac129f30d2f8354a4dd7b
+  metadata.gz: 0bc59d36f6eff245b1a1a954af0e6982dace91b2
+  data.tar.gz: df24ac0ab0619164206a67b8f501e04586df8b8a
 SHA512:
-  metadata.gz: c226a22e83ede73c78f45e96e395ad21143e80483e3e52649f9237fa1391448fc7d987e0e9383660be884ca910c999b0900863f56a5d5ff958d6376cc6c2127f
-  data.tar.gz: 63363244938c0a3d5d5a5cc032dd22230062909cc11a3e898e159b2d86e5c1c2966369c77b1e7b64cd9ea6ee932eb92c35cf4133ae5d261cb716ded568a843f4
+  metadata.gz: 99091b62f70e965acf738ade693c82cd0cb1664751f922fad56caef158d949a59a0a4e357841599435884759b0d63edad3314586054a61c3714b83e4afdddb67
+  data.tar.gz: 3e5b84ceafcbde3642589cb6a7670b854d118448ae05fd45f30f31bacb27c20e3cd2a36d5d52cd9851b1f2faea2ab0f5d6c93092abb36ea60b1aa3450f65acf3

data/_includes/sidebar-children.html

@@ -5,7 +5,7 @@
         aria-controls="nav-collapsible-{{ forloop.index }}">+</button>
 <ul class="nav-children" id="nav-collapsible-{{ forloop.index }}"
     aria-hidden="{% if expand_nav == 'true' %}false{% else %}true{% endif %}">
-  {% for child in parent.children %}
+  {% if site.flat_namespace %}{% assign parent_url = '/' %}{% endif %}{% for child in parent.children %}
   {% capture child_url %}{{ parent_url }}{{ 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 %}"

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

@@ -6,7 +6,7 @@ module JekyllThemeGuidesMbland
     def self.generate(site, docs)
       breadcrumbs = create_breadcrumbs(site)
       docs.each do |page|
-        page.data['breadcrumbs'] = breadcrumbs[page.permalink || page.url]
+        page.data['breadcrumbs'] = breadcrumbs[page.data[:working_url]]
       end
     end
 

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

@@ -10,8 +10,24 @@ module JekyllThemeGuidesMbland
       GeneratedPages.generate_pages_from_navigation_data(site)
       pages = site.collections['pages']
       docs = (pages.nil? ? [] : pages.docs) + site.pages
+      docs.each { |doc| Generator.generate_working_url(doc) }
       Breadcrumbs.generate(site, docs)
       NamespaceFlattener.flatten_url_namespace(site, docs)
     end
+
+    # Calling the `url` method on a Jekyll::Page or Jekyll::Document will render
+    # the returned value immutable from that point. Here we generate a separate
+    # URL object that we use to calculate `data['permalink']` prior to the first
+    # call to `url`. This enables `NamespaceFlattener.flatten_url_namespace` to
+    # update the URL as a final step, after `Breadcrumbs.generate` has finished
+    # its processing.
+    def self.generate_working_url(doc)
+      t = doc.respond_to?(:url_template) ? doc.url_template : doc.template
+      doc.data[:working_url] = Jekyll::URL.new(
+        template:     t,
+        placeholders: doc.url_placeholders,
+        permalink:    doc.permalink
+      ).to_s
+    end
   end
 end

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

@@ -11,7 +11,8 @@ module JekyllThemeGuidesMbland
     end
 
     def self.flatten_page_urls(page, flat_to_orig)
-      orig_url = page.permalink || page.url
+      return if page.data['title'].nil?
+      orig_url = page.data[:working_url]
       flattened_url = flat_url(orig_url)
       (flat_to_orig[flattened_url] ||= []) << orig_url
       page.data['permalink'] = flattened_url

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

@@ -1,4 +1,4 @@
-require 'jekyll/tags/include'
+require 'jekyll'
 require 'liquid'
 
 module JekyllThemeGuidesMbland

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

@@ -1,3 +1,3 @@
 module JekyllThemeGuidesMbland
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-guides-mbland
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides consistent style elements for Guides generated using Jekyll.
   Originally based on DOCter (https://github.com/cfpb/docter/) from CFPB (http://cfpb.github.io/).
 email: