Merge pull request #70 from devlucky/project/style-fixes

Project/style fixes

Author: rpunkfu

src/Database/index.js

@@ -8,12 +8,10 @@ const pushToStore = (collectionName, records, store) => {
     recordFactory(record, collectionName, store));
 };
 
-const deepMap = (obj, fn) => {
-  return _.mapValues(obj, (value, key) => {
-    if (_.isPlainObject(value)) return deepMap(value, fn);
-    return fn(value);
-  });
-}
+const deepMap = (obj, fn) => _.mapValues(obj, (value) => {
+  if (_.isPlainObject(value)) return deepMap(value, fn);
+  return fn(value);
+});
 
 export class Database {
   constructor() {
@@ -23,15 +21,16 @@ export class Database {
   all(collectionName, raw = false) {
     this.checkFactoryPresence(collectionName);
     const records = _.cloneDeep(this.store[collectionName]);
-    if (raw) {return records;}
+    if (raw) { return records; }
 
-    return this.serialize(records, collectionName)
+    return this.serialize(records, collectionName);
   }
 
   belongsTo(collectionName, predicate) {
-    return () => predicate ?
-      this.find(collectionName, predicate) :
-      this.randomRecord(collectionName);
+    return () => {
+      if (predicate) { return this.find(collectionName, predicate); }
+      return this.randomRecord(collectionName);
+    };
   }
 
   hasMany(collectionName, limit = randomIndex(this.all(collectionName)) + 1) {
@@ -48,11 +47,13 @@ export class Database {
     this.checkFactoryPresence(collectionName);
 
     const factory = this.factoryFor(collectionName);
-    const records = this.store[collectionName] || [];
+    const records = this.store[collectionName] || [];
 
-    while (size--) {
-      const record = deepMap(factory(faker), field =>
-        _.isFunction(field) ? field() : field);
+    for (let idx = 0; idx < size; ++idx) {
+      const record = deepMap(factory(faker), (field) => {
+        if (_.isFunction(field)) { return field(); }
+        return field;
+      });
 
       records.push(this.decorateRecord(collectionName, record));
     }
@@ -62,7 +63,7 @@ export class Database {
 
   decorateRecord(collectionName, record) {
     this.checkFactoryPresence(collectionName);
-    return _.assign({}, record, {id: this.uuid(collectionName)});
+    return _.assign({}, record, { id: this.uuid(collectionName) });
   }
 
   factoryFor(collectionName) {
@@ -101,8 +102,7 @@ export class Database {
   push(collectionName, record) {
     this.checkFactoryPresence(collectionName);
 
-    const factory = this.factoryFor(collectionName);
-    const records = this.store[collectionName] || [];
+    const records = this.store[collectionName] || [];
     const content = _.castArray(record);
 
     records.push(...content);
@@ -111,14 +111,14 @@ export class Database {
   }
 
   register(collectionName, factory, serializer) {
-    this.factories[collectionName] = {factory, serializer};
+    this.factories[collectionName] = { factory, serializer };
     this.store[collectionName] = [];
   }
 
   serialize(record, collectionName) {
     const serializer = this.serializerFor(collectionName);
     const records = _.castArray(record);
-    if (!serializer) {return records;}
+    if (!serializer) { return records; }
 
     return records.map(r => serializer(r, collectionName));
   }
@@ -137,9 +137,8 @@ export class Database {
     const all = this.all(collectionName);
     const records = [];
 
-    while (limit) {
+    for (let idx = 0; idx < limit; ++idx) {
       records.push(randomItem(all));
-      limit--;
     }
 
     return records;
@@ -152,14 +151,14 @@ export class Database {
   setInitialState() {
     this.factories = {};
     this.store = {};
-    this._uuids = {};
+    this.uuids = {};
   }
 
   uuid(collectionName) {
     this.checkFactoryPresence(collectionName);
 
-    const id = this._uuids[collectionName] || 0;
-    this._uuids[collectionName] = id + 1;
+    const id = this.uuids[collectionName] || 0;
+    this.uuids[collectionName] = id + 1;
 
     return id;
   }

src/Database/recordFactory.js

@@ -1,14 +1,16 @@
 import _ from 'lodash';
 
 const updateRecord = (record, collectionName, store) => {
-  const originalRecord = _.find(store[collectionName], {id: record.id});
+  const originalRecord = _.find(store[collectionName], { id: record.id });
   return _.assign(originalRecord, record);
 };
 
 export const recordFactory = (record, collectionName, store) => {
-  record.save = function() {
-    return updateRecord(this, collectionName, store);
+  const recordExtension = {
+    save() {
+      return updateRecord(this, collectionName, store);
+    },
   };
 
-  return record;
+  return Object.assign({}, record, recordExtension);
 };

src/Router/index.js

@@ -2,13 +2,13 @@ import _ from 'lodash';
 import { interceptors } from '../interceptors';
 
 const routerDefaultConfig = {
-  strategies: ['fetch', 'XMLHttpRequest']
+  strategies: ['fetch', 'XMLHttpRequest'],
 };
 
 const interceptorDefaultConfig = {
   host: '',
   requestDelay: 0,
-  routes: {GET: {}, POST: {}, PUT: {}, DELETE: {}}
+  routes: { GET: {}, POST: {}, PUT: {}, DELETE: {} },
 };
 
 export class Router {

src/helpers/util.js

@@ -1,11 +1,5 @@
-export const randomIndex = (arr) => {
-  return Math.floor(Math.random() * arr.length);
-}
+export const randomIndex = arr => Math.floor(Math.random() * arr.length);
 
-export const randomItem = (arr) => {
-  return arr[randomIndex(arr)];
-}
+export const randomItem = arr => arr[randomIndex(arr)];
 
-export const lastItem = (arr) => {
-  return arr[arr.length - 1];
-}
+export const lastItem = arr => arr[arr.length - 1];

src/interceptors/baseInterceptor.js

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import queryString from 'query-string';
 import pathMatch from 'path-match';
 import parseUrl from 'parse-url';
 
@@ -15,7 +14,7 @@ export const baseInterceptor = ({ routes, host }, fakeService) => {
   const extractUrl = (url, method) => ({
     handlers: routes[method],
     pathname: parseUrl(url).pathname,
-    fullpath: parseUrl(url).href
+    fullpath: parseUrl(url).href,
   });
 
   const getHandler = (url, method) => {
@@ -33,5 +32,5 @@ export const baseInterceptor = ({ routes, host }, fakeService) => {
     return route ? matchesPathname(route) : null;
   };
 
-  return fakeService.bind(null, {getHandler, getParams});
+  return fakeService.bind(null, { getHandler, getParams });
 };

src/interceptors/fetchInterceptor.js

@@ -1,5 +1,4 @@
 import queryString from 'query-string';
-import pathMatch from 'path-match';
 import parseUrl from 'parse-url';
 
 import { baseInterceptor } from './baseInterceptor';
@@ -9,17 +8,16 @@ import { nativeFetch } from '../helpers/nativeServices';
 export const name = 'fetch';
 export const reference = nativeFetch;
 
-const fakeResponse = function(response = {}, headers = {}) {
+const fakeResponse = (response = {}, headers = {}) => {
   const responseStr = JSON.stringify(response);
-
-  return new window.Response(responseStr, {headers});
+  return new window.Response(responseStr, { headers });
 };
 
 export const fakeService = config =>
   baseInterceptor(config, (helpers, url, options = {}) => {
     const body = options.body || '';
     const method = options.method || 'GET';
-    const headers = options.headers || {};
+    const headers = options.headers || {};
 
     const handler = helpers.getHandler(url, method);
     const params = helpers.getParams(url, method);
@@ -29,14 +27,21 @@ export const fakeService = config =>
     }
 
     const query = queryString.parse(parseUrl(url).search);
-    const response = handler({params, query, body, headers});
+    const response = handler({ params, query, body, headers });
 
     if (!(response instanceof KakapoResponse)) {
-      return new Promise((resolve, reject) => setTimeout(() =>
-        resolve(fakeResponse(response)), config.requestDelay));
+      return new Promise((resolve) => setTimeout(
+        () => resolve(fakeResponse(response)),
+        config.requestDelay
+      ));
     }
 
     const result = fakeResponse(response.body, response.headers);
-    return new Promise((resolve, reject) => setTimeout(() =>
-      response.error ? reject(result) : resolve(result), config.requestDelay));
+    return new Promise((resolve, reject) => setTimeout(
+      () => {
+        if (response.error) { return reject(result); }
+        return resolve(result);
+      },
+      config.requestDelay
+    ));
   });

src/interceptors/index.js

@@ -1,16 +1,16 @@
 import * as xhrInterceptor from './xhrInterceptor';
 import * as fetchInterceptor from './fetchInterceptor';
 
-const interceptor = ({name, reference, fakeService}) => ({
+const interceptor = ({ name, reference, fakeService }) => ({
   enable(config) {
     window[name] = fakeService(config);
   },
   disable() {
     window[name] = reference;
-  }
+  },
 });
 
 export const interceptors = {
-  'XMLHttpRequest': interceptor(xhrInterceptor),
-  'fetch': interceptor(fetchInterceptor)
+  XMLHttpRequest: interceptor(xhrInterceptor),
+  fetch: interceptor(fetchInterceptor),
 };

src/interceptors/xhrInterceptor.js

@@ -1,17 +1,13 @@
-import queryString from 'query-string';
-import pathMatch from 'path-match';
-import parseUrl from 'parse-url';
-
 import { baseInterceptor } from './baseInterceptor';
 import { nativeXHR } from '../helpers/nativeServices';
 
 export const name = 'XMLHttpRequest';
-export const reference = nativeXHR;
+export const Reference = nativeXHR;
 
 export const fakeService = config =>
   baseInterceptor(config, class fakeXMLHttpRequest {
     constructor(helpers) {
-      this.xhr = new reference();
+      this.xhr = new Reference();
       this.getHandler = helpers.getHandler;
       this.getParams = helpers.getParams;
     }
@@ -28,10 +24,9 @@ export const fakeService = config =>
 
       if (handler && this.onreadystatechange) {
         this.readyState = 4;
-        this.status = 200; //TODO: Support custom status codes
-        this.responseText = handler({params});
-        this.onreadystatechange();
-        return;
+        this.status = 200; // @TODO (zzarcon): Support custom status codes
+        this.responseText = handler({ params });
+        return this.onreadystatechange();
       }
 
       this.xhr.onreadystatechange = () => {
@@ -41,6 +36,6 @@ export const fakeService = config =>
         this.onreadystatechange.call(this.xhr);
       };
 
-      this.xhr.send();
+      return this.xhr.send();
     }
   });

src/serializers/index.js

@@ -1 +1 @@
-export * from './json-api';
+export * from './json-api';

src/serializers/json-api.js

@@ -1,18 +1,19 @@
-//TODO: Implement 'included' support after relationships
+import _ from 'lodash';
+
+// @TODO (zzarcon): Implement 'included' support after relationships
 export const JSONApiSerializer = (record = {}, type = null) => {
   const id = record.id;
-  const relationships = {};
   const included = [];
-
-  delete record.id;
+  const relationships = {};
+  const serializedRecord = _.pickBy(record, (value, key) => key !== 'id');
 
   return {
     data: {
       id,
-      attributes: record,
+      attributes: serializedRecord,
       relationships,
-      type
+      type,
     },
-    included
+    included,
   };
-};
+};

test/specs/database_spec.js

@@ -23,7 +23,7 @@ export const databaseSpec = () => {
 
     assert.ok(_.isObject(db.store), 'Sets up initial store object.');
     assert.ok(_.isObject(db.factories), 'Sets up initial factorie object.');
-    assert.ok(_.isObject(db._uuids), 'Sets up initial identifier object.');
+    assert.ok(_.isObject(db.uuids), 'Sets up initial identifier object.');
 
     assert.end();
   });