diff --git a/bin/index.js b/bin/index.js index 7e138cb..cf74971 100644 --- a/bin/index.js +++ b/bin/index.js @@ -1,5 +1,5 @@ #!/usr/bin/env node var path = require('path'); var fs = require('fs'); -var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib'); -require(lib + '/shopsense.js'); +var src = path.join(path.dirname(fs.realpathSync(__filename)), '../src'); +require(src + '/shopsense.js'); diff --git a/src/httpclient.js b/src/httpclient.js index ace9f3f..11585b3 100644 --- a/src/httpclient.js +++ b/src/httpclient.js @@ -1,7 +1,9 @@ var Future = require('future'); var request = require('request'); -module.exports = function(url, future){ +module.exports = function(url){ + var future = new Future(); request.get({url:url, json:true}, function (e, r, d) { future.deliver(d); }); + return future; }; diff --git a/src/shopsense.js b/src/shopsense.js index 06916a2..5367b72 100644 --- a/src/shopsense.js +++ b/src/shopsense.js @@ -1,4 +1,3 @@ -var Future = require('future'); var httpClient = require("./httpclient.js"); var ShopSense = (function () { @@ -82,9 +81,8 @@ var ShopSense = (function () { return future; }, _get: function(url, params){ - var future = new Future(); url += this._serialize(params); - _httpClient(url, future); + var future = _httpClient(url); return future; }, product: function(id) {