jekyll-geolexica 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4af820f6b04bb909021588008cdedd298324f13aa4f4b1c50239cf372dd78dd
-  data.tar.gz: 4f3d6cb5bae735a523a1be7364810f870ff249efc90beca1c925ad9fed7e4ebf
+  metadata.gz: 9061ca7ab8416d7410b611eef734939fbd9e4a19ba834b197130a7200f7739b7
+  data.tar.gz: ce890669ec7bd794ee4c9f48c40088dd1d0ca550568279bbc8bbdb6ad8b60b8b
 SHA512:
-  metadata.gz: f5911a94c4790a8861b5b839c5e1769a3f2bed8f4244b59a41b92c687b1a92eedc6f9a596b8ce2ce4132b4e1530c3f3571e023a97871790557f6c6b3845948f9
-  data.tar.gz: 0be54b8eb39d76d78ac760aaa53c1b8d6075446dfb8f5a83d01acff2ebfb99fc0aff7d39ddf8ce4fc11200202aa6023a9377969c5738f7bed3124c90359fe957
+  metadata.gz: 85a90a13c2b61627fcf570dcbc462e428e0205059ef8d5d2dd76ad0bb018f176d03735e14fe5d572ce9cc8e972229ce9ea1cc7bd231950d19fec9ea5911cbcb3
+  data.tar.gz: 03de01f7b8f0e267e24e9017734189b3314a8fe7f4c4d87dacefdbc48f90bcba7478a494203a5008a0d3516473c240fe1c10e547029438acf2abed55c1c8bb74

data/_pages/{concepts-index-list.json → concept-search-index.json}

@@ -1,11 +1,15 @@
 ---
-permalink: "/api/concepts-index-list.json"
+permalink: "/api/concept-search-index.json"
 ---
 [
   {% for concept in site.concepts %}
   {
-    "termid": {{ concept.termid }},
+    "termid": {{ concept.termid | jsonify }},
     "term": {{ concept.eng.terms.first.designation | jsonify }},
+    "term_url": {{ concept.url | jsonify }},
+    "sort_order": {
+      "natural": {{ forloop.index }}
+    },
 
     {% assign english_concept = concept["eng"] %}
     {% for lang in site.geolexica.term_languages %}
@@ -13,6 +17,7 @@ permalink: "/api/concepts-index-list.json"
     "{{ lang }}": {% if concept[lang] %}{
       "term": {{ concept[lang].terms.first.designation | jsonify }},
       "id": {{ concept[lang].id | jsonify }},
+      "term_url": {{ concept.url | append: "#entry-lang-" | append: lang | jsonify }},
       "entry_status": {{ english_concept.entry_status | jsonify }},
       "language_code": {{ concept[lang].language_code | jsonify }},
       "review_decision": {{ english_concept.review_decision | jsonify }}

data/assets/js/concept-search-worker.js

@@ -1,21 +1,16 @@
+---
+---
 importScripts('/assets/js/babel-polyfill.js');
 
-const CONCEPTS_URL = '/api/concepts-index-list.json';
+const CONCEPTS_URL = '/api/concept-search-index.json';
 
-const LANGUAGES = [
-  'eng',
-  'ara',
-  'spa',
-  'swe',
-  'kor',
-  'rus',
-  'ger',
-  'fre',
-  'fin',
-  'jpn',
-  'dan',
-  'chi',
-];
+/** For example:
+ *    const LANGUAGES = [ 'eng', 'deu' ];
+ *  Having a wrapper function helps not to break syntax highlight.
+ */
+const LANGUAGES = (function() {
+  return {{ site.geolexica.term_languages | jsonify }} || [];
+})();
 
 var concepts = null;
 var latestQuery = null;
@@ -39,7 +34,7 @@ async function filterAndSort(params) {
       const matchingLanguages = LANGUAGES.
         filter((lang) => {
           const term = (item[lang] || {}).term;
-          return term && term.toLowerCase().indexOf(params.string) >= 0;
+          return term && term.toLowerCase().indexOf(queryString) >= 0;
         });
 
       if (matchingLanguages.length > 0) {
@@ -77,7 +72,7 @@ async function filterAndSort(params) {
       });
   }
 
-  return concepts.sort((item1, item2) => item1.termid - item2.termid);
+  return concepts.sort((item1, item2) => item1.sort_order.natural - item2.sort_order.natural);
 }
 
 onmessage = async function(msg) {

data/assets/js/concept-search.js

@@ -1,22 +1,24 @@
+---
+---
 (function () {
 
   const searchWorker = new Worker('/assets/js/concept-search-worker.js');
 
-  // TODO: Move to a shared module
-  const LANGUAGES = [
-    'eng',
-    'ara',
-    'spa',
-    'swe',
-    'kor',
-    'rus',
-    'ger',
-    'fre',
-    'fin',
-    'jpn',
-    'dan',
-    'chi',
-  ];
+  /** For example:
+   *    const LANGUAGES = [ 'eng', 'deu' ];
+   *  Having a wrapper function helps not to break syntax highlight.
+   */
+  const LANGUAGES = (function() {
+    return {{ site.geolexica.term_languages | jsonify }} || [];
+  })();
+
+  /** For example:
+   *    const SEARCH_REFINEMENTS = [ 'validity' ];
+   *  Having a wrapper function helps not to break syntax highlight.
+   */
+  const SEARCH_REFINEMENTS = (function() {
+    return {{ site.geolexica.search.refinements | jsonify }} || [];
+  })();
 
 
   // React-based concept browser
@@ -57,7 +59,7 @@
       this.stringInputRef = React.createRef();
 
       this.state = {
-        valid: 'valid',  // Required value of the entry_status field, or undefined
+        valid: SEARCH_REFINEMENTS.indexOf('validity') >= 0 ? 'valid' : undefined,  // Required value of the entry_status field, or undefined
         string: '',
       };
     }
@@ -75,10 +77,10 @@
           onChange: this.handleSearchStringChange}),
       ];
 
-      if (this.state.string.length > 1 && (this.props.refineControls || []).length > 0) {
+      if (this.state.string.length > 1 && (SEARCH_REFINEMENTS).length > 0) {
         var refineControls = [];
 
-        if (this.props.refineControls.indexOf('validity') >= 0) {
+        if (SEARCH_REFINEMENTS.indexOf('validity') >= 0) {
           refineControls.push(
             el('div', { key: 'validity', className: 'validity' }, [
               el('input', {
@@ -218,7 +220,7 @@
         el('div', { key: 'search-controls', className: 'search-controls' },
           el(SearchControls, {
             onSearchChange: this.handleSearchQuery,
-            refineControls: ['validity'],
+            refineControls: SEARCH_REFINEMENTS,
           })
         ),
       ];
@@ -265,13 +267,7 @@
   ReactDOM.render(el(ConceptBrowser, null), document.querySelector('.browse-concepts'))
 
   function getConceptPermalink(concept) {
-    if (concept.termid) {
-      return `/concepts/${concept.termid}/`;
-    } else if (concept.id && concept.language_code) {
-      return `/concepts/${concept.id}/#entry-lang-${concept.language_code}`;
-    } else {
-      return null;
-    }
+    return concept.term_url;
   }
 
   function updateBodyClass({ searchQuery, expanded }) {

data/lib/jekyll/geolexica.rb

@@ -5,6 +5,10 @@ require "jekyll"
 
 module Jekyll
   module Geolexica
+    def self.load_tasks
+      tasks_path = File.expand_path("../tasks", __dir__)
+      Rake.add_rakelib(tasks_path)
+    end
   end
 end
 

data/lib/jekyll/geolexica/concepts_generator.rb

@@ -44,7 +44,7 @@ module Jekyll
       end
 
       def sort_pages
-        generated_pages.sort_by! { |p| p.termid.to_s }
+        generated_pages.sort_by! { |p| p.termid }
       end
 
       def initialize_collections

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.4.1".freeze
+    VERSION = "1.5.0".freeze
   end
 end

data/lib/tasks/deploy.rake

@@ -0,0 +1,41 @@
+namespace :geolexica do
+
+  desc "Deploy site to S3"
+  task :s3_deploy do
+    s3sync_patterns_and_options = {
+      "*.html" => ["--content-type", "text/html; charset=utf-8"],
+      "*.json" => ["--content-type", "application/json; charset=utf-8"],
+      "*.jsonld" => ["--content-type", "application/ld+json; charset=utf-8"],
+      "*.tbx.xml" => ["--content-type", "application/xml; charset=utf-8"],
+      "*.ttl" => ["--content-type", "text/turtle; charset=utf-8"],
+      "*.yaml" => ["--content-type", "text/yaml; charset=utf-8"],
+    }
+
+    s3sync_patterns_and_options.each_pair do |pattern, options|
+      s3_sync "--exclude", "*", "--include", pattern, *options
+    end
+
+    # Remaining files
+    remaining_patterns = s3sync_patterns_and_options.keys
+    s3_sync "--include", "*", *remaining_patterns.flat_map { |k| ["--exclude", k] }
+
+    aws "configure", "set", "preview.cloudfront", "true"
+
+    aws "cloudfront", "create-invalidation",
+      "--distribution-id", ENV["CLOUDFRONT_DISTRIBUTION_ID"],
+      "--paths", "/*"
+  end
+
+  def s3_sync(*args)
+    source = "_site"
+    target = "s3://#{ENV["S3_BUCKET_NAME"]}"
+    common_options = ["--region", ENV["AWS_REGION"], "--delete", "--no-progress"]
+
+    aws "s3", "sync", source, target, *common_options, *args
+  end
+
+  def aws(*args)
+    system "aws", *args, exception: true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -148,7 +148,7 @@ files:
 - _layouts/resource-page.html
 - _pages/404.adoc
 - _pages/api/rdf-profile.ttl
-- _pages/concepts-index-list.json
+- _pages/concept-search-index.json
 - _pages/concepts-index.json
 - _pages/concepts.adoc
 - _pages/index.adoc
@@ -190,6 +190,7 @@ files:
 - lib/jekyll/geolexica/hooks.rb
 - lib/jekyll/geolexica/meta_pages_generator.rb
 - lib/jekyll/geolexica/version.rb
+- lib/tasks/deploy.rake
 - package-lock.json
 - package.json
 homepage: https://open.ribose.com/