Extract interface for driver object, added AssociateOfAsync and ChildOfAsync helper methods

Author: mibewh

cloudcms-csharp-driver.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>CloudCMS</RootNamespace>
 
     <PackageId>cloudcms</PackageId>
-    <PackageVersion>1.1.3</PackageVersion>
+    <PackageVersion>1.1.4</PackageVersion>
     <Title>CloudCMS Driver</Title>
     <Description>C# .NET driver for CloudCMS</Description>
     <Summary>C# .NET driver for CloudCMS</Summary>

src/CloudCMSDriver.cs

@@ -12,7 +12,7 @@
 
 namespace CloudCMS
 {
-    public class CloudCMSDriver
+    public class CloudCMSDriver : ICloudCMSDriver
     {
         // Static connection methods
 

src/ICloudCMSDriver.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace CloudCMS
+{
+    public interface ICloudCMSDriver
+    {
+        Task<JObject> RequestAsync(string uri, HttpMethod method, IDictionary<string, string> queryParams = null, HttpContent body = null);
+        Task<JObject> GetAsync(string uri, IDictionary<string, string> queryParams = null);
+        Task<JObject> PostAsync(string uri, IDictionary<string, string> queryParams = null, HttpContent body = null);
+        Task<JObject> PutAsync(string uri, IDictionary<string, string> queryParams = null, HttpContent body = null);
+        Task<JObject> DeleteAsync(string uri, IDictionary<string, string> queryParams = null);
+        Task<Stream> DownloadAsync(string uri);
+        Task<byte[]> DownloadBytesAsync(string uri);
+        Task UploadAsync(string uri, byte[] bytes, string mimetype, IDictionary<string, string> paramMap = null);
+        Task UploadAsync(string uri, Stream stream, string mimetype, IDictionary<string, string> paramMap = null);
+        Task UploadAsync(string uri, IDictionary<string, string> paramMap, IDictionary<string, AttachmentContent> payloads);
+
+    }
+}

src/documents/AbstractDocument.cs

@@ -12,9 +12,9 @@ public abstract class AbstractDocument : IDocument
 
         public abstract string URI { get; }
 
-        public CloudCMSDriver Driver { get; }
+        public ICloudCMSDriver Driver { get; }
 
-        protected AbstractDocument(CloudCMSDriver driver, JObject obj)
+        protected AbstractDocument(ICloudCMSDriver driver, JObject obj)
         {
             this.Driver = driver;
             this.Id = obj.GetValue("_doc").ToString();

src/documents/IDocument.cs

@@ -9,7 +9,7 @@ public interface IDocument : ITypedID, IReferenceable
 
         JObject Data { get; set; }
 
-        CloudCMSDriver Driver { get; }
+        ICloudCMSDriver Driver { get; }
 
         string URI { get; }
 

src/nodes/INode.cs

@@ -15,14 +15,18 @@ public interface INode : IBaseNode
         Task<List<IAssociation>> AssociationsAsync(QName associationTypeQName);
         Task<List<IAssociation>> AssociationsAsync(QName associationTypeQName, Direction direction, JObject pagination);
 
-        Task<Association> AssociateAsync(INode targetNode, QName associationTypeQName);
-        Task<Association> AssociateAsync(INode targetNode, QName associationTypeQName, JObject data);
-        Task<Association> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality);
-        Task<Association> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality, JObject data);
+        Task<IAssociation> AssociateAsync(INode targetNode, QName associationTypeQName);
+        Task<IAssociation> AssociateAsync(INode targetNode, QName associationTypeQName, JObject data);
+        Task<IAssociation> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality);
+        Task<IAssociation> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality, JObject data);
 
         Task UnassociateAsync(INode targetNode, QName associationTypeQName);
         Task UnassociateAsync(INode targetNode, QName associationTypeQName, Directionality directionality);
+
+        Task<IAssociation> AssociateOfAsync(INode sourceNode, QName associationTypeQName, JObject data=null);
+        Task<IAssociation> ChildOfAsync(INode sourceNode);
 
+
         // File Folder
         Task<JObject> FileFolderTreeAsync();
         Task<JObject> FileFolderTreeAsync(string basePath);

src/nodes/Node.cs

@@ -61,22 +61,22 @@ public async Task<List<IAssociation>> AssociationsAsync(QName associationTypeQNa
             return associations;
         }
 
-        public async Task<Association> AssociateAsync(INode targetNode, QName associationTypeQName)
+        public async Task<IAssociation> AssociateAsync(INode targetNode, QName associationTypeQName)
         {
             return await AssociateAsync(targetNode, associationTypeQName, Directionality.DIRECTED, null);
         }
 
-        public async Task<Association> AssociateAsync(INode targetNode, QName associationTypeQName, JObject data)
+        public async Task<IAssociation> AssociateAsync(INode targetNode, QName associationTypeQName, JObject data)
         {
             return await AssociateAsync(targetNode, associationTypeQName, Directionality.DIRECTED, data);
         }
 
-        public async Task<Association> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality)
+        public async Task<IAssociation> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality)
         {
             return await AssociateAsync(otherNode, associationTypeQName, directionality, null);
         }
 
-        public async Task<Association> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality, JObject data)
+        public async Task<IAssociation> AssociateAsync(INode otherNode, QName associationTypeQName, Directionality directionality, JObject data)
         {
             if (data == null)
             {
@@ -123,6 +123,16 @@ public Task UnassociateAsync(INode targetNode, QName associationTypeQName, Direc
             return Driver.PostAsync(uri, queryParams);
         }
 
+        public Task<IAssociation> AssociateOfAsync(INode sourceNode, QName associationTypeQName, JObject data = null)
+        {
+            return sourceNode.AssociateAsync(this, associationTypeQName, Directionality.DIRECTED, data);
+        }
+
+        public Task<IAssociation> ChildOfAsync(INode sourceNode)
+        {
+            return AssociateOfAsync(sourceNode, QName.create("a:child"));
+        }
+
         public Task<JObject> FileFolderTreeAsync()
         {
             return FileFolderTreeAsync(null);

src/platforms/Platform.cs

@@ -9,7 +9,7 @@ namespace CloudCMS
     class Platform : AbstractDocument,
                      IPlatform
     {
-        public Platform(CloudCMSDriver driver, JObject obj) : base(driver, obj)
+        public Platform(ICloudCMSDriver driver, JObject obj) : base(driver, obj)
         {
 
         }

src/repositories/Repository.cs

@@ -10,7 +10,7 @@ class Repository : AbstractDocument,
     {
         public string PlatformId { get; }
 
-        public Repository(CloudCMSDriver driver, JObject obj) : base(driver, obj)
+        public Repository(ICloudCMSDriver driver, JObject obj) : base(driver, obj)
         {
             this.PlatformId = obj.SelectToken("platformId").ToString();
         }

tests/AssociationTest.cs

@@ -22,12 +22,12 @@ public async void TestAssociateUnassociate()
             INode node1 = (INode) await master.CreateNodeAsync(nodeObj1);
 
             JObject nodeObj2 = new JObject(
-                new JProperty("title", "Node1")
+                new JProperty("title", "Node2")
             );
             INode node2 = (INode) await master.CreateNodeAsync(nodeObj2);
 
             JObject nodeObj3 = new JObject(
-                new JProperty("title", "Node1")
+                new JProperty("title", "Node3")
             );
             INode node3 = (INode) await master.CreateNodeAsync(nodeObj3);
 
@@ -76,5 +76,30 @@ public async void TestAssociateUnassociate()
             allAssociations = await node1.AssociationsAsync();
             Assert.Single(allAssociations); // will include a has_role association
         }
+
+        [Fact]
+        public async void TestChildOf()
+        {
+            IBranch master = await Fixture.Repository.MasterAsync();
+            
+            JObject nodeObj1 = new JObject(
+                new JProperty("title", "Node1")
+            );
+            INode node1 = (INode) await master.CreateNodeAsync(nodeObj1);
+            
+            JObject nodeObj2 = new JObject(
+                new JProperty("title", "Node2")
+            );
+            INode node2 = (INode) await master.CreateNodeAsync(nodeObj2);
+
+            IAssociation association = await node1.ChildOfAsync(node2);
+            Assert.NotNull(association);
+            Assert.Equal(Directionality.DIRECTED, association.Directionality);
+            
+            INode source = await association.ReadSourceNodeAsync();
+            Assert.Equal(node2.Id, source.Id);
+            INode target = await association.ReadTargetNodeAsync();
+            Assert.Equal(node1.Id, target.Id);
+        }
     }
 }