Add subspecs: MVP and UIViewController

Author: Larry Tin

Example/GDDataDrivenView/GDDCollectionViewEmbeddedInTableViewCellPresenter.m

@@ -9,6 +9,7 @@
 #import "GDDCollectionViewLayout.h"
 #import "GDDSampleCollectionViewCellRender.h"
 #import "NSObject+GDChannel.h"
+#import "GDDModel.h"
 
 @interface GDDCollectionViewEmbeddedInTableViewCellPresenter ()
 @property(nonatomic, weak) GDDViewController *owner;
@@ -24,12 +25,11 @@ - (instancetype)initWithOwner:(id)owner {
   return [self init];
 }
 
-- (void)update:(GDDCollectionViewEmbeddedInTableViewCellRender *)render withModel:(GDDModel *)model {
-  NSString *layoutTopic = [NSString stringWithFormat:@"%@/%@/%@", self.owner.topic, @"layouts", model.mid];
+- (void)update:(GDDCollectionViewEmbeddedInTableViewCellRender *)render withData:(NSDictionary *)data {
+  NSString *layoutTopic = [NSString stringWithFormat:@"%@/%@/%@", self.owner.topic, @"layouts", [[NSUUID alloc] init].UUIDString];
   self.layout = [[GDDCollectionViewLayout alloc] initWithCollectionView:
       render.collectionView withTopic:layoutTopic withOwner:self.owner];
 
-  NSDictionary *data = model.data;
   NSArray *images = data[@"images"];
   NSMutableArray<GDDModel *> *models = @[].mutableCopy;
   for (NSString *image in images) {

Example/GDDataDrivenView/GDDSampleCellPresenter.m

@@ -18,12 +18,11 @@ - (instancetype)initWithOwner:(GDDViewController *)owner {
   return [self init];
 }
 
-- (void)update:(GDDSampleCellRender *)render withModel:(GDDModel *)model {
+- (void)update:(GDDSampleCellRender *)render withData:(NSDictionary *)data {
   static int a;
   a++;
   NSLog(@"%s: %d", __PRETTY_FUNCTION__, a);
 
-  NSDictionary *data = model.data;
   render.titleLabel.text = data[@"title"];
   render.contentLabel.text = data[@"content"];
   render.usernameLabel.text = data[@"username"];
@@ -33,7 +32,7 @@ - (void)update:(GDDSampleCellRender *)render withModel:(GDDModel *)model {
 
   __weak GDDSampleCellPresenter *weakSelf = self;
   render.tapHandler = ^{
-      [weakSelf.owner appendToLastRow:model];
+//      [weakSelf.owner appendToLastRow:model];
   };
 }
 

Example/GDDataDrivenView/GDDSampleCollectionViewCellPresenter.m

@@ -10,9 +10,8 @@ @implementation GDDSampleCollectionViewCellPresenter {
 
 }
 
-- (void)update:(GDDSampleCollectionViewCellRender *)render withModel:(GDDModel *)model {
-  NSString *image = model.data;
-  render.imageView.image = [UIImage imageNamed:image];
+- (void)update:(GDDSampleCollectionViewCellRender *)render withData:(NSString *)data {
+  render.imageView.image = [UIImage imageNamed:data];
 }
 
 @end

Example/Podfile

@@ -1,6 +1,6 @@
 target 'GDDataDrivenView_Example' do
   pod 'GDDataDrivenView', :path => '../'
-  pod 'GDChannel', :git => 'https://github.com/goodow/GDChannel.git', :branch => 'mqtt'
+  pod 'GDChannel', :git => 'https://github.com/goodow/GDChannel.git'
   # pod 'UITableView+FDTemplateLayoutCell', '~> 1.5.beta'
   target 'GDDataDrivenView_Tests' do
     inherit! :search_paths

Example/Podfile.lock

@@ -1,4 +1,5 @@
 PODS:
+  - Aspects (1.4.1)
   - Expecta (1.0.5)
   - Expecta+Snapshots (3.0.0):
     - Expecta (~> 1.0)
@@ -10,8 +11,18 @@ PODS:
     - MQTTKit (~> 0.1.0)
     - Protobuf (~> 3.0)
   - GDDataDrivenView (0.1.0):
+    - GDDataDrivenView/Core (= 0.1.0)
+    - GDDataDrivenView/MVP (= 0.1.0)
+    - GDDataDrivenView/UIViewController (= 0.1.0)
+  - GDDataDrivenView/Core (0.1.0):
     - GDChannel (~> 0.6)
+    - GDDataDrivenView/MVP
     - SVPullToRefresh (~> 0.4)
+  - GDDataDrivenView/MVP (0.1.0)
+  - GDDataDrivenView/UIViewController (0.1.0):
+    - Aspects (~> 1.4.1)
+    - GDChannel (~> 0.6)
+    - GDDataDrivenView/MVP
   - Mantle (2.0.7):
     - Mantle/extobjc (= 2.0.7)
   - Mantle/extobjc (2.0.7)
@@ -23,34 +34,34 @@ PODS:
 DEPENDENCIES:
   - Expecta
   - Expecta+Snapshots
-  - GDChannel (from `https://github.com/goodow/GDChannel.git`, branch `mqtt`)
+  - GDChannel (from `https://github.com/goodow/GDChannel.git`)
   - GDDataDrivenView (from `../`)
   - Specta
 
 EXTERNAL SOURCES:
   GDChannel:
-    :branch: mqtt
     :git: https://github.com/goodow/GDChannel.git
   GDDataDrivenView:
     :path: ../
 
 CHECKOUT OPTIONS:
   GDChannel:
-    :commit: 9c4c59d95e4a338b762abf1a395ebd1486d0920e
+    :commit: 1148b350a207c524c49ad0122ce4fb65230a6d72
     :git: https://github.com/goodow/GDChannel.git
 
 SPEC CHECKSUMS:
+  Aspects: 7595ba96a6727a58ebcbfc954497fc5d2fdde546
   Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
   Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
   FBSnapshotTestCase: 918c55861356ee83aee7843d759f55a18ff6982b
   GDChannel: e26b61a1f156eb4b657516d80d90bdad2db46c56
-  GDDataDrivenView: de21373f20bf7f39f8d62d2db5332aeb727a2786
+  GDDataDrivenView: 131234691a702326e9f5d2631dd5187bdde0fbb2
   Mantle: bc40bb061d8c2c6fb48d5083e04d928c3b7f73d9
   MQTTKit: a4e6b8aa92db1aeae917d2b773fd72a7749937c4
   Protobuf: c032ce1bdf7a266acfd640fbfd8bdb166127c7f5
   Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
   SVPullToRefresh: ba2e718695a43253d8bea6852d2960097dc15d8c
 
-PODFILE CHECKSUM: 4d5753cec3e29b0097551e151c866fc153764d63
+PODFILE CHECKSUM: 19eae2f29ee302412e409736c977a408d65a641e
 
 COCOAPODS: 1.0.1

GDDataDrivenView.podspec

@@ -38,6 +38,24 @@ TODO: Add long description of the pod here.
 
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
-  s.dependency 'GDChannel', '~> 0.6'
-  s.dependency 'SVPullToRefresh', '~> 0.4'
+
+  s.subspec 'MVP' do |sp|
+    sp.source_files = 'GDDataDrivenView/Classes/MVP/**/*'
+  end
+
+  s.subspec 'Core' do |sp|
+    sp.dependency 'GDDataDrivenView/MVP'
+    sp.dependency 'GDChannel', '~> 0.6'
+    sp.dependency 'SVPullToRefresh', '~> 0.4'
+    sp.source_files = 'GDDataDrivenView/Classes/Model/**/*', 'GDDataDrivenView/Classes/Layout/**/*', 'GDDataDrivenView/Classes/Renders/**/*'
+  end
+
+  s.subspec 'UIViewController' do |sp|
+    sp.dependency 'GDDataDrivenView/MVP'
+    sp.dependency 'GDChannel', '~> 0.6'
+    sp.dependency 'Aspects', '~> 1.4.1'
+
+    sp.source_files = 'GDDataDrivenView/Classes/UIViewController/**/*'
+    sp.requires_arc = ['GDDataDrivenView/Classes/UIViewController/GDDViewControllerHelper.*', 'GDDataDrivenView/Classes/UIViewController/UIViewController+GDDataDrivenView.*']
+  end
 end

GDDataDrivenView/Classes/Layout/GDDCollectionViewDataSource.m

@@ -5,6 +5,7 @@
 #import "GDDCollectionViewDataSource.h"
 #import "GDDRender.h"
 #import "GDDCollectionViewLayout.h"
+#import "GDDModel.h"
 
 @interface GDDCollectionViewDataSource ()
 @property(nonatomic, weak) GDDCollectionViewLayout *layout;

…aDrivenView/Classes/Model/GDDPresenter.h …ataDrivenView/Classes/MVP/GDDPresenter.hGDDataDrivenView/Classes/Model/GDDPresenter.h renamed to GDDataDrivenView/Classes/MVP/GDDPresenter.h GDDataDrivenView/Classes/Model/GDDPresenter.h renamed to GDDataDrivenView/Classes/MVP/GDDPresenter.h

@@ -3,7 +3,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "GDDModel.h"
 
 @protocol GDDRender;
 

…DataDrivenView/Classes/Model/GDDRender.h GDDataDrivenView/Classes/MVP/GDDRender.hGDDataDrivenView/Classes/Model/GDDRender.h renamed to GDDataDrivenView/Classes/MVP/GDDRender.h GDDataDrivenView/Classes/Model/GDDRender.h renamed to GDDataDrivenView/Classes/MVP/GDDRender.h

@@ -0,0 +1,27 @@
+//
+// Created by Larry Tin on 15/4/30.
+//
+
+#import <UIKit/UIKit.h>
+#import "GDCMessage.h"
+#import "NSObject+GDChannel.h"
+#import "GoodowBool.pbobjc.h"
+#import "GoodowExtrasOption.pbobjc.h"
+#import "UIViewController+GDDataDrivenView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@interface GDDViewControllerHelper : NSObject
+
++ (UIViewController *)topViewController;
+
++ (UIViewController *)backViewController;
+
++ (void)show:(UIViewController *)controller message:(id <GDCMessage>)message;
+
++ (void)config:(UIViewController *)controller viewOptions:(GDDPBViewOption *)viewOption;
+
++ (UIViewController *)findViewController:(Class)viewControllerClass;
+
++ (void)aspect_hookSelector;
+@end
+NS_ASSUME_NONNULL_END