Add storyboard support #39

Example/IGListKitExamples/SectionControllers/StoryboardLabelSectionController.swift

@@ -22,7 +22,6 @@ class StoryboardLabelSectionController: IGListSectionController, IGListSectionTy
     }
 
     func cellForItem(at index: Int) -> UICollectionViewCell {
-        //let cell = collectionContext!.dequeueReusableCell(of: LabelCell.self, for: self, at: index) as! LabelCell
         let cell = collectionContext!.dequeueReusableCellFromStoryboard(withIdentifier: "cell", for: self, at: index) as! StoryboardCell
         cell.textLabel.text = object
         return cell

Example/IGListKitExamples/ViewControllers/StoryboardLoadMoreViewController.swift

@@ -29,6 +29,11 @@ class StoryboardLoadMoreViewController: UIViewController, IGListAdapterDataSourc
         adapter.scrollViewDelegate = self
     }
 
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        collectionView.frame = view.bounds
+    }
+
     //MARK: IGListAdapterDataSource
     func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
         var items: [IGListDiffable] = words as [IGListDiffable]

Example/IGListKitExamples/Views/StoryboardCell.swift

@@ -10,5 +10,4 @@ import UIKit
 
 class StoryboardCell: UICollectionViewCell {
     @IBOutlet weak var textLabel: UILabel!
-
 }

IGListKit.xcodeproj/project.pbxproj

@@ -27,6 +27,7 @@
 		821BC4C41DB8CEF800172ED0 /* IGTestStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 821BC4C21DB8CAE900172ED0 /* IGTestStoryboard.storyboard */; };
 		821BC4CB1DB8D60100172ED0 /* IGTestSingleStoryboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 821BC4C81DB8D5B200172ED0 /* IGTestSingleStoryboardViewController.m */; };
 		821BC4D01DB8D90900172ED0 /* IGTestStoryboardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 821BC4CD1DB8D8C500172ED0 /* IGTestStoryboardCell.m */; };
+		821BC4D31DB981AB00172ED0 /* IGTestSingleStoryboardItemDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 821BC4D21DB981AB00172ED0 /* IGTestSingleStoryboardItemDataSource.m */; };
 		88144F071D870EDC007C7F66 /* IGListAdapterE2ETests.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144EE21D870EDC007C7F66 /* IGListAdapterE2ETests.m */; };
 		88144F081D870EDC007C7F66 /* IGListAdapterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144EE31D870EDC007C7F66 /* IGListAdapterTests.m */; };
 		88144F091D870EDC007C7F66 /* IGListAdapterUpdaterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144EE41D870EDC007C7F66 /* IGListAdapterUpdaterTests.m */; };
@@ -138,6 +139,8 @@
 		821BC4C81DB8D5B200172ED0 /* IGTestSingleStoryboardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGTestSingleStoryboardViewController.m; sourceTree = "<group>"; };
 		821BC4CC1DB8D8C500172ED0 /* IGTestStoryboardCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGTestStoryboardCell.h; sourceTree = "<group>"; };
 		821BC4CD1DB8D8C500172ED0 /* IGTestStoryboardCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGTestStoryboardCell.m; sourceTree = "<group>"; };
+		821BC4D11DB9816E00172ED0 /* IGTestSingleStoryboardItemDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGTestSingleStoryboardItemDataSource.h; sourceTree = "<group>"; };
+		821BC4D21DB981AB00172ED0 /* IGTestSingleStoryboardItemDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGTestSingleStoryboardItemDataSource.m; sourceTree = "<group>"; };
 		88144EE21D870EDC007C7F66 /* IGListAdapterE2ETests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGListAdapterE2ETests.m; sourceTree = "<group>"; };
 		88144EE31D870EDC007C7F66 /* IGListAdapterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGListAdapterTests.m; sourceTree = "<group>"; };
 		88144EE41D870EDC007C7F66 /* IGListAdapterUpdaterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGListAdapterUpdaterTests.m; sourceTree = "<group>"; };
@@ -295,6 +298,8 @@
 				88144F021D870EDC007C7F66 /* IGTestSingleItemDataSource.m */,
 				26271C881DAE94E40073E116 /* IGTestSingleNibItemDataSource.h */,
 				26271C891DAE94E40073E116 /* IGTestSingleNibItemDataSource.m */,
+				821BC4D11DB9816E00172ED0 /* IGTestSingleStoryboardItemDataSource.h */,
+				821BC4D21DB981AB00172ED0 /* IGTestSingleStoryboardItemDataSource.m */,
 				821BC4C71DB8D5B200172ED0 /* IGTestSingleStoryboardViewController.h */,
 				821BC4C81DB8D5B200172ED0 /* IGTestSingleStoryboardViewController.m */,
 				88144F031D870EDC007C7F66 /* IGTestStackedDataSource.h */,
@@ -690,6 +695,7 @@
 				26271C8C1DAE96740073E116 /* IGListSingleNibItemControllerTests.m in Sources */,
 				88144F101D870EDC007C7F66 /* IGListSingleItemControllerTests.m in Sources */,
 				88144F121D870EDC007C7F66 /* IGListWorkingRangeHandlerTests.m in Sources */,
+				821BC4D31DB981AB00172ED0 /* IGTestSingleStoryboardItemDataSource.m in Sources */,
 				88144F151D870EDC007C7F66 /* IGListTestSection.m in Sources */,
 				88144F1D1D870EDC007C7F66 /* IGTestSupplementarySource.m in Sources */,
 				88144F081D870EDC007C7F66 /* IGListAdapterTests.m in Sources */,

Source/IGListSingleSectionController.h

@@ -89,8 +89,8 @@ IGLK_SUBCLASSING_RESTRICTED
  (usually "self") or the IGListAdapter. Pass in locally scoped objects or use weak references!
  */
 - (instancetype)initWithStoryboardCellIdentifier:(NSString *)identifier
-                              configureBlock:(IGListSingleSectionCellConfigureBlock)configureBlock
-                                   sizeBlock:(IGListSingleSectionCellSizeBlock)sizeBlock;
+                                  configureBlock:(IGListSingleSectionCellConfigureBlock)configureBlock
+                                       sizeBlock:(IGListSingleSectionCellSizeBlock)sizeBlock;
 
 /**
  An optional delegate that handles selection and deselection.

Source/IGListSingleSectionController.m

@@ -55,12 +55,12 @@ - (instancetype)initWithNibName:(NSString *)nibName
 }
 
 - (instancetype)initWithStoryboardCellIdentifier:(NSString *)identifier
-                              configureBlock:(IGListSingleSectionCellConfigureBlock)configureBlock
-                                   sizeBlock:(IGListSingleSectionCellSizeBlock)sizeBlock {
+                                  configureBlock:(IGListSingleSectionCellConfigureBlock)configureBlock
+                                       sizeBlock:(IGListSingleSectionCellSizeBlock)sizeBlock {
     IGParameterAssert(identifier != nil);
     IGParameterAssert(configureBlock != nil);
     if (self = [super init]) {
-        _identifier = identifier;
+        _identifier = [identifier copy];
         _configureBlock = [configureBlock copy];
         _sizeBlock = [sizeBlock copy];
     }
@@ -89,8 +89,8 @@ - (UICollectionViewCell *)cellForItemAtIndex:(NSInteger)index {
                                                          atIndex:index];
     } else if ([self.identifier length] > 0) {
         cell = [collectionContext dequeueReusableCellFromStoryboardWithIdentifier:self.identifier
-                                            forSectionController:self
-                                                         atIndex:index];
+                                                             forSectionController:self
+                                                                          atIndex:index];
     } else {
         cell = [collectionContext dequeueReusableCellOfClass:self.cellClass forSectionController:self atIndex:index];
     }

Tests/IGListSingleStoryboardItemControllerTests.m

@@ -10,6 +10,7 @@
 #import <XCTest/XCTest.h>
 
 #import "IGTestStoryboardCell.h"
+#import "IGTestSingleStoryboardItemDataSource.h"
 #import "IGTestSingleStoryboardViewController.h"
 
 #define genTestObject(k, v) [[IGTestObject alloc] initWithKey:k value:v]
@@ -21,6 +22,7 @@ @interface IGListSingleStoryboardItemControllerTests : XCTestCase
 @property (nonatomic, strong) IGListCollectionView *collectionView;
 @property (nonatomic, strong) IGListAdapter *adapter;
 @property (nonatomic, strong) IGListAdapterUpdater *updater;
+@property (nonatomic, strong) IGTestSingleStoryboardItemDataSource *dataSource;
 @property (nonatomic, strong) IGTestSingleStoryboardViewController *viewController;
 
 @end
@@ -32,8 +34,8 @@ - (void)setUp {
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"IGTestStoryboard" bundle:[NSBundle bundleForClass:self.class]];
     self.viewController = [storyboard instantiateViewControllerWithIdentifier:@"testVC"];
     [self.viewController performSelectorOnMainThread:@selector(loadView) withObject:nil waitUntilDone:YES];
-    XCTAssertNotNil(self.viewController.collectionView, @"collectionView should be connected");
     self.collectionView = self.viewController.collectionView;
+    self.dataSource = [[IGTestSingleStoryboardItemDataSource alloc] init];
     self.updater = [[IGListAdapterUpdater alloc] init];
     self.adapter = [[IGListAdapter alloc] initWithUpdater:self.updater viewController:self.viewController workingRangeSize:2];
 }
@@ -46,9 +48,9 @@ - (void)tearDown {
 }
 
 - (void)setupWithObjects:(NSArray *)objects {
-    self.viewController.objects = objects;
-    self.adapter.collectionView = self.collectionView;
-    self.adapter.dataSource = self.viewController;
+    self.dataSource.objects = objects;
+    self.adapter.collectionView = self.viewController.collectionView;
+    self.adapter.dataSource = self.dataSource;
     [self.collectionView layoutIfNeeded];
 }
 
@@ -101,7 +103,7 @@ - (void)test_whenItemUpdated_thatCellIsConfigured {
                              genTestObject(@2, @"Bar"),
                              genTestObject(@3, @"Baz"),
                              ]];
-    self.viewController.objects = @[
+    self.dataSource.objects = @[
                                 genTestObject(@1, @"Foo"),
                                 genTestObject(@2, @"Qux"), // new value
                                 genTestObject(@3, @"Baz"),

Tests/Objects/IGTestSingleStoryboardItemDataSource.h

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <IGListKit/IGListAdapterDataSource.h>
+
+#import "IGTestObject.h"
+
+@interface IGTestSingleStoryboardItemDataSource : NSObject <IGListAdapterDataSource>
+
+@property (nonatomic, strong) NSArray <IGTestObject *> *objects;
+
+@end

Tests/Objects/IGTestSingleStoryboardItemDataSource.m

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "IGTestSingleStoryboardItemDataSource.h"
+
+#import <IGListKit/IGListSingleSectionController.h>
+
+#import "IGTestStoryboardCell.h"
+
+@implementation IGTestSingleStoryboardItemDataSource
+
+- (NSArray<id<IGListDiffable>> *)objectsForListAdapter:(IGListAdapter *)listAdapter {
+    return self.objects;
+}
+
+- (IGListSectionController<IGListSectionType> *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object
+{
+    void (^configureBlock)(id, __kindof UICollectionViewCell *) = ^(IGTestObject *item, IGTestStoryboardCell *cell) {
+        cell.label.text = [item.value description];
+    };
+    CGSize (^sizeBlock)(id<IGListCollectionContext>) = ^CGSize(id<IGListCollectionContext> collectionContext) {
+        return CGSizeMake([collectionContext containerSize].width, 44);
+    };
+    return [[IGListSingleSectionController alloc] initWithStoryboardCellIdentifier:@"IGTestStoryboardCell"
+                                                                    configureBlock:configureBlock
+                                                                         sizeBlock:sizeBlock];
+}
+
+- (UIView *)emptyViewForListAdapter:(IGListAdapter *)listAdapter {
+    return nil;
+}
+
+@end

Tests/Objects/IGTestSingleStoryboardViewController.h

@@ -1,10 +1,11 @@
-//
-//  IGTestSingleStoryboardViewController.h
-//  IGListKit
-//
-//  Created by Bofei Zhu on 10/20/16.
-//  Copyright © 2016 Instagram. All rights reserved.
-//
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 
 #import <UIKit/UIKit.h>
 
@@ -14,9 +15,8 @@
 
 #import "IGTestObject.h"
 
-@interface IGTestSingleStoryboardViewController : UIViewController <IGListAdapterDataSource>
+@interface IGTestSingleStoryboardViewController : UIViewController
 
-@property (nonatomic, strong) NSArray <IGTestObject *> *objects;
 @property (weak, nonatomic) IBOutlet IGListCollectionView *collectionView;
 
 @end

Tests/Objects/IGTestSingleStoryboardViewController.m

@@ -18,26 +18,4 @@ @interface IGTestSingleStoryboardViewController ()
 
 @implementation IGTestSingleStoryboardViewController
 
-
-- (NSArray<id<IGListDiffable>> *)objectsForListAdapter:(IGListAdapter *)listAdapter {
-    return self.objects;
-}
-
-- (IGListSectionController<IGListSectionType> *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object
-{
-    void (^configureBlock)(id, __kindof UICollectionViewCell *) = ^(IGTestObject *item, IGTestStoryboardCell *cell) {
-        cell.label.text = [item.value description];
-    };
-    CGSize (^sizeBlock)(id<IGListCollectionContext>) = ^CGSize(id<IGListCollectionContext> collectionContext) {
-        return CGSizeMake([collectionContext containerSize].width, 44);
-    };
-    return [[IGListSingleSectionController alloc] initWithStoryboardCellIdentifier:@"IGTestStoryboardCell"
-                                                                    configureBlock:configureBlock
-                                                                         sizeBlock:sizeBlock];
-}
-
-- (UIView *)emptyViewForListAdapter:(IGListAdapter *)listAdapter {
-    return nil;
-}
-
 @end

Tests/Objects/IGTestStoryboardCell.h

@@ -1,10 +1,11 @@
-//
-//  IGTestStoryboardCell.h
-//  IGListKit
-//
-//  Created by Bofei Zhu on 10/20/16.
-//  Copyright © 2016 Instagram. All rights reserved.
-//
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 
 #import <UIKit/UIKit.h>
 

Tests/Objects/IGTestStoryboardCell.m

@@ -1,10 +1,11 @@
-//
-//  IGTestStoryboardCell.m
-//  IGListKit
-//
-//  Created by Bofei Zhu on 10/20/16.
-//  Copyright © 2016 Instagram. All rights reserved.
-//
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 
 #import "IGTestStoryboardCell.h"