swedbank-pay-design-guide-jekyll-theme 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d576204f0905f4ad97a12cbbf4a5bef4b2efed40fd24728f315ef29aa1bdee2
-  data.tar.gz: 76f4c8c9d616c993a50db2b83ef1d186d422222199f5063ec6273c0e247531ce
+  metadata.gz: bb6399fcb6768466d3a79fa48d7cc148786b6b16e7f2e5116d1d577998b1e411
+  data.tar.gz: cf030d126581b3a457204ed655035da20a36308c1cb93297595d1d38c5ca99db
 SHA512:
-  metadata.gz: 9a1b3b671e7effeb8b76fc0d501a9bed6b4ddf9a918c88fe2f50e23ddb539f901d7905bef61784d86141b8f4e2bc434391a480dd7274ebc1256188618f1b28ba
-  data.tar.gz: '09e20f7c41ac0c68eca729641ede6287ec05e9c1f101dd62d3ba33e4f2e523b9eda1f2527170c1f590b297a96ab4d057af44e0f8b3d44cd5fe35339a20e1670d'
+  metadata.gz: 14f293bdd5a8913d5fc292eb70d26708a212e2fbe106715495feabb2569311e45287618a881864116964280f3c8a4915b965a59ac95ee1cf681c1b9c38e93672
+  data.tar.gz: 40621213c12b27023e3c48ad1387e315cf2ec96e67d00d20abdacb813d34a86fd9eb3478dda9f4a279d220ff03a9183f0aeca81d86abbb80419e12775db96568

data/lib/gem_version.rb

@@ -4,7 +4,7 @@ module Gem
   # Gem Specification
   class Specification
     def self.gem_version
-      '1.9.2'
+      '1.9.3'
     end
   end
 end

data/lib/sidebar_html_builder.rb

@@ -44,7 +44,7 @@ module SwedbankPay
       # If we're rendering a leaf node, just set the level to a non-zero value
       # to get the 'nav-subgroup' class and such.
       level = is_leaf ? -1 : page.level
-      title_markup = title_markup(page, level)
+      title_markup = title_markup(page, level, is_leaf)
       item_class = item_class(page, current_page, level, is_leaf)
       group_heading_class = group_heading_class(level)
 
@@ -73,11 +73,12 @@ module SwedbankPay
       "#{group_class}-heading"
     end
 
-    def title_markup(page, level)
+    def title_markup(page, level, is_leaf)
       lead_title = lead_title(page)
       return "<span>#{lead_title}</span>" if level.zero?
 
-      main_title = main_title(page)
+      main_title = main_title(page, is_leaf)
+
       "<a href=\"#{page.path}\">#{main_title}</a>"
     end
 
@@ -126,14 +127,28 @@ module SwedbankPay
       ''
     end
 
-    def main_title(page)
+    def main_title(page, is_leaf)
       unless page.nil? || page.title.nil?
-        main = page.title.main
+        lead_title = lead_title(page)
+        parent_lead_title = parent_lead_title(page)
+        main_title = page.title.main
+
+        # If the lead title is different to the parent's or we're not on a leaf
+        # node item, use the lead title as the main title. This causes 'section: Card'
+        # to be used as title for the Card item, but allows the nav-subgroup-heading
+        # 'Introduction' item to use the main title 'Introduction'.
+        main_title = lead_title unless lead_title == parent_lead_title || is_leaf
 
-        return main || page.title.to_s
+        return main_title || page.title.to_s
       end
 
       ''
     end
+
+    def parent_lead_title(page)
+      return page.parent.title.lead unless page.parent.nil? || page.parent.title.nil?
+
+      nil
+    end
   end
 end

data/lib/sidebar_page_title.rb

@@ -72,12 +72,11 @@ module SwedbankPay
 
       # Return the 'section' front matter if it can be found on the current page.
       section = section_from_front_matter(page)
+
       return section unless section.nil?
 
       # Recurse upwards to the root (until there is no parent).
-      return find_section(page.parent) unless page.nil? || page.parent.nil? || !page.parent.is_a?(SidebarPage)
-
-      nil
+      section_from_parent(page)
     end
 
     def section_from_front_matter(page)
@@ -89,7 +88,7 @@ module SwedbankPay
     def section_from_parent(page)
       return nil if page.nil? || page.parent.nil?
 
-      find_section(page.parent, level) unless page.nil? || page.parent.nil?
+      find_section(page.parent) unless page.nil? || page.parent.nil?
     end
   end
 end

data/lib/sidebar_text_builder.rb

@@ -13,8 +13,9 @@ module SwedbankPay
 
     def to_s
       name = @page.name == '/' ? '/' : "/#{@page.name}"
-      title = @page.title.nil? ? '?' : @page.title.main
-      s = "#{indent} #{@page.coordinate}. #{name}: #{title}\n"
+      lead_title = @page.title.nil? ? '?' : @page.title.lead
+      main_title = @page.title.nil? ? '?' : @page.title.main
+      s = "#{indent} #{@page.coordinate}. #{name}: #{lead_title} – #{main_title}\n"
 
       if @page.children?
         @page.children.each do |child|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swedbank-pay-design-guide-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday