Merge ca67f1e into 65b4c34

.github/workflows/main.yml

@@ -9,4 +9,9 @@ jobs:
         with:
           node-version: '10.x'
       - run: npm install
-      - run: npm test
+      - run: npm run test-coverage
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v1.0.1
+        with:
+          github-token: ${{ secrets.github_token }}
+          path-to-lcov: 'coverage.info'

README.md

@@ -4,6 +4,9 @@ official [coaster.cloud](https://coaster.cloud) api.
 
 This library is currently in early development. Contribution is welcome.
 
+[![npm version](https://badge.fury.io/js/coaster.js.svg)](https://badge.fury.io/js/coaster.js)
+[![Coverage Status](https://coveralls.io/repos/github/migo315/coaster.js/badge.svg?branch=master)](https://coveralls.io/github/migo315/coaster.js?branch=master)
+
 ## Installation
 ```
 yarn add coaster.js

config.js

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

package.json

@@ -5,7 +5,8 @@
   "main": "src/client.js",
   "scripts": {
     "build": "minify src/client.js --mangle.keepClassName --deadcode.keepFnArgs --outFile dist/client.min.js",
-    "test": "jest"
+    "test": "jest",
+    "test-coverage": "jest --collectCoverage --coverageReporters=text-lcov >> coverage.info"
   },
   "repository": {
     "type": "git",
@@ -25,6 +26,7 @@
     "babel-jest": "^24.9.0",
     "babel-minify": "^0.5.1",
     "babel-preset-es2015": "^6.24.1",
+    "coveralls": "^3.0.7",
     "jest": "^24.9.0"
   }
 }

src/build-query.js

@@ -1,7 +1,6 @@
 const _ = require('lodash');
-const { language } = require('../config');
 
-const buildQuery = (config, withAcl) => {
+const buildQuery = (config) => {
   let query = [];
 
   if (config.hasOwnProperty('page') && config.page) {
@@ -18,8 +17,6 @@ const buildQuery = (config, withAcl) => {
 
   if (config.hasOwnProperty('language') && config.language) {
       query.push('language=' + encodeURIComponent(config.language));
-  } else {
-      query.push('language=' + encodeURIComponent(language));
   }
 
   if (config.hasOwnProperty('sort') && config.sort) {
@@ -60,10 +57,6 @@ const buildQuery = (config, withAcl) => {
       query.push('filter[]=' + encodeURIComponent(`founded.year:${year}`));
   }
 
-  if (withAcl === true) {
-      query.push('acl=true');
-  }
-
   return query.length > 0 ? '?' + query.join('&') : '';
 };
 

src/client.js

@@ -9,7 +9,7 @@
 
 // Imports
 const Axios = require('axios');
-const { baseUrl, withAcl } = require('../config');
+const { baseUrl } = require('../config');
 const { buildQuery } = require('./build-query');
 
 module.exports = {
@@ -19,7 +19,7 @@ module.exports = {
         let result = null;
 
         try {
-            let response = await Axios.get(baseUrl + '/parks' + buildQuery(config, withAcl));
+            let response = await Axios.get(baseUrl + '/parks' + buildQuery(config));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -33,7 +33,7 @@ module.exports = {
         let result = null;
 
         try {
-            let response = await Axios.get(baseUrl + '/parks/' + uuid + buildQuery(config, withAcl));
+            let response = await Axios.get(baseUrl + '/parks/' + uuid + buildQuery(config));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -48,7 +48,7 @@ module.exports = {
 
         try {
             let response = await Axios.get(
-                baseUrl + '/parks/' + uuid  + '/waiting-times' + buildQuery(config, withAcl)
+                baseUrl + '/parks/' + uuid  + '/waiting-times' + buildQuery(config)
             );
             result = response.data;
         } catch (error) {
@@ -70,7 +70,7 @@ module.exports = {
         }
 
         try {
-            let response = await Axios.get(url + buildQuery(config, withAcl));
+            let response = await Axios.get(url + buildQuery(config));
             result = response.data;
         } catch (error) {
             console.error(error)
@@ -84,7 +84,7 @@ module.exports = {
         let result = null;
 
         try {
-            let response = await Axios.get(baseUrl + '/attractions/' + uuid + buildQuery(config, withAcl));
+            let response = await Axios.get(baseUrl + '/attractions/' + uuid + buildQuery(config));
             result = response.data;
         } catch (error) {
             console.error(error)