Merge pull request #31 from lexich/add_postfetch_option

lexich · lexich · commit d04b678b6fa2 · 2015-12-17T14:01:51.000+03:00
Add postfetch option
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,4 @@
 {
   "presets": ["es2015", "stage-0"],
+  "plugins": ["add-module-exports"]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -45,6 +45,7 @@
     "no-empty": 0,
     "guard-for-in": 0,
     "comma-dangle": 0,
-    "space-before-function-paren": 0
+    "space-before-function-paren": 0,
+    "arrow-spacing": [2, { "before": false, "after": true }]
   }
 }
diff --git a/README.md b/README.md
@@ -181,6 +181,25 @@ function (state, action) {
 }
 ```
 
+####postfetch
+- @description: you can organize chain of calling events after the current endpoint will be successful executed
+- @type: Array<Function>
+- @default: null
+- @example:
+```js
+{
+  user: "/user/info",
+  logout: {
+    url: "/user/logout",
+    postfetch: [
+      function({data, dispatch, getState}) {
+        dispatch(actions.user.reset());
+      }      
+    ]    
+  }
+}
+```
+
 ####validation (data, callback)
 - @param **data** - response data
   > type: Object
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-api",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/redux-api.min.js",
   "dependencies": {}
 }
diff --git a/dist/redux-api.js b/dist/redux-api.js
diff --git a/dist/redux-api.js.map b/dist/redux-api.js.map
diff --git a/dist/redux-api.min.js b/dist/redux-api.min.js
diff --git a/dist/redux-api.min.js.map b/dist/redux-api.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-api",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "author": {
     "name": "Efremov Alex",
     "email": "lexich121@gmail.com",
@@ -31,16 +31,17 @@
   },
   "devDependencies": {
     "babel": "^6.3.13",
-    "babel-cli": "^6.3.15",
-    "babel-core": "^6.3.15",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.17",
     "babel-eslint": "^4.1.6",
     "babel-loader": "^6.2.0",
+    "babel-plugin-add-module-exports": "^0.1.1",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "chai": "^3.4.1",
-    "coveralls": "^2.11.4",
+    "coveralls": "^2.11.6",
     "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^2.0.0",
+    "eslint-config-airbnb": "^2.1.1",
     "eslint-plugin-react": "^3.11.3",
     "husky": "^0.10.2",
     "isparta": "^4.0.0",
diff --git a/src/actionFn.js b/src/actionFn.js
@@ -96,6 +96,9 @@ export default function actionFn(url, name, options, ACTIONS={}, meta={}) {
           .then((data)=> {
             dispatch({ type: actionSuccess, syncing: false, data });
             each(meta.broadcast, (btype)=> dispatch({ type: btype, data }));
+            each(meta.postfetch, (postfetch)=> {
+              isFunction(postfetch) && postfetch({ data, getState, dispatch });
+            });
             pubsub.resolve(getState()[name]);
           })
           .catch((error)=> {
diff --git a/src/index.js b/src/index.js
@@ -95,7 +95,7 @@ export default function reduxApi(config) {
 
     const {
       url, options, transformer, broadcast,
-      reducerName, prefetch, validation, helpers
+      reducerName, prefetch, postfetch, validation, helpers
     } = opts;
 
     const ACTIONS = {
@@ -113,7 +113,7 @@ export default function reduxApi(config) {
       broadcast,
       virtual: !!opts.virtual,
       actions: memo.actions,
-      prefetch, validation, helpers,
+      prefetch, postfetch, validation, helpers
     };
 
     memo.actions[key] = actionFn(url, key, options, ACTIONS, meta);
diff --git a/test/actionFn_spec.js b/test/actionFn_spec.js
@@ -186,7 +186,7 @@ describe("actionFn", function() {
       callOptions++;
       return { ...params,  test: 1 };
     }, ACTIONS, {
-      fetch: function(url, opts) {
+      fetch(url, opts) {
         checkOptions = opts;
         return fetchSuccess();
       }
@@ -336,6 +336,49 @@ describe("actionFn", function() {
       expect(expData).to.eql({ msg: "hello" });
     });
   });
+  it("check postfetch option", function() {
+    let expectedOpts;
+    const meta = {
+      fetch: fetchSuccess,
+      postfetch: [
+        function(opts) {
+          expectedOpts = opts;
+          opts.dispatch({ type: "One", data: opts.data });
+        },
+        function(opts) {
+          opts.dispatch({ type: "Two", data: opts.data });
+        }
+      ]
+    };
+    const api = actionFn("/test/:id", "test", null, ACTIONS, meta);
+    const expectedEvent = [{
+      type: ACTIONS.actionFetch,
+      syncing: false
+    }, {
+      type: ACTIONS.actionSuccess,
+      data: { msg: "hello" },
+      syncing: false
+    }, {
+      type: "One",
+      data: { msg: "hello" }
+    }, {
+      type: "Two",
+      data: { msg: "hello" }
+    }];
+    function dispatch(msg) {
+      expect(expectedEvent).to.have.length.above(0);
+      const exp = expectedEvent.shift();
+      expect(msg).to.eql(exp);
+    }
+    return new Promise((resolve)=> {
+      api(resolve)(dispatch, getState);
+    }).then(()=> {
+      expect(expectedOpts).to.exist;
+      expect(expectedOpts).to.include.keys("data", "getState", "dispatch");
+      expect(expectedOpts.getState).to.eql(getState);
+      expect(expectedOpts.dispatch).to.eql(dispatch);
+    });
+  });
   it("check prefetch option", function() {
     const checkPrefetch = [];
     const meta = {
@@ -348,7 +391,7 @@ describe("actionFn", function() {
         function(opts, cb) {
           checkPrefetch.push(["two", opts]);
           cb();
-        },
+        }
       ]
     };
     const api = actionFn("/test/:id", "test", null, ACTIONS, meta);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": ["es2015", "stage-0"],`
	`3`	`+ "plugins": ["add-module-exports"]`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`"no-empty": 0,`
`46`	`46`	`"guard-for-in": 0,`
`47`	`47`	`"comma-dangle": 0,`
`48`		`- "space-before-function-paren": 0`
	`48`	`+ "space-before-function-paren": 0,`
	`49`	`+ "arrow-spacing": [2, { "before": false, "after": true }]`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redux-api",`
`3`		`- "version": "0.7.1",`
	`3`	`+ "version": "0.7.2",`
`4`	`4`	`"main": "dist/redux-api.min.js",`
`5`	`5`	`"dependencies": {}`
`6`	`6`	`}`