Merge branch 'master' into update-objc

.gitignore

@@ -24,3 +24,5 @@ docs/.sass-cache
 *.swp
 
 *.lock
+
+*.gcov

.slather.yml

@@ -0,0 +1,5 @@
+ci_service: travis_ci
+coverage_service: coveralls
+xcodeproj: AsyncDisplayKit.xcodeproj
+source_directory: AsyncDisplayKit
+

.travis.yml

@@ -4,6 +4,7 @@ before_install:
   - brew update
   - brew reinstall xctool
   - gem install cocoapods -v 0.37.2
+  - gem install slather
   - xcrun simctl list
 install: echo "<3"
 env:
@@ -11,6 +12,8 @@ env:
   - MODE=examples
   - MODE=life-without-cocoapods
 script: ./build.sh $MODE
+after_success:
+  - slather
 
 # whitelist
 branches:

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -1681,6 +1681,8 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1718,6 +1720,8 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

AsyncDisplayKit/ASCellNode.h

@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * Generic cell node.  Subclass ASCellNode instead of <ASDisplayNode> to use <ASTableView>.
+ * Generic cell node.  Subclass this instead of `ASDisplayNode` to use with `ASTableView` and `ASCollectionView`.
  */
 @interface ASCellNode : ASDisplayNode
 

AsyncDisplayKit/Layout/ASLayout.mm

@@ -28,9 +28,11 @@ extern BOOL CGPointIsNull(CGPoint point)
                                 sublayouts:(NSArray *)sublayouts
 {
   ASDisplayNodeAssert(layoutableObject, @"layoutableObject is required.");
+#if DEBUG
   for (ASLayout *sublayout in sublayouts) {
     ASDisplayNodeAssert(!CGPointIsNull(sublayout.position), @"Invalid position is not allowed in sublayout.");
   }
+#endif
   
   ASLayout *l = [super new];
   if (l) {

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'slather'

README.md

@@ -1,6 +1,7 @@
 ![AsyncDisplayKit](https://github.com/facebook/AsyncDisplayKit/blob/master/docs/assets/logo.png)
 
 [![Build Status](https://travis-ci.org/facebook/AsyncDisplayKit.svg)](https://travis-ci.org/facebook/AsyncDisplayKit)
+[![Coverage Status](https://coveralls.io/repos/facebook/AsyncDisplayKit/badge.svg?branch=master)](https://coveralls.io/r/facebook/AsyncDisplayKit?branch=master)
  [![Version](http://img.shields.io/cocoapods/v/AsyncDisplayKit.svg)](http://cocoapods.org/?q=AsyncDisplayKit)
  [![Platform](http://img.shields.io/cocoapods/p/AsyncDisplayKit.svg)]()
  [![License](http://img.shields.io/cocoapods/l/AsyncDisplayKit.svg)](https://github.com/facebook/AsyncDisplayKit/blob/master/LICENSE)

smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj

@@ -195,6 +195,8 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -236,6 +238,8 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;