Merge pull request #11 from ReactiveCocoa/remove-vm-model

Remove RVMViewModel.model

Author: joshaber

ReactiveViewModel/RVMViewModel.h

@@ -10,13 +10,10 @@
 
 @class RACSignal;
 
-// Adapts a domain model to be user-presentable, and implements behaviors that
-// drive the UI.
+// Implements behaviors that drive the UI, and/or adapts a domain model to be
+// user-presentable.
 @interface RVMViewModel : NSObject
 
-// The model which the view model is adapting for the UI.
-@property (nonatomic, readonly, strong) id model;
-
 // Whether the view model is currently "active."
 //
 // This generally implies that the associated view is visible. When set to NO,
@@ -39,16 +36,6 @@
 // upon subscription.
 @property (nonatomic, strong, readonly) RACSignal *didBecomeInactiveSignal;
 
-// Calls -initWithModel: with a nil model.
-- (instancetype)init;
-
-// Creates a new view model with the given model.
-//
-// model - The model to adapt for the UI. This argument may be nil.
-//
-// Returns an initialized view model, or nil if an error occurs.
-- (instancetype)initWithModel:(id)model;
-
 // Subscribes (or resubscribes) to the given signal whenever
 // `didBecomeActiveSignal` fires.
 //

ReactiveViewModel/RVMViewModel.m

@@ -80,21 +80,6 @@ - (RACSignal *)didBecomeInactiveSignal {
 	return _didBecomeInactiveSignal;
 }
 
-#pragma mark Lifecycle
-
-- (id)init {
-	return [self initWithModel:nil];
-}
-
-- (id)initWithModel:(id)model {
-	self = [super init];
-	if (self == nil) return nil;
-
-	_model = model;
-
-	return self;
-}
-
 #pragma mark Activation
 
 - (RACSignal *)forwardSignalWhileActive:(RACSignal *)signal {

ReactiveViewModelTests/RVMViewModelSpec.m

@@ -13,7 +13,7 @@
 __block RVMTestViewModel *viewModel;
 
 beforeEach(^{
-	viewModel = [[RVMTestViewModel alloc] initWithModel:@"foobar"];
+	viewModel = [[RVMTestViewModel alloc] init];
 });
 
 describe(@"active property", ^{
@@ -79,7 +79,7 @@
 			deallocated = NO;
 
 			createViewModel = ^{
-				RVMTestViewModel *viewModel = [[RVMTestViewModel alloc] initWithModel:nil];
+				RVMTestViewModel *viewModel = [[RVMTestViewModel alloc] init];
 				[viewModel.rac_deallocDisposable addDisposable:[RACDisposable disposableWithBlock:^{
 					deallocated = YES;
 				}]];