Move epic stuff to observable index, add tests

src/redux-observable/fromResource.js

@@ -4,11 +4,10 @@ import fromResource from '../fromResource';
 import generateEpic from './generateEpic';
 
 export default function(...args) {
-  const tasks = fromResource.apply(null, [generateEpic, ...args]);
-
+  const tasks = fromResource(generateEpic, ...args);
   const epics = Object.keys(tasks).map(taskName => tasks[taskName].epic);
 
   tasks.epic = combineEpics(...epics);
-  
+
   return tasks;
 }

src/redux-observable/generateEpic.js

@@ -1,6 +1,6 @@
 import { from, of } from 'rxjs';
 import { ofType } from 'redux-observable';
-import { map, filter, switchMap, catchError } from 'rxjs/operators';
+import { map, switchMap, catchError } from 'rxjs/operators';
 import createUrl from 'batarang/createUrl';
 
 import ajaxObservable from './ajaxObservable';
@@ -90,6 +90,6 @@ export default function generateEpic(
   }
 
   deps.ajax = deps.ajax || ajaxObservable(deps.getHeaders);
-  
+
   return generator({ url, actions, onSuccess, onFailure, beforeSubmit }, deps);
 }

src/redux-observable/index.js

@@ -1,9 +1,24 @@
+import { combineEpics } from 'redux-observable';
+
 import processResources from '../processResources';
 import generateEpic from './generateEpic';
 import fromResource from './fromResource';
 
 export default function incrudable(resources, config) {
-  return processResources(generateEpic, resources, config);
+  const sources = processResources(generateEpic, resources, config);
+
+  const epics = Object.keys(sources).reduce((acc, sourceName) => {
+    const tasks = sources[sourceName];
+    const epics = Object.keys(tasks).map(taskName => tasks[taskName].epic);
+    tasks.epic = combineEpics(...epics);
+
+    return acc.concat(tasks.epic);
+  }, []);
+  console.log('epics', epics);
+
+  sources.epic = combineEpics(...epics);
+
+  return sources;
 }
 
 incrudable.fromResource = fromResource;

src/redux-thunk/index.js

@@ -1,17 +1,9 @@
-import { combineEpics } from 'redux-observable';
-
 import processResources from '../processResources';
 import generateThunk from './generateThunk';
 import fromResource from './fromResource';
 
-
 export default function incrudable(resources, config) {
-  const sources = processResources(generateThunk, resources, config);
-
-  const epics = Object.keys(sources).map(resourceName => sources[resourceName].epic);
-  sources.epic = combineEpics(...epics);
-
-  return sources;
+  return processResources(generateThunk, resources, config);
 }
 
 incrudable.fromResource = fromResource;

tests/redux-observable/fromResource.test.js

@@ -118,7 +118,7 @@ describe('fromResource: redux-observable', () => {
     });
   });
 
-  // it('creates an root epic for all the operations', done => {
+  // It('creates an root epic for all the operations', done => {
   //   const tasks = fromResource(resource, config);
   //   const request = { params: { id: 10 } };
   //   const action$ = of(tasks.create(request));

tests/redux-observable/generateEpic.test.js

@@ -11,7 +11,7 @@ import generateEpic, {
 
 function getTask(options, ajax) {
   const type = options.actions.wait.toString();
-  const waitStub = sinon.stub(options.actions, 'wait').callThrough().toString = () => type;
+  sinon.stub(options.actions, 'wait').callThrough().toString = () => type;
   sinon.stub(options.actions, 'success').callThrough();
   sinon.stub(options.actions, 'failure').callThrough();
 
@@ -288,7 +288,7 @@ describe('generateEpic', () => {
       );
 
       const type = actions.wait.toString();
-      const waitStub = sinon.stub(actions, 'wait').callThrough().toString = () => type;
+      sinon.stub(actions, 'wait').callThrough().toString = () => type;
       sinon.stub(actions, 'success').callThrough();
       sinon.stub(actions, 'failure').callThrough();
 

tests/redux-observable/index.test.js

@@ -29,13 +29,18 @@ const resources = {
 describe('incrudable', () => {
   it('create the actions and tasks for resources', () => {
     const tasks = incrudable(resources);
+    expect(tasks.epic).to.be.a('function');
 
     Object.keys(resources).forEach(resource => {
+      expect(tasks[resource].epic).to.be.a('function');
+
       Object.keys(resources[resource].operations).forEach(operation => {
-        expect(tasks[resource][operation]).to.be.a('function');
-        expect(tasks[resource][operation].success).to.be.a('function');
-        expect(tasks[resource][operation].failure).to.be.a('function');
-        expect(tasks[resource][operation].wait).to.be.a('function');
+        const opTask = tasks[resource][operation];
+        expect(opTask).to.be.a('function');
+        expect(opTask.epic).to.be.a('function');
+        expect(opTask.success).to.be.a('function');
+        expect(opTask.failure).to.be.a('function');
+        expect(opTask.wait).to.be.a('function');
       });
     });
   });