Add NSObject+GDDataDrivenView

Author: larrytin

Example/Podfile.lock

@@ -12,16 +12,20 @@ PODS:
     - Protobuf (~> 3.0)
   - GDDataDrivenView (0.1.0):
     - GDDataDrivenView/Core (= 0.1.0)
+    - GDDataDrivenView/Generated (= 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/Generated (0.1.0):
+    - Protobuf (~> 3.0)
   - GDDataDrivenView/MVP (0.1.0)
   - GDDataDrivenView/UIViewController (0.1.0):
     - Aspects (~> 1.4.1)
     - GDChannel (~> 0.6)
+    - GDDataDrivenView/Generated
     - GDDataDrivenView/MVP
   - Mantle (2.0.7):
     - Mantle/extobjc (= 2.0.7)
@@ -55,7 +59,7 @@ SPEC CHECKSUMS:
   Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
   FBSnapshotTestCase: 918c55861356ee83aee7843d759f55a18ff6982b
   GDChannel: e26b61a1f156eb4b657516d80d90bdad2db46c56
-  GDDataDrivenView: 131234691a702326e9f5d2631dd5187bdde0fbb2
+  GDDataDrivenView: 31e283dce74cdf5e3651d02a85603104229b71d0
   Mantle: bc40bb061d8c2c6fb48d5083e04d928c3b7f73d9
   MQTTKit: a4e6b8aa92db1aeae917d2b773fd72a7749937c4
   Protobuf: c032ce1bdf7a266acfd640fbfd8bdb166127c7f5

GDDataDrivenView.podspec

@@ -52,10 +52,17 @@ TODO: Add long description of the pod here.
 
   s.subspec 'UIViewController' do |sp|
     sp.dependency 'GDDataDrivenView/MVP'
+    sp.dependency 'GDDataDrivenView/Generated'
     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
+
+  s.subspec 'Generated' do |sp|
+    sp.dependency 'Protobuf', '~> 3.0'
+
+    sp.requires_arc = false
+    sp.source_files = 'GDDataDrivenView/Generated/**/*'
   end
 end

GDDataDrivenView/Classes/Renders/GDDUnknownCellRender.h

@@ -6,7 +6,7 @@
 #import "GDDRender.h"
 
 @interface GDDUnknownCellRender : UITableViewCell <GDDRender, GDDPresenter>
+
 @property (strong, nonatomic) IBOutlet UILabel *descriptionLabel;
 
-+ (UITableView *)findTableViewOfCell:(UITableViewCell *)cell;
 @end

GDDataDrivenView/Classes/Renders/GDDUnknownCellRender.m

@@ -3,7 +3,7 @@
 //
 
 #import "GDDUnknownCellRender.h"
-
+#import "UITableViewCell+GDDRender.h"
 
 @implementation GDDUnknownCellRender {
 //  BOOL _didSetupConstraints;
@@ -67,7 +67,7 @@ - (void)handleTap:(UITapGestureRecognizer *)sender {
     [self.descriptionLabel addConstraint:_heightConstraint];
 //    NSLog(@"_heightConstraint");
   }
-  UITableView *tableView = [self.class findTableViewOfCell:self];
+  UITableView *tableView = [self nearestTableView];
 //  [tableView reloadData];
 //  NSLog(@"reloadRowsAtIndexPaths");
   [tableView reloadRowsAtIndexPaths:@[[tableView indexPathForCell:self]] withRowAnimation:UITableViewRowAnimationAutomatic];
@@ -81,11 +81,4 @@ - (void)handleTap:(UITapGestureRecognizer *)sender {
   return self;
 }
 
-+ (UITableView *)findTableViewOfCell:(UITableViewCell *)cell {
-  UIView *view = cell.superview;
-  do {
-    view = view.superview;
-  } while (![view isKindOfClass:UITableView.class]);
-  return view;
-}
 @end

GDDataDrivenView/Classes/Renders/UITableViewCell+GDDRender.h

@@ -0,0 +1,9 @@
+//
+// Created by Larry Tin on 16/9/12.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UITableViewCell (GDDRender)
+- (UITableView *)nearestTableView;
+@end

GDDataDrivenView/Classes/Renders/UITableViewCell+GDDRender.m

@@ -0,0 +1,18 @@
+//
+// Created by Larry Tin on 16/9/12.
+//
+
+#import "UITableViewCell+GDDRender.h"
+
+
+@implementation UITableViewCell (GDDRender)
+
+- (UITableView *)nearestTableView {
+  UIView *view = self.superview;
+  do {
+    view = view.superview;
+  } while (![view isKindOfClass:UITableView.class]);
+  return view;
+}
+
+@end

GDDataDrivenView/Classes/UIViewController/GDDViewControllerHelper.m

@@ -33,8 +33,8 @@ + (void)show:(UIViewController *)controller message:(id <GDCMessage>)message {
   if (!controller) {
     return;
   }
-  id <GDDPresenter> presenter = [self findOrCreatePresenterForViewController:controller];
   void (^messageHandler)() = ^{
+      id <GDDPresenter> presenter = [self findOrCreatePresenterForViewController:controller];
       if (presenter) {
         NSParameterAssert([controller conformsToProtocol:@protocol(GDDRender)]);
         [presenter update:(id <GDDRender>) controller withData:message.payload];
@@ -334,7 +334,7 @@ + (UIViewController *)getVisibleOrChildViewController:(UIViewController *)parent
   Class presenterClass;
   NSString *viewControllerClassName = NSStringFromClass(controller.class);
   NSString *presenterClassName;
-  NSString *const renderSuffix = @"ViewContrller";
+  NSString *const renderSuffix = @"ViewController";
   if ([viewControllerClassName hasSuffix:renderSuffix]) {
     presenterClassName = [viewControllerClassName substringToIndex:viewControllerClassName.length - renderSuffix.length];
     presenterClass = NSClassFromString([NSString stringWithFormat:@"%@Presenter", presenterClassName]);

GDDataDrivenView/Classes/UIViewController/NSObject+GDDataDrivenView.h

@@ -0,0 +1,12 @@
+//
+// Created by Larry Tin on 16/9/12.
+//
+
+#import <Foundation/Foundation.h>
+#import "NSObject+GDChannel.h"
+
+@interface NSObject (GDDataDrivenView)
+
+- (void)subscribeLocalToSelf:(NSArray<NSString *> *)topics;
+
+@end

GDDataDrivenView/Classes/UIViewController/NSObject+GDDataDrivenView.m

@@ -0,0 +1,29 @@
+//
+// Created by Larry Tin on 16/9/12.
+//
+
+#import "NSObject+GDDataDrivenView.h"
+#import "Aspects.h"
+
+@implementation NSObject (GDDataDrivenView)
+
+- (void)subscribeLocalToSelf:(NSArray<NSString *> *)topics {
+  NSMutableArray *consumers = [NSMutableArray arrayWithCapacity:topics.count];
+  for (NSString *topic in topics) {
+    [consumers addObject:[self subscribe:self toOne:topic]];
+  }
+  [self aspect_hookSelector:NSSelectorFromString(@"dealloc") withOptions:AspectPositionBefore usingBlock:^(id<AspectInfo> info) {
+      for (id <GDCMessageConsumer> consumer in consumers) {
+        [consumer unsubscribe];
+      }
+      [consumers removeAllObjects];
+  } error:NULL];
+}
+
+- (id <GDCMessageConsumer>)subscribe:(NSObject <GDCMessageHandler> *)handler toOne:(NSString *)topic {
+  __weak id <GDCMessageHandler> weakHandler = handler;
+  return [self.bus subscribeLocal:topic handler:^(id <GDCMessage> message) {
+      [weakHandler handleMessage:message];
+  }];
+}
+@end

GDDataDrivenView/Classes/UIViewController/GoodowBool.pbobjc.h renamed to GDDataDrivenView/Generated/GoodowBool.pbobjc.h

@@ -1,4 +1,4 @@
 # protoc --objc_out=. goodow_extras_option.proto
-protoc --objc_out=GDDataDrivenView/Classes/UIViewController -IGDDataDrivenView/Classes/UIViewController \
- GDDataDrivenView/Classes/UIViewController/goodow_bool.proto \
- GDDataDrivenView/Classes/UIViewController/goodow_extras_option.proto
+protoc --objc_out=GDDataDrivenView/Generated -IGDDataDrivenView/protos \
+ GDDataDrivenView/protos/goodow_bool.proto \
+ GDDataDrivenView/protos/goodow_extras_option.proto