Updated ZSContextWatcher, ZSReachability, added shared header.

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2013 Kyle Robson (http://kylerobson.com) 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

NSData+ZSAdditions.m

@@ -32,6 +32,7 @@
 
 #import "NSData+ZSAdditions.h"
 #import <CommonCrypto/CommonDigest.h>
+#import "ZSShared.h"
 
 @implementation NSData (ZSAdditions)
 

NSString+ZSAdditions.m

@@ -32,6 +32,7 @@
 
 #import "NSString+ZSAdditions.h"
 #import "NSData+ZSAdditions.h"
+#import "ZSShared.h"
 
 @implementation NSString(ZSAdditions)
 

UIImageView+ZSAssetManagerAdditions.m

@@ -9,6 +9,7 @@
 #import "UIImageView+ZSAssetManagerAdditions.h"
 #import "ZSAssetManager.h"
 #import <objc/runtime.h>
+#import "ZSShared.h"
 
 static char const * const assetManagerImageURLKey = "assetManagerImageURLKey";
 

ZDSStreamJSONParser.h

@@ -26,6 +26,7 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 
 #import "YAJLParser.h"
+#import <CoreData/CoreData.h>
 
 @interface ZDSStreamJSONParser : NSObject <YAJLParserDelegate>
 

ZDSStreamJSONParser.m

@@ -26,6 +26,7 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 
 #import "ZDSStreamJSONParser.h"
+#import "ZSShared.h"
 
 @implementation ZDSStreamJSONParser
 

ZSAssetManager.m

@@ -34,8 +34,8 @@
 #import "ZSAssetManager.h"
 #import "ZSURLConnectionDelegate.h"
 #import "ZSReachability.h"
-
 #import "NSString+ZSAdditions.h"
+#import "ZSShared.h"
 
 #define kCachePath @"imageCache"
 
@@ -98,7 +98,7 @@ - (id)init
   self = [super init];
 
   // TODO: Is there a way to avoid object:nil?
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kZSReachabilityChangedNotification object:nil];
 
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(flushMemoryCaches:) name:UIApplicationDidReceiveMemoryWarningNotification object:[UIApplication sharedApplication]];
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enteringBackground:) name:UIApplicationDidEnterBackgroundNotification object:[UIApplication sharedApplication]];

ZSContextWatcher.h

@@ -24,9 +24,10 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 //  OTHER DEALINGS IN THE SOFTWARE.
 
-@interface ZSContextWatcher : NSObject 
+#import <CoreData/CoreData.h>
+
+@interface ZSContextWatcher : NSObject
 {
-  NSPersistentStoreCoordinator *persistentStoreCoordinator;
   NSPredicate *masterPredicate;
   NSString *reference;
 
@@ -41,7 +42,8 @@
 @property (nonatomic, retain) NSPredicate *masterPredicate;
 @property (nonatomic, retain) NSString *reference;
 
-- (id)initWithManagedObjectContext:(NSManagedObjectContext*)context;
+- (id)initWithManagedObjectContextToWatch:(NSManagedObjectContext*)contextToWatch;
+- (id)initWithPersistentStoreCoordinatorToWatch:(NSPersistentStoreCoordinator*)persistentStoreCoordinatorToWatch;
 
 - (void)addEntityToWatch:(NSEntityDescription*)description withPredicate:(NSPredicate*)predicate;
 

ZSContextWatcher.m

@@ -25,26 +25,53 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 
 #import "ZSContextWatcher.h"
+#import "ZSShared.h"
+
+@interface ZSContextWatcher ()
+
+@property (nonatomic, strong) NSManagedObjectContext *contextToWatch;
+@property (nonatomic, strong) NSPersistentStoreCoordinator *persistentStoreCoordinatorToWatch;
+
+@end
 
 @implementation ZSContextWatcher
 
-- (id)initWithManagedObjectContext:(NSManagedObjectContext*)context;
+- (id)initWithManagedObjectContextToWatch:(NSManagedObjectContext*)contextToWatch
 {
-  ZAssert(context, @"Context is nil!");
+  ZAssert(contextToWatch, @"Context is nil!");
   [super init];
+
+  self.contextToWatch = contextToWatch;
 
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contextUpdated:) name:NSManagedObjectContextDidSaveNotification object:nil];
 
-  persistentStoreCoordinator = [context persistentStoreCoordinator];
-
+  return self;
+}
+
+- (id)initWithPersistentStoreCoordinatorToWatch:(NSPersistentStoreCoordinator*)persistentStoreCoordinatorToWatch
+{
+  ZAssert(persistentStoreCoordinatorToWatch, @"Persistent Store Coordinator is nil!");
+  [super init];
+
+  self.persistentStoreCoordinatorToWatch = persistentStoreCoordinatorToWatch;
+
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contextUpdated:) name:NSManagedObjectContextDidSaveNotification object:nil];
+
   return self;
 }
 
 - (void) dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   delegate = nil;
-  [masterPredicate release], masterPredicate = nil;
+  [masterPredicate release];
+  masterPredicate = nil;
+  [reference release];
+  reference = nil;
+  [_contextToWatch release];
+  _contextToWatch = nil;
+  [_persistentStoreCoordinatorToWatch release];
+  _persistentStoreCoordinatorToWatch = nil;
   [super dealloc];
 }
 
@@ -68,8 +95,15 @@ - (void)contextUpdated:(NSNotification*)notification
 {
   NSManagedObjectContext *incomingContext = [notification object];
   NSPersistentStoreCoordinator *incomingCoordinator = [incomingContext persistentStoreCoordinator];
-  if (incomingCoordinator != [self persistentStoreCoordinator]) {
-    return;
+  if (self.contextToWatch != nil) {
+    if (incomingContext != self.contextToWatch) {
+        return;
+    }
+  }
+  else if (self.persistentStoreCoordinatorToWatch != nil) {
+    if  (incomingCoordinator != self.persistentStoreCoordinatorToWatch) {
+      return;
+    }
   }
   if ([self reference]) {
     DLog(@"%@ entered", [self reference]);
@@ -101,7 +135,7 @@ - (void)contextUpdated:(NSNotification*)notification
     if ([self reference]) {
       DLog(@"%@++++++++++firing action", [self reference]);
     }
-    [[self delegate] performSelectorOnMainThread:[self action] withObject:self waitUntilDone:YES];
+    [[self delegate] performSelectorOnMainThread:[self action] withObject:results waitUntilDone:YES];
   } else {
     if ([self reference]) {
       DLog(@"%@----------delegate doesn't respond", [self reference]);
@@ -113,7 +147,6 @@ - (void)contextUpdated:(NSNotification*)notification
   [updated release], updated = nil;
 }
 
-@synthesize persistentStoreCoordinator;
 @synthesize delegate;
 @synthesize action;
 @synthesize masterPredicate;

ZSReachability.h

@@ -54,7 +54,7 @@ typedef enum {
 	ReachableViaWiFi,
 	ReachableViaWWAN
 } NetworkStatus;
-#define kReachabilityChangedNotification @"kNetworkReachabilityChangedNotification"
+#define kZSReachabilityChangedNotification @"kZSNetworkReachabilityChangedNotification"
 
 @interface ZSReachability: NSObject
 {

ZSReachability.m

@@ -51,10 +51,9 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 #import <arpa/inet.h>
 #import <ifaddrs.h>
 #import <netdb.h>
-
 #import <CoreFoundation/CoreFoundation.h>
-
 #import "ZSReachability.h"
+#import "ZSShared.h"
 
 #define kShouldPrintReachabilityFlags 1
 
@@ -92,7 +91,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
 
 	ZSReachability* noteObject = (ZSReachability*) info;
 	// Post a notification to notify the client that the network reachability changed.
-	[[NSNotificationCenter defaultCenter] postNotificationName: kReachabilityChangedNotification object: noteObject];
+	[[NSNotificationCenter defaultCenter] postNotificationName: kZSReachabilityChangedNotification object: noteObject];
 
 	[myPool release];
 }

ZSShared.h

@@ -0,0 +1,32 @@
+//
+//  ZSShared.h
+//  Channel4000
+//
+//  Created by Kyle Robson on 12/18/13.
+//  Copyright (c) 2013 Internet Broadcasting. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+#ifdef DEBUG
+#define MCRelease(x) [x release]
+#define DLog(...) NSLog(@"%s(%p) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
+#define DCLog(...) NSLog(@"%@", [NSString stringWithFormat:__VA_ARGS__])
+#define ALog(...) {NSLog(@"%s(%p) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__]);[[NSAssertionHandler currentHandler] handleFailureInFunction:[NSString stringWithCString:__PRETTY_FUNCTION__ encoding:NSUTF8StringEncoding] file:[NSString stringWithCString:__FILE__ encoding:NSUTF8StringEncoding] lineNumber:__LINE__ description:__VA_ARGS__];}
+#else
+#define MCRelease(x) [x release], x = nil
+#define DLog(...) do { } while (0)
+#define DCLog(...) do { } while (0)
+#ifndef NS_BLOCK_ASSERTIONS
+#define NS_BLOCK_ASSERTIONS
+#endif
+#define ALog(...) NSLog(@"%s(%p) %@", __PRETTY_FUNCTION__, self, [NSString stringWithFormat:__VA_ARGS__])
+#endif
+
+#define ZAssert(condition, ...) do { if (!(condition)) { ALog(__VA_ARGS__); }} while(0)
+
+#define ISRETINADISPLAY (([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) ? [[UIScreen mainScreen] scale] > 1.0 : NO)
+
+#define degreesToRadians(x) (M_PI * x / 180.0)

ZSURLConnectionDelegate.m

@@ -32,9 +32,9 @@
  */
 
 #import "ZSURLConnectionDelegate.h"
-
 #import <ImageIO/ImageIO.h>
 #import <MobileCoreServices/MobileCoreServices.h>
+#import "ZSShared.h"
 
 static NSInteger activityCount;