Fixed issue #2

Author: khurrumqureshi

lib/model/currencypair.js

@@ -55,6 +55,7 @@ CurrencyPair.prototype.getQuoteCurrency = function () {
  * Returns a string representation of the pair.
  * @returns string
  */
-CurrencyPair.prototype.toString = function () {
-  return this.baseCurrency + '/' + this.quoteCurrency;
+CurrencyPair.prototype.toString = function (seprator) {
+  seprator = _.isUndefined(seprator) ? '/' : seprator;
+  return this.baseCurrency + seprator + this.quoteCurrency;
 };

lib/provider/currencylayer.js

@@ -13,7 +13,7 @@ var _ = require('lodash');
 var Rate = require('../model/rate');
 var UnsupportedCurrencyPairException = require('../error/UnsupportedCurrencyPairException');
 
-const URL = 'http://apilayer.net/api/convert?access_key=%s&from=%s&to=%s&amount=1&format=1';
+const URL = 'http://apilayer.net/api/live?access_key=%s&currencies=%s&source=%s&format=1';
 const Provider = 'Currency Layer';
 
 /**
@@ -60,7 +60,7 @@ util.inherits(CurrencyLayerProvider, AbstractProvider);
 CurrencyLayerProvider.prototype.fetchRate = function (currencyPair, callback) {
     var self = this;
 
-    var url = sprintf(URL, self.accessKey, currencyPair.getBaseCurrency() + currencyPair.getQuoteCurrency());
+    var url = sprintf(URL, self.accessKey, currencyPair.getQuoteCurrency(), currencyPair.getBaseCurrency());
 
     self.fetchContent(url, function (err, content) {
         if (err) {
@@ -75,12 +75,12 @@ CurrencyLayerProvider.prototype.fetchRate = function (currencyPair, callback) {
                 return callback(new Error(data.error.info), null);
             }
 
-            if (_.isUndefined(data) || _.isUndefined(data.result)) {
+            if (_.isUndefined(data) || _.isUndefined(data.quotes || _.isUndefined(data.quotes[currencyPair.toString('')]))) {
                 return callback(new UnsupportedCurrencyPairException(currencyPair, Provider), null);
             }
 
-            var date = data.info && data.info.timestamp ? new Date(data.info.timestamp * 1000) : new Date();
-            return callback(null, new Rate(data.result.toString(), date, Provider));
+            var date = data.timestamp ? new Date(data.timestamp * 1000) : new Date();
+            return callback(null, new Rate(data.quotes[currencyPair.toString('')], date, Provider));
         }
         catch (err) {
             return callback(err, null);
@@ -95,7 +95,7 @@ CurrencyLayerProvider.prototype.fetchRate = function (currencyPair, callback) {
 CurrencyLayerProvider.prototype.fetchRateSync = function (currencyPair) {
     var self = this;
 
-    var url = sprintf(URL, self.accessKey, currencyPair.getBaseCurrency() + currencyPair.getQuoteCurrency());
+    var url = sprintf(URL, self.accessKey, currencyPair.getQuoteCurrency(), currencyPair.getBaseCurrency());
     var content = this.fetchContentSync(url);
 
     // Parse the content fetch from currency layer
@@ -105,10 +105,10 @@ CurrencyLayerProvider.prototype.fetchRateSync = function (currencyPair) {
         throw new Error(data.error.info);
     }
 
-    if (_.isUndefined(data) || _.isUndefined(data.result)) {
+    if (_.isUndefined(data) || _.isUndefined(data.quotes) || _.isUndefined(data.quotes[currencyPair.toString('')])) {
         throw new UnsupportedCurrencyPairException(currencyPair, Provider);
     }
 
-    var date = data.info && data.info.timestamp ? new Date(data.info.timestamp * 1000) : new Date();
-    return new Rate(data.result.toString(), date, Provider);
+    var date = data.timestamp ? new Date(data.timestamp * 1000) : new Date();
+    return new Rate(data.quotes[currencyPair.toString('')], date, Provider);
 };

test/provider/currencylayer.js

@@ -37,8 +37,7 @@ describe('currency layer provider', function () {
 
         assert.throw(function () {
                 provider.fetchRateSync(currencyPair);
-            }, UnsupportedCurrencyPairException,
-            'The currency pair "USD/XXL" is not supported or "Currency Layer" changed the response format')
+            }, Error)
     });
 
     it('it_fetches_a_rate_sync', function () {
@@ -55,8 +54,7 @@ describe('currency layer provider', function () {
         provider.fetchRate(currencyPair, function (err, rate) {
             assert.throw(function () {
                     throw err;
-                }, UnsupportedCurrencyPairException,
-                'The currency pair "USD/XXL" is not supported or "Currency Layer" changed the response format');
+                }, Error);
             done();
         });
     });