Merge pull request #20 from lexich/request_validation

Add validation to request helper

.babelrc

@@ -1,4 +1,3 @@
 {
-  "stage": 0,
-  "loose": "all"
+  "presets": ["es2015", "stage-0"],
 }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-api",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "main": "dist/redux-api.min.js",
   "dependencies": {}
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-api",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "author": {
     "name": "Efremov Alex",
     "email": "lexich121@gmail.com",
@@ -12,9 +12,9 @@
   "repository": "http://github.com/lexich/redux-api",
   "scripts": {
     "test": "npm run eslint && npm run mocha",
-    "mocha": "istanbul test _mocha --report html -- --require babel/register test/*_spec.js --reporter spec",
+    "mocha": "istanbul test _mocha --report html -- --require babel-core/register test/*_spec.js --reporter spec",
     "build": "rm -rf dist lib && npm run browser-dev && npm run browser-min && npm run compile",
-    "coveralls": "istanbul cover node_modules/.bin/_mocha --report html --report lcovonly -- --require babel/register  test/*_spec.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "coveralls": "istanbul cover node_modules/.bin/_mocha --report html --report lcovonly -- --require babel-core/register  test/*_spec.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
     "eslint": "node_modules/.bin/eslint src test examples/isomorphic/app examples/isomorphic/server.js",
     "compile": "node_modules/.bin/babel src --out-dir lib",
     "browser-dev": "node_modules/.bin/webpack -d src/index.js dist/redux-api.js",
@@ -29,19 +29,23 @@
     "qs": "^5.2.0"
   },
   "devDependencies": {
-    "babel": "^5.8.23",
+    "babel": "^6.0.15",
+    "babel-cli": "^6.1.2",
+    "babel-core": "^6.1.2",
     "babel-eslint": "^4.1.3",
-    "babel-loader": "^5.3.2",
-    "chai": "^3.3.0",
+    "babel-loader": "^6.1.0",
+    "babel-preset-es2015": "^6.1.2",
+    "babel-preset-stage-0": "^6.1.2",
+    "chai": "^3.4.1",
     "coveralls": "^2.11.4",
-    "eslint": "^1.6.0",
-    "eslint-config-airbnb": "^0.1.0",
-    "eslint-plugin-react": "^3.5.1",
+    "eslint": "^1.9.0",
+    "eslint-config-airbnb": "^1.0.0",
+    "eslint-plugin-react": "^3.8.0",
     "husky": "^0.10.1",
-    "istanbul": "^0.3.22",
+    "istanbul": "^0.4.0",
     "mocha": "^2.3.3",
     "mocha-lcov-reporter": "^1.0.0",
-    "webpack": "^1.12.2"
+    "webpack": "^1.12.4"
   },
   "engines": {
     "node": ">=0.12.0"

src/actionFn.js

@@ -48,7 +48,11 @@ export default function actionFn(url, name, options, ACTIONS={}, meta={}) {
     const urlT = urlTransform(url, pathvars);
     const baseOptions = isFunction(options) ? options(urlT, params, getState) : options;
     const opts = { ...baseOptions, ...params };
-    return meta.holder.fetch(urlT, opts);
+    const response = meta.holder.fetch(urlT, opts);
+    return !meta.validation ? response : response.then(
+      (data)=> new Promise(
+        (resolve, reject)=> meta.validation(data,
+          (err)=> err ? reject(err) : resolve(data))));
   };
 
   /**
@@ -77,9 +81,6 @@ export default function actionFn(url, name, options, ACTIONS={}, meta={}) {
 
       fetchResolver(0, fetchResolverOpts,
         (err)=> err ? pubsub.reject(err) : request(pathvars, params, getState)
-          .then((data)=> !meta.validation ? data :
-              new Promise((resolve, reject)=> meta.validation(data,
-                (err)=> err ? reject(err) : resolve(data))))
           .then((data)=> {
             dispatch({ type: actionSuccess, syncing: false, data });
             each(meta.broadcast, (btype)=> dispatch({type: btype, data}));

test/actionFn_spec.js

@@ -76,14 +76,21 @@ describe("actionFn", function() {
 
   it("check request method", function() {
     let executeCounter = 0;
-    const api = actionFn("/test", "test", null, ACTIONS, {holder: {fetch: ()=> {
-      executeCounter++;
-      return fetchSuccess();
-    }}});
-    const async = api.request();
+    let urlFetch, paramsFetch;
+    const api = actionFn("/test/:id", "test", null, ACTIONS, {holder: {
+      fetch: (url, params)=> {
+        executeCounter++;
+        urlFetch = url;
+        paramsFetch = params;
+        return fetchSuccess();
+      }
+    }});
+    const async = api.request({id: 2}, {hello: "world"});
     expect(async).to.be.an.instanceof(Promise);
     return async.then((data)=> {
       expect(data).to.eql({msg: "hello"});
+      expect(urlFetch).to.eql("/test/2");
+      expect(paramsFetch).to.eql({hello: "world"});
     });
   });
 
@@ -250,6 +257,23 @@ describe("actionFn", function() {
       expect(expectedEvent).to.have.length(0);
     });
   });
+  it("check validation with request method", function() {
+    let expData, counter = 0;
+    const meta = {
+      holder: {fetch: fetchSuccess},
+      validation(data, cb) {
+        counter++;
+        expData = data;
+        cb();
+      }
+    };
+    const api = actionFn("/test/:id", "test", null, ACTIONS, meta);
+    return api.request({id: 1}).then((data)=> {
+      expect(data).to.eql({msg: "hello"});
+      expect(counter).to.eql(1);
+      expect(expData).to.eql({msg: "hello"});
+    });
+  });
   it("check success validation", function() {
     let expData, counter = 0;
     const meta = {

test/adapters_fetch_spec.js

@@ -1,8 +1,8 @@
 "use strict";
 /* global describe, it */
 
-const expect = require("chai").expect;
-const fetch = require("../src/adapters/fetch");
+import {expect} from "chai";
+import fetch from "../src/adapters/fetch";
 
 describe("fetch adapters", function() {
   it("check", function() {

test/index_spec.js

@@ -1,11 +1,11 @@
 "use strict";
 /* global describe, it */
 
-const expect = require("chai").expect;
-const reduxApi = require("../src/index.js").default;
-const transformers = require("../src/index.js").transformers;
-const isFunction = require("lodash/lang/isFunction");
-const size = require("lodash/collection/size");
+import {expect} from "chai";
+import reduxApi from "../src/index.js";
+import {transformers} from "../src/index.js";
+import isFunction from "lodash/lang/isFunction";
+import size from "lodash/collection/size";
 
 function getState() {
   return {test: {loading: false, data: {}}};

test/reducerFn_spec.js

@@ -1,9 +1,9 @@
 "use strict";
 /* global describe, it */
 
-const expect = require("chai").expect;
-const reducerFn = require("../src/reducerFn");
-const isFunction = require("lodash/lang/isFunction");
+import {expect} from "chai";
+import reducerFn from "../src/reducerFn";
+import isFunction from "lodash/lang/isFunction";
 
 describe("reducerFn", function() {
   it("check null params", function() {

test/urlTransform_spec.js

@@ -1,8 +1,8 @@
 "use strict";
 /* global describe, it */
 
-const expect = require("chai").expect;
-const urlTransform = require("../src/urlTransform");
+import {expect} from "chai";
+import urlTransform from "../src/urlTransform";
 
 describe("urlTransform", function() {
   it("check null params", function() {