made it my way

mdrohmann · Sep 11, 2015 · 031005f · 031005f
1 parent f1a79a0
commit 031005f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fluxible-plugin-fetchr",
-  "version": "0.3.7",
+  "version": "1.0.0",
   "description": "A plugin for Fluxible applications to provide an isomorphic interface for RESTful services",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "debug": "^2.0.0",
-    "fetchr": "^0.5.14"
+    "fetchr": "[email protected]:mdrohmann/fetchr.git"
   },
   "devDependencies": {
     "chai": "^2.0.0",

diff --git a/tests/fixtures/services/test.js b/tests/fixtures/services/test.js
@@ -17,7 +17,7 @@ module.exports = {
     update: function update(req, resource, params, config, body, callback) {
         callback(null, 'update');
     },
-    'delete': function del(req, resource, params, config, callback) {
+    'delete': function del(req, resource, params, config, body, callback) {
         callback(null, 'delete');
     }
 };
diff --git a/tests/unit/lib/fetchr-plugin.js b/tests/unit/lib/fetchr-plugin.js
@@ -89,7 +89,7 @@ describe('fetchrPlugin', function () {
             });
             describe('delete', function () {
                 it('should call the service\'s delete method', function (done) {
-                    actionContext.service['delete']('test', {}, function (err, result) {
+                    actionContext.service['delete']('test', {}, null, function (err, result) {
                         expect(result).to.equal('delete');
                         expect(actionContext.getServiceMeta()).to.be.empty;
                         done();
@@ -169,9 +169,12 @@ describe('fetchrPlugin', function () {
 
                 expect(actionContext.service.constructGetXhrUri(
                     'resourceFoo',
-                    {a: 1},
+                    {
+                        query: {a: 1},
+                        paths: ['a', 'b']
+                    },
                     {cors: true}
-                )).to.equal('http://example.com/resourceFoo;a=1?device=tablet', 'default construct uri function');
+                )).to.equal('http://example.com/resourceFoo/a/b?a=1&device=tablet', 'default construct uri function');
             });
         });
 
@@ -188,14 +191,17 @@ describe('fetchrPlugin', function () {
 
                 expect(actionContext.service.constructGetXhrUri(
                     'resourceFoo',
-                    {a: 1}
-                )).to.equal('custom2/api/resourceFoo;a=1?device=tablet', 'default construct uri function');
+                    {
+                        query: {a: 1},
+                        paths: ['a', 'b'],
+                    }
+                )).to.equal('custom2/api/resourceFoo/a/b?a=1&device=tablet', 'default construct uri function');
 
                 expect(actionContext.service.constructGetXhrUri(
                     'resourceFoo',
-                    {a: 1},
+                    { query: {a: 1}},
                     {
-                        constructGetUri: function () {
+                        constructUri: function () {
                             return '/customGetUri';
                         }
                     }