[brooklyn-docs] 33/34: WIP trying to fix jekyll compilation problems wrt site_structure

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch ruby-3
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git

commit e376ed077ffa6ddb2905621af19cc26ad7c8f277
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu May 20 12:49:54 2021 +0100

    WIP trying to fix jekyll compilation problems wrt site_structure
---
 _plugins/site_structure.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/_plugins/site_structure.rb b/_plugins/site_structure.rb
index 5f2d42b..b4bf9b6 100644
--- a/_plugins/site_structure.rb
+++ b/_plugins/site_structure.rb
@@ -186,10 +186,10 @@ module SiteStructure
     end
 
     # processes liquid tags, e.g. in a link or path object
-    def self.render_liquid(site, page, content)
+    def self.render_liquid_with_page(site, page, content)
       return content unless page
       info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => page } }
-      page.render_liquid(content, site.site_payload, info)
+      page.render_liquid(content, site.site_payload, info, nil)
     end
     
     def self.gen_structure(site, item, parent, breadcrumb_pages_in, breadcrumb_paths_in, structure_processed_pages)
@@ -200,7 +200,7 @@ module SiteStructure
         item = { 'path' => item }
       end
       if (item['path'])      
-        page = find_page_with_path_absolute_or_relative_to(site, render_liquid(site, parent, item['path']), parent, structure_processed_pages)
+        page = find_page_with_path_absolute_or_relative_to(site, render_liquid_with_page(site, parent, item['path']), parent, structure_processed_pages)
         # if nil and find_page doesn't raise, we are in debug mode, silently ignore
         return nil unless page
         # build up the menu info
@@ -251,7 +251,7 @@ module SiteStructure
         
         data['path'] = page.path
         if item['href_path']
-          href_page = find_page_with_path_absolute_or_relative_to(site, render_liquid(site, page, item['href_path']), parent, structure_processed_pages)
+          href_page = find_page_with_path_absolute_or_relative_to(site, render_liquid_with_page(site, page, item['href_path']), parent, structure_processed_pages)
         else
           href_page = page
         end
@@ -277,7 +277,7 @@ module SiteStructure
         
       elsif (item['link'])
         puts "setting up #{item} as link" if @@verbose
-        link = render_liquid(site, parent, item['link'])
+        link = render_liquid_with_page(site, parent, item['link'])
         data = { 'link' => link, 'url' => link, 'external' => true }
         data['title'] = item['title'] if item['title']
         breadcrumb_pages << data
@@ -294,7 +294,7 @@ module SiteStructure
       data['breadcrumb_paths'] ||= breadcrumb_paths
       data['menu_parent'] ||= parent
       
-      data['title_in_menu'] = render_liquid(site, parent, item['title_in_menu'] || item['title'] || data['title_in_menu'] || data['title'])
+      data['title_in_menu'] = render_liquid_with_page(site, parent, item['title_in_menu'] || item['title'] || data['title_in_menu'] || data['title'])
       data['title'] ||= data['title_in_menu']
 #      puts "built #{data}, now looking at children"
 
@@ -314,7 +314,7 @@ module SiteStructure
       if data['breadcrumbs']
         # if custom breadcrumbs set on page, use them instead
         breadcrumb_pages = data['breadcrumb_pages'] = data['breadcrumbs'].collect { |path|
-          result = find_page_with_path_absolute_or_relative_to(site, render_liquid(site, parent, path), page, structure_processed_pages)
+          result = find_page_with_path_absolute_or_relative_to(site, render_liquid_with_page(site, parent, path), page, structure_processed_pages)
           raise "missing breadcrumb #{path} in #{page.path}" unless result
           result
         }
@@ -324,7 +324,7 @@ module SiteStructure
       if data['menu_parent'] 
         if data['menu_parent'].is_a? String
           # if custom menu_parent was set as a string then load it
-          parent_result = find_page_with_path_absolute_or_relative_to(site, render_liquid(site, parent, data['menu_parent']), page, structure_processed_pages)        
+          parent_result = find_page_with_path_absolute_or_relative_to(site, render_liquid_with_page(site, parent, data['menu_parent']), page, structure_processed_pages)        
           raise "missing parent #{data['menu_parent']} in #{page['path']}" unless parent_result
           data['menu_parent'] = parent_result
           if !data['breadcrumbs']
@@ -348,7 +348,7 @@ module SiteStructure
               sub['menu'] = child['menu']
               if (sub['menu'] != nil)
                 if sub['menu'].is_a? String
-                  sub['menu'] = YAML.load(render_liquid(site, page, sub['menu'])) if sub['menu'].is_a? String
+                  sub['menu'] = YAML.load(render_liquid_with_page(site, page, sub['menu'])) if sub['menu'].is_a? String
                 end
                 sub['menu'] = sub['menu'].collect { |mi| 
                   gen_structure(site, mi, page, breadcrumb_pages, breadcrumb_paths, structure_processed_pages)