Use custom provider to handle calling from with ctx

#51

Author: ganemone

package.json

@@ -52,6 +52,7 @@
     "fusion-tokens": "0.0.5",
     "nyc": "^11.4.1",
     "prettier": "1.10.2",
+    "prop-types": "^15.6.0",
     "react": "^16.2.0",
     "react-dom": "16.2.0",
     "react-redux": "^5.0.6",

src/__tests__/index.node.js

@@ -45,14 +45,10 @@ test('withRPCRedux hoc', t => {
   const expectedPayloads = ['test-args', 'test-resolve'];
   renderer.render(React.createElement(Connected), {
     rpc: {
-      from() {
-        return {
-          request(method, args) {
-            t.equal(method, 'test');
-            t.equal(args, 'test-args');
-            return Promise.resolve('test-resolve');
-          },
-        };
+      request(method, args) {
+        t.equal(method, 'test');
+        t.equal(args, 'test-args');
+        return Promise.resolve('test-resolve');
       },
     },
     store: {
@@ -87,14 +83,10 @@ test('withRPCReactor hoc', t => {
   const expectedPayloads = ['test-args', 'test-resolve'];
   renderer.render(React.createElement(Connected), {
     rpc: {
-      from() {
-        return {
-          request(method, args) {
-            t.equal(method, 'test');
-            t.equal(args, 'test-args');
-            return Promise.resolve('test-resolve');
-          },
-        };
+      request(method, args) {
+        t.equal(method, 'test');
+        t.equal(args, 'test-args');
+        return Promise.resolve('test-resolve');
       },
     },
     store: {

src/hoc.js

@@ -35,7 +35,7 @@ export function withRPCRedux(
         const {rpc, store} = this.context;
         const handler = createRPCHandler({
           rpcId,
-          rpc: rpc.from(this.props.ctx),
+          rpc,
           store,
           actions,
           mapStateToParams,

src/index.js

@@ -4,17 +4,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {ProviderPlugin} from 'fusion-react';
-import {mock as RPCMock} from 'fusion-plugin-rpc';
-import plugin from './plugin';
+import plugin, {mock} from './plugin';
 
 export {createRPCReducer} from 'fusion-rpc-redux';
 export {withRPCRedux, withRPCReactor} from './hoc';
 
 export default plugin;
-
-export const mock = ProviderPlugin.create('rpc', RPCMock);
-
+export {mock};
 export {
   RPCToken,
   RPCHandlersToken,

src/plugin.js

@@ -5,6 +5,26 @@
  */
 
 import {ProviderPlugin} from 'fusion-react';
-import rpc from 'fusion-plugin-rpc';
+import PropTypes from 'prop-types';
+import React from 'react';
+import rpc, {mock as RPCMock} from 'fusion-plugin-rpc';
 
-export default ProviderPlugin.create('rpc', rpc);
+class RPCProvider extends React.Component {
+  constructor(props, context) {
+    super(props, context);
+    this.rpc = props.provides.from(props.ctx);
+  }
+  getChildContext() {
+    return {rpc: this.rpc};
+  }
+  render() {
+    return React.Children.only(this.props.children);
+  }
+}
+
+RPCProvider.childContextTypes = {
+  rpc: PropTypes.object.isRequired,
+};
+
+export default ProviderPlugin.create('rpc', rpc, RPCProvider);
+export const mock = ProviderPlugin.create('rpc', RPCMock, RPCProvider);