diff --git a/CHANGELOG.md b/CHANGELOG.md
index e987316..fd6e8ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 2.1.1
+- Fix bug preventing match_id and participant_id passed as underscore properties for URL generation #32
+
### 2.1.0
- Fix null values being returned as empty objects (#24)
- Add processCheckIns and abortCheckIn methods to tournament api
diff --git a/docs/Client.html b/docs/Client.html
index 260654d..4f60584 100644
--- a/docs/Client.html
+++ b/docs/Client.html
@@ -383,7 +383,7 @@ Properties
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/Matches.html b/docs/Matches.html
index 25507b2..4bdb3fe 100644
--- a/docs/Matches.html
+++ b/docs/Matches.html
@@ -608,7 +608,7 @@ Properties
- The id of the match to get
+ OR obj.match_id The id of the match to get
@@ -677,7 +677,7 @@ Source:
Properties
- The id of the match to update
+ OR obj.match_id The id of the match to update
@@ -945,7 +945,7 @@ Properties
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/Matches_.html b/docs/Matches_.html
deleted file mode 100644
index 3c113ff..0000000
--- a/docs/Matches_.html
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
- JSDoc: Class: Matches
-
-
-
-
-
-
-
Class: Matches
-
-
-
-
-
-
-
-
-
-
- Matches
- options
-
-
-
-
-
-
-
-
-
-
-
-
-
(options)
-
-
-
-
-
-
- Constructor function for the class to query Matches endpoints
-
- index GET tournaments/:tournament/matches
- show GET tournaments/:tournament/matches/:match_id
- update PUT tournaments/:tournament/matches/:match_id
-
-
-
-
-
-
-
-
-
-
-
-
Parameters:
-
-
-
-
-
-
- Name
-
-
- Type
-
-
-
-
-
- Description
-
-
-
-
-
-
-
-
- options
-
-
-object
-
-
-
-
-
-
-
-
-
- configuration options for this instance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Source:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Modules Classes Global
-
-
-
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 00:31:48 GMT-0400 (EDT)
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/Participants.html b/docs/Participants.html
index 3f8883c..68883fe 100644
--- a/docs/Participants.html
+++ b/docs/Participants.html
@@ -466,7 +466,7 @@ Source:
Properties
- The id of the participant to remove
+ OR obj.participant_id The id of the participant to remove
@@ -922,7 +922,7 @@ Source:
Properties
- The id of the participant to get
+ OR obj.participant_id The id of the participant to get
@@ -1378,7 +1378,7 @@ Source:
Properties
- The id of the participant to update
+ OR obj.participant_id The id of the participant to update
@@ -1645,7 +1645,7 @@ Properties
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/Tournaments.html b/docs/Tournaments.html
index e53e79f..5ce12c6 100644
--- a/docs/Tournaments.html
+++ b/docs/Tournaments.html
@@ -2356,7 +2356,7 @@ Properties
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/api_client.js.html b/docs/api_client.js.html
index 25dca8a..1338862 100644
--- a/docs/api_client.js.html
+++ b/docs/api_client.js.html
@@ -95,6 +95,11 @@ api/client.js
}
};
+Client.prototype.convertCamelToUnderscoreProperties = function(obj) {
+ obj = util.convert(obj, util.camelToUnderscore);
+ return obj;
+};
+
// cleans the passed in object, generates the API url/query-string, makes the request, delegates errors and calls callbacks
Client.prototype.makeRequest = function(obj) {
const self = this;
@@ -107,7 +112,7 @@ api/client.js
let path = obj.path;
// normalize the rest of the properties
- obj = util.convert(obj, util.camelToUnderscore);
+ obj = this.convertCamelToUnderscoreProperties(obj);
// Add on the api key
obj.api_key = this.options.get('apiKey');
@@ -175,7 +180,7 @@ api/client.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/api_error-handler.js.html b/docs/api_error-handler.js.html
index f4c052f..c39d6e1 100644
--- a/docs/api_error-handler.js.html
+++ b/docs/api_error-handler.js.html
@@ -120,7 +120,7 @@ api/error-handler.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/api_matches.js.html b/docs/api_matches.js.html
index 8b3d2ff..1e1f1bf 100644
--- a/docs/api_matches.js.html
+++ b/docs/api_matches.js.html
@@ -89,7 +89,7 @@ api/matches.js
* @memberof Matches
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to get the match from
- * @param {string} obj.matchId The id of the match to get
+ * @param {string} obj.matchId OR obj.match_id The id of the match to get
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* Retrieve a single match record for a tournament.
@@ -106,9 +106,10 @@ api/matches.js
*/
Matches.prototype.show = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.matchId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.match_id;
delete obj.id;
- delete obj.matchId;
+ delete obj.match_id;
obj.method = 'GET';
this.makeRequest(obj);
};
@@ -118,7 +119,7 @@ api/matches.js
* @memberof Matches
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to update the match in
- * @param {string} obj.matchId The id of the match to update
+ * @param {string} obj.matchId OR obj.match_id The id of the match to update
* @param {object} obj.match The match object with updates. See challonge docs for available properties.
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
@@ -140,9 +141,10 @@ api/matches.js
*/
Matches.prototype.update = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.matchId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.match_id;
delete obj.id;
- delete obj.matchId;
+ delete obj.match_id;
obj.method = 'PUT';
this.makeRequest(obj);
};
@@ -158,7 +160,7 @@ api/matches.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/api_participants.js.html b/docs/api_participants.js.html
index 3282e97..454bf1e 100644
--- a/docs/api_participants.js.html
+++ b/docs/api_participants.js.html
@@ -123,7 +123,7 @@ api/participants.js
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to get a participant in
- * @param {string} obj.participantId The id of the participant to get
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to get
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* Retrieve a single participant record for a tournament.
@@ -140,9 +140,10 @@ api/participants.js
*/
Participants.prototype.show = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'GET';
this.makeRequest(obj);
};
@@ -152,7 +153,7 @@ api/participants.js
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to update a participant in
- * @param {string} obj.participantId The id of the participant to update
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to update
* @param {object} obj.participant The participant object with updates. See challonge docs for available properties.
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
@@ -173,9 +174,10 @@ api/participants.js
*/
Participants.prototype.update = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'PUT';
this.makeRequest(obj);
};
@@ -185,7 +187,7 @@ api/participants.js
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to remove a participant from
- * @param {string} obj.participantId The id of the participant to remove
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to remove
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* If the tournament has not started, delete a participant, automatically filling in the abandoned seed number. If tournament is underway, mark a participant inactive, automatically forfeiting his/her remaining matches.
@@ -202,9 +204,10 @@ api/participants.js
*/
Participants.prototype.destroy = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'DELETE';
this.makeRequest(obj);
};
@@ -246,7 +249,7 @@ api/participants.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/api_tournaments.js.html b/docs/api_tournaments.js.html
index a21a2fe..c527c48 100644
--- a/docs/api_tournaments.js.html
+++ b/docs/api_tournaments.js.html
@@ -361,7 +361,7 @@ api/tournaments.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/challonge.js.html b/docs/challonge.js.html
index 915287e..e7c8015 100644
--- a/docs/challonge.js.html
+++ b/docs/challonge.js.html
@@ -89,7 +89,7 @@ challonge.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/fonts/OpenSans-Bold-webfont.eot b/docs/fonts/OpenSans-Bold-webfont.eot
deleted file mode 100644
index 5d20d91..0000000
Binary files a/docs/fonts/OpenSans-Bold-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-Bold-webfont.svg b/docs/fonts/OpenSans-Bold-webfont.svg
deleted file mode 100644
index 3ed7be4..0000000
--- a/docs/fonts/OpenSans-Bold-webfont.svg
+++ /dev/null
@@ -1,1830 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-Bold-webfont.woff b/docs/fonts/OpenSans-Bold-webfont.woff
deleted file mode 100644
index 1205787..0000000
Binary files a/docs/fonts/OpenSans-Bold-webfont.woff and /dev/null differ
diff --git a/docs/fonts/OpenSans-BoldItalic-webfont.eot b/docs/fonts/OpenSans-BoldItalic-webfont.eot
deleted file mode 100644
index 1f639a1..0000000
Binary files a/docs/fonts/OpenSans-BoldItalic-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-BoldItalic-webfont.svg b/docs/fonts/OpenSans-BoldItalic-webfont.svg
deleted file mode 100644
index 6a2607b..0000000
--- a/docs/fonts/OpenSans-BoldItalic-webfont.svg
+++ /dev/null
@@ -1,1830 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-BoldItalic-webfont.woff b/docs/fonts/OpenSans-BoldItalic-webfont.woff
deleted file mode 100644
index ed760c0..0000000
Binary files a/docs/fonts/OpenSans-BoldItalic-webfont.woff and /dev/null differ
diff --git a/docs/fonts/OpenSans-Italic-webfont.eot b/docs/fonts/OpenSans-Italic-webfont.eot
deleted file mode 100644
index 0c8a0ae..0000000
Binary files a/docs/fonts/OpenSans-Italic-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-Italic-webfont.svg b/docs/fonts/OpenSans-Italic-webfont.svg
deleted file mode 100644
index e1075dc..0000000
--- a/docs/fonts/OpenSans-Italic-webfont.svg
+++ /dev/null
@@ -1,1830 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-Italic-webfont.woff b/docs/fonts/OpenSans-Italic-webfont.woff
deleted file mode 100644
index ff652e6..0000000
Binary files a/docs/fonts/OpenSans-Italic-webfont.woff and /dev/null differ
diff --git a/docs/fonts/OpenSans-Light-webfont.eot b/docs/fonts/OpenSans-Light-webfont.eot
deleted file mode 100644
index 1486840..0000000
Binary files a/docs/fonts/OpenSans-Light-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-Light-webfont.svg b/docs/fonts/OpenSans-Light-webfont.svg
deleted file mode 100644
index 11a472c..0000000
--- a/docs/fonts/OpenSans-Light-webfont.svg
+++ /dev/null
@@ -1,1831 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-Light-webfont.woff b/docs/fonts/OpenSans-Light-webfont.woff
deleted file mode 100644
index e786074..0000000
Binary files a/docs/fonts/OpenSans-Light-webfont.woff and /dev/null differ
diff --git a/docs/fonts/OpenSans-LightItalic-webfont.eot b/docs/fonts/OpenSans-LightItalic-webfont.eot
deleted file mode 100644
index 8f44592..0000000
Binary files a/docs/fonts/OpenSans-LightItalic-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-LightItalic-webfont.svg b/docs/fonts/OpenSans-LightItalic-webfont.svg
deleted file mode 100644
index 431d7e3..0000000
--- a/docs/fonts/OpenSans-LightItalic-webfont.svg
+++ /dev/null
@@ -1,1835 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-LightItalic-webfont.woff b/docs/fonts/OpenSans-LightItalic-webfont.woff
deleted file mode 100644
index 43e8b9e..0000000
Binary files a/docs/fonts/OpenSans-LightItalic-webfont.woff and /dev/null differ
diff --git a/docs/fonts/OpenSans-Regular-webfont.eot b/docs/fonts/OpenSans-Regular-webfont.eot
deleted file mode 100644
index 6bbc3cf..0000000
Binary files a/docs/fonts/OpenSans-Regular-webfont.eot and /dev/null differ
diff --git a/docs/fonts/OpenSans-Regular-webfont.svg b/docs/fonts/OpenSans-Regular-webfont.svg
deleted file mode 100644
index 25a3952..0000000
--- a/docs/fonts/OpenSans-Regular-webfont.svg
+++ /dev/null
@@ -1,1831 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/fonts/OpenSans-Regular-webfont.woff b/docs/fonts/OpenSans-Regular-webfont.woff
deleted file mode 100644
index e231183..0000000
Binary files a/docs/fonts/OpenSans-Regular-webfont.woff and /dev/null differ
diff --git a/docs/global.html b/docs/global.html
index 91718e2..a419c5a 100644
--- a/docs/global.html
+++ b/docs/global.html
@@ -450,7 +450,7 @@ Returns:
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/index.html b/docs/index.html
index 333902c..f6f75d7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -103,7 +103,7 @@ Branching master is the active development branch
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/module-ErrorHandler.html b/docs/module-ErrorHandler.html
index e3c4a49..b701239 100644
--- a/docs/module-ErrorHandler.html
+++ b/docs/module-ErrorHandler.html
@@ -366,7 +366,7 @@ Parameters:
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/module-Util.html b/docs/module-Util.html
index 9a8c78a..c1a0489 100644
--- a/docs/module-Util.html
+++ b/docs/module-Util.html
@@ -857,7 +857,7 @@ Returns:
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/param-serializer.js.html b/docs/param-serializer.js.html
index fae0928..e8d84fb 100644
--- a/docs/param-serializer.js.html
+++ b/docs/param-serializer.js.html
@@ -107,7 +107,7 @@ param-serializer.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/docs/styles/jsdoc-default.css b/docs/styles/jsdoc-default.css
deleted file mode 100644
index ede1919..0000000
--- a/docs/styles/jsdoc-default.css
+++ /dev/null
@@ -1,354 +0,0 @@
-@font-face {
- font-family: 'Open Sans';
- font-weight: normal;
- font-style: normal;
- src: url('../fonts/OpenSans-Regular-webfont.eot');
- src:
- local('Open Sans'),
- local('OpenSans'),
- url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
- url('../fonts/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
-}
-
-@font-face {
- font-family: 'Open Sans Light';
- font-weight: normal;
- font-style: normal;
- src: url('../fonts/OpenSans-Light-webfont.eot');
- src:
- local('Open Sans Light'),
- local('OpenSans Light'),
- url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
- url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
- url('../fonts/OpenSans-Light-webfont.svg#open_sanslight') format('svg');
-}
-
-html
-{
- overflow: auto;
- background-color: #fff;
- font-size: 14px;
-}
-
-body
-{
- font-family: 'Open Sans', sans-serif;
- line-height: 1.5;
- color: #4d4e53;
- background-color: white;
-}
-
-a, a:visited, a:active {
- color: #0095dd;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-header
-{
- display: block;
- padding: 0px 4px;
-}
-
-tt, code, kbd, samp {
- font-family: Consolas, Monaco, 'Andale Mono', monospace;
-}
-
-.class-description {
- font-size: 130%;
- line-height: 140%;
- margin-bottom: 1em;
- margin-top: 1em;
-}
-
-.class-description:empty {
- margin: 0;
-}
-
-#main {
- float: left;
- width: 70%;
-}
-
-article dl {
- margin-bottom: 40px;
-}
-
-section
-{
- display: block;
- background-color: #fff;
- padding: 12px 24px;
- border-bottom: 1px solid #ccc;
- margin-right: 30px;
-}
-
-.variation {
- display: none;
-}
-
-.signature-attributes {
- font-size: 60%;
- color: #aaa;
- font-style: italic;
- font-weight: lighter;
-}
-
-nav
-{
- display: block;
- float: right;
- margin-top: 28px;
- width: 30%;
- box-sizing: border-box;
- border-left: 1px solid #ccc;
- padding-left: 16px;
-}
-
-nav ul {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
- font-size: 100%;
- line-height: 17px;
- padding: 0;
- margin: 0;
- list-style-type: none;
-}
-
-nav ul a, nav ul a:visited, nav ul a:active {
- font-family: Consolas, Monaco, 'Andale Mono', monospace;
- line-height: 18px;
- color: #4D4E53;
-}
-
-nav h3 {
- margin-top: 12px;
-}
-
-nav li {
- margin-top: 6px;
-}
-
-footer {
- display: block;
- padding: 6px;
- margin-top: 12px;
- font-style: italic;
- font-size: 90%;
-}
-
-h1, h2, h3, h4 {
- font-weight: 200;
- margin: 0;
-}
-
-h1
-{
- font-family: 'Open Sans Light', sans-serif;
- font-size: 48px;
- letter-spacing: -2px;
- margin: 12px 24px 20px;
-}
-
-h2, h3.subsection-title
-{
- font-size: 30px;
- font-weight: 700;
- letter-spacing: -1px;
- margin-bottom: 12px;
-}
-
-h3
-{
- font-size: 24px;
- letter-spacing: -0.5px;
- margin-bottom: 12px;
-}
-
-h4
-{
- font-size: 18px;
- letter-spacing: -0.33px;
- margin-bottom: 12px;
- color: #4d4e53;
-}
-
-h5, .container-overview .subsection-title
-{
- font-size: 120%;
- font-weight: bold;
- letter-spacing: -0.01em;
- margin: 8px 0 3px 0;
-}
-
-h6
-{
- font-size: 100%;
- letter-spacing: -0.01em;
- margin: 6px 0 3px 0;
- font-style: italic;
-}
-
-table
-{
- border-spacing: 0;
- border: 0;
- border-collapse: collapse;
-}
-
-td, th
-{
- border: 1px solid #ddd;
- margin: 0px;
- text-align: left;
- vertical-align: top;
- padding: 4px 6px;
- display: table-cell;
-}
-
-thead tr
-{
- background-color: #ddd;
- font-weight: bold;
-}
-
-th { border-right: 1px solid #aaa; }
-tr > th:last-child { border-right: 1px solid #ddd; }
-
-.ancestors { color: #999; }
-.ancestors a
-{
- color: #999 !important;
- text-decoration: none;
-}
-
-.clear
-{
- clear: both;
-}
-
-.important
-{
- font-weight: bold;
- color: #950B02;
-}
-
-.yes-def {
- text-indent: -1000px;
-}
-
-.type-signature {
- color: #aaa;
-}
-
-.name, .signature {
- font-family: Consolas, Monaco, 'Andale Mono', monospace;
-}
-
-.details { margin-top: 14px; border-left: 2px solid #DDD; }
-.details dt { width: 120px; float: left; padding-left: 10px; padding-top: 6px; }
-.details dd { margin-left: 70px; }
-.details ul { margin: 0; }
-.details ul { list-style-type: none; }
-.details li { margin-left: 30px; padding-top: 6px; }
-.details pre.prettyprint { margin: 0 }
-.details .object-value { padding-top: 0; }
-
-.description {
- margin-bottom: 1em;
- margin-top: 1em;
-}
-
-.code-caption
-{
- font-style: italic;
- font-size: 107%;
- margin: 0;
-}
-
-.prettyprint
-{
- border: 1px solid #ddd;
- width: 80%;
- overflow: auto;
-}
-
-.prettyprint.source {
- width: inherit;
-}
-
-.prettyprint code
-{
- font-size: 100%;
- line-height: 18px;
- display: block;
- padding: 4px 12px;
- margin: 0;
- background-color: #fff;
- color: #4D4E53;
-}
-
-.prettyprint code span.line
-{
- display: inline-block;
-}
-
-.prettyprint.linenums
-{
- padding-left: 70px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-.prettyprint.linenums ol
-{
- padding-left: 0;
-}
-
-.prettyprint.linenums li
-{
- border-left: 3px #ddd solid;
-}
-
-.prettyprint.linenums li.selected,
-.prettyprint.linenums li.selected *
-{
- background-color: lightyellow;
-}
-
-.prettyprint.linenums li *
-{
- -webkit-user-select: text;
- -moz-user-select: text;
- -ms-user-select: text;
- user-select: text;
-}
-
-.params .name, .props .name, .name code {
- color: #4D4E53;
- font-family: Consolas, Monaco, 'Andale Mono', monospace;
- font-size: 100%;
-}
-
-.params td.description > p:first-child,
-.props td.description > p:first-child
-{
- margin-top: 0;
- padding-top: 0;
-}
-
-.params td.description > p:last-child,
-.props td.description > p:last-child
-{
- margin-bottom: 0;
- padding-bottom: 0;
-}
-
-.disabled {
- color: #454545;
-}
diff --git a/docs/styles/prettify-jsdoc.css b/docs/styles/prettify-jsdoc.css
deleted file mode 100644
index 5a2526e..0000000
--- a/docs/styles/prettify-jsdoc.css
+++ /dev/null
@@ -1,111 +0,0 @@
-/* JSDoc prettify.js theme */
-
-/* plain text */
-.pln {
- color: #000000;
- font-weight: normal;
- font-style: normal;
-}
-
-/* string content */
-.str {
- color: #006400;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a keyword */
-.kwd {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* a comment */
-.com {
- font-weight: normal;
- font-style: italic;
-}
-
-/* a type name */
-.typ {
- color: #000000;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a literal value */
-.lit {
- color: #006400;
- font-weight: normal;
- font-style: normal;
-}
-
-/* punctuation */
-.pun {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* lisp open bracket */
-.opn {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* lisp close bracket */
-.clo {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* a markup tag name */
-.tag {
- color: #006400;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a markup attribute name */
-.atn {
- color: #006400;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a markup attribute value */
-.atv {
- color: #006400;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a declaration */
-.dec {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* a variable name */
-.var {
- color: #000000;
- font-weight: normal;
- font-style: normal;
-}
-
-/* a function name */
-.fun {
- color: #000000;
- font-weight: bold;
- font-style: normal;
-}
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums {
- margin-top: 0;
- margin-bottom: 0;
-}
diff --git a/docs/styles/prettify-tomorrow.css b/docs/styles/prettify-tomorrow.css
deleted file mode 100644
index b6f92a7..0000000
--- a/docs/styles/prettify-tomorrow.css
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Tomorrow Theme */
-/* Original theme - https://github.com/chriskempson/tomorrow-theme */
-/* Pretty printing styles. Used with prettify.js. */
-/* SPAN elements with the classes below are added by prettyprint. */
-/* plain text */
-.pln {
- color: #4d4d4c; }
-
-@media screen {
- /* string content */
- .str {
- color: #718c00; }
-
- /* a keyword */
- .kwd {
- color: #8959a8; }
-
- /* a comment */
- .com {
- color: #8e908c; }
-
- /* a type name */
- .typ {
- color: #4271ae; }
-
- /* a literal value */
- .lit {
- color: #f5871f; }
-
- /* punctuation */
- .pun {
- color: #4d4d4c; }
-
- /* lisp open bracket */
- .opn {
- color: #4d4d4c; }
-
- /* lisp close bracket */
- .clo {
- color: #4d4d4c; }
-
- /* a markup tag name */
- .tag {
- color: #c82829; }
-
- /* a markup attribute name */
- .atn {
- color: #f5871f; }
-
- /* a markup attribute value */
- .atv {
- color: #3e999f; }
-
- /* a declaration */
- .dec {
- color: #f5871f; }
-
- /* a variable name */
- .var {
- color: #c82829; }
-
- /* a function name */
- .fun {
- color: #4271ae; } }
-/* Use higher contrast and text-weight for printable form. */
-@media print, projection {
- .str {
- color: #060; }
-
- .kwd {
- color: #006;
- font-weight: bold; }
-
- .com {
- color: #600;
- font-style: italic; }
-
- .typ {
- color: #404;
- font-weight: bold; }
-
- .lit {
- color: #044; }
-
- .pun, .opn, .clo {
- color: #440; }
-
- .tag {
- color: #006;
- font-weight: bold; }
-
- .atn {
- color: #404; }
-
- .atv {
- color: #060; } }
-/* Style */
-/*
-pre.prettyprint {
- background: white;
- font-family: Consolas, Monaco, 'Andale Mono', monospace;
- font-size: 12px;
- line-height: 1.5;
- border: 1px solid #ccc;
- padding: 10px; }
-*/
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums {
- margin-top: 0;
- margin-bottom: 0; }
-
-/* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L4,
-li.L5,
-li.L6,
-li.L7,
-li.L8,
-li.L9 {
- /* */ }
-
-/* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 {
- /* */ }
diff --git a/docs/util.js.html b/docs/util.js.html
index 166d700..717e73f 100644
--- a/docs/util.js.html
+++ b/docs/util.js.html
@@ -121,7 +121,7 @@ util.js
- Documentation generated by JSDoc 3.4.3 on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the docdash theme.
+ Documentation generated by JSDoc 3.4.3 on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the docdash theme.
diff --git a/lib/api/client.js b/lib/api/client.js
index 420634d..447bd3a 100644
--- a/lib/api/client.js
+++ b/lib/api/client.js
@@ -56,6 +56,11 @@ Client.prototype.setSubdomain = function(subdomain) {
}
};
+Client.prototype.convertCamelToUnderscoreProperties = function(obj) {
+ obj = util.convert(obj, util.camelToUnderscore);
+ return obj;
+};
+
// cleans the passed in object, generates the API url/query-string, makes the request, delegates errors and calls callbacks
Client.prototype.makeRequest = function(obj) {
const self = this;
@@ -68,7 +73,7 @@ Client.prototype.makeRequest = function(obj) {
let path = obj.path;
// normalize the rest of the properties
- obj = util.convert(obj, util.camelToUnderscore);
+ obj = this.convertCamelToUnderscoreProperties(obj);
// Add on the api key
obj.api_key = this.options.get('apiKey');
diff --git a/lib/api/matches.js b/lib/api/matches.js
index 3a73393..e85c235 100644
--- a/lib/api/matches.js
+++ b/lib/api/matches.js
@@ -50,7 +50,7 @@ Matches.prototype.index = function(obj) {
* @memberof Matches
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to get the match from
- * @param {string} obj.matchId The id of the match to get
+ * @param {string} obj.matchId OR obj.match_id The id of the match to get
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* Retrieve a single match record for a tournament.
@@ -67,9 +67,10 @@ client.matches.show({
*/
Matches.prototype.show = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.matchId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.match_id;
delete obj.id;
- delete obj.matchId;
+ delete obj.match_id;
obj.method = 'GET';
this.makeRequest(obj);
};
@@ -79,7 +80,7 @@ Matches.prototype.show = function(obj) {
* @memberof Matches
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to update the match in
- * @param {string} obj.matchId The id of the match to update
+ * @param {string} obj.matchId OR obj.match_id The id of the match to update
* @param {object} obj.match The match object with updates. See challonge docs for available properties.
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
@@ -101,9 +102,10 @@ client.matches.update({
*/
Matches.prototype.update = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.matchId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/matches/' + obj.match_id;
delete obj.id;
- delete obj.matchId;
+ delete obj.match_id;
obj.method = 'PUT';
this.makeRequest(obj);
};
diff --git a/lib/api/matches.spec.js b/lib/api/matches.spec.js
index cb64540..5d8f6ab 100644
--- a/lib/api/matches.spec.js
+++ b/lib/api/matches.spec.js
@@ -68,6 +68,19 @@ describe('matches endpoints', () => {
matchId: 123
});
});
+
+ it('should create an appropriate url with a underscore match_id', () => {
+ matchesInstance.makeRequest = (obj) => {
+ expect(obj).toEqual({
+ path: '/25/matches/123',
+ method: 'GET'
+ });
+ };
+ matchesInstance.show({
+ id: 25,
+ match_id: 123
+ });
+ });
});
// update PUT tournaments/:tournament/matches/:match_id
@@ -98,5 +111,18 @@ describe('matches endpoints', () => {
matchId: 123
});
});
+
+ it('should create an appropriate url with an underscore match_id', () => {
+ matchesInstance.makeRequest = (obj) => {
+ expect(obj).toEqual({
+ path: '/25/matches/123',
+ method: 'PUT'
+ });
+ };
+ matchesInstance.update({
+ id: 25,
+ match_id: 123
+ });
+ });
});
});
diff --git a/lib/api/participants.js b/lib/api/participants.js
index ef8f400..bfc0bdb 100644
--- a/lib/api/participants.js
+++ b/lib/api/participants.js
@@ -84,7 +84,7 @@ Participants.prototype.create = function(obj) {
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to get a participant in
- * @param {string} obj.participantId The id of the participant to get
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to get
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* Retrieve a single participant record for a tournament.
@@ -101,9 +101,10 @@ client.participants.show({
*/
Participants.prototype.show = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'GET';
this.makeRequest(obj);
};
@@ -113,7 +114,7 @@ Participants.prototype.show = function(obj) {
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to update a participant in
- * @param {string} obj.participantId The id of the participant to update
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to update
* @param {object} obj.participant The participant object with updates. See challonge docs for available properties.
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
@@ -134,9 +135,10 @@ client.participants.update({
*/
Participants.prototype.update = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'PUT';
this.makeRequest(obj);
};
@@ -146,7 +148,7 @@ Participants.prototype.update = function(obj) {
* @memberof Participants
* @param {object} obj params to pass to the api request
* @param {string} obj.id The url of the tournament to remove a participant from
- * @param {string} obj.participantId The id of the participant to remove
+ * @param {string} obj.participantId OR obj.participant_id The id of the participant to remove
* @param {function} obj.callback A method to call when the API returns. Arguments are (error, data)
* @description
* If the tournament has not started, delete a participant, automatically filling in the abandoned seed number. If tournament is underway, mark a participant inactive, automatically forfeiting his/her remaining matches.
@@ -163,9 +165,10 @@ client.participants.destroy({
*/
Participants.prototype.destroy = function(obj) {
- obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participantId;
+ obj = this.convertCamelToUnderscoreProperties(obj);
+ obj.path = '/' + this.options.get('subdomain') + obj.id + '/participants/' + obj.participant_id;
delete obj.id;
- delete obj.participantId;
+ delete obj.participant_id;
obj.method = 'DELETE';
this.makeRequest(obj);
};
diff --git a/lib/api/participants.spec.js b/lib/api/participants.spec.js
index 5ccc6cf..93739de 100644
--- a/lib/api/participants.spec.js
+++ b/lib/api/participants.spec.js
@@ -94,6 +94,19 @@ describe('participants endpoints', () => {
participantId: 456
});
});
+
+ it('should create an appropriate url with an underscore participant_id', () => {
+ participantsInstance.makeRequest = (obj) => {
+ expect(obj).toEqual({
+ path: '/25/participants/456',
+ method: 'GET'
+ });
+ };
+ participantsInstance.show({
+ id: 25,
+ participant_id: 456
+ });
+ });
});
// update PUT tournaments/:tournament/participants/:participant_id
@@ -123,6 +136,18 @@ describe('participants endpoints', () => {
participantId: 456
});
});
+ it('should create an appropriate url with an underscore participant_id', () => {
+ participantsInstance.makeRequest = (obj) => {
+ expect(obj).toEqual({
+ path: '/25/participants/456',
+ method: 'PUT'
+ });
+ };
+ participantsInstance.update({
+ id: 25,
+ participant_id: 456
+ });
+ });
});
// destroy DELETE tournaments/:tournament/participants/:participant_id
@@ -152,6 +177,19 @@ describe('participants endpoints', () => {
participantId: 456
});
});
+
+ it('should create an appropriate url with an underscore participant_id', () => {
+ participantsInstance.makeRequest = (obj) => {
+ expect(obj).toEqual({
+ path: '/25/participants/456',
+ method: 'DELETE'
+ });
+ };
+ participantsInstance.destroy({
+ id: 25,
+ participant_id: 456
+ });
+ });
});
// randomize GET tournaments/:tournament/participants/randomize
diff --git a/package.json b/package.json
index 4e7f551..f3c1ac6 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"description": "Wrapper for the challong api",
"author": "Aaron Tiwell ",
"main": "./lib/challonge.js",
- "version": "2.1.0",
+ "version": "2.1.1",
"contributors": [
{
"name": "Ricardo Reis",