Move stuff around, finish removing provide() and <Connector>

Author: gaearon

src/components/createAll.js

@@ -1,15 +1,9 @@
 import createProvider from './createProvider';
-import createProvideDecorator from './createProvideDecorator';
-
-import createConnectDecorator from './createConnectDecorator';
+import createConnect from './createConnect';
 
 export default function createAll(React) {
-  // Wrapper components
   const Provider = createProvider(React);
+  const connect = createConnect(React);
 
-  // Higher-order components (decorators)
-  const provide = createProvideDecorator(React, Provider);
-  const connect = createConnectDecorator(React);
-
-  return { Provider, provide, connect };
+  return { Provider, connect };
 }

src/components/createConnectDecorator.js src/components/createConnect.jssrc/components/createConnectDecorator.js renamed to src/components/createConnect.js

@@ -1,5 +1,4 @@
 import createStoreShape from '../utils/createStoreShape';
-import getDisplayName from '../utils/getDisplayName';
 import shallowEqualScalar from '../utils/shallowEqualScalar';
 import shallowEqual from '../utils/shallowEqual';
 import isPlainObject from '../utils/isPlainObject';
@@ -12,8 +11,11 @@ const emptyBinder = () => ({});
 
 const identityMerge = (slice, actionsCreators, props) => ({ ...props, ...slice, ...actionsCreators});
 
+function getDisplayName(Component) {
+  return Component.displayName || Component.name || 'Component';
+}
 
-export default function createConnectDecorator(React) {
+export default function createConnect(React) {
   const { Component, PropTypes } = React;
   const storeShape = createStoreShape(PropTypes);
 
@@ -25,7 +27,7 @@ export default function createConnectDecorator(React) {
     const merge = mergeHandler;
 
     return DecoratedComponent => class ConnectDecorator extends Component {
-      static displayName = `ConnectDecorator(${getDisplayName(DecoratedComponent)})`;
+      static displayName = `Connect(${getDisplayName(DecoratedComponent)})`;
       static DecoratedComponent = DecoratedComponent;
 
       static contextTypes = {

src/components/createProvideDecorator.js

@@ -1,4 +1,4 @@
 import React from 'react';
 import createAll from './components/createAll';
 
-export const { Provider, Connector, provide, connect, connectDeprecated } = createAll(React);
+export const { Provider, connect } = createAll(React);

src/index.js

@@ -1,4 +1,4 @@
 import React from 'react-native';
 import createAll from './components/createAll';
 
-export const { Provider, Connector, provide, connect, connectDeprecated } = createAll(React);
+export const { Provider, connect } = createAll(React);

src/native.js

@@ -1,7 +1,7 @@
 import expect from 'expect';
 import jsdomReact from './jsdomReact';
-import React, { PropTypes, Component } from 'react/addons';
-import { createStore, combineReducers } from 'redux';
+import React, { createClass, PropTypes, Component } from 'react/addons';
+import { createStore } from 'redux';
 import { connect } from '../../src/index';
 
 const { TestUtils } = React.addons;
@@ -433,14 +433,30 @@ describe('React', () => {
     });
 
     it('should set the displayName correctly', () => {
-      @connect(state => state)
-      class Container extends Component {
-        render() {
-          return <div />;
+      expect(connect(state => state)(
+        class Foo extends Component {
+          render() {
+            return <div />;
+          }
         }
-      }
+      ).displayName).toBe('Connect(Foo)');
 
-      expect(Container.displayName).toBe('ConnectDecorator(Container)');
+      expect(connect(state => state)(
+        createClass({
+          displayName: 'Bar',
+          render() {
+            return <div />;
+          }
+        })
+      ).displayName).toBe('Connect(Bar)');
+
+      expect(connect(state => state)(
+        createClass({
+          render() {
+            return <div />;
+          }
+        })
+      ).displayName).toBe('Connect(Component)');
     });
 
     it('should expose the wrapped component as DecoratedComponent', () => {