Merge bfa186e into 84abbec

michaelengland · Feb 12, 2015 · fb7e5e4 · fb7e5e4
2 parents 84abbec + bfa186e
commit fb7e5e4
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 52 deletions.
diff --git a/Classes/FlipTheSwitch/FlipTheSwitch.h b/Classes/FlipTheSwitch/FlipTheSwitch.h
@@ -1,3 +1,7 @@
+extern NSString *const FTSFeatureStatusChangedNotification;
+extern NSString *const FTSFeatureStatusChangedNotificationFeatureKey;
+extern NSString *const FTSFeatureStatusChangedNotificationEnabledKey;
+
 @interface FlipTheSwitch : NSObject
 - (instancetype)init __attribute__((unavailable("init not available ")));
 + (instancetype)sharedInstance;

diff --git a/Classes/FlipTheSwitch/FlipTheSwitch.m b/Classes/FlipTheSwitch/FlipTheSwitch.m
@@ -1,8 +1,13 @@
 #import "FlipTheSwitch.h"
 
+NSString *const FTSFeatureStatusChangedNotification = @"FTSFeatureStatusChangedNotification";
+NSString *const FTSFeatureStatusChangedNotificationFeatureKey = @"FTSFeatureStatusChangedNotificationFeatureKey";
+NSString *const FTSFeatureStatusChangedNotificationEnabledKey = @"FTSFeatureStatusChangedNotificationEnabledKey";
+
 @interface FlipTheSwitch ()
 @property (nonatomic, readonly) NSUserDefaults *userDefaults;
 @property (nonatomic, readonly) NSBundle *bundle;
+@property (nonatomic, readonly) NSNotificationCenter *notificationCenter;
 @end
 
 @implementation FlipTheSwitch {
@@ -17,7 +22,8 @@ + (instancetype)sharedInstance
     static dispatch_once_t once;
     dispatch_once(&once, ^{
         sharedInstance = [[self alloc] initWithUserDefaults:[NSUserDefaults standardUserDefaults]
-                                                     bundle:[NSBundle mainBundle]];
+                                                     bundle:[NSBundle mainBundle]
+                                         notificationCenter:[NSNotificationCenter defaultCenter]];
     });
     return sharedInstance;
 }
@@ -26,13 +32,16 @@ + (instancetype)sharedInstance
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults
                               bundle:(NSBundle *)bundle
+                  notificationCenter:(NSNotificationCenter *)notificationCenter
 {
     self = [super init];
     if (self) {
         NSParameterAssert(userDefaults);
         NSParameterAssert(bundle);
+        NSParameterAssert(notificationCenter);
         _userDefaults = userDefaults;
         _bundle = bundle;
+        _notificationCenter = notificationCenter;
     }
     return self;
 }
@@ -45,7 +54,7 @@ - (BOOL)isFeatureEnabled:(NSString *)feature
     if (userEnabledFeature) {
         return [userEnabledFeature boolValue];
     } else {
-        return [[[self plistEnabledFeatures] objectForKey:feature] boolValue];
+        return [[self plistEnabledFeatures][feature] boolValue];
     }
 }
 
@@ -61,8 +70,12 @@ - (void)disableFeature:(NSString *)feature
 
 - (void)setFeature:(NSString *)feature enabled:(BOOL)enabled
 {
-    [self.userDefaults setBool:enabled forKey:[self userKeyForFeature:feature]];
-    [self.userDefaults synchronize];
+    if (![self isFeatureEnabled:feature] == enabled) {
+        [self.userDefaults setBool:enabled forKey:[self userKeyForFeature:feature]];
+        [self.userDefaults synchronize];
+        [self.notificationCenter postNotification:[self statusChangeNotificationForFeature:feature
+                                                                                   enabled:enabled]];
+    }
 }
 
 #pragma mark - Private
@@ -85,4 +98,14 @@ - (NSString *)featurePlistPath
     return [self.bundle pathForResource:@"Features" ofType:@"plist"];
 }
 
+- (NSNotification *)statusChangeNotificationForFeature:(NSString *)feature enabled:(BOOL)enabled
+{
+    return [NSNotification notificationWithName:FTSFeatureStatusChangedNotification
+                                         object:self
+                                       userInfo:@{
+                                           FTSFeatureStatusChangedNotificationFeatureKey : feature,
+                                           FTSFeatureStatusChangedNotificationEnabledKey : @(enabled)
+                                       }];
+}
+
 @end
diff --git a/Tests/FlipTheSwitchSpec.xcodeproj/project.pbxproj b/Tests/FlipTheSwitchSpec.xcodeproj/project.pbxproj
@@ -18,9 +18,7 @@
 		F803222F52BB5CB3482ED84D /* FlipTheSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = F8032766B6B64076F108F6DC /* FlipTheSwitch.m */; };
 		F803238AA8E0E1976F0F95DC /* FlipTheSwitchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F80322BF56E8D76FB9736847 /* FlipTheSwitchSpec.m */; };
 		F80325D46C885BC440A30C43 /* FlipTheSwitchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F80322BF56E8D76FB9736847 /* FlipTheSwitchSpec.m */; };
-		F803272CB8A5B38D4757608E /* GcovTestObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = F8032394DDE5CCE6C76898E9 /* GcovTestObserver.m */; };
 		F80329B3B762341EF7AD3E7F /* FlipTheSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = F8032766B6B64076F108F6DC /* FlipTheSwitch.m */; };
-		F80329FE8A8EF57B776A9FDE /* GcovTestObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = F8032394DDE5CCE6C76898E9 /* GcovTestObserver.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -58,9 +56,7 @@
 		CF8E94075C5A480F893ECEE0 /* Pods-FlipTheSwitchSpec-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlipTheSwitchSpec-iOS.xcconfig"; path = "Pods/Pods-FlipTheSwitchSpec-iOS.xcconfig"; sourceTree = "<group>"; };
 		F8032139C1E76BF6C51205CD /* FlipTheSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlipTheSwitch.h; sourceTree = "<group>"; };
 		F80321987A56E7AF3BFF5FD9 /* FlipTheSwitchSpec-iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FlipTheSwitchSpec-iOS-Prefix.pch"; sourceTree = "<group>"; };
-		F80322339C8E3439D05DCB0E /* GcovTestObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GcovTestObserver.h; sourceTree = "<group>"; };
 		F80322BF56E8D76FB9736847 /* FlipTheSwitchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlipTheSwitchSpec.m; sourceTree = "<group>"; };
-		F8032394DDE5CCE6C76898E9 /* GcovTestObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GcovTestObserver.m; sourceTree = "<group>"; };
 		F80325C7A88C24081CF78461 /* FlipTheSwitchSpec-iOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; path = "FlipTheSwitchSpec-iOS-Info.plist"; sourceTree = "<group>"; };
 		F80326FF993EEA2C7572BD21 /* FlipTheSwitchSpec-Mac-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FlipTheSwitchSpec-Mac-Prefix.pch"; sourceTree = "<group>"; };
 		F8032766B6B64076F108F6DC /* FlipTheSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlipTheSwitch.m; sourceTree = "<group>"; };
@@ -156,15 +152,6 @@
 			path = Classes;
 			sourceTree = "<group>";
 		};
-		F80322747F4E4DC74EC73A3A /* Helpers */ = {
-			isa = PBXGroup;
-			children = (
-				F80322339C8E3439D05DCB0E /* GcovTestObserver.h */,
-				F8032394DDE5CCE6C76898E9 /* GcovTestObserver.m */,
-			);
-			path = Helpers;
-			sourceTree = "<group>";
-		};
 		F80323A5D7806CC7C7B8D36A /* FlipTheSwitch */ = {
 			isa = PBXGroup;
 			children = (
@@ -186,7 +173,6 @@
 			isa = PBXGroup;
 			children = (
 				F803205E2BED616EF1088A54 /* Classes */,
-				F80322747F4E4DC74EC73A3A /* Helpers */,
 			);
 			path = Spec;
 			sourceTree = "<group>";
@@ -354,7 +340,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F803272CB8A5B38D4757608E /* GcovTestObserver.m in Sources */,
 				F80325D46C885BC440A30C43 /* FlipTheSwitchSpec.m in Sources */,
 				F80329B3B762341EF7AD3E7F /* FlipTheSwitch.m in Sources */,
 			);
@@ -365,7 +350,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				F803238AA8E0E1976F0F95DC /* FlipTheSwitchSpec.m in Sources */,
-				F80329FE8A8EF57B776A9FDE /* GcovTestObserver.m in Sources */,
 				F803222F52BB5CB3482ED84D /* FlipTheSwitch.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Tests/FlipTheSwitchSpec.xcodeproj/xcshareddata/xcschemes/FlipTheSwitchSpec-Mac.xcscheme b/Tests/FlipTheSwitchSpec.xcodeproj/xcshareddata/xcschemes/FlipTheSwitchSpec-Mac.xcscheme
@@ -48,13 +48,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "SPECTA_REPORTER_CLASS"
-            value = "GcovTestObserver"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5B9DCEAA193A869B00C63F9F"
+            BuildableName = "FlipTheSwitchSpec-Mac.xctest"
+            BlueprintName = "FlipTheSwitchSpec-Mac"
+            ReferencedContainer = "container:FlipTheSwitchSpec.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/Tests/FlipTheSwitchSpec.xcodeproj/xcshareddata/xcschemes/FlipTheSwitchSpec-iOS.xcscheme b/Tests/FlipTheSwitchSpec.xcodeproj/xcshareddata/xcschemes/FlipTheSwitchSpec-iOS.xcscheme
@@ -48,13 +48,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "SPECTA_REPORTER_CLASS"
-            value = "GcovTestObserver"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5B87AFE9193A80F20082F7A1"
+            BuildableName = "FlipTheSwitchSpec-iOS.xctest"
+            BlueprintName = "FlipTheSwitchSpec-iOS"
+            ReferencedContainer = "container:FlipTheSwitchSpec.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/Tests/Spec/Classes/FlipTheSwitch/FlipTheSwitchSpec.m b/Tests/Spec/Classes/FlipTheSwitch/FlipTheSwitchSpec.m
@@ -2,7 +2,8 @@
 
 @interface FlipTheSwitch (Spec)
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults
-                              bundle:(NSBundle *)bundle;
+                              bundle:(NSBundle *)bundle
+                  notificationCenter:(NSNotificationCenter *)notificationCenter;
 @end
 
 SpecBegin(FlipTheSwitch)
@@ -15,12 +16,15 @@ - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults
 
     before(^{
         userDefaults = [[NSUserDefaults alloc] init];
+        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
 
         standardFeature = @"standard_feature";
         plistEnabledFeature = @"plist_enabled_feature";
 
         subject = [[FlipTheSwitch alloc] initWithUserDefaults:userDefaults
-                                                       bundle:[NSBundle bundleForClass:[self class]]];
+                                                       bundle:bundle
+                                           notificationCenter:notificationCenter];
     });
 
     after(^{
@@ -85,4 +89,55 @@ - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults
             expect([subject isFeatureEnabled:plistEnabledFeature]).to.beTruthy();
         });
     });
+
+    describe(@"notifications", ^{
+        context(@"when feature already enabled", ^{
+            before(^{
+                [subject setFeature:standardFeature enabled:YES];
+            });
+
+            context(@"when feature re-enabled", ^{
+                it(@"does nothing", ^{
+                    expect(^{ [subject setFeature:standardFeature enabled:YES]; }).toNot.notify(FTSFeatureStatusChangedNotification);
+                });
+            });
+
+            context(@"when feature disabled", ^{
+                it(@"sends a notification about the change", ^{
+                    NSNotification *enabledNotification = [NSNotification notificationWithName:FTSFeatureStatusChangedNotification
+                                                                                        object:subject
+                                                                                      userInfo:@{
+                                                                                          FTSFeatureStatusChangedNotificationFeatureKey : standardFeature,
+                                                                                          FTSFeatureStatusChangedNotificationEnabledKey : @NO
+                                                                                      }];
+                    expect(^{ [subject setFeature:standardFeature enabled:NO]; }).to.notify(enabledNotification);
+                });
+            });
+        });
+
+        context(@"when feature already disabled", ^{
+            before(^{
+                [subject setFeature:standardFeature enabled:NO];
+            });
+
+            context(@"when feature re-disabled", ^{
+                it(@"does nothing", ^{
+                    expect(^{ [subject setFeature:standardFeature enabled:NO]; }).toNot.notify(FTSFeatureStatusChangedNotification);
+                });
+            });
+
+            context(@"when feature enabled", ^{
+                it(@"sends a notification about the change", ^{
+                    NSNotification *enabledNotification = [NSNotification notificationWithName:FTSFeatureStatusChangedNotification
+                                                                                        object:subject
+                                                                                      userInfo:@{
+                                                                                          FTSFeatureStatusChangedNotificationFeatureKey : standardFeature,
+                                                                                          FTSFeatureStatusChangedNotificationEnabledKey : @YES
+                                                                                      }];
+                    expect(^{ [subject setFeature:standardFeature enabled:YES]; }).to.notify(enabledNotification);
+                });
+
+            });
+        });
+    });
 SpecEnd
diff --git a/Tests/Spec/Helpers/GcovTestObserver.h b/Tests/Spec/Helpers/GcovTestObserver.h
diff --git a/Tests/Spec/Helpers/GcovTestObserver.m b/Tests/Spec/Helpers/GcovTestObserver.m