finished removing the profiled views. Closes GH-907

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

Hide file tree

Showing 16 changed files with 14 additions and 357 deletions.
diff --git a/src/FubuMVC.Core/FubuMVC.Core.csproj b/src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -606,7 +606,6 @@
     <Compile Include="Http\Owin\Readers\OwinRequestReader.cs" />
     <Compile Include="Services\JasperServiceConfiguration.cs" />
     <Compile Include="Services\JasperServiceRuntime.cs" />
-    <Compile Include="View\Attachment\ProfileViewBag.cs" />
     <Compile Include="View\ImageTag.cs" />
     <Compile Include="Runtime\IFubuRequestContext.cs" />
     <Compile Include="Projections\AccessorProjection.cs" />
@@ -1074,12 +1073,7 @@
     <Compile Include="Urls\IUrlRegistry.cs" />
     <Compile Include="Security\Authorization\IAuthenticationContext.cs" />
     <Compile Include="Security\Authorization\ISecurityContext.cs" />
-    <Compile Include="View\Attachment\DefaultProfile.cs" />
-    <Compile Include="View\Attachment\IViewProfile.cs" />
-    <Compile Include="View\Attachment\ProfileViewToken.cs" />
     <Compile Include="View\Attachment\ViewBag.cs" />
-    <Compile Include="View\Attachment\ViewProfile.cs" />
-    <Compile Include="View\Attachment\ViewTokenExtensions.cs" />
     <Compile Include="View\AutoImportModelNamespacesConvention.cs" />
     <Compile Include="View\CommonViewNamespaces.cs" />
     <Compile Include="View\IFubuView.cs" />

diff --git a/src/FubuMVC.Core/Http/ConnegSettings.cs b/src/FubuMVC.Core/Http/ConnegSettings.cs
@@ -9,6 +9,7 @@
 using FubuMVC.Core.Resources.Conneg;
 using FubuMVC.Core.Runtime;
 using FubuMVC.Core.Runtime.Formatters;
+using FubuMVC.Core.View;
 using FubuMVC.Core.View.Attachment;
 
 namespace FubuMVC.Core.Http
@@ -50,7 +51,7 @@ public void ReadConnegGraph(BehaviorGraph graph)
             _graph = ConnegGraph.Build(graph);
         }
 
-        public void StoreViews(Task<IEnumerable<ProfileViewBag>> views)
+        public void StoreViews(Task<ViewBag> views)
         {
             _views = views;
         }
@@ -67,11 +68,11 @@ public ConnegGraph Graph
             }
         }
 
-        public IEnumerable<ProfileViewBag> Views
+        public ViewBag Views
         {
             get
             {
-                if (_views == null) return Enumerable.Empty<ProfileViewBag>();
+                if (_views == null) return new ViewBag(Enumerable.Empty<IViewToken>());
 
                 _views.Wait(5.Seconds());
                 return _views.Result;
@@ -103,7 +104,7 @@ public void ApplyRules(OutputNode node)
 
         public readonly IList<IMimetypeCorrection> Corrections = new List<IMimetypeCorrection>();
         private Task<ConnegGraph> _graph;
-        private Task<IEnumerable<ProfileViewBag>> _views;
+        private Task<ViewBag> _views;
 
         public void InterpretQuerystring(CurrentMimeType mimeType, IHttpRequest request)
         {

diff --git a/src/FubuMVC.Core/Registration/BehaviorGraphBuilder.cs b/src/FubuMVC.Core/Registration/BehaviorGraphBuilder.cs
@@ -79,13 +79,9 @@ private static void applySettings(ConfigGraph config, BehaviorGraph graph, IActi
             config.Settings.Each(x => x.Alter(graph.Settings));
 
             var viewSettings = graph.Settings.Get<ViewEngineSettings>();
-
 
-            var views = viewSettings.BuildViewBag(graph, diagnostics, files)
-                .ContinueWith(t =>
-                {
-                    return viewSettings.Profiles(t.Result);
-                });
+
+            var views = viewSettings.BuildViewBag(graph, diagnostics, files);
 
             var conneg = graph.Settings.Get<ConnegSettings>();
 

diff --git a/src/FubuMVC.Core/Resources/Conneg/ViewAttachment.cs b/src/FubuMVC.Core/Resources/Conneg/ViewAttachment.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using FubuMVC.Core.Http;
 using FubuMVC.Core.Registration.Nodes;
 
@@ -9,19 +8,14 @@ public class ViewAttachment : ConnegRule
     {
         protected override DoNext applyOutputs(IOutputNode node, BehaviorChain chain, ConnegSettings settings)
         {
-            var profileViewBags = settings.Views;
-            profileViewBags.Each(profile =>
+            var candidates = settings.Views.Where(x => x.ViewModel == node.ResourceType).ToArray();
+            if (candidates.Count() == 1)
             {
-                var candidates = profile.Views.Where(x => x.ViewModel == node.ResourceType).ToArray();
-                if (candidates.Count() == 1)
+                if (!node.HasView())
                 {
-                    if (!node.HasView())
-                    {
-                        node.AddView(candidates.Single());
-                    }
+                    node.AddView(candidates.Single());
                 }
-            });
-
+            }
 
             return DoNext.Continue;
         }

diff --git a/src/FubuMVC.Core/View/Attachment/DefaultProfile.cs b/src/FubuMVC.Core/View/Attachment/DefaultProfile.cs
diff --git a/src/FubuMVC.Core/View/Attachment/IViewProfile.cs b/src/FubuMVC.Core/View/Attachment/IViewProfile.cs
diff --git a/src/FubuMVC.Core/View/Attachment/ProfileViewBag.cs b/src/FubuMVC.Core/View/Attachment/ProfileViewBag.cs
diff --git a/src/FubuMVC.Core/View/Attachment/ProfileViewToken.cs b/src/FubuMVC.Core/View/Attachment/ProfileViewToken.cs
diff --git a/src/FubuMVC.Core/View/Attachment/ViewProfile.cs b/src/FubuMVC.Core/View/Attachment/ViewProfile.cs
diff --git a/src/FubuMVC.Core/View/Attachment/ViewTokenExtensions.cs b/src/FubuMVC.Core/View/Attachment/ViewTokenExtensions.cs
diff --git a/src/FubuMVC.Core/View/ViewEngineSettings.cs b/src/FubuMVC.Core/View/ViewEngineSettings.cs
@@ -149,70 +149,7 @@ public bool FolderShouldBeIgnored(string folder)
         }
 
 
-        private readonly IList<Func<IViewToken, bool>> _defaultExcludes = new List<Func<IViewToken, bool>>();
-        private readonly IList<IViewProfile> _profiles = new List<IViewProfile>();
 
-
-        public IEnumerable<ProfileViewBag> Profiles(ViewBag views)
-        {
-            if (_profiles.Any())
-            {
-                foreach (var profile in _profiles)
-                {
-                    yield return new ProfileViewBag(profile, views);
-                }
-
-                Func<IViewToken, bool> defaultFilter = x => !_defaultExcludes.Any(test => test(x));
-                var defaultProfile = new ViewProfile(Always.Flyweight, defaultFilter, x => x.Name());
-
-                yield return new ProfileViewBag(defaultProfile, views);
-            }
-            else
-            {
-                yield return new ProfileViewBag(new DefaultProfile(), views);
-            }
-        }
-
-        /// <summary>
-        /// Create an attachment profile based on a runtime condition.  The original intent of view profiles
-        /// was to enable multiple views per action based on the detected device of the user (desktop, tablet, smartphone),
-        /// but is not limited to that functionality
-        /// </summary>
-        /// <param name="condition"></param>
-        /// <param name="filter"></param>
-        /// <param name="nameCorrection"></param>
-        /// <returns></returns>
-        public IViewProfile Profile(IConditional condition, Func<IViewToken, bool> filter,
-            Func<IViewToken, string> nameCorrection)
-        {
-            _defaultExcludes.Add(filter);
-            var profile = new ViewProfile(condition, filter, nameCorrection);
-            _profiles.Add(profile);
-
-            return profile;
-        }
-
-
-        /// <summary>
-        ///   This creates a view profile for the view attachment.  Used for scenarios like
-        ///   attaching multiple views to the same chain for different devices.
-        /// </summary>
-        /// <typeparam name = "T"></typeparam>
-        /// <param name = "prefix"></param>
-        /// <example>
-        ///   Profile<IsMobile>("m.") -- where "m" would mean look for views that are named "m.something"
-        /// </example>
-        /// <returns></returns>
-        public void Profile<T>(string prefix) where T : IConditional, new()
-        {
-            Func<IViewToken, string> naming = view =>
-            {
-                var name = view.Name();
-                return name.Substring(prefix.Length);
-            };
-
-            Profile(new T(), x => x.Name().StartsWith(prefix), naming);
-        }
     }
 
     /// <summary>

diff --git a/src/FubuMVC.IntegrationTesting/Views/ViewIntegrationContext.cs b/src/FubuMVC.IntegrationTesting/Views/ViewIntegrationContext.cs
@@ -53,8 +53,7 @@ public void FixtureSetUp()
 
             _views = new Lazy<ViewBag>(() =>
             {
-                var allViews = _host.Get<ConnegSettings>().Views.SelectMany(x => x.Views);
-                return new ViewBag(allViews);
+                return _host.Get<ConnegSettings>().Views;
             });
         }
 

diff --git a/src/FubuMVC.Tests/FubuMVC.Tests.csproj b/src/FubuMVC.Tests/FubuMVC.Tests.csproj
@@ -683,10 +683,7 @@
     <Compile Include="Urls\BasicUrlRegistrationScanningIntegrationTester.cs" />
     <Compile Include="Urls\ChainUrlResolverTester.cs" />
     <Compile Include="Urls\UrlRegistryIntegrationTester.cs" />
-    <Compile Include="View\Attachment\DefaultProfileTester.cs" />
-    <Compile Include="View\Attachment\ProfileViewTokenTester.cs" />
     <Compile Include="View\Attachment\ViewExclusionTester.cs" />
-    <Compile Include="View\Attachment\ViewTokenExtensionsTester.cs" />
     <Compile Include="View\AutoImportModelNamespacesConventionTester.cs" />
     <Compile Include="View\CommonViewNamespaces_is_registered.cs" />
     <Compile Include="View\FakeViews\Folder1\A.aspx.cs">