Merge pull request #6 from k06a/feature/defaults-archived

Add DIDefaultsArchive and DIDefaultsArchiveSync protocols
k06a · May 29, 2016 · 50709ba · 50709ba
2 parents 26426fb + 4a5b642
commit 50709ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/DeluxeInjection.podspec b/DeluxeInjection.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "DeluxeInjection"
-  s.version          = "0.3.0"
+  s.version          = "0.3.1"
   s.summary          = "Simplest Objective-C Dependency Injection (DI:syringe:) implementation ever"
 
   s.description      = <<-DESC

diff --git a/DeluxeInjection/Classes/DIDefaults.h b/DeluxeInjection/Classes/DIDefaults.h
@@ -1,6 +1,6 @@
 //
 //  DIDefaults.h
-//  Pods
+//  DeluxeInjection
 //
 //  Copyright (c) 2016 Anton Bukov <k06aaa@gmail.com>
 //
@@ -29,7 +29,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface NSObject (DIDefaults) <DIDefaults, DIDefaultsSync>
+@protocol DIDefaultsArchived <NSObject>
+
+@end
+
+@protocol DIDefaultsArchivedSync <NSObject>
+
+@end
+
+@interface NSObject (DIDefaults) <DIDefaults, DIDefaultsSync, DIDefaultsArchived, DIDefaultsArchivedSync>
 
 @end
 

diff --git a/DeluxeInjection/Classes/DIDefaults.m b/DeluxeInjection/Classes/DIDefaults.m
@@ -1,6 +1,6 @@
 //
 //  DIDefaults.m
-//  Pods
+//  DeluxeInjection
 //
 //  Copyright (c) 2016 Anton Bukov <k06aaa@gmail.com>
 //
@@ -17,6 +17,7 @@
 //  limitations under the License.
 //
 
+#import <Foundation/Foundation.h>
 #import "DIDeluxeInjectionPlugin.h"
 #import "DIDefaults.h"
 
@@ -28,15 +29,22 @@ @implementation DeluxeInjection (DIDefaults)
 
 #pragma mark - Private
 
-+ (void)injectDefaultsWithKey:(DIDefaultsKeyBlock)keyBlock forProtocol:(Protocol *)protocol withSync:(BOOL)withSync {
++ (void)injectDefaultsWithKey:(DIDefaultsKeyBlock)keyBlock forProtocol:(Protocol *)protocol withSync:(BOOL)withSync withArchive:(BOOL)withArchive {
     [self inject:^NSArray *(Class targetClass, SEL getter, SEL setter, NSString *propertyName, Class propertyClass, NSSet<Protocol *> *propertyProtocols) {
         NSString *key = keyBlock(targetClass, propertyName, propertyClass, propertyProtocols) ?: propertyName;
         return @[DIGetterMake(^id _Nullable(id  _Nonnull target, id  _Nullable __autoreleasing * _Nonnull ivar) {
             if (withSync) {
                 [[NSUserDefaults standardUserDefaults] synchronize];
             }
-            return [[NSUserDefaults standardUserDefaults] objectForKey:key];
+            id value = [[NSUserDefaults standardUserDefaults] objectForKey:key];
+            if (withArchive && value) {
+                return [NSKeyedUnarchiver unarchiveObjectWithData:value];
+            }
+            return value;
         }), DISetterWithOriginalMake(^(id  _Nonnull target, id  _Nullable __autoreleasing * _Nonnull ivar, id  _Nonnull value, void (* _Nullable originalSetter)(id  _Nonnull __strong, SEL _Nonnull, id  _Nullable __strong)) {
+            if (withArchive && value) {
+                value = [NSKeyedArchiver archivedDataWithRootObject:value];
+            }
             [[NSUserDefaults standardUserDefaults] setObject:value forKey:key];
             if (withSync) {
                 [[NSUserDefaults standardUserDefaults] synchronize];
@@ -57,8 +65,10 @@ + (void)injectDefaults {
 }
 
 + (void)injectDefaultsWithKey:(DIDefaultsKeyBlock)keyBlock {
-    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaults) withSync:NO];
-    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaultsSync) withSync:YES];
+    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaults) withSync:NO withArchive:NO];
+    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaultsSync) withSync:YES withArchive:NO];
+    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaultsArchived) withSync:NO withArchive:YES];
+    [self injectDefaultsWithKey:keyBlock forProtocol:@protocol(DIDefaultsArchivedSync) withSync:YES withArchive:YES];
 }
 
 + (void)rejectDefaults {
@@ -68,6 +78,12 @@ + (void)rejectDefaults {
     [self reject:^BOOL(Class targetClass, NSString *propertyName, Class propertyClass, NSSet<Protocol *> *propertyProtocols) {
         return YES;
     } conformingProtocol:@protocol(DIDefaultsSync)];
+    [self reject:^BOOL(Class targetClass, NSString *propertyName, Class propertyClass, NSSet<Protocol *> *propertyProtocols) {
+        return YES;
+    } conformingProtocol:@protocol(DIDefaultsArchived)];
+    [self reject:^BOOL(Class targetClass, NSString *propertyName, Class propertyClass, NSSet<Protocol *> *propertyProtocols) {
+        return YES;
+    } conformingProtocol:@protocol(DIDefaultsArchivedSync)];
 }
 
 @end