Merge pull request #81 from cloudspace/code_improvements

Code improvements

Author: jlorich

EasyReader - Unit Tests/Application/Controllers/Menu/EZRMenuSearchControllerTests.m

@@ -69,26 +69,5 @@ - (void)testSearch
     [mockAPIClient verify];
 }
 
-- (void)testSearchCancel
-{
-    [[mockAPIClient expect] requestRoute:@"feedSearch"
-                              parameters:[OCMArg any]
-                                 success:[OCMArg any]
-                                 failure:[OCMArg any]];
-    
-    [controller search:@"test1"];
-    
-    [[mockAPIClient expect] cancelOperationsForRoute:@"feedSearch"
-                                          parameters:@{@"name": @"test1"}];
-    
-    [[mockAPIClient expect] requestRoute:@"feedSearch"
-                              parameters:[OCMArg any]
-                                 success:[OCMArg any]
-                                 failure:[OCMArg any]];
-    
-    [controller search:@"test2"];
-    
-    [mockAPIClient verify];
-}
 
 @end

EasyReader - Unit Tests/Application/Models/CSRemoteObjectTests.m

@@ -12,6 +12,7 @@
 
 @implementation EZRBaseModelTests
 
+
 - (void)setUp
 {
     [User setCurrent:nil];

EasyReader - Unit Tests/Application/Models/EZRBaseModelTests.m

@@ -16,6 +16,7 @@
 #import "FeedItem.h"
 #import "Feed.h"
 #import "User.h"
+#import "EZRRegisterRoutesService.h"
 
 @interface FeedItem (Test)
 
@@ -66,6 +67,15 @@ - (void)testHeadline
     XCTAssertTrue(assert, @"");
 }
 
+- (void)testStupidBrokenSingletonBullshit {
+    id mock = [[APIClient alloc] init];
+    [APIClient setSharedClient:mock];
+    
+    XCTAssertEqual(mock, [APIClient shared], @"works");
+    XCTAssertEqual([FeedItem client], [APIClient shared], @"doesn't work");
+    
+}
+
 - (void)testRequestFeedItemsFromFeeds
 {
     [[mockAPIClient expect] requestRoute:@"feedItems"
@@ -76,11 +86,13 @@ - (void)testRequestFeedItemsFromFeeds
     Feed *feed = [Feed MR_createEntity];
     [feed setId:@1];
 
+   // [mockAPIClient requestRoute:@"feedItems" parameters:nil success:nil failure:nil];
+    
     [FeedItem requestFeedItemsFromFeeds:[NSSet setWithObject:feed]
                                   since:[NSDate date]
                                 success:nil
                                 failure:nil];
-        
+    
     [mockAPIClient verify];
 }
 

EasyReader - Unit Tests/Application/Models/EZRFeedItemTests.m

@@ -7,74 +7,69 @@
 //
 
 #import "EZRRootViewController.h"
-
 #import "EZRMenuViewController.h"
 #import "EZRHomeViewController.h"
 
 
+#pragma mark - MFSideMenuContainerViewController
 
-//#import "UIViewController+NibLoader.h"
-
-
+/**
+ * Category to enable access to the private menuContainerView property
+ */
 @interface MFSideMenuContainerViewController ()
 
+/// The menu container view
 @property (nonatomic, strong) UIView *menuContainerView;
 
 @end
 
 
+#pragma mark - Root view controller
+
 @implementation EZRRootViewController
 
 /**
  * Creates the menu contorllers and side menu
  */
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{    
-  self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-  
-  if (self) {
-    // Create view controller
-    UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
-    EZRHomeViewController *collections = [storyboard_home instantiateViewControllerWithIdentifier:@"Home"];
-    _viewController_main = collections;
-
-    [self setViewControllers:@[_viewController_main]];
-  }
-  
-  return self;
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    
+    if (self) {
+        UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
+        EZRHomeViewController *collections = [storyboard_home instantiateViewControllerWithIdentifier:@"Home"];
+        _viewController_main = collections;
+        
+        [self setViewControllers:@[_viewController_main]];
+    }
+    
+    return self;
 }
 
-- (void)viewDidAppear:(BOOL)animated
-{
+/**
+ * Disable the gesture recognizer on the left view controller so that it doesn't interfere with
+ * swipe to delete on the feed menu tableview
+ */
+- (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
 
     MFSideMenuContainerViewController *container = (MFSideMenuContainerViewController *)[[[[UIApplication sharedApplication] delegate] window] rootViewController];
-//    container.menuContainerView.gestureRecognizers
-    
 
     for (UIGestureRecognizer *recognizer in container.menuContainerView.gestureRecognizers) {
         [recognizer setEnabled:NO];
-//        [container.menuContainerView removeGestureRecognizer:recognizer];
     }
-
 }
 
 /**
  * If the left menu is open, it closes it
  * Otherwise it opens to the left menu
  */
-- (void) toggleLeftMenu
-{
-  if (self.menuContainerViewController.menuState == MFSideMenuStateLeftMenuOpen)
-  {
-    [self.menuContainerViewController setMenuState:MFSideMenuStateClosed completion:^{}];
-  
-  }
-  else
-  {
-    [self.menuContainerViewController toggleLeftSideMenuCompletion:^{}];
-  }
+- (void) toggleLeftMenu {
+    if (self.menuContainerViewController.menuState == MFSideMenuStateLeftMenuOpen) {
+        [self.menuContainerViewController setMenuState:MFSideMenuStateClosed completion:^{}];
+        
+    } else {
+        [self.menuContainerViewController toggleLeftSideMenuCompletion:^{}];
+    }
 }
 
-
 @end

EasyReader.xcodeproj/project.pbxproj

@@ -9,13 +9,13 @@
 #import <UIKit/UIKit.h>
 #import "FeedItem.h"
 
-@class EZRCollectionView;
+@class EZRFeedItemCollectionView;
 
-@protocol EZRCollectionViewDelegate<NSObject, UICollectionViewDelegate>
+@protocol EZRFeedItemCollectionViewDelegate<NSObject, UICollectionViewDelegate>
 
 @optional
 
-- (void)collectionView:(EZRCollectionView *)collectionView didTapTitleOfItem:(FeedItem *)item;
+- (void)collectionView:(EZRFeedItemCollectionView *)collectionView didTapTitleOfItem:(FeedItem *)item;
 
 @end