removed the conditional media writer checking in conneg

DarthFubuMVC · Aug 24, 2015 · e0edb2c · e0edb2c
1 parent 2728fb6
commit e0edb2c
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 386 deletions.
diff --git a/src/FubuMVC.Core/FubuMVC.Core.csproj b/src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -862,10 +862,8 @@
     <Compile Include="Resources\Conneg\FormatterReader.cs" />
     <Compile Include="Resources\Conneg\FormatterWriter.cs" />
     <Compile Include="Resources\Conneg\HtmlStringWriter.cs" />
-    <Compile Include="Resources\Conneg\IMedia.cs" />
     <Compile Include="Resources\Conneg\IMediaWriter.cs" />
     <Compile Include="Resources\Conneg\InputBehavior.cs" />
-    <Compile Include="Resources\Conneg\Media.cs" />
     <Compile Include="Resources\Conneg\ModelBindingReader.cs" />
     <Compile Include="Resources\Conneg\OutputBehavior.cs" />
     <Compile Include="Resources\Conneg\StringWriter.cs" />

diff --git a/src/FubuMVC.Core/Registration/Nodes/BehaviorChain.cs b/src/FubuMVC.Core/Registration/Nodes/BehaviorChain.cs
@@ -353,15 +353,14 @@ public virtual string Title()
             {
                 var views =
                     Output.Media()
-                        .Select(x => x.Writer)
                         .OfType<IViewWriter>()
                         .Select(x => Description.For(x.View).Title);
                 return "View(s): " + views.Join("");
             }
 
             if (HasOutput() && Output.Media().Any())
             {
-                return Output.Media().Select(x => Description.For(x.Writer).Title).Join(", ");
+                return Output.Media().Select(x => Description.For(x).Title).Join(", ");
             }
 
             if (InputType() != null)

diff --git a/src/FubuMVC.Core/Resources/Conneg/CustomReadersAndWriters.cs b/src/FubuMVC.Core/Resources/Conneg/CustomReadersAndWriters.cs
@@ -20,7 +20,7 @@ protected override DoNext applyInputs(IInputNode node, BehaviorChain chain, Conn
         protected override DoNext applyOutputs(IOutputNode node, BehaviorChain chain, ConnegSettings settings)
         {
             var graph = settings.Graph ?? new ConnegGraph();
-            graph.WriterTypesFor(node.ResourceType).Each(type => node.Add(Activator.CreateInstance(type)));
+            graph.WriterTypesFor(node.ResourceType).Each(type => node.Add((IMediaWriter) Activator.CreateInstance(type)));
 
             return DoNext.Continue;
         }

diff --git a/src/FubuMVC.Core/Resources/Conneg/IMedia.cs b/src/FubuMVC.Core/Resources/Conneg/IMedia.cs
diff --git a/src/FubuMVC.Core/Resources/Conneg/IMediaCollection.cs b/src/FubuMVC.Core/Resources/Conneg/IMediaCollection.cs
@@ -6,7 +6,7 @@ namespace FubuMVC.Core.Resources.Conneg
 {
     public interface IMediaCollection<T> where T : class
     {
-        IMedia<T> SelectMedia(CurrentMimeType mimeTypes, IFubuRequestContext logger);
-        IEnumerable<IMedia<T>> Media { get; }
+        IMediaWriter<T> SelectWriter(CurrentMimeType mimeTypes, IFubuRequestContext logger);
+        IEnumerable<IMediaWriter<T>> Writers { get; }
     }
 }
diff --git a/src/FubuMVC.Core/Resources/Conneg/IMediaWriter.cs b/src/FubuMVC.Core/Resources/Conneg/IMediaWriter.cs
@@ -3,9 +3,14 @@
 
 namespace FubuMVC.Core.Resources.Conneg
 {
-    public interface IMediaWriter<T>
+    public interface IMediaWriter
     {
-        void Write(string mimeType, IFubuRequestContext context, T resource);
         IEnumerable<string> Mimetypes { get; }
     }
+
+    public interface IMediaWriter<T> : IMediaWriter
+    {
+        void Write(string mimeType, IFubuRequestContext context, T resource);
+
+    }
 }
diff --git a/src/FubuMVC.Core/Resources/Conneg/IOutputNode.cs b/src/FubuMVC.Core/Resources/Conneg/IOutputNode.cs
@@ -14,31 +14,28 @@ public interface IOutputNode
         /// Add an IFormatter strategy for writing with an optional condition
         /// </summary>
         /// <param name="formatter"></param>
-        /// <param name="condition"></param>
-        void Add(IFormatter formatter, IConditional condition = null);
+        void Add(IFormatter formatter);
 
         /// <summary>
         /// Add a media writer and optional condition by an open type
         /// of IMediaWriter<T> where T is the resource type
         /// </summary>
         /// <param name="mediaWriterType"></param>
-        /// <param name="condition"></param>
-        void Add(Type mediaWriterType, IConditional condition = null);
+        void Add(Type mediaWriterType);
 
         /// <summary>
         /// Explicitly register an IMediaWriter<T> where T is the resource type
         /// </summary>
         /// <param name="writer"></param>
-        /// <param name="condition"></param>
-        void Add(object writer, IConditional condition = null);
+        void Add(IMediaWriter writer);
 
         /// <summary>
         /// All the explicitly configured Media.
         /// </summary>
         /// <returns></returns>
-        IEnumerable<IMedia> Media();
+        IEnumerable<IMediaWriter> Media();
 
-        IEnumerable<IMedia<T>> Media<T>();
+        IEnumerable<IMediaWriter<T>> Media<T>();
 
 
 
@@ -76,7 +73,7 @@ public interface IOutputNode
         /// </summary>
         Instance ResourceNotFound { get; set; }
 
-        bool HasView(IConditional conditional);
+        bool HasView();
 
 
         IViewToken DefaultView();

diff --git a/src/FubuMVC.Core/Resources/Conneg/Media.cs b/src/FubuMVC.Core/Resources/Conneg/Media.cs
diff --git a/src/FubuMVC.Core/Resources/Conneg/MediaCollection.cs b/src/FubuMVC.Core/Resources/Conneg/MediaCollection.cs
@@ -8,40 +8,39 @@ namespace FubuMVC.Core.Resources.Conneg
 {
     public class MediaCollection<T> : IMediaCollection<T> where T : class
     {
-        private readonly Lazy<IEnumerable<IMedia<T>>> _media; 
+        private readonly Lazy<IEnumerable<IMediaWriter<T>>> _media; 
 
         public MediaCollection(IOutputNode node)
         {
-            _media = new Lazy<IEnumerable<IMedia<T>>>(() => node.Media<T>().ToArray());
+            _media = new Lazy<IEnumerable<IMediaWriter<T>>>(() => node.Media<T>().ToArray());
         }
 
-        public IEnumerable<IMedia<T>> Media
+        public IEnumerable<IMediaWriter<T>> Writers
         {
             get { return _media.Value; }
         }
 
-        public IMedia<T> SelectMedia(CurrentMimeType mimeTypes, IFubuRequestContext context)
+        public IMediaWriter<T> SelectWriter(CurrentMimeType mimeTypes, IFubuRequestContext context)
         {
             foreach (var acceptType in mimeTypes.AcceptTypes)
             {
-                var candidates = Media.Where(x => x.Mimetypes.Contains(acceptType));
-                if (candidates.Any())
+                var candidate = Writers.FirstOrDefault(x => x.Mimetypes.Contains(acceptType));
+                if (candidate != null)
                 {
-                    var writer = candidates.FirstOrDefault(x => x.MatchesRequest(context));
-                    if (writer != null)
+                    if (candidate != null)
                     {
-                        context.Logger.DebugMessage(() => new WriterChoice(acceptType, writer, writer.Condition));
-                        return writer;
+                        context.Logger.DebugMessage(() => new WriterChoice(acceptType, candidate));
+                        return candidate;
                     }
-
-                    context.Logger.DebugMessage(() => NoWritersMatch.For(acceptType, candidates));
                 }
+
+
             }
 
             if (mimeTypes.AcceptsAny())
             {
-                var media = Media.FirstOrDefault(x => x.MatchesRequest(context));
-                context.Logger.DebugMessage(() => new WriterChoice(MimeType.Any.Value, media, media.Condition));
+                var media = Writers.FirstOrDefault();
+                context.Logger.DebugMessage(() => new WriterChoice(MimeType.Any.Value, media));
 
                 return media;
             }

diff --git a/src/FubuMVC.Core/Resources/Conneg/NoWritersMatch.cs b/src/FubuMVC.Core/Resources/Conneg/NoWritersMatch.cs
@@ -1,22 +1,18 @@
 using System.Collections.Generic;
 using System.Linq;
-using FubuCore;
 using FubuCore.Descriptions;
 using FubuCore.Logging;
 
 namespace FubuMVC.Core.Resources.Conneg
 {
     public class NoWritersMatch : LogRecord, DescribesItself
     {
-        public static NoWritersMatch For<T>(string acceptType, IEnumerable<IMedia<T>> candidates)
+        public static NoWritersMatch For<T>(string acceptType, IEnumerable<IMediaWriter<T>> candidates)
         {
             var match = new NoWritersMatch{
                 WriterList = candidates.Select(writer =>
                 {
-                    var title = Description.For(writer).Title;
-                    var condition = Description.For(writer.Condition).Title;
-
-                    return "{0} ({1})".ToFormat(title, condition);
+                    return Description.For(writer).Title;
                 }).Join(", ")
             };
 

diff --git a/src/FubuMVC.Core/Resources/Conneg/OutputBehavior.cs b/src/FubuMVC.Core/Resources/Conneg/OutputBehavior.cs
@@ -88,7 +88,7 @@ public void WriteResource(CurrentMimeType mimeTypes, T resource)
             // Select the appropriate media writer
             // based on the mimetype and other runtime
             // conditions
-            var media = _media.SelectMedia(mimeTypes, _context);
+            var media = _media.SelectWriter(mimeTypes, _context);
 
             if (media == null)
             {
@@ -106,9 +106,9 @@ public void WriteResource(CurrentMimeType mimeTypes, T resource)
 
         // ENDSAMPLE
 
-        public IEnumerable<IMedia<T>> Media
+        public IEnumerable<IMediaWriter<T>> Media
         {
-            get { return _media.Media; }
+            get { return _media.Writers; }
         }
 
         public void WriteHeaders()