added new methods to take custom NSDateFormatter object

Author: Shan Ul Haq

Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - Realm (0.91.1):
-    - Realm/Headers (= 0.91.1)
-  - Realm/Headers (0.91.1)
+  - Realm (0.92.3):
+    - Realm/Headers (= 0.92.3)
+  - Realm/Headers (0.92.3)
 
 DEPENDENCIES:
   - Realm
 
 SPEC CHECKSUMS:
-  Realm: b9c1fd9defa26aa7276ce938a8df52ec81f24528
+  Realm: bf604805d5e897850da488260f93889f510924b3
 
-COCOAPODS: 0.36.3
+COCOAPODS: 0.37.1

SHModelObject.xcworkspace/xcuserdata/shan.haq.xcuserdatad/UserInterfaceState.xcuserstate

@@ -61,7 +61,8 @@
  *  @param dictionary dictionary containing key/value pairs for the object
  *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
  *type.
- *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date.
+ *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date. this will use
+ *the systemTimeZone to create the formatter
  *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
  *
  *  @return object of type instancetype populated with the values from `dictionary`
@@ -71,6 +72,23 @@
                    inputDateFormat:(NSString *)inputDateFormat
                           mappings:(NSDictionary *)mapping;
 
+/**
+ *  class initializer
+ *
+ *  @param dictionary dictionary containing key/value pairs for the object
+ *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
+ *type.
+ *  @param inputDateFormatter NSDateFormatter object which will be used to format the input date.
+ *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
+ *
+ *  @return object of type instancetype populated with the values from `dictionary`
+ */
+
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary
+              dateConversionOption:(kDateConversionOption)option
+                inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                          mappings:(NSDictionary *)mapping;
+
 /**
  *  static variant of class initializer with nil check for the dictionary passed
  *
@@ -114,7 +132,8 @@
  *  @param dictionary dictionary containing key/value pairs for the object
  *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
  *type.
- *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date.
+ *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date. this will use
+ *the systemTimeZone to create the formatter
  *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
  *
  *  @return object of type instancetype populated with the values from `dictionary`
@@ -124,6 +143,22 @@
                      inputDateFormat:(NSString *)inputDateFormat
                             mappings:(NSDictionary *)mapping;
 
+/**
+ *  static variant of class initializer with nil check for the dictionary passed
+ *
+ *  @param dictionary dictionary containing key/value pairs for the object
+ *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
+ *type.
+ *  @param inputDateFormatter NSDateFormatter object which will be used to format the input date.
+ *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
+ *
+ *  @return object of type instancetype populated with the values from `dictionary`
+ */
++ (instancetype)objectWithDictionary:(NSDictionary *)dictionary
+                dateConversionOption:(kDateConversionOption)option
+                  inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                            mappings:(NSDictionary *)mapping;
+
 /**
  *  update the instance with new dictionary values
  *
@@ -155,7 +190,8 @@
  *  @param dictionary dictionary containing key/value pairs for the object
  *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
  *type.
- *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date.
+ *  @param inputDateFormat NSDateFormatter format specifier which will be used to format the input date. this will use
+ *the systemTimeZone to create the formatter
  *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
  *
  *  @return object of type instancetype populated with the values from `dictionary`
@@ -165,6 +201,22 @@
                      inputDateFormat:(NSString *)inputDateFormat
                             mappings:(NSDictionary *)mapping;
 
+/**
+ *  update the instance with new dictionary values
+ *
+ *  @param dictionary dictionary containing key/value pairs for the object
+ *  @param option `kDateConverstionOption` to determine what to do when the value from dictionary is a DOT.NET Date
+ *type.
+ *  @param inputDateFormatter NSDateFormatter object which will be used to format the input date.
+ *  @param mapping dictionary to define the mappings for date conversion and array <-> object.
+ *
+ *  @return object of type instancetype populated with the values from `dictionary`
+ */
+- (instancetype)updateWithDictionary:(NSDictionary *)dictionary
+                dateConversionOption:(kDateConversionOption)option
+                  inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                            mappings:(NSDictionary *)mapping;
+
 @end
 
 @interface NSString (Additions)

SHModelObject/SHModelObject/SHModelObject.h

@@ -119,6 +119,23 @@ + (instancetype)objectWithDictionary:(NSDictionary *)dictionary
                                            mappings:mapping];
 }
 
++ (instancetype)objectWithDictionary:(NSDictionary *)dictionary
+                dateConversionOption:(kDateConversionOption)option
+                  inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                            mappings:(NSDictionary *)mapping {
+    if (nil == dictionary || ![dictionary isKindOfClass:[NSDictionary class]]) {
+        return nil;
+    }
+
+    if ([dictionary isKindOfClass:[NSNull class]]) {
+        return nil;
+    }
+    return [[[self class] alloc] initWithDictionary:dictionary
+                               dateConversionOption:option
+                                 inputDateFormatter:inputDateFormatter
+                                           mappings:mapping];
+}
+
 //
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary;
 {
@@ -158,6 +175,19 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
     return self;
 }
 
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary
+              dateConversionOption:(kDateConversionOption)option
+                inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                          mappings:(NSDictionary *)mapping {
+    if ((self = [super init])) {
+        return [self updateWithDictionary:dictionary
+                     dateConversionOption:option
+                       inputDateFormatter:inputDateFormatter
+                                 mappings:mapping];
+    }
+    return self;
+}
+
 // NSCoding
 - (NSArray *)propertyNames {
     NSMutableArray *array = [NSMutableArray array];
@@ -257,6 +287,18 @@ - (instancetype)updateWithDictionary:(NSDictionary *)dictionary
     return [self updateWithDictionary:dictionary];
 }
 
+- (instancetype)updateWithDictionary:(NSDictionary *)dictionary
+                dateConversionOption:(kDateConversionOption)option
+                  inputDateFormatter:(NSDateFormatter *)inputDateFormatter
+                            mappings:(NSDictionary *)mapping {
+    _converstionOption = option;
+    _inputDateFormat = kInputDateFormatCustom;
+    _customFormatter = inputDateFormatter;
+    _mappings = mapping;
+
+    return [self updateWithDictionary:dictionary];
+}
+
 #pragma mark - SHModalSerialization protocol methods
 
 - (void)serializeValue:(id)value withKey:(id)key {