pelias-schema 6.3.0 → 6.4.1

package/.github/workflows/push.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-16.04, ubuntu-18.04]
-        node-version: [10.x, 12.x]
+        os: [ubuntu-20.04]
+        node-version: [12.x, 14.x, 16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Install node.js ${{ matrix.node-version }}
@@ -26,8 +26,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04]
-        node-version: [10.x, 12.x]
+        os: [ubuntu-20.04]
+        node-version: [12.x, 14.x, 16.x]
         es-version: [7.6.1]
         jdk-version: [oraclejdk11]
     steps:
@@ -51,18 +51,30 @@ jobs:
   npm-publish:
     needs: [unit-tests, integration-tests]
     if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: Install node.js 12.x
+    - name: Install Node.js
       uses: actions/setup-node@v2-beta
       with:
-        node-version: 12.x
+        node-version: 16.x
     - name: Run semantic-release
       env:
         GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       run: |
-        npm install -g npm
-        npm install --production
         curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
+  build-docker-images:
+    # run this job if the unit tests passed and the npm-publish job was a success or was skipped
+    # note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true`
+    if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
+    needs: [unit-tests, integration-tests, npm-publish]
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build Docker images
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -

package/Dockerfile

@@ -6,7 +6,7 @@ ENV WORKDIR /code/pelias/schema
 WORKDIR ${WORKDIR}
 
 # copy package.json first to prevent npm install being rerun when only code changes
-COPY ./package.json ${WORK}
+COPY ./package.json ${WORKDIR}
 RUN npm install
 
 # add code from local checkout to image

package/README.md

@@ -152,4 +152,4 @@ $ docker run --rm --name elastic-test -p 9200:9200 pelias/elasticsearch:7.5.1
 
 ### Continuous Integration
 
-Travis tests every release against all supported Node.js versions.
+CI tests every release against all supported Node.js versions.

package/integration/analyzer_peliasIndexOneEdgeGram.js

@@ -48,7 +48,7 @@ module.exports.tests.analyze = function(test, common){
       '1:a',
       '2:a', '2:ab',
       '3:a', '3:ab', '3:abc',
-      '4:a', '4:ab', '4:abc', '4:abcd', '4:abcde', '4:abcdef', 
+      '4:a', '4:ab', '4:abc', '4:abcd', '4:abcde', '4:abcdef',
       '4:abcdefg', '4:abcdefgh', '4:abcdefghi', '4:abcdefghij'
     ] );
     assertAnalysis( 'removeAllZeroNumericPrefix', '00001', ['1'] );
@@ -69,7 +69,7 @@ module.exports.tests.analyze = function(test, common){
     // remove punctuation (handled by the char_filter)
     assertAnalysis('punctuation', punctuation.all.join(''), ['0:&', '0:a', '0:an', '0:and', '0:u', '0:un', '0:und'] );
     assertAnalysis( 'punctuation', 'Hawai‘i', ['0:h', '0:ha', '0:haw', '0:hawa', '0:hawai', '0:hawaii'] );
-
+    assertAnalysis( 'punctuation', '„Tip Top”', ['0:t', '0:ti', '0:tip', '1:t', '1:to', '1:top'] );
     // ensure that very large grams are created
     assertAnalysis( 'largeGrams', 'grolmanstrasse', [
       '0:g', '0:gr', '0:gro', '0:grol', '0:grolm', '0:grolma', '0:grolman', '0:grolmans',

package/integration/analyzer_peliasPhrase.js

@@ -51,6 +51,9 @@ module.exports.tests.analyze = function(test, common){
     assertAnalysis( 'british_american_english', 'town theatre', ['0:town', '1:theatre', '1:theater'] );
     assertAnalysis( 'british_american_english', 'town theater', ['0:town', '1:theater', '1:theatre'] );
 
+    // remove leading zeros from numeric input
+    assertAnalysis( 'leading_zeros', '01000', ['0:1000'] );
+    assertAnalysis( 'leading_zeros', '09999', ['0:9999'] );
 
     suite.run( t.end );
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pelias-schema",
-  "version": "6.3.0",
+  "version": "6.4.1",
   "author": "pelias",
   "description": "Elasticsearch schema files and tooling for Pelias",
   "homepage": "https://github.com/pelias/schema",
@@ -12,8 +12,7 @@
     "create_index": "./bin/create_index",
     "drop_index": "node scripts/drop_index",
     "reset_type": "node scripts/reset_type",
-    "update_settings": "node scripts/update_settings",
-    "travis": "npm run test && npm run integration"
+    "update_settings": "node scripts/update_settings"
   },
   "repository": {
     "type": "git",
@@ -45,7 +44,7 @@
     "iso3166-1": "^0.5.1",
     "proxyquire": "^2.0.0",
     "tap-spec": "^5.0.0",
-    "tape": "^4.5.0"
+    "tape": "^5.0.0"
   },
   "pre-commit": [],
   "release": {

package/punctuation.js

@@ -4,7 +4,7 @@
 module.exports.all = [
   ".","`","‘","-","_","=","?","'","|","\"","(",")","{","}","[","]","<",">","*",
   "#","&","^","$","@","!","~",":",";","+","《","》","—","－","，","。",
-  "、", "：","；","！","·","？","“","”","）","（","【","】","［","］","●"
+  "、", "：","；","！","·","？","„","“","”","）","（","【","】","［","］","●"
 ];
 
 module.exports.allowed = [

package/settings.js

@@ -91,6 +91,7 @@ function generate(){
             "name_synonyms_multiplexer",
             "icu_folding",
             "remove_ordinals",
+            "removeAllZeroNumericPrefix",
             "unique_only_same_position",
             "notnull",
             "flatten_graph"

package/test/fixtures/expected.json

@@ -96,6 +96,7 @@
             "name_synonyms_multiplexer",
             "icu_folding",
             "remove_ordinals",
+            "removeAllZeroNumericPrefix",
             "unique_only_same_position",
             "notnull",
             "flatten_graph"
@@ -2312,6 +2313,7 @@
             "！=>",
             "·=>",
             "？=>",
+            "„=>",
             "“=>",
             "”=>",
             "）=>",
@@ -3049,4 +3051,4 @@
     },
     "dynamic": "strict"
   }
-}
+}

package/test/settings.js

@@ -159,6 +159,7 @@ module.exports.tests.peliasPhraseAnalyzer = function(test, common) {
       "name_synonyms_multiplexer",
       "icu_folding",
       "remove_ordinals",
+      "removeAllZeroNumericPrefix",
       "unique_only_same_position",
       "notnull",
       "flatten_graph"
@@ -590,7 +591,7 @@ module.exports.tests.punctuationCharFilter = function(test, common) {
     var char_filter = s.analysis.char_filter.punctuation;
     t.equal(char_filter.type, 'mapping');
     t.true(Array.isArray(char_filter.mappings));
-    t.equal(char_filter.mappings.length, 48);
+    t.equal(char_filter.mappings.length, 49);
     t.end();
   });
 };

package/.circleci/config.yml

@@ -1,12 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: /app
-    docker:
-      - image: docker:18.06.1-ce-git
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build and push image to Docker Hub
-          command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -