Changeset 134

(2009/09/01 13:40) Over 2 years ago

Affected files

trunk/Source/SampleApplication/Controllers/HomeController.cs Download diff

 using System.Web.Mvc;
 using Snooze;
-using Snooze.Authentication;
 namespace SampleApplication.Controllers
 {
         {
             return OK(new HomeViewModel
             {
-                Login = new LoginUrl(),
                 BooksLink = new BooksUrl().ToString()
-            }).WithXrdsHeader(); // for openid 2.0 support
+            });
         }
     }

trunk/Source/SampleApplication/Global.asax.cs Download diff

 using System.Web.Mvc;
 using System.Web.Routing;
 using SampleApplication.Controllers;
-using Snooze.Authentication;
 using Snooze.Routing;
 namespace SampleApplication
             routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
             // Snooze provides some handy features...
-            routes.AddOpenIdSupport();
             routes.AddVersionedStaticFilesSupport();
             routes.AddIE6Support();

trunk/Source/Snooze/Input.cs Download diff

	133		134
86	_errorMessages.Add(message);	86	_errorMessages.Add(message);
87	}	87	}
88		88
		89	public override string ToString()
		90	{
		91	if (HasValue)
		92	{
		93	return Value.ToString();
		94	}
		95	else
		96	{
		97	return default(T).ToString();
		98	}
		99	}
		100
89	public static implicit operator T(Input<T> input)	101	public static implicit operator T(Input<T> input)
90	{	102	{
91	if (input.IsValid)	103	if (input.IsValid)

trunk/Source/Snooze/InputModelBinder.cs Download diff

	133		134
1	using System.ComponentModel;	1	using System.ComponentModel;
2	using System.Web.Mvc;	2	using System.Web.Mvc;
		3	using System;
3		4
4	namespace Snooze	5	namespace Snooze
5	{	6	{
6	public class InputModelBinder : DefaultModelBinder	7	public class InputModelBinder : DefaultModelBinder
7	{	8	{
		9	public InputModelBinder(IModelBinder defaultBinder)
		10	{
		11	_innerBinder = defaultBinder;
		12	}
		13
		14	IModelBinder _innerBinder;
		15
8	protected override void BindProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor)	16	protected override void BindProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor)
9	{	17	{
10	if (typeof(IInput).IsAssignableFrom(propertyDescriptor.PropertyType))	18	if (typeof(IInput).IsAssignableFrom(propertyDescriptor.PropertyType))
11	{	19	{
12	var binder = this.Binders.GetBinder(propertyDescriptor.PropertyType);	20	BindInputProperty(controllerContext, bindingContext, propertyDescriptor);
13	var context = new ModelBindingContext
14	{
15	ModelState = bindingContext.ModelState,
16	ModelType = propertyDescriptor.PropertyType,
17	ValueProvider = bindingContext.ValueProvider
18	};
19	var input = binder.BindModel(controllerContext, context);
20	SetProperty(controllerContext, bindingContext, propertyDescriptor, input);
21	}	21	}
22	else	22	else
23	{	23	{
24	base.BindProperty(controllerContext, bindingContext, propertyDescriptor);	24	base.BindProperty(controllerContext, bindingContext, propertyDescriptor);
25	}	25	}
26	}	26	}
		27
		28	void BindInputProperty(ControllerContext controllerContext, ModelBindingContext bindingContext, PropertyDescriptor propertyDescriptor)
		29	{
		30	var binder = this.Binders.GetBinder(propertyDescriptor.PropertyType);
		31	if (binder is InputModelBinder) binder = _innerBinder;
		32
		33	var context = new ModelBindingContext
		34	{
		35	ModelName = propertyDescriptor.Name,
		36	ModelState = bindingContext.ModelState,
		37	ModelType = typeof(string),
		38	ValueProvider = bindingContext.ValueProvider
		39	};
		40	var value = (string)binder.BindModel(controllerContext, context);
		41	var input = (IInput)Activator.CreateInstance(propertyDescriptor.PropertyType);
		42	if (value != null)
		43	{
		44	input.RawValue = value;
		45	}
		46	SetProperty(controllerContext, bindingContext, propertyDescriptor, input);
		47	}
27	}	48	}
28	}	49	}

trunk/Source/Snooze/IResourceFormatter.cs Download diff

	133		134
4	{	4	{
5	public interface IResourceFormatter	5	public interface IResourceFormatter
6	{	6	{
7	bool CanFormat(object resource, string mimeType);	7	bool CanFormat(ControllerContext context, object resource, string mimeType);
8	void Output(ControllerContext context, object resource, string contentType);	8	void Output(ControllerContext context, object resource, string contentType);
9	}	9	}
10	}	10	}

trunk/Source/Snooze/JsonFormatter.cs Download diff

	133		134
7	{	7	{
8	public class JsonFormatter : IResourceFormatter	8	public class JsonFormatter : IResourceFormatter
9	{	9	{
10	public bool CanFormat(object resource, string mimeType)	10	public bool CanFormat(ControllerContext context, object resource, string mimeType)
11	{	11	{
12	return resource != null && mimeType == "application/json";	12	return resource != null && mimeType == "application/json";
13	}	13	}

trunk/Source/Snooze/ResourceController.cs Download diff

	133		134
44	return new ResourceResult(304, null);	44	return new ResourceResult(304, null);
45	}	45	}
46		46
		47	public virtual ActionResult Redirect(Url url)
		48	{
		49	return Redirect(url.ToString());
		50	}
		51
		52	public virtual ActionResult TemporaryRedirect(Url url)
		53	{
		54	return new ResourceResult(307, url.ToString()).WithHeader("Location", url.ToString());
		55	}
		56
		57	public virtual ActionResult TemporaryRedirect(string url)
		58	{
		59	return new ResourceResult(307, url).WithHeader("Location", url);
		60	}
		61
47	public virtual ResourceResult BadRequest()	62	public virtual ResourceResult BadRequest()
48	{	63	{
49	return new ResourceResult(403, null);	64	return new ResourceResult(400, null);
50	}	65	}
51		66
52	public virtual ResourceResult BadRequest(object errorResource)	67	public virtual ResourceResult BadRequest(object errorResource)
53	{	68	{
54	return new ResourceResult(403, errorResource);	69	return new ResourceResult(400, errorResource);
55	}	70	}
56		71
57	public virtual ResourceResult NotFound()	72	public virtual ResourceResult NotFound()

trunk/Source/Snooze/ResourceFormatters.cs Download diff

             // So we add an explicitly typed ViewFormatter first.
             _formatters.Add(new ViewFormatter("application/xhtml+xml"));
             _formatters.Add(new ViewFormatter("*/*")); // similar reason for this.
-            _formatters.Add(new StringFormatter());
             _formatters.Add(new JsonFormatter());
             _formatters.Add(new XmlFormatter());
             _formatters.Add(new ViewFormatter());
+            _formatters.Add(new StringFormatter());
         }
         public static IList<IResourceFormatter> Formatters

trunk/Source/Snooze/ResourceResult.cs Download diff

             }
             var acceptTypes = ParseAcceptTypes(context.HttpContext.Request.AcceptTypes);
-            var formatter = FindFormatter(acceptTypes);
+            var formatter = FindFormatter(context, acceptTypes);
             if (formatter == null)
             {
-                context.HttpContext.Response.StatusCode = 406; // not acceptable
+                if (Resource is string)
+                {
+                    context.HttpContext.Response.Output.Write(Resource);
+                }
+                else
+                {
+                    context.HttpContext.Response.StatusCode = 406; // not acceptable
+                }
                 return;
             }
             formatter.Output(context, Resource, ContentType);
             }
         }
-        IResourceFormatter FindFormatter(IEnumerable<string> acceptTypes)
+        IResourceFormatter FindFormatter(ControllerContext context, IEnumerable<string> acceptTypes)
         {
             if (ContentType != null) // Controller action forced the content type.
             {
                 EnsureContentTypeIsMimeType();
-                return ResourceFormatters.Formatters.FirstOrDefault(f => f.CanFormat(Resource, ContentType));
+                return ResourceFormatters.Formatters.FirstOrDefault(f => f.CanFormat(context, Resource, ContentType));
             }
             foreach (var formatter in ResourceFormatters.Formatters)
             {
                 foreach (var acceptType in acceptTypes)
                 {
-                    if (formatter.CanFormat(Resource, acceptType)) return formatter;
+                    if (formatter.CanFormat(context, Resource, acceptType)) return formatter;
                 }
             }
             return null;

trunk/Source/Snooze/Snooze.csproj Download diff

	133		134
65	<Compile Include="FutureAction.cs" />	65	<Compile Include="FutureAction.cs" />
66	<Compile Include="IInput.cs" />	66	<Compile Include="IInput.cs" />
67	<Compile Include="Input.cs" />	67	<Compile Include="Input.cs" />
68	<Compile Include="InputModelAttribute.cs" />
69	<Compile Include="InputModelBinder.cs" />	68	<Compile Include="InputModelBinder.cs" />
70	<Compile Include="IResourceFormatter.cs" />	69	<Compile Include="IResourceFormatter.cs" />
71	<Compile Include="JsonFormatter.cs" />	70	<Compile Include="JsonFormatter.cs" />

trunk/Source/Snooze/StringFormatter.cs Download diff

	133		134
4	{	4	{
5	public class StringFormatter : IResourceFormatter	5	public class StringFormatter : IResourceFormatter
6	{	6	{
7	public bool CanFormat(object resource, string mimeType)	7	public bool CanFormat(ControllerContext context, object resource, string mimeType)
8	{	8	{
9	if (resource != null && resource.GetType() == typeof(string)) return true;	9	if (resource != null && resource.GetType() == typeof(string)) return true;
10	if (mimeType == "text/plain") return true;	10	if (mimeType == "text/plain") return true;

trunk/Source/Snooze/ViewFormatter.cs Download diff

         string _targetMimeType;
-        public bool CanFormat(object resource, string mimeType)
+        public bool CanFormat(ControllerContext context, object resource, string mimeType)
         {
-            return (_targetMimeType == mimeType) || (_targetMimeType == null);
+            return ((_targetMimeType == mimeType) || (_targetMimeType == null))
+                && FindView(context, resource).View != null;
         }
         public void Output(ControllerContext context, object resource, string contentType)
         {
+            if (contentType != null)
+            {
+                context.HttpContext.Response.ContentType = contentType;
+            }
+            var result = FindView(context, resource);
+            if (result.View != null)
+            {
+                result.View.Render(
+                    new ViewContext(
+                        context,
+                        result.View,
+                        new ViewDataDictionary(resource),
+                        new TempDataDictionary()
+                    ),
+                    context.HttpContext.Response.Output
+                );
+            }
+        }
+        private ViewEngineResult FindView(ControllerContext context, object resource)
+        {
             var viewName = GetViewName(resource);
             var result = ViewEngines.Engines.FindView(context, viewName, null);
-            context.HttpContext.Response.ContentType = contentType;
+            return result;
-            result.View.Render(
-                new ViewContext(
-                    context,
-                    result.View,
-                    new ViewDataDictionary(resource),
-                    new TempDataDictionary()
-                ),
-                context.HttpContext.Response.Output
-            );
         }
         string GetViewName(object resource)

trunk/Source/Snooze/XmlFormatter.cs Download diff

	133		134
7	{	7	{
8	public class XmlFormatter : IResourceFormatter	8	public class XmlFormatter : IResourceFormatter
9	{	9	{
10	public bool CanFormat(object resource, string mimeType)	10	public bool CanFormat(ControllerContext context, object resource, string mimeType)
11	{	11	{
12	return resource != null && mimeType.Contains("xml");	12	return resource != null && mimeType.Contains("xml");
13	}	13	}