Merge pull request #69 from lenage/master

Remove path prefix '/resource' for endpoint url
yahoo · Apr 8, 2015 · 2913e2c · 2913e2c
2 parents 9cecc83 + f8347d4
commit 2913e2c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/libs/fetcher.client.js b/libs/fetcher.client.js
@@ -290,7 +290,7 @@ Queue.prototype = {
          * @private
          */
         _constructGetUri: function (uri, resource, params, config) {
-            var query = [], matrix = [], id_param = config.id_param, id_val, final_uri = uri + '/resource/' + resource;
+            var query = [], matrix = [], id_param = config.id_param, id_val, final_uri = uri + '/' + resource;
             lodash.forEach(params, function (v, k) {
                 if (k === id_param) {
                     id_val = encodeURIComponent(v);

diff --git a/libs/fetcher.js b/libs/fetcher.js
@@ -93,7 +93,7 @@ function parseParamValues (params) {
             var request;
 
             if (req.method === GET) {
-                var path = req.path.substr(req.path.lastIndexOf('/resource/') + '/resource/'.length).split(';');
+                var path = req.path.substr(1).split(';');
                 request = {
                     req: req,
                     resource: path.shift(),

diff --git a/tests/unit/libs/fetcher.js b/tests/unit/libs/fetcher.js
@@ -40,7 +40,7 @@ describe('Server Fetcher', function () {
                     statusCodeSet = false,
                     req = {
                         method: 'POST',
-                        path: '/resource/' + mockService.name,
+                        path: '/' + mockService.name,
                         body: {
                             requests: {},
                             context: {
@@ -73,7 +73,7 @@ describe('Server Fetcher', function () {
                     statusCodeSet = false,
                     req = {
                         method: 'POST',
-                        path: '/resource/' + mockService.name,
+                        path: '/' + mockService.name,
                         body: {
                             requests: {
                                 g0: {
@@ -127,7 +127,7 @@ describe('Server Fetcher', function () {
                     statusCodeSet = false,
                     req = {
                         method: 'POST',
-                        path: '/resource/' + mockService.name,
+                        path: '/' + mockService.name,
                         body: {
                             requests: {
                                 g0: {
@@ -185,7 +185,7 @@ describe('Server Fetcher', function () {
                         statusCodeSet = false,
                         req = {
                             method: 'POST',
-                            path: '/resource/' + mockErrorService.name,
+                            path: '/' + mockErrorService.name,
                             body: {
                                 requests: {
                                     g0: {
@@ -243,7 +243,7 @@ describe('Server Fetcher', function () {
                     },
                     req = {
                         method: 'GET',
-                        path: '/resource/' + mockService.name + ';' + qs.stringify(params, ';')
+                        path: '/' + mockService.name + ';' + qs.stringify(params, ';')
                     },
                     res = {
                         json: function(response) {
@@ -283,7 +283,7 @@ describe('Server Fetcher', function () {
                     },
                     req = {
                         method: 'GET',
-                        path: '/resource/' + mockService.name + ';' + qs.stringify(params, ';')
+                        path: '/' + mockService.name + ';' + qs.stringify(params, ';')
                     },
                     res = {
                         json: function(response) {
@@ -323,7 +323,7 @@ describe('Server Fetcher', function () {
                         statusCodeSet = false,
                         req = {
                             method: 'GET',
-                            path: '/resource/' + mockErrorService.name + ';' + qs.stringify(params, ';')
+                            path: '/' + mockErrorService.name + ';' + qs.stringify(params, ';')
                         },
                         res = {
                             json: function(response) {