removes warnings, adds three new tests on annotationArray;

initWithAnnotation now raises exception when any element of the annotation collection is not responding to mkannotation protocol;
refactors a little bit the HKAnnotationArray class private implementation

Author: hepaKKes

EPMapExtensions/HKAnnotationArray.h

@@ -23,6 +23,7 @@
 
 /** 
  @param annotations Annotation array which contains objects conforming to `MKAnnotation` protocol
+ @exception raises exception when any element of the annotation collection is not responding to `MKAnnotation` protocol
  */
 
 - (id)initWithAnnotationArray:(NSArray *)annotations;

EPMapExtensions/HKAnnotationArray.m

@@ -8,6 +8,12 @@
 
 #import "HKAnnotationArray.h"
 
+@interface  HKAnnotationArray ()
+
+void checkAnnotationsCompliance(NSArray *annotations, Protocol *p);
+
+@end
+
 @implementation HKAnnotationArray
 
 #pragma mark - Obj Alloc/Dealloc 
@@ -23,6 +29,7 @@ - (id)init
 - (id)initWithAnnotationArray:(NSArray *)annotations
 {
     if (self = [super init]) {
+        checkAnnotationsCompliance(annotations, @protocol(MKAnnotation));
         _annotationArray = [[NSMutableArray alloc] initWithArray:annotations];
     }
     return self;
@@ -33,19 +40,17 @@ - (id)initWithAnnotationArray:(NSArray *)annotations
 
 - (void)addAnnotations:(NSArray *)annotations
 {
-    for (id annotation in annotations)
-        if (! [annotation conformsToProtocol:@protocol(MKAnnotation)])
-            [NSException raise:NSInternalInconsistencyException format:@"annotations should contains only objs conforms to MKAnnotation protocol"];
-    
+    checkAnnotationsCompliance(annotations, @protocol(MKAnnotation));
     [_annotationArray addObjectsFromArray:annotations];
 }
 
 - (void)addAnnotation:(id <MKAnnotation>)annotation
 {
-    if ( ! [annotation conformsToProtocol:@protocol(MKAnnotation)] )
+    if ( ! [annotation conformsToProtocol:@protocol(MKAnnotation)] ) {
         [NSException raise:NSInternalInconsistencyException format:@"annotation should respond to MKAnnotation protocol"];
-    else
+    } else {
         [_annotationArray addObject:annotation];
+    }
 }
 
 - (NSArray *)allAnnotations
@@ -91,16 +96,15 @@ - (void)removeAnnotationsOfKindOfClasses:(NSArray *)classes
 
 - (void)removeAnnotation:(id<MKAnnotation>)annotation
 {
-    if ( ! [annotation conformsToProtocol:@protocol(MKAnnotation)] )
+    if ( ! [annotation conformsToProtocol:@protocol(MKAnnotation)] ) {
         [NSException raise:NSInternalInconsistencyException format:@"annotation should respond to MKAnnotation protocol"];
+    }
     [_annotationArray removeObject:annotation];
 }
 
 - (void)removeAnnotations:(NSArray *)annotations
 {
-    for (id annotation in annotations)
-        if (! [annotation conformsToProtocol:@protocol(MKAnnotation)])
-            [NSException raise:NSInternalInconsistencyException format:@"annotations should contains only objs conforms to MKAnnotation protocol"];
+    checkAnnotationsCompliance(annotations, @protocol(MKAnnotation));
     [_annotationArray removeObjectsInArray:annotations];
 }
 
@@ -165,4 +169,14 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state object
     return [_annotationArray countByEnumeratingWithState:state objects:buffer count:len];
 }
 
+#pragma mark - Private / Helper methods 
+
+void checkAnnotationsCompliance(NSArray *annotations, Protocol *p) {
+    for (id annotation in annotations) {
+        if (! [annotation conformsToProtocol:p]) {
+            [NSException raise:NSInternalInconsistencyException format:@"annotations should contains only objs conforms to MKAnnotation protocol"];
+        }
+    }
+}
+
 @end

EPMapExtensions/HKMapViewDecorator.m

@@ -36,20 +36,23 @@ - (id)init
 - (void)registerAnnotationViewForClass:(Class<MKAnnotation>)cls annotationView:(NSString *)annotation
 {
     NSParameterAssert(annotation != nil && cls != Nil);
-    if ([NSClassFromString(annotation) isSubclassOfClass:[MKAnnotationView class]])
+    if ([NSClassFromString(annotation) isSubclassOfClass:[MKAnnotationView class]]) {
         _annotationViewForClass[NSStringFromClass(cls)] = NSClassFromString(annotation);
-    else
+    }
+    else {
         [[NSException exceptionWithName:NSInvalidArgumentException
                                  reason:[NSString stringWithFormat:@"Annotation %@ should be any subclass of the MKAnnotationView", annotation]
                                userInfo:nil] raise];
+    }
 }
 
 - (void)registerAnnotationViewForClass:(Class<MKAnnotation>)cls annotationView:(NSString *)annotation
                            configBlock:(void (^)(MKAnnotationView *, id<MKAnnotation>))block
 {
     [self registerAnnotationViewForClass:cls annotationView:annotation];
-    if (block)
+    if (block) {
         [self setConfigBlockForClass:cls block:block];
+    }
 }
 
 - (void)setConfigBlockForClass:(Class<MKAnnotation>)cls block:(ConfigurationBlockType)block
@@ -84,19 +87,21 @@ - (void)registerAnnotationViewForClass:(Class <MKAnnotation>)cls translationBloc
     }
 }
 
-
 - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnotation>)annotation
 {
 
     if ([annotation class] == [MKUserLocation class]) return _userLocationAnnotationView;
 
-    if ([self HK_isNoneRegistered])
-        return _defaultAnnotationView;
-    
+    if ([self HK_isNoneRegistered]) {
+         return _defaultAnnotationView;
+    }
+
     MKAnnotationView* annotationView;
     NSString *reuseIdentifier = [self HK_reuseIdentifierForAnnotation:annotation];
 
-    if (!reuseIdentifier) return _defaultAnnotationView;
+    if (![reuseIdentifier length]) {
+       return _defaultAnnotationView;
+    }
 
     if( !(annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:reuseIdentifier]) ) {
         Class c = [self HK_annotationViewClassFromAnnotation:annotation];
@@ -113,35 +118,42 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnot
 
 - (NSString *)HK_reuseIdentifierForAnnotation:(id<MKAnnotation>)annotation
 {
-    if (_translationBlockForAllClasses && _translationBlockForAllClasses(annotation))
+    if (_translationBlockForAllClasses && _translationBlockForAllClasses(annotation)) {
         return _translationBlockForAllClasses(annotation);
+    }
 
     NSString *annotationViewClass = NSStringFromClass([annotation class]);
 
-    if (_translationBlockForClass[annotationViewClass] && ((TranslationBlockType) _translationBlockForClass[annotationViewClass]) (annotation) )
+    if (_translationBlockForClass[annotationViewClass] && ((TranslationBlockType) _translationBlockForClass[annotationViewClass]) (annotation) ) {
         return ((TranslationBlockType) _translationBlockForClass[annotationViewClass]) (annotation);
-    else
+    }
+    else {
         return  NSStringFromClass(_annotationViewForClass[annotationViewClass]);
+    }
 }
 
 - (Class)HK_annotationViewClassFromAnnotation:(id<MKAnnotation>)annotation
 {
     Class annotationViewClass = NSClassFromString([self HK_reuseIdentifierForAnnotation:annotation]);
 
-    if (! [annotationViewClass isSubclassOfClass:[MKAnnotationView class]] )
+    if (! [annotationViewClass isSubclassOfClass:[MKAnnotationView class]] ) {
         [[NSException exceptionWithName:NSInvalidArgumentException
                                  reason:[NSString stringWithFormat:@"%@ should be any subclass of the MKAnnotationView", annotationViewClass]
                                userInfo:nil] raise];
+    }
 
     return annotationViewClass;
 }
 
 - (void)HK_configureAnnotationView:(MKAnnotationView *)annotationView
 {
-    if ( _configBlockForAnnotationView[ NSStringFromClass([annotationView.annotation class])] )
+    if ( _configBlockForAnnotationView[ NSStringFromClass([annotationView.annotation class])] ) {
         ( (ConfigurationBlockType)_configBlockForAnnotationView[ NSStringFromClass([annotationView.annotation class]) ] )(annotationView, annotationView.annotation);
-    if (_configBlockForAllClasses)
-        _configBlockForAllClasses(annotationView, annotationView.annotation);
+    }
+    
+    if (_configBlockForAllClasses) {
+         _configBlockForAllClasses(annotationView, annotationView.annotation);
+    }
 }
 
 - (BOOL)HK_isNoneRegistered

EPMapExtensions/HKPointOfInterest.h

@@ -10,7 +10,7 @@
 #import <CoreLocation/CoreLocation.h>
 
 /**
- `EPPointOfInterest` represent an annotation object responding to `MKAnnotation` protocol
+ `HKPointOfInterest` represent an annotation object responding to `MKAnnotation` protocol
  */
 
 @interface HKPointOfInterest : NSObject <MKAnnotation, NSCopying>
@@ -29,7 +29,7 @@
  Coordinate of the point of interest
  */
 
-@property (readonly) CLLocationCoordinate2D coordinate;
+@property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
 
 @end
 

EPMapExtensionsTests/HKAnnotationArrayTest.m

@@ -25,6 +25,26 @@ - (void)setUp
                                                                   addressDictionary:nil];
 }
 
+- (void)testInitWithAnnotationsConformingToMKAnnotationProtocol
+{
+    _annotationArray = [[HKAnnotationArray alloc] initWithAnnotationArray:@[_poi, _poi]];
+    STAssertTrue([_annotationArray count] == 2, @"annotation array obj should contain 2 pois");
+}
+
+- (void)testInitWithAnnotationsNotConformingToMKAnnotationProtocol
+{
+    STAssertThrows((_annotationArray = [[HKAnnotationArray alloc] initWithAnnotationArray:@[_poi, @"test"]]),
+                   @"should raise exception");
+    STAssertTrue([_annotationArray count] == 0, @"annotation array should be nil");
+}
+
+- (void)testWithNilAnnoatationsCollection
+{
+    _annotationArray = [[HKAnnotationArray alloc] initWithAnnotationArray:nil];
+    STAssertTrue(_annotationArray != nil, @"annotation array should have been allocated");
+    STAssertTrue([_annotationArray count] == 0, @"annotation array should contain 0 elements");
+}
+
 - (void)testAddAnnotationConformToProtocol
 {
     [_annotationArray addAnnotation:_poi];

iOSMapExtension/HKAppDelegate.h

@@ -8,12 +8,12 @@
 
 #import <UIKit/UIKit.h>
 
-@class EPViewController;
+@class HKViewController;
 
 @interface HKAppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 
-@property (strong, nonatomic) EPViewController *viewController;
+@property (strong, nonatomic) HKViewController *viewController;
 
 @end