update fixtures, clean up lint errors, update default handlers

# Conflicts:
#	src/Documentation.js

Author: glebez

src/Documentation.js

@@ -70,24 +70,26 @@ class Documentation {
 
     if (this._props.size > 0) {
       obj.props = {};
-      for (var [name, descriptor] of this._props) {
-        if (Object.keys(descriptor).length > 0) {
-          obj.props[name] = descriptor;
+      for (var [propName, propDescriptor] of this._props) {
+        if (Object.keys(propDescriptor).length > 0) {
+          obj.props[propName] = propDescriptor;
         }
       }
     }
 
     if (this._context.size > 0) {
       obj.context = {};
-      for (var [name, descriptor] of this._context) {
-        obj.context[name] = descriptor;
+      for (var [contextName, contextDescriptor] of this._context) {
+        if (Object.keys(contextDescriptor).length > 0) {
+          obj.context[contextName] = contextDescriptor;
+        }
       }
     }
 
     if (this._childContext.size > 0) {
       obj.childContext = {};
-      for (var [name, descriptor] of this._childContext) {
-        obj.childContext[name] = descriptor;
+      for (var [childContextName, childContextDescriptor] of this._childContext) {
+        obj.childContext[childContextName] = childContextDescriptor;
       }
     }
 

src/__tests__/__snapshots__/main-test.js.snap

@@ -102,6 +102,22 @@ Object {
 
 exports[`main fixtures processes component "component_5.js" without errors 1`] = `
 Object {
+  "childContext": Object {
+    "color": Object {
+      "required": false,
+      "type": Object {
+        "name": "string",
+      },
+    },
+  },
+  "context": Object {
+    "config": Object {
+      "required": false,
+      "type": Object {
+        "name": "object",
+      },
+    },
+  },
   "description": "",
   "displayName": "Button",
   "methods": Array [],
@@ -137,6 +153,22 @@ Object {
 
 exports[`main fixtures processes component "component_6.js" without errors 1`] = `
 Object {
+  "childContext": Object {
+    "color": Object {
+      "required": false,
+      "type": Object {
+        "name": "string",
+      },
+    },
+  },
+  "context": Object {
+    "config": Object {
+      "required": false,
+      "type": Object {
+        "name": "object",
+      },
+    },
+  },
   "description": "",
   "displayName": "Button",
   "methods": Array [],

src/__tests__/fixtures/component_5.js

@@ -15,4 +15,12 @@ Button.propTypes = {
   style: React.PropTypes.object,
 };
 
+Button.childContextTypes = {
+  color: React.PropTypes.string,
+};
+
+Button.contextTypes = {
+  config: React.PropTypes.object,
+};
+
 export default Button;

src/__tests__/fixtures/component_6.js

@@ -16,4 +16,11 @@ Button.propTypes = {
   style: PropTypes.object,
 };
 
+Button.childContextTypes = {
+  color: PropTypes.string,
+};
+
+Button.contextTypes = {
+  config: PropTypes.object,
+};
 export default Button;

src/main.js

@@ -18,6 +18,8 @@ import * as utils from './utils';
 var defaultResolver = resolver.findExportedComponentDefinition;
 var defaultHandlers = [
   handlers.propTypeHandler,
+  handlers.contextTypeHandler,
+  handlers.childContextTypeHandler,
   handlers.propTypeCompositionHandler,
   handlers.propDocBlockHandler,
   handlers.flowTypeHandler,