fiftyone.geolocation 4.3.1 → 4.3.6

package/geoLocationPipelineBuilder.js

@@ -20,14 +20,6 @@
  * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
-const require51 = (requestedPackage) => {
-  try {
-    return require(__dirname + '/../' + requestedPackage);
-  } catch (e) {
-    return require(requestedPackage);
-  }
-};
-
 const GeoLocationCloud = require('./geoLocationCloud');
 const CloudRequestEngine = require('fiftyone.pipeline.cloudrequestengine').CloudRequestEngine;
 const PipelineBuilder = require('fiftyone.pipeline.core').PipelineBuilder;
@@ -40,16 +32,17 @@ class GeoLocationPipelineBuilder extends PipelineBuilder {
      * @param {Boolean} options.shareUsage // include share usage element?
      * @param {String} options.resourceKey // resourceKey for cloud
      * @param {String} options.locationProvider // the provider to request data from. Either "fiftyonedegrees" or "digitalelement".
-     * @param {string} options.cloudRequestOrigin The value to set the 
+     * @param {string} options.cloudRequestOrigin The value to set the
      * Origin header to when making requests to the cloud service
      *
     */
-  constructor ({ 
-    shareUsage = true, 
-    resourceKey = null, 
-    locationProvider = 'fiftyonedegrees', 
+  constructor ({
+    shareUsage = true,
+    resourceKey = null,
+    locationProvider = 'fiftyonedegrees',
     baseURL = null,
-    cloudRequestOrigin = null }) {
+    cloudRequestOrigin = null
+  }) {
     super(...arguments);
 
     // Check if share usage enabled and add it to the pipeline if so
@@ -60,9 +53,9 @@ class GeoLocationPipelineBuilder extends PipelineBuilder {
 
     // First we need the cloudRequestEngine
 
-    const cloudRequestEngineOptions = { 
+    const cloudRequestEngineOptions = {
       resourceKey: resourceKey,
-      cloudRequestOrigin: cloudRequestOrigin 
+      cloudRequestOrigin: cloudRequestOrigin
     };
     if (baseURL !== null) {
       cloudRequestEngineOptions.baseURL = baseURL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.geolocation",
-  "version": "4.3.1",
+  "version": "4.3.6",
   "description": "Geo-location services for the 51Degrees Pipeline API",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -17,10 +17,10 @@
     "Joseph Dix <joseph@51degrees.com> (https://51degrees.com)"
   ],
   "dependencies": {
-    "fiftyone.pipeline.cloudrequestengine": "^4.3.1",
-    "fiftyone.pipeline.core": "^4.3.1",
-    "fiftyone.pipeline.engines": "^4.3.1",
-    "fiftyone.pipeline.engines.fiftyone": "^4.3.1"
+    "fiftyone.pipeline.cloudrequestengine": "^4.3.7",
+    "fiftyone.pipeline.core": "^4.3.7",
+    "fiftyone.pipeline.engines": "^4.3.7",
+    "fiftyone.pipeline.engines.fiftyone": "^4.3.7"
   },
   "devDependencies": {
     "@types/node": "^15.12.2",
@@ -30,7 +30,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "jest": "^24.9.0",
+    "jest": "^27.0.6",
     "jest-expect-message": "^1.0.2",
     "jest-junit": "^9.0.0"
   },
@@ -42,7 +42,11 @@
     "outputName": "test_results.xml"
   },
   "jest": {
-    "setupTestFrameworkScriptFile": "jest-expect-message",
+    "testRunner": "jest-jasmine2",
+    "setupFilesAfterEnv": [
+      "./setup.js",
+      "jest-expect-message"
+    ],
     "globals": {
       "resourceKey": "!!YOUR_RESOURCE_KEY!!"
     }

package/setup.js

@@ -0,0 +1 @@
+jest.setTimeout(10000); // in milliseconds

package/ci/common-ci/java/shared-code-signing-steps.yml

@@ -1,17 +0,0 @@
-parameters:
-- name: gpgPassPhrase
-
-steps:
-# Download Code Signing Certificate from SecureFile Library
-- task: DownloadSecureFile@1
-  name: CodeSigningCert
-  displayName: 'Download Code Signing Certificate'
-  inputs:
-    secureFile: '51Degrees Code Signing Certificate.asc'
-    retryCount: 5
-
-- task: Bash@3
-  displayName: 'Import Code Signing Certificate'
-  inputs:
-    targetType: 'inline'
-    script: 'echo ${{ parameters.gpgPassPhrase }} | gpg --import --batch --yes --passphrase-fd 0 "$(CodeSigningCert.secureFilePath)"'