merge in master

Author: Joey Lorich

.travis.yml

@@ -8,4 +8,5 @@ before_install:
 script:
   - xctool -workspace EasyReader.xcworkspace -scheme Development -sdk iphonesimulator7.1 ONLY_ACTIVE_ARCH=NO
   - xctool test -workspace EasyReader.xcworkspace -scheme Development -sdk iphonesimulator7.1 ONLY_ACTIVE_ARCH=NO
-
+notifications:
+  slack: cloudspace:euw2TezwiQfK9ebqBtGa1Rjz

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

@@ -10,9 +10,9 @@
 #import "EZRBaseModelTests.h"
 
 // Models
-#import "CSRemoteObject.h"
+#import "APIRemoteObject.h"
 
-@interface CSRemoteObject (Test)
+@interface APIRemoteObject (Test)
 
 + (NSDate *)dateFromAPIDateString:(NSString*)dateString;
 
@@ -48,15 +48,15 @@ - (void)testDateFromAPIDateStringNoTimeString
     // First 10 characters go up to the date without time
     NSString *dateString = [[NSString stringWithFormat:@"%@",date] substringWithRange:NSMakeRange(0, 10)];
 
-    NSString *resultDateValue = [NSString stringWithFormat:@"%@",[CSRemoteObject dateFromAPIDateString:dateString]];
+    NSString *resultDateValue = [NSString stringWithFormat:@"%@",[APIRemoteObject dateFromAPIDateString:dateString]];
 
     XCTAssertTrue([resultDateValue rangeOfString:resultDateValue].location == 0, @"");
 }
 
 - (void)testDateFromAPIDateStringFullTimeString
 {
     NSString *dateString = @"2014-03-28T14:53:21.000Z";
-    NSDate *resultDate = [CSRemoteObject dateFromAPIDateString:dateString];
+    NSDate *resultDate = [APIRemoteObject dateFromAPIDateString:dateString];
 
     NSLog(@"%@", resultDate);
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];

EasyReader.xcodeproj/project.pbxproj

@@ -13,6 +13,9 @@ @implementation EZRCoreDataService
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [MagicalRecord setShouldDeleteStoreOnModelMismatch:YES];
+//    [MagicalRecord setShouldAutoCreateManagedObjectModel:YES];
+//    [MagicalRecord setShouldAutoCreateDefaultPersistentStoreCoordinator:YES];
     [MagicalRecord setupAutoMigratingCoreDataStack];
     return YES;
 }

EasyReader/Application/AppDelegates/EZRCoreDataService.m

@@ -37,7 +37,12 @@
 #import "EZRHomePageControlDataSource.h"
 #import "EZRHomeWebViewDelegate.h"
 #import "EZRCurrentFeedsProvider.h"
-#import "CSArrayCollectionViewDataSource.h"
+
+#import "CLDArrayCollectionViewDataSource.h"
+
+#import "CLDSocialShareToolbar.h"
+
+>>>>>>> master
 #import "EZRHomeSocialToolbarDataSource.h"
 #import "EZRGoogleAnalyticsService.h"
 #import "CCARadialGradientLayer.h"
@@ -80,7 +85,7 @@ @implementation EZRHomeViewController
     EZRHomeWebViewDelegate *webViewDelegate;
 
     /// The data source for the collection view
-    CSArrayCollectionViewDataSource *collectionViewArrayDataSource;
+    CLDArrayCollectionViewDataSource *collectionViewArrayDataSource;
 
     /// Background gradient
     CCARadialGradientLayer *gradient;
@@ -264,7 +269,7 @@ - (void)layOutVerticalScrollView
  */
 - (void)setUpCollectionView
 {
-    collectionViewArrayDataSource = [CSArrayCollectionViewDataSource dataSourceWithArray:self.currentFeedsProvider.feedItems
+    collectionViewArrayDataSource = [CLDArrayCollectionViewDataSource dataSourceWithArray:self.currentFeedsProvider.feedItems
                                      reusableCellIdentifier:@"feedItem"
                                              configureBlock:^(UICollectionViewCell *cell, id item) {
                                                  ((EZRFeedItemCollectionViewCell *)cell).feedItem = item;

EasyReader/Application/Controllers/Home/EZRHomeViewController.m

@@ -105,7 +105,7 @@ - (void)applyMenuStyles
 }
 
 - (void)feedsDidChange:(EZRCurrentFeedsProvider *)currentFeedProvider feeds:(NSArray *)feeds {
-    ((CSArrayTableViewDataSource *)self.tableView_menu.dataSource).source = self.currentFeedsProvider.feeds;
+    ((CLDArrayTableViewDataSource *)self.tableView_menu.dataSource).source = self.currentFeedsProvider.feeds;
     [self.tableView_menu reloadData];
 }
 

EasyReader/Application/Controllers/Menu/EZRMenuViewController.m

@@ -20,8 +20,10 @@ @implementation EZRSearchFeedCell
 - (void)setFeedData:(NSDictionary *)feedData
 {
     _feedData = feedData;
-    //self.imageView_icon.image = [UIImage imageNamed:@"icon_plus"];
-    self.label_name.text = [feedData objectForKey:@"name"];
+    
+    if (feedData) {
+        self.label_name.text = [feedData objectForKey:@"name"];
+    }
 }
 
 @end

EasyReader/Application/Controllers/Menu/MenuCells/EZRSearchFeedCell.m

@@ -7,12 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "CSArrayTableViewDataSource.h"
+#import "CLDArrayTableViewDataSource.h"
 
 /**
  * A UITableViewDataSource for custom and searched feeds returned by the API
  */
-@interface EZRMenuSearchFeedDataSource : CSArrayTableViewDataSource
+@interface EZRMenuSearchFeedDataSource : CLDArrayTableViewDataSource
 
 #pragma mark - Properties
 

EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.h

@@ -39,9 +39,13 @@ - (void) setLastSearchTerm:(NSString *)lastSearchTerm {
 
 - (void)setFeedData:(NSDictionary *)feedData
 {
-    NSSet *feedSet = [NSSet setWithArray:feedData[@"feeds"]];
-    
-    self.source = [feedSet sortedArrayByAttributes:@[@"name"] ascending:YES];
+    if (feedData) {
+        NSSet *feedSet = [NSSet setWithArray:feedData[@"feeds"]];
+        
+        self.source = [feedSet sortedArrayByAttributes:@[@"name"] ascending:YES];
+    } else {
+        self.source = nil;
+    }
 }
 
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

EasyReader/Application/Controllers/Menu/MenuDataSources/EZRMenuSearchFeedDataSource.m

@@ -7,14 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "CSArrayTableViewDataSource.h"
+#import "CLDArrayTableViewDataSource.h"
 
 @class User;
 
 /**
  * A UITableViewDataSource for feeds in Core Data
  */
-@interface EZRMenuUserFeedDataSource : CSArrayTableViewDataSource
+@interface EZRMenuUserFeedDataSource : CLDArrayTableViewDataSource
 
 /// Feeds used to populate the menu table
 @property (nonatomic, retain) NSMutableSet *feeds;