swedbank-pay-design-guide-jekyll-theme 1.6.1.pre.PullRequest0137.pre.0038 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea679310380770b238499d99d68e6629916975c873e7589d7d1b141d6681ac1
-  data.tar.gz: 97c6b7e450f5bb969ae5c9b47279b1f93de42d90145d083b2bab1b06770684cd
+  metadata.gz: 3d3d07347a94b92124a9544e2f389d190b168839db3b6636462af1ac28d52f8e
+  data.tar.gz: 290dfa45ad65496aecbb7b1f7ddfea1796a9b6ea5326823adc28605246e4cad7
 SHA512:
-  metadata.gz: 922a7b1ec212602c927e68fecac3a6ddb946f66c516a92e048bf0cb4b6d8454d4d5059b3473642673e3c8fe3911190c6a25551215c6f288f1601d1008e252e60
-  data.tar.gz: 771721f7eda8afd83e5e42db11755a47f684bfb3a0680d96536c506f935735b97ced152ce8d7ee60d5b5ccf6558cc7ddcec0978121a87f12a040498a1e68bf31
+  metadata.gz: 0a860ed7034200d5ca1c3dbfdf4c775dada77c5b9f9c45829f699ad7aa2d756d333fb8c750455095c68e971e29f48be8fd6cc4071b232d4c5463a524926d16b6
+  data.tar.gz: 5f315b0b6a703c14717c31175648826146245e5c846cc7a52abdaf88557e935f0319776f5768f63e784f150a55663f2b0e4bef99d348d9b56624f1dac776cc2f

data/_includes/front-page.html

@@ -7,6 +7,7 @@ in release-notes
 
 {% assign card_col_class = include.card_col_class | default: "col-xxl-3 col-xl-6 col-lg-6" %}
 {% assign num_dates = include.num_dates | default: 3 %}
+{% assign show_merchants_bar = include.show_merchants_bar | default: false %}
 
 <div class="front-page">
     <div class="front-page-container">
@@ -49,7 +50,7 @@ in release-notes
                 </div>
             </div>
         </div>
-
+        {% if show_merchants_bar == true %}
         <div class="front-page-merchants">
             <h6>Trusted by</h6>
             <div class="merchants-container justify-content-xxl-between">
@@ -77,7 +78,7 @@ in release-notes
             </div>
         </div>
     </div>
-
+    {% endif %}
     <a href="https://ecom.externalintegration.payex.com/pspdemoshop" class="front-page-demoshop">
         <span class="front-page-demoshop-text">
             <span class="h2">Try our Demoshop<span>.</span></span>

data/_plugins/sidebar.rb

@@ -1,216 +1,2 @@
 # frozen_string_literal: false
-
-require 'jekyll'
-require 'nokogiri'
-require 'json'
-
-###
-# This plugin works only if used as a remote-theme
-# If included as a theme or gem this plugin must be copied over
-###
-
-module Jekyll
-  class Sidebar
-    attr_accessor :hash_pre_render
-    attr_accessor :filename_with_headers
-
-    def initialize
-      @hash_pre_render = {}
-      @filename_with_headers = {}
-    end
-
-    def pre_render(page)
-      menu_order = page['menu-order'].nil? ? 0 : page['menu-order']
-      hide_from_sidebar = page['hide_from_sidebar'].nil? ? false : page['hide_from_sidebar']
-      url = page['url'].gsub('index.html', '').gsub('.html', '')
-      @hash_pre_render[url] = {
-        title: page['title'],
-        url: page['url'].gsub('.html', ''),
-        name: page['name'],
-        menu_order: menu_order,
-        hide_from_sidebar: hide_from_sidebar
-      }
-    end
-
-    def post_write(site)
-      files = []
-      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
-        doc = File.open(filename) { |f| Nokogiri::HTML(f) }
-        files.push(doc)
-
-        headers = []
-        doc.xpath('//h2 ').each do |header|
-          next unless header['id']
-
-          child = header.last_element_child
-          header = {
-            id: header['id'],
-            title: header.content.strip,
-            hash: (child['href']).to_s
-          }
-          headers.push(header)
-        end
-        sanitized_filename = sanitize_filename(filename)
-        @filename_with_headers[sanitized_filename] = { headers: headers }
-      end
-
-      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
-        sanitized_filename = sanitize_filename(filename)
-        sidebar = render(sanitized_filename)
-        file = File.open(filename) { |f| Nokogiri::HTML(f) }
-        file.xpath('//*[@id="dx-sidebar-main-nav-ul"]').each do |location|
-          location.inner_html = sidebar
-        end
-        File.open(filename, 'w') { |f| f.write(file.to_html(encoding: 'UTF-8')) }
-      end
-
-      # File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
-    end
-
-    private
-
-    def sanitize_filename(filename)
-      sanitized_filename = filename.match(/(?m)(?<=\b_site).*$/)[0]
-      sanitized_filename = sanitized_filename.gsub('index.html', '')
-      sanitized_filename.gsub('.html', '')
-    end
-
-    def generateSubgroup(filename, key, value, all_subgroups, level)
-      title = value[:title].split('–').last
-      subsubgroup_list = all_subgroups.select do |subsubgroup_key, _subsubgroup_value|
-        subsubgroup_key.include? key and subsubgroup_key != key and \
-          key.split('/').length > level
-      end
-
-      subgroup = ''
-      has_subgroups = !all_subgroups.empty?
-      if value[:headers].any? || !subsubgroup_list.empty?
-        if has_subgroups
-          url = value[:url]
-          active = active?(filename, url, true)
-          # puts "#{url}, #{filename}, #{key}" if active
-          item_class = active || (url.split('/').length > level && filename.start_with?(url)) ? 'nav-subgroup active' : 'nav-subgroup'
-          subgroup << "<li class=\"#{item_class}\">"
-          subgroup << "<div class=\"nav-subgroup-heading\"><i class=\"material-icons\">arrow_right</i><a href=\"#{url}\">#{title}</a></div>"
-          subgroup << '<ul class="nav-ul">'
-
-          if subsubgroup_list.empty?
-            value[:headers].each do |header|
-              subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
-            end
-          else
-            subgroup_leaf_class = active ? 'nav-leaf nav-subgroup-leaf active' : 'nav-leaf nav-subgroup-leaf'
-            subgroup << "<li class=\"#{subgroup_leaf_class}\"><a href=\"#{value[:url]}\">#{title} overview</a></li>"
-
-            subsubgroup_list.each do |subsubgroup_key, subsubgroup_value|
-              subgroup << generateSubgroup(filename, subsubgroup_key, subsubgroup_value, subsubgroup_list, 3)
-            end
-          end
-
-          subgroup << '</ul>'
-          subgroup << '</li>'
-        else
-          value[:headers].each do |header|
-            subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
-          end
-        end
-      else
-        subgroup << if has_subgroups
-                      "<li class=\"nav-leaf nav-subgroup-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
-                    else
-                      "<li class=\"nav-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
-                    end
-      end
-
-      subgroup
-    end
-
-    def render(filename)
-      sidebar = ''
-
-      merged = merge(@hash_pre_render, @filename_with_headers).sort_by { |_key, value| value[:menu_order] }
-      merged.select { |key, _value| key.split('/').length <= 2 }.each do |key, value|
-        next if value[:title].nil?
-        next if value[:hide_from_sidebar]
-
-        subgroups = merged.select { |subgroup_key, _subgroup_value| subgroup_key.include? key and subgroup_key != key and key != '/' }
-
-        active = active?(filename, key)
-        # puts "#{filename}, #{key}" if active
-        item_class = active ? 'nav-group active' : 'nav-group'
-
-        child = "<li class=\"#{item_class}\">"
-        child << "<div class=\"nav-group-heading\"><i class=\"material-icons\">arrow_right</i><span>#{value[:title].split('–').first}</span></div>"
-
-        child << '<ul class="nav-ul">'
-
-        subgroup = generateSubgroup(filename, key, value, subgroups, 2)
-
-        child << subgroup
-
-        if subgroups.any?
-          subgroups.select { |subgroup_key, _subgroup_value| subgroup_key.split('/').length <= 3 }.each do |subgroup_key, subgroup_value|
-            subgroup = generateSubgroup(filename, subgroup_key, subgroup_value, subgroups, 2)
-            child << subgroup
-          end
-        end
-
-        child << '</ul>'
-        child << '</li>'
-        sidebar << child
-      end
-
-      File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
-      sidebar
-    end
-
-    def active?(filename, url, exact = false)
-      if filename == '/' || url == '/'
-        if filename == '/' && url == '/'
-          return true
-        else
-          return false
-        end
-      end
-
-      exact ? filename == url : filename.start_with?(url)
-    end
-
-    def merge(hash1, hash2)
-      all_keys = hash1.keys | hash2.keys
-      result_hash = {}
-
-      all_keys.each do |key|
-        hash_value = {}
-
-        if hash1.key? key
-          value = hash1[key]
-
-          hash_value = value unless value.nil?
-        end
-
-        if hash2.key? key
-          value = hash2[key]
-
-          hash_value = hash_value.merge(value) unless value.nil?
-        end
-
-        result_hash[key] = hash_value
-      end
-
-      result_hash
-    end
-  end
-end
-
-sidebar = Jekyll::Sidebar.new
-
-Jekyll::Hooks.register :site, :pre_render do |site, _payload|
-  site.pages.each do |page|
-    sidebar.pre_render page
-  end
-end
-
-Jekyll::Hooks.register :site, :post_write do |site|
-  sidebar.post_write site
-end
+require_relative '../lib/sidebar.rb'

data/lib/gem_version.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gem
+  # Gem Specification
+  class Specification
+    def self.gem_version
+      '1.7.1'
+    end
+  end
+end

data/lib/sidebar.rb

@@ -0,0 +1,211 @@
+# frozen_string_literal: false
+
+require 'jekyll'
+require 'nokogiri'
+require 'json'
+
+module Jekyll
+  class Sidebar
+    attr_accessor :hash_pre_render
+    attr_accessor :filename_with_headers
+
+    def initialize
+      @hash_pre_render = {}
+      @filename_with_headers = {}
+    end
+
+    def pre_render(page)
+      menu_order = page['menu-order'].nil? ? 0 : page['menu-order']
+      hide_from_sidebar = page['hide_from_sidebar'].nil? ? false : page['hide_from_sidebar']
+      url = page['url'].gsub('index.html', '').gsub('.html', '')
+      @hash_pre_render[url] = {
+        title: page['title'],
+        url: page['url'].gsub('.html', ''),
+        name: page['name'],
+        menu_order: menu_order,
+        hide_from_sidebar: hide_from_sidebar
+      }
+    end
+
+    def post_write(site)
+      files = []
+      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
+        doc = File.open(filename) { |f| Nokogiri::HTML(f) }
+        files.push(doc)
+
+        headers = []
+        doc.xpath('//h2 ').each do |header|
+          next unless header['id']
+
+          child = header.last_element_child
+          header = {
+            id: header['id'],
+            title: header.content.strip,
+            hash: (child['href']).to_s
+          }
+          headers.push(header)
+        end
+        sanitized_filename = sanitize_filename(filename)
+        @filename_with_headers[sanitized_filename] = { headers: headers }
+      end
+
+      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
+        sanitized_filename = sanitize_filename(filename)
+        sidebar = render(sanitized_filename)
+        file = File.open(filename) { |f| Nokogiri::HTML(f) }
+        file.xpath('//*[@id="dx-sidebar-main-nav-ul"]').each do |location|
+          location.inner_html = sidebar
+        end
+        File.open(filename, 'w') { |f| f.write(file.to_html(encoding: 'UTF-8')) }
+      end
+
+      # File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
+    end
+
+    private
+
+    def sanitize_filename(filename)
+      sanitized_filename = filename.match(/(?m)(?<=\b_site).*$/)[0]
+      sanitized_filename = sanitized_filename.gsub('index.html', '')
+      sanitized_filename.gsub('.html', '')
+    end
+
+    def generateSubgroup(filename, key, value, all_subgroups, level)
+      title = value[:title].split('–').last
+      subsubgroup_list = all_subgroups.select do |subsubgroup_key, _subsubgroup_value|
+        subsubgroup_key.include? key and subsubgroup_key != key and \
+          key.split('/').length > level
+      end
+
+      subgroup = ''
+      has_subgroups = !all_subgroups.empty?
+      if value[:headers].any? || !subsubgroup_list.empty?
+        if has_subgroups
+          url = value[:url]
+          active = active?(filename, url, true)
+          # puts "#{url}, #{filename}, #{key}" if active
+          item_class = active || (url.split('/').length > level && filename.start_with?(url)) ? 'nav-subgroup active' : 'nav-subgroup'
+          subgroup << "<li class=\"#{item_class}\">"
+          subgroup << "<div class=\"nav-subgroup-heading\"><i class=\"material-icons\">arrow_right</i><a href=\"#{url}\">#{title}</a></div>"
+          subgroup << '<ul class="nav-ul">'
+
+          if subsubgroup_list.empty?
+            value[:headers].each do |header|
+              subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
+            end
+          else
+            subgroup_leaf_class = active ? 'nav-leaf nav-subgroup-leaf active' : 'nav-leaf nav-subgroup-leaf'
+            subgroup << "<li class=\"#{subgroup_leaf_class}\"><a href=\"#{value[:url]}\">#{title} overview</a></li>"
+
+            subsubgroup_list.each do |subsubgroup_key, subsubgroup_value|
+              subgroup << generateSubgroup(filename, subsubgroup_key, subsubgroup_value, subsubgroup_list, 3)
+            end
+          end
+
+          subgroup << '</ul>'
+          subgroup << '</li>'
+        else
+          value[:headers].each do |header|
+            subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
+          end
+        end
+      else
+        subgroup << if has_subgroups
+                      "<li class=\"nav-leaf nav-subgroup-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
+                    else
+                      "<li class=\"nav-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
+                    end
+      end
+
+      subgroup
+    end
+
+    def render(filename)
+      sidebar = ''
+
+      merged = merge(@hash_pre_render, @filename_with_headers).sort_by { |_key, value| value[:menu_order] }
+      merged.select { |key, _value| key.split('/').length <= 2 }.each do |key, value|
+        next if value[:title].nil?
+        next if value[:hide_from_sidebar]
+
+        subgroups = merged.select { |subgroup_key, _subgroup_value| subgroup_key.include? key and subgroup_key != key and key != '/' }
+
+        active = active?(filename, key)
+        # puts "#{filename}, #{key}" if active
+        item_class = active ? 'nav-group active' : 'nav-group'
+
+        child = "<li class=\"#{item_class}\">"
+        child << "<div class=\"nav-group-heading\"><i class=\"material-icons\">arrow_right</i><span>#{value[:title].split('–').first}</span></div>"
+
+        child << '<ul class="nav-ul">'
+
+        subgroup = generateSubgroup(filename, key, value, subgroups, 2)
+
+        child << subgroup
+
+        if subgroups.any?
+          subgroups.select { |subgroup_key, _subgroup_value| subgroup_key.split('/').length <= 3 }.each do |subgroup_key, subgroup_value|
+            subgroup = generateSubgroup(filename, subgroup_key, subgroup_value, subgroups, 2)
+            child << subgroup
+          end
+        end
+
+        child << '</ul>'
+        child << '</li>'
+        sidebar << child
+      end
+
+      File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
+      sidebar
+    end
+
+    def active?(filename, url, exact = false)
+      if filename == '/' || url == '/'
+        if filename == '/' && url == '/'
+          return true
+        else
+          return false
+        end
+      end
+
+      exact ? filename == url : filename.start_with?(url)
+    end
+
+    def merge(hash1, hash2)
+      all_keys = hash1.keys | hash2.keys
+      result_hash = {}
+
+      all_keys.each do |key|
+        hash_value = {}
+
+        if hash1.key? key
+          value = hash1[key]
+
+          hash_value = value unless value.nil?
+        end
+
+        if hash2.key? key
+          value = hash2[key]
+
+          hash_value = hash_value.merge(value) unless value.nil?
+        end
+
+        result_hash[key] = hash_value
+      end
+
+      result_hash
+    end
+  end
+end
+
+sidebar = Jekyll::Sidebar.new
+
+Jekyll::Hooks.register :site, :pre_render do |site, _payload|
+  site.pages.each do |page|
+    sidebar.pre_render page
+  end
+end
+
+Jekyll::Hooks.register :site, :post_write do |site|
+  sidebar.post_write site
+end

data/lib/swedbank-pay-design-guide-jekyll-theme.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'sidebar'

metadata

@@ -1,37 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: swedbank-pay-design-guide-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.6.1.pre.PullRequest0137.pre.0038
+  version: 1.7.1
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: jekyll-github-metadata
+  name: html-proofer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,21 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jekyll-material-icon-tag
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: jemoji
+  name: jekyll-github-metadata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: jekyll-material-icon-tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,21 +87,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: jemoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: html-proofer
+  name: kramdown-plantuml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,19 +115,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown-plantuml
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +143,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,9 @@ files:
 - assets/tipuesearch/tipuesearch.min.js
 - assets/tipuesearch/tipuesearch_content.js
 - assets/tipuesearch/tipuesearch_set.js
+- lib/gem_version.rb
+- lib/sidebar.rb
+- lib/swedbank-pay-design-guide-jekyll-theme.rb
 homepage: https://github.com/SwedbankPay/swedbank-pay-design-guide-jekyll-theme
 licenses:
 - Apache-2.0
@@ -254,9 +257,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: