Container improvements

src/container/__tests__/containerSpec.js

@@ -67,7 +67,7 @@ describe('Container', () => {
     });
   });
 
-  describe('component lifestyle', () => {
+  describe('component lifecycle', () => {
     var ParentComponent;
     var componentWillReceiveProps;
     var componentWillUpdate;
@@ -276,7 +276,7 @@ describe('Container', () => {
     });
   });
 
-  describe('when the parent updates its props then it should update its childrens', () => {
+  describe('when the parent updates its props then it should update its children\'s', () => {
     var ParentComponent, fetch;
 
     beforeEach(() => {
@@ -428,6 +428,12 @@ describe('Container', () => {
       ContainerComponent = wrap(InnerComponent, {
         something() {
           return [this, 'foo'];
+        },
+
+        statics: {
+          somethingElse() {
+            return [this, 'bar'];
+          }
         }
       });
 
@@ -437,6 +443,11 @@ describe('Container', () => {
     it('should expose the function with the element as the context', () => {
       expect(element.something()).to.eql([element, 'foo']);
     });
+
+    it('should expose the static function on the component class', () => {
+      expect(ContainerComponent.somethingElse())
+        .to.eql([ContainerComponent, 'bar']);
+    });
   });
 
   describe('when the component is bound to an application', () => {
@@ -670,6 +681,19 @@ describe('Container', () => {
     });
   });
 
+  describe('injectApp', () => {
+    it('should inject app as a property on the component', () => {
+      class Component extends React.Component {
+        render() {
+          return null;
+        }
+      }
+      Marty.injectApp(Component);
+
+      expect(render(Component).app).to.eql(app);
+    });
+  });
+
   function withoutApp(props) {
     return _.omit(props, 'app');
   }

src/container/createContainer.js

@@ -18,11 +18,21 @@ let RESERVED_FUNCTIONS = [
 ];
 
 module.exports = function (React) {
-  let DEFAULT_CONTEXT_TYPES = {
-    app: React.PropTypes.object,
+  const DEFAULT_CONTEXT_TYPES  = {
+    app: React.PropTypes.object
   };
 
-  return function createContainer(InnerComponent, config) {
+  function injectApp(Component) {
+    Component.contextTypes = _.extend(
+      {},
+      DEFAULT_CONTEXT_TYPES,
+      Component.contextTypes
+    );
+
+    appProperty(Component.prototype);
+  }
+
+  function createContainer(InnerComponent, config) {
     config = config || {};
 
     if (!InnerComponent) {
@@ -37,13 +47,7 @@ module.exports = function (React) {
       config.contextTypes
     );
 
-    InnerComponent.contextTypes = _.extend(
-      {},
-      DEFAULT_CONTEXT_TYPES,
-      InnerComponent.contextTypes
-    );
-
-    appProperty(InnerComponent.prototype);
+    injectApp(InnerComponent);
 
     let specification = _.extend({
       contextTypes: contextTypes,
@@ -135,12 +139,15 @@ module.exports = function (React) {
       specification.componentWillUnmount, config.componentWillUnmount
     );
 
-    var Container = React.createClass(specification);
-
-    Container.InnerComponent = InnerComponent;
-    Container.displayName = innerComponentDisplayName + 'Container';
-
-    return Container;
+    const Container = React.createClass(specification);
+    return _.extend(
+      Container,
+      config.statics,
+      {
+        InnerComponent,
+        displayName: `${innerComponentDisplayName}Container`
+      }
+    );
 
     function callBoth(func1, func2) {
       if (_.isFunction(func2)) {
@@ -163,5 +170,7 @@ module.exports = function (React) {
         return func1;
       }
     }
-  };
-};
+  }
+
+  return {injectApp, createContainer};
+};

src/container/index.js

@@ -1,3 +1,5 @@
+const _ = require('../mindash');
+
 module.exports = function (marty, React) {
-  marty.createContainer = require('./createContainer')(React);
-};
+  _.extend(marty, require('./createContainer')(React));
+};