updated client

Author: DanielJDufour

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@code.gov/api-client",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Client for Interacting with Code.gov API",
   "main": "dist/bundle.js",
   "scripts": {

package.json

@@ -27,7 +27,7 @@ function cleanRepo(repo) {
 
 class CodeGovAPIClient {
   constructor(options = {}) {
-    this.base = options.base || 'https://api.code.gov/'
+    this._base = options.base || 'https://api.code.gov/'
     this.remember = options.remember || false
     this.debug = options.debug || false
     this.tasksUrl = options.tasksUrl || 'https://raw.githubusercontent.com/GSA/code-gov-data/master/help-wanted.json'
@@ -71,7 +71,7 @@ class CodeGovAPIClient {
    * });
    */
   getAgencies(size = 10) {
-    const url = `${this.base}agencies?api_key=${this.api_key}&size=${size}`
+    const url = `${this._base}agencies?api_key=${this.api_key}&size=${size}`
     return get(url).then(response => {
         return response.data.agencies.sort((a, b) => {
           return (a.name || a.term).toLowerCase() < (b.name || b.term).toLowerCase() ? -1 : 1
@@ -142,10 +142,9 @@ class CodeGovAPIClient {
    * });
    */
   getRepoById(repoId = '') {
-    let url = `${this.base}repos/${repoId}`
+    let url = `${this._base}repos/${repoId}`
     if (this.api_key) url += `?api_key=${this.api_key}`
-    return get(url).then(response => {
-      const { data } = response
+    return this.getJSON(url).then(data => {
       // if the response is returned as an array
       if (some(data)) {
         return data[0]
@@ -171,10 +170,11 @@ class CodeGovAPIClient {
    */
   suggest(term = '', size = 10) {
     if (term && term.length > 2) {
-      let url = `${this.base}terms?term=${term}&size=${size}`
+      let url = `${this._base}terms?term=${term}&size=${size}`
       if (this.api_key) url += `&api_key=${this.api_key}`
       if (this.debug) console.log('url:', url)
-      return get(url).then(response => response.data.terms)
+      return this.getJSON(url)
+        .then(data => data.terms.map(term => term.term))
     }
     else {
       return Promise.resolve([])
@@ -198,7 +198,7 @@ class CodeGovAPIClient {
       from = this.from
     }
 
-    let url = `${this.base}repos?size=${size}&api_key=${this.api_key}`
+    let url = `${this._base}repos?size=${size}&api_key=${this.api_key}`
 
     if (from && from > 0) {
       url += `&from=${from}`
@@ -246,7 +246,6 @@ class CodeGovAPIClient {
     if (this.debug) console.log('fetching url:', url)
 
     return this.getJSON(url).then(dirty => {
-      console.log('dirty:', dirty);
       dirty.repos = dirty.repos.map(cleanRepo)
       return dirty
     })
@@ -272,7 +271,7 @@ class CodeGovAPIClient {
   }
 
   getStatus() {
-    return this.getJSON(`${this.base}status.json`)
+    return this.getJSON(`${this._base}status.json`)
   }
 
 

src/index.js

@@ -5,7 +5,7 @@ let CodeGovAPIClient = require("../src/index.js").CodeGovAPIClient;
 let client = new CodeGovAPIClient({
   api_key: process.env.CODE_GOV_API_KEY,
   base: process.env.CODE_GOV_API_BASE,
-  debug: true
+  debug: false
 });
 
 describe('Getting Information', function() {
@@ -70,7 +70,7 @@ describe('Getting Information', function() {
         this.timeout(50000);
         client.suggest("National").then(searchResults => {
           expect(searchResults.length).to.be.above(2);
-          expect(searchResults[0].term.toLowerCase()).to.have.string('national');
+          expect(searchResults[0].toLowerCase()).to.have.string('national');
           done();
         });
     });
@@ -89,8 +89,9 @@ describe('Getting Information', function() {
   describe("Getting Individual Repositories", function() {
     it("should get correct result", function(done) {
       this.timeout(50000);
-      let repoId = "cfpb_new_clouseau_";
-      client.getRepoById(repoId).then(repo => {
+      let repoID = "doe_sandia_national_laboratories_snl_water_network_tool_for_resilience_v_1_0";
+      client.getRepoById(repoID).then(repo => {
+        expect(repo.repoID).to.equal(repoID)
         done();
       });
     });