StorageEngine: use more powerful NSKeyedArchiver (allows to store your NSCoded objects)

Author: gelosi

EDQueue.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'EDQueue'
-  s.version      = '1.0'
+  s.version      = '1.1'
   s.license      = 'MIT'
   s.summary      = 'A persistent background job queue for iOS.'
   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/gelosi/queue.git', :tag => 'v1.0' }
+  s.source       = { :git => 'https://github.com/gelosi/queue.git', :tag => 'v1.1' }
   s.platform     = :ios, '7.0'
   s.source_files = 'EDQueue'
   s.library      = 'sqlite3.0'

EDQueue/EDQueueStorageEngine.m

@@ -125,11 +125,9 @@ - (void)createJob:(EDQueueJob *)job
         @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"EDQueueJob.userInfo can not be nil" userInfo:nil];
     }
 
-    NSData *data = [NSJSONSerialization dataWithJSONObject:job.userInfo
-                                                       options:NSJSONWritingPrettyPrinted
-                                                         error:nil];
+    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:job.userInfo];
 
-    NSString *dataString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    NSString *dataString = [data base64EncodedStringWithOptions:0];
 
 
     [self.queue inDatabase:^(FMDatabase *db) {
@@ -332,7 +330,15 @@ - (NSTimeInterval)fetchNextJobTimeInterval
 
 - (id<EDQueueStorageItem>)_jobFromResultSet:(FMResultSet *)rs
 {
-    NSDictionary *userInfo = [NSJSONSerialization JSONObjectWithData:[[rs stringForColumn:@"data"] dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil];
+    NSString *encodedString = [rs stringForColumn:@"data"];
+    NSDictionary *userInfo;
+    @try {
+        NSData *data = [[NSData alloc] initWithBase64EncodedString:encodedString options:0];
+        userInfo = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+    } @catch (NSException *exception) {
+        /* respect previous JSON serialization [though, good idea to move serializer out of storage] */
+        userInfo = [NSJSONSerialization JSONObjectWithData:[encodedString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil];
+    }
 
     EDQueueStorageEngineJob *storedItem = [[EDQueueStorageEngineJob alloc] initWithTag:[rs stringForColumn:@"tag"]
                                                                        userInfo:userInfo

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Andrew Sliwinski
+Copyright (c) 2012 Andrew Sliwinski, 2016 Oleg Shanyuk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: