jekyll-geolexica 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781327ac34b947ac0373cb20db954c62f4922623311445a2da3c62f854a048d6
-  data.tar.gz: 6bfc61dbedcd5165e4041fa8893ecb35583fafba9040a553850df41239f80094
+  metadata.gz: fa082f698405c5747b8479196495e0f13c46d8abab8e805225436f51a4583bf7
+  data.tar.gz: c2281b410069a7eacb57eee814b0f2ba02a0f523ab6ae27ccc76216265a81d41
 SHA512:
-  metadata.gz: a0b0a570bd48cd0846ab34ef0b1d33f36ebb5a278f58424f4172074c216f9c25eb79188814751c058e16abcf641d52b2ac5f676f271880a8b91967e01ba181e5
-  data.tar.gz: 6a3a4a0d8c0424262331d802de8a31d16b4c160755caee798041b77c98c3768b00cbbeca9a22e9e1c38872aac94720fc12586ed32d093ccfbff4c0915c485f82
+  metadata.gz: 82b6e04b1eaf33573a03878d63743581c57a274ae64ec49434395b4b0cbb39de3112d97e4bd54f48bb2dc4f137ca3f0d50bed277e91a13727e998c83c71a7cd9
+  data.tar.gz: 13bfc507093d9beef13813c160c4d3974f5533813bf7306688606fa16d8289eb575e978f5cb9adae1daae0170605678092e747fdaa82860be0e1e8c26303b444

data/_pages/concepts-index.json

@@ -4,11 +4,12 @@ permalink: "/api/concepts.json"
 {
   {% for concept in site.concepts %}
   {% assign json_concept = concept.representations.json %}
-  "{{ concept.termid }}": {
-    "term": "{{ concept.term }}",
-    "termid": {{ concept.termid }},
-    "uri-html": "{{ concept.url }}",
-    "uri-json": "{{ json_concept.url }}"
+  {% comment %}"append" below ensures conversion to string{% endcomment -%}
+  {{ concept.termid | append: '' | jsonify }}: {
+    "term": {{ concept.term | jsonify }},
+    "termid": {{ concept.termid | jsonify }},
+    "uri-html": {{ concept.url | jsonify }},
+    "uri-json": {{ json_concept.url | jsonify }}
   }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 }

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

@@ -15,6 +15,22 @@ const LANGUAGES = (function() {
 var concepts = null;
 var latestQuery = null;
 
+// TODO Support filters here maybe.
+class SearchQuery {
+  constructor(queryString) {
+    this.searchWords = queryString.toLowerCase().match(/\p{Letter}+/ug) || [];
+  }
+
+  isEmpty() {
+    return this.searchWords.length == 0;
+  }
+
+  match(string) {
+    const stringLC = string.toLowerCase();
+    return this.searchWords.every((word) => stringLC.includes(word));
+  }
+}
+
 function fetchConcepts() {
   if (concepts === null) {
     concepts = fetch(CONCEPTS_URL).then((resp) => resp.json());
@@ -25,16 +41,17 @@ function fetchConcepts() {
 async function filterAndSort(params) {
   var concepts = await fetchConcepts();
 
-  if (params.string !== '') {
+  const query = new SearchQuery(params.string);
+
+  if (!query.isEmpty()) {
     concepts = concepts.map((_item) => {
       // Search all localized term names for the presence of given search string
 
       const item = Object.assign({}, _item);
-      const queryString = params.string.toLowerCase();
       const matchingLanguages = LANGUAGES.
         filter((lang) => {
           const term = (item[lang] || {}).term;
-          return term && term.toLowerCase().indexOf(queryString) >= 0;
+          return term && query.match(term);
         });
 
       if (matchingLanguages.length > 0) {

data/gemfiles/Jekyll-4.0.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.expand_path("../Gemfile", __dir__)
+
+gem "jekyll", "~> 4.0"

data/gemfiles/Jekyll-4.1.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.expand_path("../Gemfile", __dir__)
+
+gem "jekyll", "~> 4.1"

data/gemfiles/Jekyll-4.2.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.expand_path("../Gemfile", __dir__)
+
+gem "jekyll", "~> 4.2"

data/jekyll-geolexica.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   # I doubt we should be worried, but there is no good reason to allow them
   # either.
   # See: https://jekyllrb.com/news/2020/06/24/jekyll-4-1-1-released/
-  spec.add_runtime_dependency "jekyll", ">= 3.8.5", "< 4.2", "!= 4.1.0"
+  spec.add_runtime_dependency "jekyll", ">= 3.8.5", "< 4.3", "!= 4.1.0"
 
   spec.add_runtime_dependency "jekyll-asciidoc"
 

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.5.4".freeze
+    VERSION = "1.6.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-21 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -19,7 +19,7 @@ dependencies:
         version: 3.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
     - - "!="
       - !ruby/object:Gem::Version
         version: 4.1.0
@@ -32,7 +32,7 @@ dependencies:
         version: 3.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
     - - "!="
       - !ruby/object:Gem::Version
         version: 4.1.0
@@ -120,7 +120,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-description: 
+description:
 email:
 - open.source@ribose.com
 executables: []
@@ -194,6 +194,9 @@ files:
 - assets/resource-viewer-placeholder.html
 - assets/style.scss
 - babel.config.js
+- gemfiles/Jekyll-4.0.gemfile
+- gemfiles/Jekyll-4.1.gemfile
+- gemfiles/Jekyll-4.2.gemfile
 - jekyll-geolexica.gemspec
 - lib/jekyll-geolexica.rb
 - lib/jekyll/geolexica.rb
@@ -216,7 +219,7 @@ metadata:
   bug_tracker_uri: https://github.com/geolexica/geolexica-server/issues
   homepage_uri: https://open.ribose.com/
   source_code_uri: https://github.com/geolexica/geolexica-server
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Geolexica plugin for Jekyll
 test_files: []