Code-Sharp · shanielh · Jan 21, 2014 · Dec 31, 2013 · Dec 31, 2013 · Jan 2, 2014
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 /packages/*
 */bin/*
 */obj/*
+*.psess
+*.vsp
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Usage :
 
 More modifications will be made to make it more "user friendly" out of the box :
 
-* [RESTful](http://en.wikipedia.org/wiki/Representational_state_transfer) controllers
+* ~~[RESTful](http://en.wikipedia.org/wiki/Representational_state_transfer) controllers~~ (Done)
 * Caching support
 * NuGet package
 * ~~Ssl Support~~ (Done!)

diff --git a/uhttpsharp-demo/Handlers/ExceptionHandler.cs b/uhttpsharp-demo/Handlers/ExceptionHandler.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Threading.Tasks;
+using uhttpsharp;
+
+namespace uhttpsharpdemo.Handlers
+{
+    public class ExceptionHandler : IHttpRequestHandler
+    {
+        public async Task Handle(IHttpContext context, Func<Task> next)
+        {
+            try
+            {
+                await next();
+            }
+            catch (HttpException e)
+            {
+                context.Response = new HttpResponse(e.ResponseCode, "Error while handling your request. " + e.Message, false);
+            }
+            catch (Exception e)
+            {
+                context.Response = new HttpResponse(HttpResponseCode.InternalServerError, "Error while handling your request. " + e, false);
+            }
+        }
+    }
+}
diff --git a/uhttpsharp-demo/HttpException.cs b/uhttpsharp-demo/HttpException.cs
@@ -0,0 +1,24 @@
+using System;
+using uhttpsharp;
+
+namespace uhttpsharpdemo
+{
+    public class HttpException : Exception
+    {
+        private readonly HttpResponseCode _responseCode;
+
+        public HttpResponseCode ResponseCode
+        {
+            get { return _responseCode; }
+        }
+
+        public HttpException(HttpResponseCode responseCode)
+        {
+            _responseCode = responseCode;
+        }
+        public HttpException(HttpResponseCode responseCode, string message) : base(message)
+        {
+            _responseCode = responseCode;
+        }
+    }
+}
diff --git a/uhttpsharp-demo/Program.cs b/uhttpsharp-demo/Program.cs
@@ -34,17 +34,19 @@ private static void Main()
         {
             log4net.Config.XmlConfigurator.Configure();
 
-            var serverCertificate = X509Certificate.CreateFromCertFile(@"TempCert.cer");
+            //var serverCertificate = X509Certificate.CreateFromCertFile(@"TempCert.cer");
 
             using (var httpServer = new HttpServer(new HttpRequestProvider()))
             {
                 httpServer.Use(new TcpListenerAdapter(new TcpListener(IPAddress.Loopback, 80)));
-                httpServer.Use(new ListenerSslDecorator(new TcpListenerAdapter(new TcpListener(IPAddress.Loopback, 443)), serverCertificate));
+                //httpServer.Use(new ListenerSslDecorator(new TcpListenerAdapter(new TcpListener(IPAddress.Loopback, 443)), serverCertificate));
 
+                httpServer.Use(new ExceptionHandler());
                 httpServer.Use(new TimingHandler());
 
                 httpServer.Use(new HttpRouter().With(string.Empty, new IndexHandler())
-                                               .With("about", new AboutHandler()));
+                                               .With("about", new AboutHandler())
+                                               .With("strings", new RestHandler<string>(new StringsRestController(), new JsonResponseProvider())));
 
                 httpServer.Use(new FileHandler());
                 httpServer.Use(new ErrorHandler());

diff --git a/uhttpsharp-demo/SomeRestController.cs b/uhttpsharp-demo/SomeRestController.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Bson;
+using uhttpsharp;
+
+namespace uhttpsharpdemo
+{
+    class SomeRestController
+    {
+
+        IDictionary<int, string> _strings = new Dictionary<int, string>() { { 1 , "Hahaha"}};
+
+        public Task<uhttpsharp.HttpResponse> Get(uhttpsharp.IHttpRequest request)
+        {
+            var memoryStream = new MemoryStream();
+            Newtonsoft.Json.JsonWriter writer = new JsonTextWriter(new StreamWriter( memoryStream));
+
+            JsonSerializer.Create().Serialize(writer, _strings);
+            writer.Flush();
+            return Task.FromResult(new HttpResponse(HttpResponseCode.Ok, "application/json; charset=utf-8", memoryStream, true));
+        }
+
+        public Task<uhttpsharp.HttpResponse> GetItem(uhttpsharp.IHttpRequest request)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<uhttpsharp.HttpResponse> Create(uhttpsharp.IHttpRequest request)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<uhttpsharp.HttpResponse> Upsert(uhttpsharp.IHttpRequest request)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<uhttpsharp.HttpResponse> Delete(uhttpsharp.IHttpRequest request)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/uhttpsharp-demo/StringsRestController.cs b/uhttpsharp-demo/StringsRestController.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using uhttpsharp;
+using uhttpsharp.Handlers;
+
+namespace uhttpsharpdemo
+{
+    class StringsRestController : IRestController<string>
+    {
+        private readonly ICollection<string> _collection = new HashSet<string>();  
+
+        public Task<IEnumerable<string>> Get(IHttpRequest request)
+        {
+            return Task.FromResult<IEnumerable<string>>(_collection);
+        }
+        public Task<string> GetItem(IHttpRequest request)
+        {
+            var id = GetId(request);
+
+            if (_collection.Contains(id))
+            {
+                return Task.FromResult(id);
+            }
+
+            throw GetNotFoundException();
+        }
+        private static string GetId(IHttpRequest request)
+        {
+            var id = request.RequestParameters[1];
+
+            return id;
+        }
+        public Task<string> Create(IHttpRequest request)
+        {
+            var id = GetId(request);
+
+            _collection.Add(id);
+
+            return Task.FromResult(id);
+        }
+        public Task<string> Upsert(IHttpRequest request)
+        {
+            return Create(request);
+        }
+        public Task<string> Delete(IHttpRequest request)
+        {
+            var id = GetId(request);
+
+            if (_collection.Remove(id))
+            {
+                return Task.FromResult(id);
+            }
+
+            throw GetNotFoundException();
+        }
+        private static Exception GetNotFoundException()
+        {
+            return new HttpException(HttpResponseCode.NotFound, "The resource you've looked for is not found");
+        }
+    }
+}
diff --git a/uhttpsharp-demo/packages.config b/uhttpsharp-demo/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
 </packages>
diff --git a/uhttpsharp-demo/uhttpsharp.Demo.csproj b/uhttpsharp-demo/uhttpsharp.Demo.csproj
@@ -42,8 +42,12 @@
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -56,10 +60,14 @@
     </Compile>
     <Compile Include="Handlers\AboutHandler.cs" />
     <Compile Include="Handlers\ErrorHandler.cs" />
+    <Compile Include="Handlers\ExceptionHandler.cs" />
     <Compile Include="Handlers\IndexHandler.cs" />
+    <Compile Include="HttpException.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Handlers\TimingHandler.cs" />
+    <Compile Include="SomeRestController.cs" />
+    <Compile Include="StringsRestController.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\uhttpsharp\uhttpsharp.csproj">

diff --git a/uhttpsharp/Handlers/FileHandler.cs b/uhttpsharp/Handlers/FileHandler.cs
@@ -60,12 +60,11 @@ public async Task Handle(IHttpContext context, System.Func<Task> next)
 
             if (!File.Exists(path))
             {
-                await next();
+                await next().ConfigureAwait(false);
 
                 return;
             }
 
-
             context.Response = new HttpResponse(GetContentType(path), File.OpenRead(path), context.Request.Headers.KeepAliveConnection());
         }
     }

diff --git a/uhttpsharp/Handlers/IResponseProvider.cs b/uhttpsharp/Handlers/IResponseProvider.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace uhttpsharp.Handlers
+{
+    public interface IResponseProvider
+    {
+
+        Task<IHttpResponse> Provide(object value);
+
+    }
+}
diff --git a/uhttpsharp/Handlers/IRestController.cs b/uhttpsharp/Handlers/IRestController.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace uhttpsharp.Handlers
+{
+    public interface IRestController<T>
+    {
+        /// <summary>
+        /// Returns a list of object that found in the collection
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<IEnumerable<T>> Get(IHttpRequest request);
+
+        /// <summary>
+        /// Returns an item from the collection
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<T> GetItem(IHttpRequest request);
+
+        /// <summary>
+        /// Creates a new entry in the collection - new uri is returned
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<T> Create(IHttpRequest request);
+
+        /// <summary>
+        /// Updates an entry in the collection
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<T> Upsert(IHttpRequest request);
+
+        /// <summary>
+        /// Removes an entry from the collection
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<T> Delete(IHttpRequest request);
+    }
+}
diff --git a/uhttpsharp/Handlers/JsonResponseProvider.cs b/uhttpsharp/Handlers/JsonResponseProvider.cs
@@ -0,0 +1,19 @@
+using System.IO;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace uhttpsharp.Handlers
+{
+    public class JsonResponseProvider : IResponseProvider
+    {
+        public Task<IHttpResponse> Provide(object value)
+        {
+            var memoryStream = new MemoryStream();
+            var writer = new JsonTextWriter(new StreamWriter(memoryStream));
+            var serializer = new JsonSerializer();
+            serializer.Serialize(writer, value);
+            writer.Flush();
+            return Task.FromResult<IHttpResponse>(new HttpResponse(HttpResponseCode.Ok, "application/json; charset=utf-8", memoryStream, true));
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,5 @@ @@
     /packages/*
     */bin/*
     */obj/*
+    *.psess
+    *.vsp