upgraded project to the more-less modern state (iOS 7 bottomline)

added nullability

added EDQueueJob instead of dictionary + keys (for user data it still provides userInfo dictionary, nullable)

Author: gelosi

EDQueue.podspec

@@ -3,10 +3,10 @@ Pod::Spec.new do |s|
   s.version      = '0.7.2'
   s.license      = 'MIT'
   s.summary      = 'A persistent background job queue for iOS.'
-  s.homepage     = 'https://github.com/thisandagain/queue'
+  s.homepage     = 'https://github.com/gelosi/queue'
   s.authors      = {'Andrew Sliwinski' => '[email protected]', 'Francois Lambert' => '[email protected]', 'Oleg Shanyuk' => '[email protected]'}
-  s.source       = { :git => 'https://github.com/thisandagain/queue.git', :tag => 'v0.7.1' }
-  s.platform     = :ios, '5.0'
+  s.source       = { :git => 'https://github.com/gelosi/queue.git', :tag => 'v0.7.2' }
+  s.platform     = :ios, '7.0'
   s.source_files = 'EDQueue'
   s.library      = 'sqlite3.0'
   s.requires_arc = true

EDQueue/EDQueue.h

@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import "EDQueueJob.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, EDQueueResult) {
@@ -40,21 +42,19 @@ extern NSString *const EDQueueDataKey;
 @property (nonatomic, readonly) BOOL isActive;
 @property (nonatomic) NSUInteger retryLimit;
 
-- (void)enqueueWithData:(nullable NSDictionary *)data forTask:(NSString *)task;
+- (void)enqueueJob:(EDQueueJob *)job;
 - (void)start;
 - (void)stop;
 - (void)empty;
 
 - (BOOL)jobExistsForTask:(NSString *)task;
 - (BOOL)jobIsActiveForTask:(NSString *)task;
-- (NSDictionary *)nextJobForTask:(NSString *)task;
+- (nullable EDQueueJob *)nextJobForTask:(NSString *)task;
 
 @end
 
 @protocol EDQueueDelegate <NSObject>
-@optional
-- (EDQueueResult)queue:(EDQueue *)queue processJob:(NSDictionary *)job;
-- (void)queue:(EDQueue *)queue processJob:(NSDictionary *)job completion:(EDQueueCompletionBlock)block;
+- (void)queue:(EDQueue *)queue processJob:(EDQueueJob *)job completion:(EDQueueCompletionBlock)block;
 @end
 
 NS_ASSUME_NONNULL_END

EDQueue/EDQueue.m

@@ -18,6 +18,14 @@
 NSString *const EDQueueNameKey = @"name";
 NSString *const EDQueueDataKey = @"data";
 
+
+NSString *const EDQueueStorageJobIdKey = @"id";
+NSString *const EDQueueStorageJobTaskKey = @"task";
+NSString *const EDQueueStorageJobDataKey = @"data";
+NSString *const EDQueueStorageJobAttemptsKey = @"atempts";
+NSString *const EDQueueStorageJobStampKey = @"stamp";
+
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface EDQueue ()
@@ -80,10 +88,9 @@ - (void)dealloc
  *
  * @return {void}
  */
-- (void)enqueueWithData:(nullable NSDictionary *)data forTask:(NSString *)task
+- (void)enqueueJob:(EDQueueJob *)job
 {
-    if (data == nil) data = @{};
-    [self.engine createJob:data forTask:task];
+    [self.engine createJob:job];
     [self tick];
 }
 
@@ -120,9 +127,9 @@ - (BOOL)jobIsActiveForTask:(NSString *)task
  *
  * @return {NSArray}
  */
-- (NSDictionary *)nextJobForTask:(NSString *)task
+- (nullable EDQueueJob *)nextJobForTask:(NSString *)task
 {
-    NSDictionary *nextJobForTask = [self.engine fetchJobForTask:task];
+    EDQueueJob *nextJobForTask = [self.engine fetchJobForTask:task];
     return nextJobForTask;
 }
 
@@ -190,81 +197,56 @@ - (void)tick
         if (self.isRunning && !self.isActive && [self.engine fetchJobCount] > 0) {
             // Start job
             _isActive = YES;
-            NSDictionary *job = [self.engine fetchJob];
-            self.activeTask = [job objectForKey:@"task"];
+            EDQueueJob *job = [self.engine fetchJob];
+            self.activeTask = job.task;
 
             // Pass job to delegate
-            if ([self.delegate respondsToSelector:@selector(queue:processJob:completion:)]) {
                 [self.delegate queue:self processJob:job completion:^(EDQueueResult result) {
                     [self processJob:job withResult:result];
                     self.activeTask = nil;
                 }];
-            } else {
-                EDQueueResult result = [self.delegate queue:self processJob:job];
-                [self processJob:job withResult:result];
-                self.activeTask = nil;
-            }
         }
     });
 }
 
-- (void)processJob:(NSDictionary*)job withResult:(EDQueueResult)result
+- (void)processJob:(EDQueueJob*)job withResult:(EDQueueResult)result
 {
-    if (!job) {
-        job = @{};
-    }
     // Check result
     switch (result) {
         case EDQueueResultSuccess:
 
-//            NSDictionary *object = @{
-//                                     EDQueueNameKey : EDQueueJobDidSucceed,
-//                                     EDQueueDataKey : job
-//                                     };
-            //[NSDictionary dictionaryWithObjectsAndKeys:EDQueueJobDidSucceed, EDQueueNameKey, job, EDQueueDataKey, nil]
-
-//            [self performSelectorOnMainThread:@selector(postNotification:)
-//                                   withObject:@{
-//                                                EDQueueNameKey : EDQueueJobDidSucceed,
-//                                                EDQueueDataKey : job
-//                                                }
-//                                waitUntilDone:false];
-
             [self postNotificationOnMainThread:@{
                                                  EDQueueNameKey : EDQueueJobDidSucceed,
                                                  EDQueueDataKey : job
                                                  }];
 
-            [self.engine removeJob:[job objectForKey:@"id"]];
+            [self.engine removeJob:job];
             break;
 
         case EDQueueResultFail:
-//            [self performSelectorOnMainThread:@selector(postNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:EDQueueJobDidFail, EDQueueNameKey, job, EDQueueDataKey, nil] waitUntilDone:true];
 
             [self postNotificationOnMainThread:@{
                                                  EDQueueNameKey : EDQueueJobDidFail,
                                                  EDQueueDataKey : job
                                                  }];
 
-            NSUInteger currentAttempt = [[job objectForKey:@"attempts"] intValue] + 1;
+            NSUInteger currentAttempt = job.attempts.integerValue + 1;
 
             if (currentAttempt < self.retryLimit) {
-                [self.engine incrementAttemptForJob:[job objectForKey:@"id"]];
+                [self.engine incrementAttemptForJob:job];
             } else {
-                [self.engine removeJob:[job objectForKey:@"id"]];
+                [self.engine removeJob:job];
             }
             break;
         case EDQueueResultCritical:
 
-//            [self performSelectorOnMainThread:@selector(postNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:EDQueueJobDidFail, EDQueueNameKey, job, EDQueueDataKey, nil] waitUntilDone:false];
-
             [self postNotificationOnMainThread:@{
                                                  EDQueueNameKey : EDQueueJobDidFail,
                                                  EDQueueDataKey : job
                                                  }];
 
             [self errorWithMessage:@"Critical error. Job canceled."];
-            [self.engine removeJob:[job objectForKey:@"id"]];
+            [self.engine removeJob:job];
             break;
     }
 
@@ -273,7 +255,7 @@ - (void)processJob:(NSDictionary*)job withResult:(EDQueueResult)result
 
     // Drain
     if ([self.engine fetchJobCount] == 0) {
-//        [self performSelectorOnMainThread:@selector(postNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:EDQueueDidDrain, EDQueueNameKey, nil, EDQueueDataKey, nil] waitUntilDone:false];
+
         [self postNotificationOnMainThread:@{
                                              EDQueueNameKey : EDQueueDidDrain,
                                              }];

EDQueue/EDQueueJob.h

@@ -0,0 +1,35 @@
+//
+//  EDQueueJob.h
+//  queue
+//
+//  Created by Oleg Shanyuk on 18/02/16.
+//  Copyright © 2016 DIY, Co. All rights reserved.
+//
+
+@import Foundation;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface EDQueueJob : NSObject
+
+@property(nonatomic, readonly) NSString *task;
+@property(nonatomic, readonly) NSDictionary *userInfo;
+
+@property(nonatomic, readonly, nullable) NSNumber *jobID;
+@property(nonatomic, readonly, nullable) NSNumber *attempts;
+@property(nonatomic, readonly, nullable) NSString *timeStamp;
+
+- (instancetype)initWithTask:(NSString *)task
+                    userInfo:(nullable NSDictionary *)userInfo
+                       jobID:(nullable NSNumber *)jobID
+                     atempts:(nullable NSNumber *)attemps
+                   timeStamp:(nullable NSString *)timeStamp;
+
+- (instancetype)initWithTask:(NSString *)task
+                    userInfo:(nullable NSDictionary *)userInfo;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END

EDQueue/EDQueueJob.m

@@ -0,0 +1,42 @@
+//
+//  EDQueueJob.m
+//  queue
+//
+//  Created by Oleg Shanyuk on 18/02/16.
+//  Copyright © 2016 DIY, Co. All rights reserved.
+//
+
+#import "EDQueueJob.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation EDQueueJob
+
+- (instancetype)initWithTask:(NSString *)task
+                    userInfo:(nullable NSDictionary *)userInfo
+                       jobID:(nullable NSNumber *)jobID
+                     atempts:(nullable NSNumber *)attemps
+                   timeStamp:(nullable NSString *)timeStamp
+{
+  self = [super init];
+
+  if (self) {
+      _jobID = [jobID copy];
+      _task = [task copy];
+      _userInfo =  userInfo ? [userInfo copy] : @{};
+      _attempts = [attemps copy];
+      _timeStamp = [timeStamp copy];
+  }
+
+  return self;
+}
+
+- (instancetype)initWithTask:(NSString *)task
+                    userInfo:(nullable NSDictionary *)userInfo
+{
+    return [self initWithTask:task userInfo:userInfo jobID:nil atempts:nil timeStamp:nil];
+}
+
+@end
+
+NS_ASSUME_NONNULL_END

EDQueue/EDQueueStorageEngine.h

@@ -6,20 +6,23 @@
 //  Copyright (c) 2012 DIY, Co. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
-@class FMDatabaseQueue;
-@interface EDQueueStorageEngine : NSObject
+NS_ASSUME_NONNULL_BEGIN
+
+@class EDQueueJob;
 
-@property (retain) FMDatabaseQueue *queue;
+@interface EDQueueStorageEngine : NSObject
 
-- (void)createJob:(NSDictionary *)data forTask:(id)task;
-- (BOOL)jobExistsForTask:(id)task;
-- (void)incrementAttemptForJob:(NSNumber *)jid;
-- (void)removeJob:(NSNumber *)jid;
+- (void)createJob:(EDQueueJob *)job;
+- (BOOL)jobExistsForTask:(NSString *)task;
+- (void)incrementAttemptForJob:(EDQueueJob *)jid;
+- (void)removeJob:(EDQueueJob *)jid;
 - (void)removeAllJobs;
 - (NSUInteger)fetchJobCount;
-- (NSDictionary *)fetchJob;
-- (NSDictionary *)fetchJobForTask:(id)task;
+- (nullable EDQueueJob *)fetchJob;
+- (nullable EDQueueJob *)fetchJobForTask:(NSString *)task;
+
+@end
 
-@end
+NS_ASSUME_NONNULL_END