Skip to content

Bump target to iOS7, introduce nullability, always async, and separate storage from queue #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gelosi wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Bump target to iOS7, introduce nullability, always async, and separate storage from queue #22

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6f779a5
🍋 sanitise code
gelosi Feb 18, 2016
9d08d34
upgraded project to the more-less modern state (iOS 7 bottomline)
gelosi Feb 19, 2016
9adb89e
Introduced Persistent Storage Injection for Queue
gelosi Feb 19, 2016
63a2f12
added NSDictionary contents enforcements
gelosi Feb 19, 2016
9673f1a
Refactoring part one: removing unnecessary for public use properties …
gelosi Feb 23, 2016
1f2c92a
Renamed EDQueueStoredJob to EDQueueStorageItem which is way more logical
gelosi Feb 23, 2016
bd34c48
Refeactor stage two: code Task becomes Tag
gelosi Feb 23, 2016
068d114
Refactoring: tune things up in line with merge request #22
gelosi Feb 24, 2016
474a202
EDQueueJob got expiration date, maxRetryCount, retryTimeInterval; EDQ…
gelosi Feb 24, 2016
82a64aa
Removes expired jobs along with removing job by ID
gelosi Feb 25, 2016
12e0b86
Queue got jobCount & better scheduling though storage requirement (`f…
gelosi Feb 26, 2016
22aac2c
fixed issue with global dispatch queue (so, each instance if EDQueue …
gelosi Mar 1, 2016
29f231c
Interface refactoring: removed nullability from attempts property of …
gelosi Mar 7, 2016
7e25335
StorageEngine: use more powerful NSKeyedArchiver (allows to store you…
gelosi Jul 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions EDQueue.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Pod::Spec.new do |s|
s.name = 'EDQueue'
s.version = '0.7.1'
s.version = '1.0'
s.license = 'MIT'
s.summary = 'A persistent background job queue for iOS.'
s.homepage = 'https://github.com/thisandagain/queue'
s.authors = {'Andrew Sliwinski' => '[email protected]', 'Francois Lambert' => '[email protected]'}
s.source = { :git => 'https://github.com/thisandagain/queue.git', :tag => 'v0.7.1' }
s.platform = :ios, '5.0'
s.homepage = 'https://github.com/gelosi/queue'
Copy link
Owner

@thisandagain thisandagain Feb 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we move the location of the homepage and repo?

Copy link
Author

@gelosi gelosi Feb 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've set it to mine now to use it already, but if you will accept the changes in the end (I'm still on it) I'd be happy to keep original link to repo.

s.authors = {'Andrew Sliwinski' => '[email protected]', 'Francois Lambert' => '[email protected]', 'Oleg Shanyuk' => '[email protected]'}
s.source = { :git => 'https://github.com/gelosi/queue.git', :tag => 'v1.0' }
s.platform = :ios, '7.0'
s.source_files = 'EDQueue'
s.library = 'sqlite3.0'
s.requires_arc = true
s.dependency 'FMDB', '~> 2.0'
s.dependency 'FMDB', '~> 2.1'
end
45 changes: 31 additions & 14 deletions EDQueue/EDQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
// Copyright (c) 2012 Andrew Sliwinski. All rights reserved.
//

#import <UIKit/UIKit.h>
@import Foundation;

#import "EDQueueJob.h"
#import "EDQueuePersistentStorageProtocol.h"

NS_ASSUME_NONNULL_BEGIN

typedef NS_ENUM(NSInteger, EDQueueResult) {
EDQueueResultSuccess = 0,
Expand All @@ -22,30 +27,42 @@ extern NSString *const EDQueueJobDidSucceed;
extern NSString *const EDQueueJobDidFail;
extern NSString *const EDQueueDidDrain;

@protocol EDQueueDelegate;
@interface EDQueue : NSObject
@class EDQueue;

+ (EDQueue *)sharedInstance;
@protocol EDQueueDelegate <NSObject>
- (void)queue:(EDQueue *)queue processJob:(EDQueueJob *)job completion:(EDQueueCompletionBlock)block;
@end

@interface EDQueue : NSObject

@property (nonatomic, weak) id<EDQueueDelegate> delegate;
@property (nonatomic, strong, readonly) id<EDQueuePersistentStorage> storage;

/**
* Returns true if Queue is running (e.g. not stopped).
Copy link
Owner

@thisandagain thisandagain Feb 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Thanks

*/
@property (nonatomic, readonly) BOOL isRunning;
/**
* Returns true if Queue is performing Job right now
*/
@property (nonatomic, readonly) BOOL isActive;
@property (nonatomic) NSUInteger retryLimit;

- (void)enqueueWithData:(id)data forTask:(NSString *)task;
+ (instancetype)defaultQueue;

- (instancetype)initWithPersistentStore:(id<EDQueuePersistentStorage>)persistentStore;

- (void)enqueueJob:(EDQueueJob *)job;
- (void)start;
- (void)stop;
- (void)empty;

- (BOOL)jobExistsForTask:(NSString *)task;
- (BOOL)jobIsActiveForTask:(NSString *)task;
- (NSDictionary *)nextJobForTask:(NSString *)task;
- (NSInteger)jobCount;

@end
- (BOOL)jobExistsForTag:(NSString *)tag;
- (BOOL)jobIsActiveForTag:(NSString *)tag;
- (nullable EDQueueJob *)nextJobForTag:(NSString *)tag;

@protocol EDQueueDelegate <NSObject>
@optional
- (EDQueueResult)queue:(EDQueue *)queue processJob:(NSDictionary *)job;
- (void)queue:(EDQueue *)queue processJob:(NSDictionary *)job completion:(EDQueueCompletionBlock)block;
@end


NS_ASSUME_NONNULL_END
Loading