Fixes for compact, expand, error, flatten, frame conformance tests.

Author: sblom

src/JsonLD/Core/Context.cs

@@ -44,6 +44,7 @@ public Context(JObject map) : base(map)
 		public Context(JToken context, JsonLdOptions opts) : base(context is JObject ? 
 			(JObject)context : null)
 		{
+            Init(opts);
 		}
 
 		// TODO: load remote context
@@ -919,10 +920,8 @@ internal virtual string CompactIri(string iri)
 
 		public object Clone()
 		{
-			JsonLD.Core.Context rval = (JsonLD.Core.Context)base.MemberwiseClone();
-			// TODO: is this shallow copy enough? probably not, but it passes all
-			// the tests!
-			rval.termDefinitions = new JObject(this.termDefinitions);
+			JsonLD.Core.Context rval = new Context(base.DeepClone(),options);
+			rval.termDefinitions = (JObject)termDefinitions.DeepClone();
 			return rval;
 		}
 
@@ -1210,7 +1209,7 @@ public virtual JToken ExpandValue(string activeProperty, JToken value)
 			JObject rval = new JObject();
 			JObject td = GetTermDefinition(activeProperty);
 			// 1)
-			if (td != null && "@id".Equals(td["@type"]))
+			if (td != null && td["@type"].SafeCompare("@id"))
 			{
 				// TODO: i'm pretty sure value should be a string if the @type is
 				// @id

src/JsonLD/Core/JsonLdApi.cs

@@ -196,7 +196,8 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e
 									if (!(result[property] is JArray))
 									{
                                         JArray tmp = new JArray();
-										tmp.Add(result[property] = tmp);
+                                        tmp.Add(result[property]);
+										result[property] = tmp;
 									}
 									if (value is JArray)
 									{
@@ -356,7 +357,8 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e
 								if (!(mapObject[mapKey] is JArray))
 								{
 									tmp = new JArray();
-									tmp.Add(mapObject[mapKey] = tmp);
+                                    tmp.Add(mapObject[mapKey]);
+                                    mapObject[mapKey] = tmp;
 								}
 								else
 								{
@@ -388,7 +390,8 @@ public virtual JToken Compact(Context activeCtx, string activeProperty, JToken e
                                 if (!(result[itemActiveProperty] is JArray))
 								{
                                     JArray tmp = new JArray();
-									tmp.Add(result[itemActiveProperty] = tmp);
+									tmp.Add(result[itemActiveProperty]);
+                                    result[itemActiveProperty] = tmp;
 								}
                                 if (compactedItem is JArray)
 								{
@@ -763,7 +766,7 @@ public virtual JToken Expand(Context activeCtx, string activeProperty, JToken el
 						else
 						{
 							// 7.5
-							if ("@language".Equals(activeCtx.GetContainer(key)) && value is IDictionary)
+							if ("@language".Equals(activeCtx.GetContainer(key)) && value is JObject)
 							{
 								// 7.5.1)
                                 expandedValue = new JArray();
@@ -1088,7 +1091,8 @@ internal virtual void GenerateNodeMap(JToken element, JObject
 			}
             JObject graph = (JObject)nodeMap[activeGraph
 				];
-            JObject node = (JObject)(activeSubject.IsNull() ? null : graph[(string)activeSubject]);
+            JObject node = (JObject)((activeSubject.IsNull() || activeSubject.Type != JTokenType.String) 
+                ? null : graph[(string)activeSubject]);
 			// 3)
 			if (elem.ContainsKey("@type"))
 			{
@@ -1715,7 +1719,7 @@ private bool FilterNode(JsonLdApi.FramingContext state, JObject node, JObject fr
 							);
 					}
 				}
-				if (((JArray)types).Count == 1 && ((JArray)types)[0] is IDictionary
+				if (((JArray)types).Count == 1 && ((JArray)types)[0] is JObject
 					 && ((JObject)((JArray)types)[0]).Count == 0)
 				{
 					return !((JArray)nodeTypes).IsEmpty();

src/JsonLD/Util/URL.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using JsonLD.Util;
 using Newtonsoft.Json.Linq;
@@ -233,12 +234,14 @@ public static string RemoveBase(JToken baseobj, string iri)
             // remove path segments that match
             IList<string> baseSegments = new List<string>(System.Linq.Enumerable.ToList(@base
                 .normalizedPath.Split("/")));
+            baseSegments = baseSegments.Where(seg => seg != "").ToList();
             if (@base.normalizedPath.EndsWith("/"))
             {
                 baseSegments.Add(string.Empty);
             }
             IList<string> iriSegments = new List<string>(System.Linq.Enumerable.ToList(rel.normalizedPath
                 .Split("/")));
+            iriSegments = iriSegments.Where(seg => seg != "").ToList();
             if (rel.normalizedPath.EndsWith("/"))
             {
                 iriSegments.Add(string.Empty);
@@ -321,7 +324,7 @@ public static string Resolve(string baseUri, string pathToResolve)
                     // drop fragment from uri if it has one
                     if (uri.Fragment != null)
                     {
-                        uri = new Uri(uri.Scheme + uri.Authority + uri.AbsolutePath);
+                        uri = new Uri(uri.Scheme + "://" + uri.Authority + uri.AbsolutePath);
                     }
                     // add query to the end manually (as URI.resolve does it wrong)
                     return uri.ToString() + pathToResolve;
@@ -333,12 +336,13 @@ public static string Resolve(string baseUri, string pathToResolve)
                 {
                     path = URL.RemoveDotSegments(uri.AbsolutePath, true);
                 }
-                return new Uri(uri.Scheme + uri.Authority + path + uri.Query + uri.Fragment).ToString
+                // TODO(sblom): This line is wrong, but works.
+                return new Uri(uri.Scheme + "://" + uri.Authority + path + uri.Query + uri.Fragment).ToString
                     ();
             }
             catch
             {
-                return null;
+                return pathToResolve;
             }
         }