Merge pull request #28 from braska/fix_for_axios_0_13

Fix for compatibility with Axios 0.13

Author: svrcekmichal

README.md

@@ -12,9 +12,7 @@ npm i -S redux-axios-middleware
 
 ### Use middleware
 
-By default you only need to import middleware from package and add it to redux middlewares
-and execute it with first argument being with axios instance. second optional argument are middleware
-options for customizing
+By default you only need to import middleware from package and add it to redux middlewares and execute it with first argument being with axios instance. second optional argument are middleware options for customizing
 
 ```js
 import {createStore, applyMiddleware} from 'redux';
@@ -39,12 +37,11 @@ let store = createStore(
 
 ### Dispatch action
 
-Every action which have `payload.request` defined will be handled by middleware. There are two possible type
-definitions.
+Every action which have `payload.request` defined will be handled by middleware. There are two possible type definitions.
 
 - use `action.type` with string name
-action with type will be dispatched on start, and then followed by type suffixed with underscore and
-success suffix on success, or error suffix on error
+- action with type will be dispatched on start, and then followed by type suffixed with underscore and
+- success suffix on success, or error suffix on error
 
 defaults: success suffix = "_SUCCESS" error suffix = "_FAIL"
 
@@ -62,7 +59,7 @@ export function loadCategories() {
 ```
 
 - use `action.types` with array of types `[REQUEST,SUCCESS,FAILURE]`
-`REQUEST` will be dispatched on start, then `SUCCESS` or `FAILURE` after request result
+- `REQUEST` will be dispatched on start, then `SUCCESS` or `FAILURE` after request result
 
 ```javascript
 export function loadCategories() {
@@ -110,7 +107,7 @@ Promise.all([
 
 ### Request complete
 
-After request complete, middleware will dispatch new action, 
+After request complete, middleware will dispatch new action,
 
 #### on success
 
@@ -131,7 +128,7 @@ Error action is same as success action with one difference, there's no key `payl
 ```js
 {
     type:'OH_NO',
-    error: { ... }, //axios error response object with data status headers etc.
+    error: { ... }, //axios error object with message, code, config and response fields
     meta: {
       previousAction: { ... } //action which triggered request
     }
@@ -143,10 +140,10 @@ Error action is same as success action with one difference, there's no key `payl
 ```js
 {
     type:'OH_NO',
-    error: { 
+    error: {
       status: 0,
       ... //rest of axios error response object
-    }, 
+    },
     meta: {
       previousAction: { ... } //action which triggered request
     }
@@ -155,8 +152,7 @@ Error action is same as success action with one difference, there's no key `payl
 
 ### Multiple clients
 
-If you are using more than one different APIs, you can define those clients and put them to middleware. All you have to change is import
-of middleware, which is passed to redux createStore function and defined those clients. 
+If you are using more than one different APIs, you can define those clients and put them to middleware. All you have to change is import of middleware, which is passed to redux createStore function and defined those clients.
 
 ```
 import { multiClientMiddleware } from 'redux-axios-middleware';
@@ -169,26 +165,29 @@ createStore(
 )
 ```
 
-`clients` object should be map of 
+`clients` object should be map of
+
 ```
-{ 
+{
   client: axiosInstance, // instance of axios client created by axios.create(...)
   options: {} //optional key for passing specific client options
 }
 ```
+
 For example:
+
 ```
 {
   default: {
     client: axios.create({
        baseURL:'http://localhost:8080/api',
-       responseType: 'json' 
+       responseType: 'json'
     })
   },
   googleMaps: {
     client: axios.create({
         baseURL:'https://maps.googleapis.com/maps/api',
-        responseType: 'json' 
+        responseType: 'json'
     })
   }
 }
@@ -209,45 +208,40 @@ export function loadCategories() {
   }
 }
 ```
-If you don't define client, default value will be used. You can change default client name in middleware options.
-
 
+If you don't define client, default value will be used. You can change default client name in middleware options.
 
 ### Middleware options
 
 Options can be changed on multiple levels. They are merged in following direction:
+
 ```
-default middleware values < middleware config < client config < action config 
+default middleware values < middleware config < client config < action config
 ```
-All values except interceptors are overriden, interceptors are merged in same order.
-Some values are changeable only on certain level (can be seen in change level column). 
 
-Legend:
-`M` - middleware config
-`C` - client config
-`A` - action config
+All values except interceptors are overriden, interceptors are merged in same order. Some values are changeable only on certain level (can be seen in change level column).
 
+Legend: `M` - middleware config `C` - client config `A` - action config
 
-| key | type | default value | change level | description |
-| --- | ---- | ------------- | ------------ | ----------- |
-| successSuffix | string | SUCCESS | `M` `C` `A` |  default suffix added to success action, for example `{type:"READ"}` will be `{type:"READ_SUCCESS"}`|
-| errorSuffix | string | FAIL | `M` `C` `A`| same as above |
-| onSuccess | function | described above | `M` `C` `A` | function called if axios resolve with success |
-| onError | function | described above | `M` `C` `A` | function called if axios resolve with error |
-| onComplete | function | described above | `M` `C` `A`| function called after axios resolve | 
-| returnRejectedPromiseOnError | bool | false| `M` `C` `A` | if `true`, axios onError handler will return `Promise.reject(newAction)` instead of `newAction` |
-| isAxiosRequest | function | function check if action contain `action.payload.request` | `M` | check if action is axios request, this is connected to `getRequestConfig` |
-| getRequestConfig | function | return content of `action.payload.request` | `M` `C` `A` | if `isAxiosRequest` returns true, this function get axios request config from action |
-| getClientName | function | returns `action.payload.client` OR `'default'` | `M` `C` `A` | attempts to resolve used client name or use defaultClientName |
-| defaultClientName | every possible object key type | `'default'` | `M` | key which define client used if `getClienName` returned false value |
-| getRequestOptions | function | return `action.payload.options` | `M` `C` | returns options object from action to override some values |
-| interceptors | object `{request: [], response: []}` |  | `M` `C` | You can pass axios request and response interceptors. Take care, first argument of interceptor is different from default axios interceptor, first received argument is object with `getState`, `dispatch` and `action` keys |
+key                          | type                                 | default value                                             | change level | description
+---------------------------- | ------------------------------------ | --------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+successSuffix                | string                               | SUCCESS                                                   | `M` `C` `A`  | default suffix added to success action, for example `{type:"READ"}` will be `{type:"READ_SUCCESS"}`
+errorSuffix                  | string                               | FAIL                                                      | `M` `C` `A`  | same as above
+onSuccess                    | function                             | described above                                           | `M` `C` `A`  | function called if axios resolve with success
+onError                      | function                             | described above                                           | `M` `C` `A`  | function called if axios resolve with error
+onComplete                   | function                             | described above                                           | `M` `C` `A`  | function called after axios resolve
+returnRejectedPromiseOnError | bool                                 | false                                                     | `M` `C` `A`  | if `true`, axios onError handler will return `Promise.reject(newAction)` instead of `newAction`
+isAxiosRequest               | function                             | function check if action contain `action.payload.request` | `M`          | check if action is axios request, this is connected to `getRequestConfig`
+getRequestConfig             | function                             | return content of `action.payload.request`                | `M` `C` `A`  | if `isAxiosRequest` returns true, this function get axios request config from action
+getClientName                | function                             | returns `action.payload.client` OR `'default'`            | `M` `C` `A`  | attempts to resolve used client name or use defaultClientName
+defaultClientName            | every possible object key type       | `'default'`                                               | `M`          | key which define client used if `getClienName` returned false value
+getRequestOptions            | function                             | return `action.payload.options`                           | `M` `C`      | returns options object from action to override some values
+interceptors                 | object `{request: [], response: []}` |                                                           | `M` `C`      | You can pass axios request and response interceptors. Take care, first argument of interceptor is different from default axios interceptor, first received argument is object with `getState`, `dispatch` and `action` keys
 
 ## License
 
 This project is licensed under the MIT license, Copyright (c) 2016 Michal Svrček. For more information see `LICENSE.md`.
 
 ## Acknowledgements
 
-[Dan Abramov](https://github.com/gaearon) for Redux
-[Matt Zabriskie](https://github.com/mzabriskie) for [Axios](https://github.com/mzabriskie/axios). A Promise based HTTP client for the browser and node.js
+[Dan Abramov](https://github.com/gaearon) for Redux [Matt Zabriskie](https://github.com/mzabriskie) for [Axios](https://github.com/mzabriskie/axios). A Promise based HTTP client for the browser and node.js

package.json

@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/svrcekmichal/redux-axios-middleware",
   "peerDependencies": {
-    "axios": ">= 0.5"
+    "axios": ">= 0.13"
   },
   "devDependencies": {
-    "axios": "^0.11.1",
+    "axios": "^0.13.1",
     "axios-mock-adapter": "^1.3.1",
     "babel-cli": "^6.5.1",
     "babel-eslint": "^6.0.2",

src/defaults.js

@@ -26,7 +26,7 @@ export const onSuccess = ({ action, next, response }, options) => {
 
 export const onError = ({ action, next, error }, options) => {
   let errorObject;
-  if (error instanceof Error) {
+  if (!error.response) {
     errorObject = {
       data: error.message,
       status: 0

test/defaults.js

@@ -91,11 +91,13 @@ describe('defaults', () => {
     let resultAction = null;
     let next = (action) => resultAction = action;
     const error = {
-      data: ['Error1','Error2'],
-      status:400,
-      statusTest:'BAD_REQUEST',
-      headers:{},
-      config: {}
+      response: {
+        data: ['Error1','Error2'],
+        status:400,
+        statusTest:'BAD_REQUEST',
+        headers:{},
+        config: {}
+      }
     };
 
     beforeEach(() => {

test/middleware.js

@@ -25,7 +25,7 @@ describe('middleware', () => {
   });
 
   it('should dispatch _SUCCESS', () => {
-    mockAxiosClient.onGet(`${BASE_URL}/test`).reply(200, 'response');
+    mockAxiosClient.onGet('/test').reply(200, 'response');
 
     const expectActions = [{
       type: 'LOAD',
@@ -47,7 +47,7 @@ describe('middleware', () => {
     });
   });
   it('should dispatch _FAIL', () => {
-    mockAxiosClient.onGet(`${BASE_URL}/test`).reply(404);
+    mockAxiosClient.onGet('/test').reply(404);
     const expectActions = [{
       type: 'LOAD',
       payload: {
@@ -59,7 +59,9 @@ describe('middleware', () => {
     }, {
       type: 'LOAD_FAIL',
       error: {
-        status: 404
+        response: {
+          status: 404
+        }
       }
     }];
     const store = mockStore();