jekyll-open-sdg-plugins 1.2.0.pre.beta3 → 1.3.0.pre.beta1

data/lib/jekyll-open-sdg-plugins/sdg_variables.rb

@@ -43,6 +43,24 @@ module JekyllOpenSdgPlugins
       sort_order
     end
 
+    # Get previous item from an array, or loop to the end.
+    def get_previous_item(list, index)
+      decremented = index - 1
+      if decremented < 0
+        decremented = list.length() - 1
+      end
+      list[decremented]
+    end
+
+    # Get next item from an array, or loop to the beginning.
+    def get_next_item(list, index)
+      incremented = index + 1
+      if incremented >= list.length()
+        incremented = 0
+      end
+      list[incremented]
+    end
+
     # The Jekyll baseurl is user-configured, and can be inconsistent. This
     # ensure it is consistent in whether it starts/ends with a slash.
     def normalize_baseurl(baseurl)
@@ -170,7 +188,7 @@ module JekyllOpenSdgPlugins
         goal_image_base = site.config['goal_image_base']
       end
       goal_image_extension = 'png'
-      if site.config.has_key? 'goal_image_extension'
+      if site.config.has_key?('goal_image_extension') && site.config['goal_image_extension'] != ''
         goal_image_extension = site.config['goal_image_extension']
       end
 
@@ -209,6 +227,7 @@ module JekyllOpenSdgPlugins
         goal_number = get_goal_number(indicator_number)
         target_number = get_target_number(indicator_number)
         is_global_indicator = global_inids.index(indicator_number) != nil
+
         # To get the name of global stuff, we can use predicable translation
         # keys from the SDG Translations project. Eg: global_goals.1-title
         goal_translation_key = 'global_goals.' + goal_number
@@ -253,8 +272,10 @@ module JekyllOpenSdgPlugins
             end
           end
 
+          is_standalone = meta.has_key?('standalone') and meta['standalone']
+
           # Set the goal for this language, once only.
-          if already_added[language].index(goal_number) == nil
+          if !is_standalone && already_added[language].index(goal_number) == nil
             already_added[language].push(goal_number)
             available_goal = {
               'number' => goal_number,
@@ -269,7 +290,7 @@ module JekyllOpenSdgPlugins
             available_goals[language].push(available_goal)
           end
           # Set the target for this language, once only.
-          if already_added[language].index(target_number) == nil
+          if !is_standalone && already_added[language].index(target_number) == nil
             already_added[language].push(target_number)
             available_target = {
               'number' => target_number,
@@ -293,12 +314,21 @@ module JekyllOpenSdgPlugins
           else
             indicator_name = meta['indicator_name']
           end
+          indicator_path = indicator_number
+          if is_standalone && meta.has_key?('permalink') && meta['permalink'] != ''
+            indicator_path = meta['permalink']
+          end
+          indicator_sort = get_sort_order(indicator_number)
+          if meta.has_key?('sort') && meta['sort'] != ''
+            # Allow metadata 'sort' field to override the default sort.
+            indicator_sort = meta['sort']
+          end
           available_indicator = {
             'number' => indicator_number,
             'slug' => indicator_number.gsub('.', '-'),
             'name' => opensdg_translate_key(indicator_name, translations, language),
-            'url' => get_url(baseurl, language, indicator_number, languages, languages_public),
-            'sort' => get_sort_order(indicator_number),
+            'url' => get_url(baseurl, language, indicator_path, languages, languages_public),
+            'sort' => indicator_sort,
             'goal_number' => goal_number,
             'target_number' => target_number,
             'global' => global_indicator,
@@ -374,7 +404,11 @@ module JekyllOpenSdgPlugins
             target_number = get_target_number(indicator_number)
             doc.data['goal'] = available_goals[language].find {|x| x['number'] == goal_number}
             doc.data['target'] = available_targets[language].find {|x| x['number'] == target_number}
-            doc.data['indicator'] = available_indicators[language].find {|x| x['number'] == indicator_number}
+            indicator_index = available_indicators[language].find_index {|x| x['number'] == indicator_number}
+            doc.data['indicator'] = available_indicators[language][indicator_index]
+            doc.data['next'] = get_next_item(available_indicators[language], indicator_index)
+            doc.data['previous'] = get_previous_item(available_indicators[language], indicator_index)
+
           elsif collection == 'goals'
             # For goals we also set the current goal.
             if doc.data.has_key? 'goal_number'
@@ -389,7 +423,10 @@ module JekyllOpenSdgPlugins
             if goal_number.is_a? Numeric
               goal_number = goal_number.to_s
             end
-            doc.data['goal'] = available_goals[language].find {|x| x['number'] == goal_number}
+            goal_index = available_goals[language].find_index {|x| x['number'] == goal_number}
+            doc.data['goal'] = available_goals[language][goal_index]
+            doc.data['next'] = get_next_item(available_goals[language], goal_index)
+            doc.data['previous'] = get_previous_item(available_goals[language], goal_index)
           end
         end
       end

data/lib/jekyll-open-sdg-plugins/version.rb

@@ -1,3 +1,3 @@
 module JekyllOpenSdgPlugins
-  VERSION = "1.2.0-beta3".freeze
+  VERSION = "1.3.0-beta1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-open-sdg-plugins
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.beta3
+  version: 1.3.0.pre.beta1
 platform: ruby
 authors:
 - Brock Fanning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll