Hotfix #81 - added JSON formatting to complex argument and return value types

Author: jbatte47

src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.csproj

@@ -25,6 +25,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Patterns.Testing.Autofac.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac">

src/Patterns/Logging/LoggingInterceptor.cs

@@ -21,11 +21,14 @@
 
 using System;
 using System.Linq;
+using System.Web.Script.Serialization;
 
 using Castle.DynamicProxy;
 
 using Common.Logging;
 
+using Patterns.Collections.Strategies;
+
 namespace Patterns.Logging
 {
 	/// <summary>
@@ -42,6 +45,14 @@ public class LoggingInterceptor : IInterceptor
 		private readonly LoggingConfig _config;
 		private readonly Func<Type, ILog> _logFactory;
 
+		private static readonly FuncStrategies<Type, object, object> _displayStrategies
+			= new FuncStrategies<Type, object, object>
+			{
+				{typeof (string), value => string.Format(_stringDisplayFormat, value)}
+			};
+
+		private static readonly JavaScriptSerializer _jsonSerializer = new JavaScriptSerializer();
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="LoggingInterceptor" /> class.
 		/// </summary>
@@ -92,7 +103,11 @@ private static string GetMethodArguments(IInvocation invocation)
 		private static object ConvertValueForDisplay(object value)
 		{
 			if (value == null) return _nullArgument;
-			return value is string ? string.Format(_stringDisplayFormat, value) : value;
+
+			Type valueType = value.GetType();
+			object newValue = _displayStrategies.Execute(valueType, value);
+
+			return newValue ?? _jsonSerializer.Serialize(value);
 		}
 	}
 }

src/Patterns/Patterns.csproj

@@ -49,6 +49,7 @@
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

src/Patterns/SolutionAssemblyInfo.cs

@@ -31,4 +31,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyVersion("3.9.0")]
+[assembly: AssemblyVersion("3.9.1")]

src/Patterns/SolutionAssemblyInfo.settings.tt

@@ -2,7 +2,7 @@
 Settings.Initialize(
 	majorNumber: 3,
 	minorNumber: 9,
-	patchNumber: 0,
+	patchNumber: 1,
 	buildNumber: null,
 	buildLevel: BuildLevels.None
 );