Merge pull request jsonmodel#276 from pmanna/master

icanzilb · icanzilb · commit ceb87c4d3d47 · 2015-05-10T23:21:08.000+02:00
New accessor for JSONModel &amp; static date formatter
diff --git a/JSONModel/JSONModel/JSONModel.h b/JSONModel/JSONModel/JSONModel.h
@@ -186,6 +186,12 @@ lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
    */
   -(NSString*)toJSONString;
 
+  /**
+   * Export the whole object to a JSON data text string
+   * @return JSON text data describing the data model
+   */
+  -(NSData*)toJSONData;
+
   /**
    * Export the specified properties of the object to a dictionary
    * @param propertyNames the properties to export; if nil, all properties exported
@@ -200,6 +206,13 @@ lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
    */
   -(NSString*)toJSONStringWithKeys:(NSArray*)propertyNames;
 
+  /**
+   * Export the specified properties of the object to a JSON data text string
+   * @param propertyNames the properties to export; if nil, all properties exported
+   * @return JSON text data describing the data model
+   */
+  -(NSData*)toJSONDataWithKeys:(NSArray*)propertyNames;
+
 /** @name Batch methods */
 
   /**
diff --git a/JSONModel/JSONModel/JSONModel.m b/JSONModel/JSONModel/JSONModel.m
@@ -928,6 +928,11 @@ -(NSString*)toJSONString
     return [self toJSONStringWithKeys:nil];
 }
 
+-(NSData*)toJSONData
+{
+	return [self toJSONDataWithKeys:nil];
+}
+
 //exports the model as a dictionary of JSON compliant objects
 -(NSDictionary*)toDictionaryWithKeys:(NSArray*)propertyNames
 {
@@ -1049,23 +1054,29 @@ -(NSDictionary*)toDictionaryWithKeys:(NSArray*)propertyNames
 }
 
 //exports model to a dictionary and then to a JSON string
+-(NSData*)toJSONDataWithKeys:(NSArray*)propertyNames
+{
+	NSData* jsonData = nil;
+	NSError* jsonError = nil;
+	
+	@try {
+		NSDictionary* dict = [self toDictionaryWithKeys:propertyNames];
+		jsonData = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:&jsonError];
+	}
+	@catch (NSException *exception) {
+		//this should not happen in properly design JSONModel
+		//usually means there was no reverse transformer for a custom property
+		JMLog(@"EXCEPTION: %@", exception.description);
+		return nil;
+	}
+	
+	return jsonData;
+}
+
 -(NSString*)toJSONStringWithKeys:(NSArray*)propertyNames
 {
-    NSData* jsonData = nil;
-    NSError* jsonError = nil;
-    
-    @try {
-        NSDictionary* dict = [self toDictionaryWithKeys:propertyNames];
-        jsonData = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:&jsonError];
-    }
-    @catch (NSException *exception) {
-        //this should not happen in properly design JSONModel
-        //usually means there was no reverse transformer for a custom property
-        JMLog(@"EXCEPTION: %@", exception.description);
-        return nil;
-    }
-    
-    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    return [[NSString alloc] initWithData: [self toJSONDataWithKeys: propertyNames]
+								 encoding: NSUTF8StringEncoding];
 }
 
 #pragma mark - import/export of lists
diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.m b/JSONModel/JSONModelTransformations/JSONValueTransformer.m
@@ -26,8 +26,6 @@ extern BOOL isNull(id value)
     return NO;
 }
 
-static NSDateFormatter *_dateFormatter;
-
 @implementation JSONValueTransformer
 
 -(id)init
@@ -213,14 +211,14 @@ -(NSString*)JSONObjectFromNSURL:(NSURL*)url
 #pragma mark - string <-> date
 -(NSDateFormatter*)importDateFormatter
 {
-    static dispatch_once_t once;
-    static NSDateFormatter* dateFormatter;
-    dispatch_once(&once, ^{
-        dateFormatter = [[NSDateFormatter alloc] init];
-        [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
-        [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HHmmssZZZ"];
+    static dispatch_once_t onceInput;
+    static NSDateFormatter* inputDateFormatter;
+    dispatch_once(&onceInput, ^{
+        inputDateFormatter = [[NSDateFormatter alloc] init];
+        [inputDateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
+        [inputDateFormatter setDateFormat:@"yyyy-MM-dd'T'HHmmssZZZ"];
     });
-    return dateFormatter;
+    return inputDateFormatter;
 }
 
 -(NSDate*)__NSDateFromNSString:(NSString*)string
@@ -231,10 +229,14 @@ -(NSDate*)__NSDateFromNSString:(NSString*)string
 
 -(NSString*)__JSONObjectFromNSDate:(NSDate*)date
 {
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZ"];
-    return [dateFormatter stringFromDate:date];
+    static dispatch_once_t onceOutput;
+	static NSDateFormatter *outputDateFormatter;
+    dispatch_once(&onceOutput, ^{
+        outputDateFormatter = [[NSDateFormatter alloc] init];
+        [outputDateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
+        [outputDateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZ"];
+    });
+    return [outputDateFormatter stringFromDate:date];
 }
 
 #pragma mark - number <-> date
