From da03faf044beabc6ab094b47aab3e4dbad1fcff5 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 11 Aug 2014 11:17:16 -0400
Subject: [PATCH] Add category to CardElement

New method to return a JSON representation of the element.
---
 SoObjects/SOGo/CardElement+SOGo.h | 32 ++++++++++++++++++
 SoObjects/SOGo/CardElement+SOGo.m | 54 +++++++++++++++++++++++++++++++
 SoObjects/SOGo/GNUmakefile        |  8 +++--
 3 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 SoObjects/SOGo/CardElement+SOGo.h
 create mode 100644 SoObjects/SOGo/CardElement+SOGo.m

diff --git a/SoObjects/SOGo/CardElement+SOGo.h b/SoObjects/SOGo/CardElement+SOGo.h
new file mode 100644
index 000000000..af94ebbcd
--- /dev/null
+++ b/SoObjects/SOGo/CardElement+SOGo.h
@@ -0,0 +1,32 @@
+/* CardElement+SOGo.h - this file is part of SOGo
+ *
+ * Copyright (C) 2014 Inverse inc.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef CARDELEMENT_SOGO_H
+#define CARDELEMENT_SOGO_H
+
+#import <NGCards/CardElement.h>
+
+@interface CardElement (SOGoExtensions)
+
+- (NSString *) jsonRepresentation;
+
+@end
+
+#endif /* CARDELEMENT_SOGO_H */
diff --git a/SoObjects/SOGo/CardElement+SOGo.m b/SoObjects/SOGo/CardElement+SOGo.m
new file mode 100644
index 000000000..12af02485
--- /dev/null
+++ b/SoObjects/SOGo/CardElement+SOGo.m
@@ -0,0 +1,54 @@
+/* CardElement+SOGo.m - this file is part of SOGo
+ *
+ * Copyright (C) 2014 Inverse inc.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import "NSDictionary+Utilities.h"
+
+#import "CardElement+SOGo.h"
+
+
+@implementation CardElement (SOGoExtensions)
+
+/**
+ * Return the JSON representation of the element as a dictionary with two keys:
+ *  - type: the type of the card element, if it exists;
+ *  - value: the value of the card element.
+ * @return a JSON string representation of the element.
+ */
+- (NSString *) jsonRepresentation
+{
+  NSString *v;
+  NSMutableDictionary *attrs;
+
+  attrs = [NSMutableDictionary dictionary];
+
+  v = [self value: 0 ofAttribute: @"type"];
+  if ([v length])
+    [attrs setObject: v
+              forKey: @"type"];
+  [attrs setObject: [self flattenedValuesForKey: @""]
+            forKey: @"value"];
+
+  return [attrs jsonRepresentation];
+}
+
+@end /* NGVCard */
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index f1ee391bd..e74cbc895 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -70,12 +70,13 @@ SOGo_HEADER_FILES = \
 	SOGoGroup.h			\
 	SOGoUser.h			\
 	\
+	CardElement+SOGo.h		\
 	DOMNode+SOGo.h			\
 	\
 	WORequest+SOGo.h		\
 	WOResourceManager+SOGo.h	\
 	WOResponse+SOGo.h		\
-	WOContext+SOGo.h	\
+	WOContext+SOGo.h		\
 	\
 	SOGoCredentialsFile.h
 
@@ -84,7 +85,7 @@ all::
 	@touch SOGoBuild.m
 
 SOGo_OBJC_FILES = \
-	SOGoBuild.m \
+	SOGoBuild.m			\
 	SOGoProductLoader.m		\
 	\
 	BSONCodec.m			\
@@ -149,12 +150,13 @@ SOGo_OBJC_FILES = \
 	SOGoGroup.m			\
 	SOGoUser.m			\
 	\
+	CardElement+SOGo.m		\
 	DOMNode+SOGo.m			\
 	\
 	WORequest+SOGo.m		\
 	WOResourceManager+SOGo.m	\
 	WOResponse+SOGo.m		\
-	WOContext+SOGo.m	\
+	WOContext+SOGo.m		\
 	\
 	SOGoCredentialsFile.m