Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h

AsyncDisplayKit/ASCellNode.m

@@ -18,6 +18,15 @@
 #pragma mark -
 #pragma mark ASCellNode
 
+@interface ASCellNode ()
+{
+  ASDisplayNodeDidLoadBlock _nodeLoadedBlock;
+  UIViewController *_viewController;
+  ASDisplayNode *_viewControllerNode;
+}
+
+@end
+
 @implementation ASCellNode
 
 - (instancetype)init
@@ -32,6 +41,49 @@
   return self;
 }
 
+- (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)viewControllerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
+{
+  if (!(self = [super init]))
+    return nil;
+  
+  ASDisplayNodeAssertNotNil(viewControllerBlock, @"should initialize with a valid block that returns a UIViewController");
+  
+  if (viewControllerBlock) {
+    _viewController = viewControllerBlock();
+    
+    __weak UIViewController *weakViewController = _viewController;
+    _viewControllerNode = [[ASDisplayNode alloc] initWithViewBlock:^UIView *{
+      return weakViewController.view;
+    } didLoadBlock:didLoadBlock];
+    
+    [self addSubnode:_viewControllerNode];
+    _nodeLoadedBlock = didLoadBlock;
+  }
+  
+  return self;
+}
+
+//- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
+//{
+//  _viewControllerNode.frame = (CGRect){{0,0}, constrainedSize.max};
+//  NSLog(@"%f %f", constrainedSize.max.width, constrainedSize.max.height);
+//  return [super layoutSpecThatFits:constrainedSize];
+//}
+
+- (void)layout
+{
+  [super layout];
+  
+  _viewControllerNode.frame = self.bounds;
+}
+
+- (void)layoutDidFinish
+{
+  [super layoutDidFinish];
+
+  _viewControllerNode.frame = self.bounds;
+}
+
 - (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
 {
   ASDisplayNodeAssertNotSupported();
@@ -98,7 +150,8 @@
 #pragma mark -
 #pragma mark ASTextCellNode
 
-@interface ASTextCellNode () {
+@interface ASTextCellNode ()
+{
   NSString *_text;
   ASTextNode *_textNode;
 }