jekyll-open-sdg-plugins 1.0.0.rc21 → 1.2.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 402e4a9a7fe0f395954a53d501af6848b80b374d33f689040cd52476261d8a19
-  data.tar.gz: 818e56633222d6f4d7e2f6823535824904daa67f8d35ed516c2453739a1f5d9f
+  metadata.gz: 714570ee0a7ab38905c524b6fad9c1590340e09052778c82adc543574d11e7ac
+  data.tar.gz: ed6ee32ba2cb547dd8f46159fb133197b044fc101c0d00af12662cf78a245872
 SHA512:
-  metadata.gz: 6b872d5aa7149a9c51f8d76cb8420f08803b161c9121067273fd0413360c33d6c7cdd8c7832079c1586d50a9b9376223254ca5e3023e434b62931febcfcfad96
-  data.tar.gz: 1458071d1b492ec468658e99728d36b8d3355c4e80a1760ffe77b86ba6bc7bee35e18823e522bf71f6b2388c4c109d95c4a1d5b63eb1eb86be5c54e4b83af8cb
+  metadata.gz: 2c5862fc0ffd6241ef72f92d15e72f5a0dc4fe682a8b0a9cfe80e418968b1eadfa0aa5fa7c5ea83e82b2ebe441535d3c8e77283b7925d9ce83f491b7bcf7f99d
+  data.tar.gz: 789bb89817ceb676ab5eaac06411435030a6fcdf24dd4ad5c0529fa7cfadac27d5dcd91670f5894fdc983220e9cd6a04324309fee46bb747c93996e561a79821

data/.editorconfig

@@ -1,16 +1,16 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{md,rb,gemspec},Makefile]
-charset = utf-8
-
-[Makefile]
-indent_style = tab
-
-[*.md]
-trim_trailing_whitespace = false
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{md,rb,gemspec},Makefile]
+charset = utf-8
+
+[Makefile]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false

data/.github/workflows/test-pull-requests.yml

@@ -0,0 +1,17 @@
+name: Test PRs
+
+on: [pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Run all tests
+      run: make test

data/.gitignore

@@ -1,4 +1,6 @@
-_site
-.sass-cache
-.jekyll-metadata
-*.gem
+_site
+.sass-cache
+.jekyll-metadata
+*.gem
+open-sdg/
+open-sdg-site-starter/

data/Makefile

@@ -0,0 +1,33 @@
+.PHONY: clean build serve serve.detached
+all: test
+
+clean:
+	# Stop the detached Jekyll web server.
+	-pkill -f -9 jekyll
+	# Delete the builds.
+	rm -fr open-sdg-site-starter
+	rm -fr open-sdg
+
+install: clean
+	git clone https://github.com/open-sdg/open-sdg-site-starter.git
+	git clone https://github.com/open-sdg/open-sdg.git
+	# Copy all the theme files into the site starter.
+	cp -r open-sdg/_includes/* open-sdg-site-starter/_includes/
+	cp -r open-sdg/_layouts/* open-sdg-site-starter/_layouts/
+	cp -r open-sdg/_sass/* open-sdg-site-starter/_sass/
+	cp -r open-sdg/assets/* open-sdg-site-starter/assets/
+	# Copy the required files into the site starter.
+	cp tests/_config.yml open-sdg-site-starter/
+	cp tests/Gemfile open-sdg-site-starter/
+	# Create a symlink to our plugin files.
+	ln -s ../lib/jekyll-open-sdg-plugins open-sdg-site-starter/_plugins
+	# Install Ruby dependencies.
+	cd open-sdg-site-starter && bundle install
+
+build:
+	cd open-sdg-site-starter && bundle exec jekyll build
+
+serve:
+	cd open-sdg-site-starter && bundle exec jekyll serve
+
+test: install build

data/README.md

@@ -1,7 +1,7 @@
-# jekyll-open-sdg-plugins
-
-> 💎 Jekyll plugins for use with the Open SDG platform
-
-This plugin provides required Jekyll functionality for the [Open SDG](https://github.com/open-sdg/open-sdg) platform.
-
-The details on this functionality can be found throughout the [Open SDG documentation](https://open-sdg.readthedocs.io/en/latest/).
+# jekyll-open-sdg-plugins
+
+> 💎 Jekyll plugins for use with the Open SDG platform
+
+This plugin provides required Jekyll functionality for the [Open SDG](https://github.com/open-sdg/open-sdg) platform.
+
+The details on this functionality can be found throughout the [Open SDG documentation](https://open-sdg.readthedocs.io/en/latest/).

data/jekyll-open-sdg-plugins.gemspec

@@ -1,17 +1,18 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jekyll-open-sdg-plugins/version"
-Gem::Specification.new do |spec|
-  spec.name          = "jekyll-open-sdg-plugins"
-  spec.summary       = "Jekyll plugins for use with the Open SDG platform"
-  spec.description   = "Jekyll plugins for use with the Open SDG platform"
-  spec.version       = JekyllOpenSdgPlugins::VERSION
-  spec.authors       = ["Brock Fanning"]
-  spec.email         = ["brockfanning@gmail.com"]
-  spec.homepage      = "https://github.com/open-sdg/jekyll-open-sdg-plugins"
-  spec.licenses      = ["MIT"]
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!)  }
-  spec.require_paths = ["lib"]
-  spec.add_dependency "jekyll", "~> 3.0"
-  spec.add_dependency "deep_merge", "~> 1.2"
-end
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "jekyll-open-sdg-plugins/version"
+Gem::Specification.new do |spec|
+  spec.name          = "jekyll-open-sdg-plugins"
+  spec.summary       = "Jekyll plugins for use with the Open SDG platform"
+  spec.description   = "Jekyll plugins for use with the Open SDG platform"
+  spec.version       = JekyllOpenSdgPlugins::VERSION
+  spec.authors       = ["Brock Fanning"]
+  spec.email         = ["brockfanning@gmail.com"]
+  spec.homepage      = "https://github.com/open-sdg/jekyll-open-sdg-plugins"
+  spec.licenses      = ["MIT"]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!)  }
+  spec.require_paths = ["lib"]
+  spec.add_dependency "jekyll", "~> 3.0"
+  spec.add_dependency "deep_merge", "~> 1.2"
+  spec.add_dependency "json_schemer", "~> 0.2"
+end

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

@@ -1,13 +1,16 @@
-require_relative "jekyll-open-sdg-plugins/version"
-require_relative "jekyll-open-sdg-plugins/fetch_remote_data"
-require_relative "jekyll-open-sdg-plugins/translate_key"
-require_relative "jekyll-open-sdg-plugins/translate_date"
-require_relative "jekyll-open-sdg-plugins/translate_metadata_field"
-require_relative "jekyll-open-sdg-plugins/create_indicators"
-require_relative "jekyll-open-sdg-plugins/create_goals"
-require_relative "jekyll-open-sdg-plugins/create_pages"
-require_relative "jekyll-open-sdg-plugins/sdg_variables"
-require_relative "jekyll-open-sdg-plugins/search_index"
-
-module JekyllOpenSdgPlugins
-end
+require_relative "jekyll-open-sdg-plugins/version"
+require_relative "jekyll-open-sdg-plugins/site_configuration"
+require_relative "jekyll-open-sdg-plugins/validate_site_config"
+require_relative "jekyll-open-sdg-plugins/fetch_remote_data"
+require_relative "jekyll-open-sdg-plugins/translate_key"
+require_relative "jekyll-open-sdg-plugins/translate_date"
+require_relative "jekyll-open-sdg-plugins/translate_metadata_field"
+require_relative "jekyll-open-sdg-plugins/create_indicators"
+require_relative "jekyll-open-sdg-plugins/create_goals"
+require_relative "jekyll-open-sdg-plugins/create_pages"
+require_relative "jekyll-open-sdg-plugins/sdg_variables"
+require_relative "jekyll-open-sdg-plugins/search_index"
+require_relative "jekyll-open-sdg-plugins/validate_indicator_config"
+
+module JekyllOpenSdgPlugins
+end

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

@@ -1,75 +1,75 @@
-require "jekyll"
-require_relative "helpers"
-
-module JekyllOpenSdgPlugins
-  class CreateGoals < Jekyll::Generator
-    safe true
-    priority :normal
-
-    def generate(site)
-      # If site.create_goals is set, create goals per the metadata.
-      if site.config['languages'] and site.config['create_goals']
-        # Compile the list of goals.
-        goals = {}
-        # Are we using translated builds?
-        metadata = {}
-        if opensdg_translated_builds(site)
-          # If we are using translated builds, the 'meta' data is underneath
-          # language codes. We just use the first language.
-          default_language = site.config['languages'][0]
-          metadata = site.data[default_language]['meta']
-        else
-          # Otherwise the 'meta' data is not underneath any language code.
-          metadata = site.data['meta']
-        end
-        metadata.each do |inid, indicator|
-          goal = inid.split('-')[0].to_i
-          goals[goal] = true
-        end
-        # Decide what layout to use for the goal pages.
-        layout = 'goal'
-        if site.config['create_goals'].key?('layout')
-          layout = site.config['create_goals']['layout']
-        end
-        # See if we need to "map" any language codes.
-        languages_public = Hash.new
-        if site.config['languages_public']
-          languages_public = site.config['languages_public']
-        end
-        # Loop through the languages.
-        site.config['languages'].each_with_index do |language, index|
-          # Get the "public language" (for URLs) which may be different.
-          language_public = language
-          if languages_public[language]
-            language_public = languages_public[language]
-          end
-          # Loop through the goals.
-          goals.sort.each do |goal, value|
-            # Add the language subfolder for all except the default (first) language.
-            dir = index == 0 ? goal.to_s : File.join(language_public, goal.to_s)
-            # Create the goal page.
-            site.collections['goals'].docs << GoalPage.new(site, site.source, dir, goal, language, layout)
-          end
-        end
-      end
-    end
-  end
-
-  # A Page subclass used in the `CreateGoals` class.
-  class GoalPage < Jekyll::Page
-    def initialize(site, base, dir, goal, language, layout)
-      @site = site
-      @base = base
-      @dir  = dir
-      @name = 'index.html'
-
-      self.process(@name)
-      self.data = {}
-      self.data['goal_number'] = goal.to_s
-      self.data['language'] = language
-      self.data['layout'] = layout
-      # Backwards compatibility:
-      self.data['sdg_goal'] = self.data['goal_number']
-    end
-  end
-end
+require "jekyll"
+require_relative "helpers"
+
+module JekyllOpenSdgPlugins
+  class CreateGoals < Jekyll::Generator
+    safe true
+    priority :normal
+
+    def generate(site)
+      # If site.create_goals is set, create goals per the metadata.
+      if site.config['languages'] and site.config['create_goals']
+        # Compile the list of goals.
+        goals = {}
+        # Are we using translated builds?
+        metadata = {}
+        if opensdg_translated_builds(site)
+          # If we are using translated builds, the 'meta' data is underneath
+          # language codes. We just use the first language.
+          default_language = site.config['languages'][0]
+          metadata = site.data[default_language]['meta']
+        else
+          # Otherwise the 'meta' data is not underneath any language code.
+          metadata = site.data['meta']
+        end
+        metadata.each do |inid, indicator|
+          goal = inid.split('-')[0].to_i
+          goals[goal] = true
+        end
+        # Decide what layout to use for the goal pages.
+        layout = 'goal'
+        if site.config['create_goals'].key?('layout')
+          layout = site.config['create_goals']['layout']
+        end
+        # See if we need to "map" any language codes.
+        languages_public = Hash.new
+        if site.config['languages_public']
+          languages_public = opensdg_languages_public(site)
+        end
+        # Loop through the languages.
+        site.config['languages'].each_with_index do |language, index|
+          # Get the "public language" (for URLs) which may be different.
+          language_public = language
+          if languages_public[language]
+            language_public = languages_public[language]
+          end
+          # Loop through the goals.
+          goals.sort.each do |goal, value|
+            # Add the language subfolder for all except the default (first) language.
+            dir = index == 0 ? goal.to_s : File.join(language_public, goal.to_s)
+            # Create the goal page.
+            site.collections['goals'].docs << GoalPage.new(site, site.source, dir, goal, language, layout)
+          end
+        end
+      end
+    end
+  end
+
+  # A Page subclass used in the `CreateGoals` class.
+  class GoalPage < Jekyll::Page
+    def initialize(site, base, dir, goal, language, layout)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = 'index.html'
+
+      self.process(@name)
+      self.data = {}
+      self.data['goal_number'] = goal.to_s
+      self.data['language'] = language
+      self.data['layout'] = layout
+      # Backwards compatibility:
+      self.data['sdg_goal'] = self.data['goal_number']
+    end
+  end
+end

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

@@ -1,67 +1,118 @@
-require "jekyll"
-require_relative "helpers"
-
-module JekyllOpenSdgPlugins
-  class CreateIndicators < Jekyll::Generator
-    safe true
-    priority :normal
-
-    def generate(site)
-      # If site.create_indicators is set, create indicators per the metadata.
-      if site.config['languages'] and site.config['create_indicators']
-        # Decide what layout to use for the indicator pages.
-        layout = 'indicator'
-        if site.config['create_indicators'].key?('layout')
-          layout = site.config['create_indicators']['layout']
-        end
-        # See if we need to "map" any language codes.
-        languages_public = Hash.new
-        if site.config['languages_public']
-          languages_public = site.config['languages_public']
-        end
-        # Loop through the languages.
-        site.config['languages'].each_with_index do |language, index|
-          # Get the "public language" (for URLs) which may be different.
-          language_public = language
-          if languages_public[language]
-            language_public = languages_public[language]
-          end
-          metadata = {}
-          if opensdg_translated_builds(site)
-            # If we are using translated builds, the metadata is underneath a
-            # language code.
-            metadata = site.data[language]['meta']
-          else
-            # Otherwise the 'meta' data is not underneath any language code.
-            metadata = site.data['meta']
-          end
-          # Loop through the indicators (using metadata as a list).
-          metadata.each do |inid, meta|
-            # Add the language subfolder for all except the default (first) language.
-            dir = index == 0 ? inid : File.join(language_public, inid)
-            # Create the indicator page.
-            site.collections['indicators'].docs << IndicatorPage.new(site, site.source, dir, inid, language, layout)
-          end
-        end
-      end
-    end
-  end
-
-  # A Page subclass used in the `CreateIndicators` class.
-  class IndicatorPage < Jekyll::Page
-    def initialize(site, base, dir, inid, language, layout)
-      @site = site
-      @base = base
-      @dir  = dir
-      @name = 'index.html'
-
-      self.process(@name)
-      self.data = {}
-      self.data['indicator_number'] = inid.gsub('-', '.')
-      self.data['layout'] = layout
-      self.data['language'] = language
-      # Backwards compatibility:
-      self.data['indicator'] = self.data['indicator_number']
-    end
-  end
-end
+require "jekyll"
+require_relative "helpers"
+
+module JekyllOpenSdgPlugins
+  class CreateIndicators < Jekyll::Generator
+    safe true
+    priority :normal
+
+    def generate(site)
+      # If site.create_indicators is set, create indicators per the metadata.
+      if site.config['languages'] and site.config['create_indicators']
+        # Decide what layout to use for the indicator pages.
+        layout = 'indicator'
+        if site.config['create_indicators'].key?('layout')
+          layout = site.config['create_indicators']['layout']
+        end
+        # See if we need to "map" any language codes.
+        languages_public = Hash.new
+        if site.config['languages_public']
+          languages_public = opensdg_languages_public(site)
+        end
+        # Loop through the languages.
+        site.config['languages'].each_with_index do |language, index|
+          # Get the "public language" (for URLs) which may be different.
+          language_public = language
+          if languages_public[language]
+            language_public = languages_public[language]
+          end
+          metadata = {}
+          if opensdg_translated_builds(site)
+            # If we are using translated builds, the metadata is underneath a
+            # language code.
+            metadata = site.data[language]['meta']
+          else
+            # Otherwise the 'meta' data is not underneath any language code.
+            metadata = site.data['meta']
+          end
+          # Loop through the indicators (using metadata as a list).
+          metadata.each do |inid, meta|
+            # Add the language subfolder for all except the default (first) language.
+            dir = index == 0 ? inid : File.join(language_public, inid)
+            # Create the indicator page.
+            site.collections['indicators'].docs << IndicatorPage.new(site, site.source, dir, inid, language, layout)
+          end
+        end
+        # Create the indicator configuration pages.
+        metadata = {}
+        if opensdg_translated_builds(site)
+          if site.data.has_key?('untranslated')
+            metadata = site.data['untranslated']['meta']
+          else
+            default_language = site.config['languages'][0]
+            metadata = site.data[default_language]['meta']
+          end
+        else
+          metadata = site.data['meta']
+        end
+        # Loop through the indicators (using metadata as a list).
+        if !metadata.empty?
+          site.config['show_indicator_config_forms'] = true
+          # Loop through the languages.
+          site.config['languages'].each_with_index do |language, index|
+            # Get the "public language" (for URLs) which may be different.
+            language_public = language
+            if languages_public[language]
+              language_public = languages_public[language]
+            end
+            metadata.each do |inid, meta|
+              dir = File.join('config', inid)
+              if index != 0
+                dir = File.join(language_public, 'config', inid)
+              end
+              site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, meta)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  # A Page subclass used in the `CreateIndicators` class.
+  class IndicatorPage < Jekyll::Page
+    def initialize(site, base, dir, inid, language, layout)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = 'index.html'
+
+      self.process(@name)
+      self.data = {}
+      self.data['indicator_number'] = inid.gsub('-', '.')
+      self.data['layout'] = layout
+      self.data['language'] = language
+      # Backwards compatibility:
+      self.data['indicator'] = self.data['indicator_number']
+    end
+  end
+
+  # A Page subclass used in the `CreateIndicators` class.
+  class IndicatorConfigPage < Jekyll::Page
+    def initialize(site, base, dir, inid, language, meta)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = 'index.html'
+
+      self.process(@name)
+      self.data = {}
+      self.data['language'] = language
+      self.data['indicator_number'] = inid.gsub('-', '.')
+      self.data['config_type'] = 'indicator'
+      self.data['layout'] = 'config-builder'
+      self.data['meta'] = meta
+      self.data['title'] = 'Open SDG indicator configuration: ' + self.data['indicator_number']
+      self.data['config_filename'] = inid + '.yml'
+    end
+  end
+end