diff --git a/README.md b/README.md index 54edd20..c83e7ca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,13 @@ +# This repository has moved to [https://github.com/holidayapi/node-holidayapi](https://github.com/holidayapi/node-holidayapi) + +**The NPM package has also been renamed from `node-holidayapi` to simply `holidayapi`** + +**This repository has been archived.** + +--- + # node-holidayapi + Official Node.js library for [Holiday API](https://holidayapi.com) ## Installation @@ -11,7 +20,7 @@ npm install --save node-holidayapi ```javascript var HolidayAPI = require('node-holidayapi'); -var hapi = new HolidayAPI('_YOUR_API_KEY').v1; +var hapi = new HolidayAPI('_YOUR_API_KEY_').v1; var parameters = { // Required @@ -20,13 +29,13 @@ var parameters = { // Optional // month: 7, // day: 4, - // previous true, - // upcoming true, + // previous: true, + // upcoming: true, // public: true, // pretty: true, }; -var hapi.holidays(parameters, function (err, data) { +hapi.holidays(parameters, function (err, data) { // Insert awesome code here... }); ``` diff --git a/index.js b/index.js index 12c43a2..819cc92 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,7 @@ 'use strict'; -var https = require('https'); +const https = require('https'); +const qs = require('querystring'); var HolidayAPI = function (key) { if ('undefined' !== typeof key) { @@ -11,16 +12,13 @@ var HolidayAPI = function (key) { HolidayAPI.prototype.v1 = {}; HolidayAPI.prototype.v1.holidays = function (parameters, callback) { - var url = 'https://holidayapi.com/v1/holidays'; - var querystring = '?key=' + HolidayAPI.prototype.key; - - if ('object' === typeof parameters) { - for (var parameter in parameters) { - querystring += '&' + parameter + '=' + parameters[parameter]; - } - } - - url += querystring; + const querystringObject = Object.assign( + {}, + {key: HolidayAPI.prototype.key}, + parameters, + ) + const querystring = qs.stringify(querystringObject); + const url = `https://holidayapi.com/v1/holidays?${querystring}`; https.get(url, function (res) { res.on('data', function (data) { diff --git a/package.json b/package.json index 6cd386b..0414a5c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "node-holidayapi", - "version": "1.0.1", - "description": "Official Node.js library for Holiday API", + "version": "1.0.3", + "description": "DEPRECATED -- Official Node.js library for Holiday API", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1"