Merge branch 'release/2.2.0'

.eslintrc

@@ -1,5 +1,5 @@
 {
-  "parser"  : "babel-eslint",
+  "parser": "babel-eslint",
   "extends": "airbnb",
   "parserOptions": {
     "ecmaVersion": 6,
@@ -8,12 +8,12 @@
       "jsx": false
     }
   },
-  "plugins" : [
+  "plugins": [
     "flow-vars"
   ],
-  "env"     : {
+  "env": {
     "browser" : true,
-    "mocha": true,
+    "mocha": true
   },
   "rules": {
     "no-empty-label": 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/redux-io",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Action creators, reducers and middleware for simple handling of normalized json api data in state",
   "main": "index.js",
   "scripts": {

src/actions/create.js

@@ -9,10 +9,9 @@ import { JSON_API_SOURCE } from './..';
 import {
   buildEndpoint,
   resolveConfig,
-  buildRSAAConfig,
 } from './../schemaConfig';
 import thunkAction from './_thunkAction';
-import { extendMetaWithResponse } from './_rsaa';
+import { extendMetaWithResponse, buildRSAAConfig } from '../rsaa';
 
 /**
  * Action creator used to create item on api (POST). Tag is not needed because all collection

src/actions/find.js

@@ -9,10 +9,9 @@ import { JSON_API_SOURCE } from './..';
 import {
   buildEndpoint,
   resolveConfig,
-  buildRSAAConfig,
 } from './../schemaConfig';
 import thunkAction from './_thunkAction';
-import { extendMetaWithResponse } from './_rsaa';
+import { extendMetaWithResponse, buildRSAAConfig } from '../rsaa';
 
 /**
  * If this options key is set to true, the data will be

src/actions/remove.js

@@ -9,10 +9,9 @@ import { JSON_API_SOURCE } from './..';
 import {
   buildEndpoint,
   resolveConfig,
-  buildRSAAConfig,
 } from './../schemaConfig';
 import thunkAction from './_thunkAction';
-import { extendMetaWithResponse } from './_rsaa';
+import { extendMetaWithResponse, buildRSAAConfig } from '../rsaa';
 
 /**
  * Action creator used to delete item on api (DELETE). Tag is not needed because all collection

src/actions/update.js

@@ -9,10 +9,9 @@ import { JSON_API_SOURCE } from './..';
 import {
   buildEndpoint,
   resolveConfig,
-  buildRSAAConfig,
 } from './../schemaConfig';
 import thunkAction from './_thunkAction';
-import { extendMetaWithResponse } from './_rsaa';
+import { extendMetaWithResponse, buildRSAAConfig } from '../rsaa';
 
 /**
  * Action creator used to update item on api (POST). Tag is not needed because all collections

src/reducers/resource.js

@@ -24,17 +24,6 @@ import {
 } from './../status';
 import Outdated from './../outdated';
 
-function createDefaultStatus(schema) {
-  return updateStatus(
-    createStatus(),
-    {
-      schema,
-      type: 'resource',
-      id: _.uniqueId(),
-    }
-  );
-}
-
 const actionsWithoutPayload = new Set([
   LOAD_REQUEST,
   CREATE_REQUEST,
@@ -46,14 +35,44 @@ const actionsWithoutPayload = new Set([
   REFERENCE_CLEAR,
 ]);
 
-function createNewState(state) {
+/**
+ * @param {String} schema
+ * @return {Object}
+ */
+export function createInitialStatus(schema) {
+  return updateStatus(
+    createStatus(),
+    {
+      schema,
+      type: 'resource',
+      id: _.uniqueId(),
+    }
+  );
+}
+
+/**
+ * Create new state instance
+ * @param {Array|Object} state
+ * @return {Array|Object}
+ */
+export function createNewState(state) {
   return _.isArray(state) ? [...state] : { ...state };
 }
 
-function createEmptyState(state) {
+/**
+ * Create new empty state instance
+ * @param {Array|Object} state
+ * @return {Array|Object}
+ */
+export function createEmptyState(state) {
   return _.isArray(state) ? [] : {};
 }
 
+/**
+ * @param {Object} action
+ * @param {String} schema
+ * @return {Boolean}
+ */
 function canHandleAction(action, schema) {
   if (_.get(action, 'meta.schema') !== schema) {
     return false;
@@ -72,7 +91,7 @@ function canHandleAction(action, schema) {
  */
 export default function resource(schema, initialState = {}) {
   // eslint-disable-next-line no-param-reassign
-  setStatus(initialState, createDefaultStatus(schema));
+  setStatus(initialState, createInitialStatus(schema));
   const outdated = new Outdated();
 
   return (state = initialState, action) => {
@@ -181,7 +200,7 @@ export default function resource(schema, initialState = {}) {
           return state;
         }
         const newState = createNewState(state);
-        setStatus(newState, createDefaultStatus(schema));
+        setStatus(newState, createInitialStatus(schema));
         return newState;
       }
     }

src/rsaa/config.js

@@ -0,0 +1,18 @@
+import _ from 'lodash';
+
+/**
+ * Creates new config with data pulled out from config request,
+ * @param config
+ * @returns config
+ */
+export function buildRSAAConfig(config) {
+  const rsaaConfig = {
+    endpoint: config.request.endpoint,
+    headers: config.request.headers,
+    types: config.request.types,
+    method: config.request.method,
+    body: config.request.body,
+  };
+
+  return _.omitBy(rsaaConfig, _.isNil);
+}

src/rsaa/headers.js

@@ -0,0 +1,45 @@
+import _ from 'lodash';
+
+/**
+ * Check if headers object supports entities() method.
+ * @param {Headers} headers
+ */
+function isHeadersEntriesSupported(headers) {
+  return (_.isFunction(headers.entries));
+}
+
+/**
+ * Return existing or create new Headers object instance
+ * @param {Headers|Object} headers
+ */
+function getHeadersInstance(resource) {
+  const headers = _.get(resource, 'headers');
+
+  if (headers instanceof Headers) {
+    return headers;
+  }
+
+  return new Headers({ ...headers });
+}
+
+/**
+ * Extract Request/Response headers into a plain object
+ * @param {Object} response
+ */
+export function extractHeaders(resource) {
+  const headers = getHeadersInstance(resource);
+  const extractedHeaders = {};
+
+  if (isHeadersEntriesSupported(headers)) {
+    for (const header of headers.entries()) {
+      const [headerName, headerValue] = header;
+      extractedHeaders[headerName] = headerValue;
+    }
+  } else {
+    headers.forEach((headerValue, headerName) => {
+      extractedHeaders[headerName] = headerValue;
+    });
+  }
+
+  return extractedHeaders;
+}

src/rsaa/index.js

@@ -0,0 +1,9 @@
+import { extendMetaWithResponse } from './meta';
+import { extractHeaders } from './headers';
+import { buildRSAAConfig } from './config';
+
+export {
+  extendMetaWithResponse,
+  extractHeaders,
+  buildRSAAConfig,
+};

src/actions/_rsaa.js → src/rsaa/meta.js

@@ -1,8 +1,12 @@
+import { extractHeaders } from './headers';
+
 export function extendMetaWithResponse(meta) {
   return (action, state, res) => {
     const response = {
       status: res.status,
+      headers: extractHeaders(res),
     };
-    return { ... meta, response };
+
+    return { ...meta, response };
   };
 }

src/schemaConfig.js

@@ -88,23 +88,6 @@ export function resolveConfig(schema) {
   return undefined;
 }
 
-/**
- * Creates new config with data pulled out from config request,
- * @param config
- * @returns config
- */
-export function buildRSAAConfig(config) {
-  const rsaaConfig = {
-    endpoint: config.request.endpoint,
-    headers: config.request.headers,
-    types: config.request.types,
-    method: config.request.method,
-    body: config.request.body,
-  };
-
-  return _.omitBy(rsaaConfig, _.isNil);
-}
-
 /**
  * Replace endpoint placeholders '{key}' with corresponding value of key in params dict.
  * Unused params are resolved into query params as 'key=value' pairs and concatenated to endpoint

test/actions/create.spec.js

@@ -73,7 +73,10 @@ describe('Create action creator', () => {
     };
     const expectedResponseMeta = {
       ...expectedMeta,
-      response: { status: 200},
+      response: {
+        status: 200,
+        headers: {},
+      },
     };
     const metaResponse = [{}, {}, { status: 200 }];
 
@@ -127,7 +130,10 @@ describe('Create action creator', () => {
     };
     const expectedResponseMeta = {
       ...expectedMeta,
-      response: { status: 200},
+      response: {
+        status: 200,
+        headers: {},
+      },
     };
     const metaResponse = [{}, {}, { status: 200 }];
 
@@ -179,7 +185,10 @@ describe('Create action creator', () => {
     };
     const expectedResponseMeta = {
       ...expectedMeta,
-      response: { status: 200},
+      response: {
+        status: 200,
+        headers: {},
+      },
     };
     const metaResponse = [{}, {}, { status: 200 }];
 
@@ -238,7 +247,10 @@ describe('Create action creator', () => {
     };
     const expectedResponseMeta = {
       ...expectedMeta,
-      response: { status: 200},
+      response: {
+        status: 200,
+        headers: {},
+      },
     };
     const metaResponse = [{}, {}, { status: 200 }];
 
@@ -375,7 +387,12 @@ describe('Create action creator', () => {
     };
     const expectedResponseMeta = {
       ...expectedMeta,
-      response: { status: 200},
+      response: {
+        status: 200,
+        headers: {
+          "content-type": "vnd.api+json"
+        },
+      },
     };
 
     const action = create(schemaConfig, item);