Skip to content

Commit d939f8d

Browse files
authored
Merge pull request #33 from Tidwell/master
2.1.1 Release PR
2 parents 56cc284 + f2cb11c commit d939f8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+145
-11860
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 2.1.1
2+
- Fix bug preventing match_id and participant_id passed as underscore properties for URL generation #32
3+
14
### 2.1.0
25
- Fix null values being returned as empty objects (#24)
36
- Add processCheckIns and abortCheckIn methods to tournament api

docs/Client.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ <h6>Properties</h6>
383383
<br class="clear">
384384

385385
<footer>
386-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
386+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
387387
</footer>
388388

389389
<script>prettyPrint();</script>

docs/Matches.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ <h6>Properties</h6>
608608

609609

610610

611-
<td class="description last">The id of the match to get</td>
611+
<td class="description last">OR obj.match_id The id of the match to get</td>
612612
</tr>
613613

614614

@@ -677,7 +677,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>update<span cla
677677

678678
<dt class="tag-source">Source:</dt>
679679
<dd class="tag-source"><ul class="dummy"><li>
680-
<a href="api_matches.js.html">api/matches.js</a>, <a href="api_matches.js.html#line103">line 103</a>
680+
<a href="api_matches.js.html">api/matches.js</a>, <a href="api_matches.js.html#line104">line 104</a>
681681
</li></ul></dd>
682682

683683

@@ -852,7 +852,7 @@ <h6>Properties</h6>
852852

853853

854854

855-
<td class="description last">The id of the match to update</td>
855+
<td class="description last">OR obj.match_id The id of the match to update</td>
856856
</tr>
857857

858858

@@ -945,7 +945,7 @@ <h6>Properties</h6>
945945
<br class="clear">
946946

947947
<footer>
948-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
948+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
949949
</footer>
950950

951951
<script>prettyPrint();</script>

docs/Matches_.html

Lines changed: 0 additions & 218 deletions
This file was deleted.

docs/Participants.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ <h4 class="name" id="destroy"><span class="type-signature"></span>destroy<span c
466466

467467
<dt class="tag-source">Source:</dt>
468468
<dd class="tag-source"><ul class="dummy"><li>
469-
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line165">line 165</a>
469+
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line167">line 167</a>
470470
</li></ul></dd>
471471

472472

@@ -637,7 +637,7 @@ <h6>Properties</h6>
637637

638638

639639

640-
<td class="description last">The id of the participant to remove</td>
640+
<td class="description last">OR obj.participant_id The id of the participant to remove</td>
641641
</tr>
642642

643643

@@ -922,7 +922,7 @@ <h4 class="name" id="randomize"><span class="type-signature"></span>randomize<sp
922922

923923
<dt class="tag-source">Source:</dt>
924924
<dd class="tag-source"><ul class="dummy"><li>
925-
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line192">line 192</a>
925+
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line195">line 195</a>
926926
</li></ul></dd>
927927

928928

@@ -1309,7 +1309,7 @@ <h6>Properties</h6>
13091309

13101310

13111311

1312-
<td class="description last">The id of the participant to get</td>
1312+
<td class="description last">OR obj.participant_id The id of the participant to get</td>
13131313
</tr>
13141314

13151315

@@ -1378,7 +1378,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>update<span cla
13781378

13791379
<dt class="tag-source">Source:</dt>
13801380
<dd class="tag-source"><ul class="dummy"><li>
1381-
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line136">line 136</a>
1381+
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line137">line 137</a>
13821382
</li></ul></dd>
13831383

13841384

@@ -1552,7 +1552,7 @@ <h6>Properties</h6>
15521552

15531553

15541554

1555-
<td class="description last">The id of the participant to update</td>
1555+
<td class="description last">OR obj.participant_id The id of the participant to update</td>
15561556
</tr>
15571557

15581558

@@ -1645,7 +1645,7 @@ <h6>Properties</h6>
16451645
<br class="clear">
16461646

16471647
<footer>
1648-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
1648+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
16491649
</footer>
16501650

16511651
<script>prettyPrint();</script>

docs/Tournaments.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2356,7 +2356,7 @@ <h6>Properties</h6>
23562356
<br class="clear">
23572357

23582358
<footer>
2359-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
2359+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
23602360
</footer>
23612361

23622362
<script>prettyPrint();</script>

docs/api_client.js.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ <h1 class="page-title">api/client.js</h1>
9595
}
9696
};
9797

98+
Client.prototype.convertCamelToUnderscoreProperties = function(obj) {
99+
obj = util.convert(obj, util.camelToUnderscore);
100+
return obj;
101+
};
102+
98103
// cleans the passed in object, generates the API url/query-string, makes the request, delegates errors and calls callbacks
99104
Client.prototype.makeRequest = function(obj) {
100105
const self = this;
@@ -107,7 +112,7 @@ <h1 class="page-title">api/client.js</h1>
107112
let path = obj.path;
108113

109114
// normalize the rest of the properties
110-
obj = util.convert(obj, util.camelToUnderscore);
115+
obj = this.convertCamelToUnderscoreProperties(obj);
111116

112117
// Add on the api key
113118
obj.api_key = this.options.get('apiKey');
@@ -175,7 +180,7 @@ <h1 class="page-title">api/client.js</h1>
175180
<br class="clear">
176181

177182
<footer>
178-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
183+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
179184
</footer>
180185

181186
<script>prettyPrint();</script>

docs/api_error-handler.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ <h1 class="page-title">api/error-handler.js</h1>
120120
<br class="clear">
121121

122122
<footer>
123-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
123+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
124124
</footer>
125125

126126
<script>prettyPrint();</script>

0 commit comments

Comments
 (0)