Merge pull request #7 from philipmckenna/configuration-and-tests

test: client method tests

.env

@@ -1 +1 @@
-BABEL_ENV=production
+BABEL_ENV=production

config.js

@@ -0,0 +1,7 @@
+require('dotenv').config();
+
+module.exports = {
+  baseUrl: 'https://api.coaster.cloud',
+  withAcl: false,
+  language: 'en',
+};

package.json

@@ -22,7 +22,6 @@
     "lodash": "^4.17.11"
   },
   "devDependencies": {
-    "axios-mock-adapter": "^1.17.0",
     "babel-jest": "^24.9.0",
     "babel-minify": "^0.5.1",
     "babel-preset-es2015": "^6.24.1",

src/build-query.js

@@ -0,0 +1,70 @@
+const _ = require('lodash');
+const { language } = require('../config');
+
+const buildQuery = (config, withAcl) => {
+  let query = [];
+
+  if (config.hasOwnProperty('page') && config.page) {
+      query.push('page=' + encodeURIComponent(config.page));
+  }
+
+  if (config.hasOwnProperty('itemsPerPage') && config.itemsPerPage) {
+      query.push('itemsPerPage=' + encodeURIComponent(config.itemsPerPage));
+  }
+
+  if (config.hasOwnProperty('searchTerm') && config.searchTerm) {
+      query.push('search=' + encodeURIComponent(config.searchTerm));
+  }
+
+  if (config.hasOwnProperty('language') && config.language) {
+      query.push('language=' + encodeURIComponent(config.language));
+  } else {
+      query.push('language=' + encodeURIComponent(language));
+  }
+
+  if (config.hasOwnProperty('sort') && config.sort) {
+      query.push('sort=' + encodeURIComponent(config.sort));
+  }
+
+  if (config.hasOwnProperty('regulation')) {
+      let regulation = _.merge(
+          {
+              size: null,
+              age: null
+          },
+          config.regulation
+      );
+
+      if (regulation.size !== null || regulation.age !== null) {
+          let size = (/^\d+$/.test(regulation.size)) ? regulation.size : 'null';
+          let age = (/^\d+$/.test(regulation.age)) ? regulation.age : 'null';
+
+          query.push('filter[]=' + encodeURIComponent(`regulation(${size},${age})`));
+      }
+  }
+
+  if (config.hasOwnProperty('facets')) {
+      config.facets.forEach(function (facet) {
+          query.push('facet[]=' + encodeURIComponent(facet));
+      });
+  }
+
+  if (config.hasOwnProperty('filters')) {
+      config.filters.forEach(function (filter) {
+          query.push('filter[]=' + encodeURIComponent(filter));
+      });
+  }
+
+  if (config.hasOwnProperty('founded') && config.founded !== null && (/^\d{4}$/.test(config.founded))) {
+      let year = config.founded;
+      query.push('filter[]=' + encodeURIComponent(`founded.year:${year}`));
+  }
+
+  if (withAcl === true) {
+      query.push('acl=true');
+  }
+
+  return query.length > 0 ? '?' + query.join('&') : '';
+};
+
+module.exports = { buildQuery };

src/client.js

@@ -9,19 +9,17 @@
 
 // Imports
 const Axios = require('axios');
-const _ = require('lodash');
+const { baseUrl, withAcl } = require('../config');
+const { buildQuery } = require('./build-query');
 
 module.exports = {
-    baseUrl: 'https://api.coaster.cloud',
-    withAcl: false,
-    language: 'en',
 
     // Get parks list by optional config or null on failure
     async getParks(config = {}) {
         let result = null;
 
         try {
-            let response = await Axios.get(this.baseUrl + '/parks' + this.buildQuery(config));
+            let response = await Axios.get(baseUrl + '/parks' + buildQuery(config, withAcl));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -35,7 +33,7 @@ module.exports = {
         let result = null;
 
         try {
-            let response = await Axios.get(this.baseUrl + '/parks/' + uuid + this.buildQuery(config));
+            let response = await Axios.get(baseUrl + '/parks/' + uuid + buildQuery(config, withAcl));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -50,7 +48,7 @@ module.exports = {
 
         try {
             let response = await Axios.get(
-                this.baseUrl + '/parks/' + uuid  + '/waiting-times' + this.buildQuery(config)
+                baseUrl + '/parks/' + uuid  + '/waiting-times' + buildQuery(config, withAcl)
             );
             result = response.data;
         } catch (error) {
@@ -66,13 +64,13 @@ module.exports = {
         let url = null;
 
         if (config.hasOwnProperty('park') && config.park) {
-            url = this.baseUrl + '/parks/' + config.park + '/attractions';
+            url = baseUrl + '/parks/' + config.park + '/attractions';
         } else {
-            url = this.baseUrl + '/attractions';
+            url = baseUrl + '/attractions';
         }
 
         try {
-            let response = await Axios.get(url + this.buildQuery(config));
+            let response = await Axios.get(url + buildQuery(config, withAcl));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -86,7 +84,7 @@ module.exports = {
         let result = null;
 
         try {
-            let response = await Axios.get(this.baseUrl + '/attractions/' + uuid + this.buildQuery(config));
+            let response = await Axios.get(baseUrl + '/attractions/' + uuid + buildQuery(config, withAcl));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -105,79 +103,12 @@ module.exports = {
         };
 
         try {
-            await Axios.post(this.baseUrl + '/parks/' + park + '/waiting-times', queues, config);
+            await Axios.post(baseUrl + '/parks/' + park + '/waiting-times', queues, config);
             result = true;
         } catch (error) {
             console.error(error)
         }
 
         return result;
     },
-
-    // Build query
-    buildQuery(config) {
-        let query = [];
-
-        if (config.hasOwnProperty('page') && config.page) {
-            query.push('page=' + encodeURIComponent(config.page));
-        }
-
-        if (config.hasOwnProperty('itemsPerPage') && config.itemsPerPage) {
-            query.push('itemsPerPage=' + encodeURIComponent(config.itemsPerPage));
-        }
-
-        if (config.hasOwnProperty('searchTerm') && config.searchTerm) {
-            query.push('search=' + encodeURIComponent(config.searchTerm));
-        }
-
-        if (config.hasOwnProperty('language') && config.language) {
-            query.push('language=' + encodeURIComponent(config.language));
-        } else {
-            query.push('language=' + encodeURIComponent(this.language));
-        }
-
-        if (config.hasOwnProperty('sort') && config.sort) {
-            query.push('sort=' + encodeURIComponent(config.sort));
-        }
-
-        if (config.hasOwnProperty('regulation')) {
-            let regulation = _.merge(
-                {
-                    size: null,
-                    age: null
-                },
-                config.regulation
-            );
-
-            if (regulation.size !== null || regulation.age !== null) {
-                let size = (/^\d+$/.test(regulation.size)) ? regulation.size : 'null';
-                let age = (/^\d+$/.test(regulation.age)) ? regulation.age : 'null';
-
-                query.push('filter[]=' + encodeURIComponent(`regulation(${size},${age})`));
-            }
-        }
-
-        if (config.hasOwnProperty('facets')) {
-            config.facets.forEach(function (facet) {
-                query.push('facet[]=' + encodeURIComponent(facet));
-            });
-        }
-
-        if (config.hasOwnProperty('filters')) {
-            config.filters.forEach(function (filter) {
-                query.push('filter[]=' + encodeURIComponent(filter));
-            });
-        }
-
-        if (config.hasOwnProperty('founded') && config.founded !== null && (/^\d{4}$/.test(config.founded))) {
-            let year = config.founded;
-            query.push('filter[]=' + encodeURIComponent(`founded.year:${year}`));
-        }
-
-        if (this.withAcl === true) {
-            query.push('acl=true');
-        }
-
-        return query.length > 0 ? '?' + query.join('&') : '';
-    }
 };