Merge remote-tracking branch 'origin/develop' into develop

i4004 · i4004 · commit 0c6785756b73 · 2019-08-23T22:08:09.000+06:00
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ _This project is a continuator of [AcspNet web-framework](https://github.com/i40
 
 ## Package status
 
-| Latest version | [![Nuget version](http://img.shields.io/badge/nuget-v2.0.1-blue.svg)](https://www.nuget.org/packages/Simplify.Web/) |
+| Latest version | [![Nuget version](http://img.shields.io/badge/nuget-v2.1-blue.svg)](https://www.nuget.org/packages/Simplify.Web/) |
 | :------ | :------: |
 | **Dependencies** | [![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/nuget/Simplify.Web.svg)](https://libraries.io/nuget/Simplify.Web) |
 
diff --git a/src/Simplify.Web/IHideObjectMembers.cs b/src/Simplify.Web/IHideObjectMembers.cs
diff --git a/src/Simplify.Web/ModelBinding/Binders/Parsers/ArrayToSpecifiedListParser.cs b/src/Simplify.Web/ModelBinding/Binders/Parsers/ArrayToSpecifiedListParser.cs
@@ -15,7 +15,7 @@ public class ArrayToSpecifiedListParser
 		/// </summary>
 		/// <param name="type">The type.</param>
 		/// <returns></returns>
-		/// <exception cref="ModelNotSupportedException">Exception throws in case of underfined list type</exception>
+		/// <exception cref="ModelNotSupportedException">Exception throws in case of undefined list type</exception>
 		public static bool IsTypeValidForParsing(Type type)
 		{
 			if (!type.IsGenericType || type.GetGenericTypeDefinition() != typeof(IList<>))
diff --git a/src/Simplify.Web/Modules/Data/Html/IHtmlWrapper.cs b/src/Simplify.Web/Modules/Data/Html/IHtmlWrapper.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Various HTML generation classes container
 	/// </summary>
-	public interface IHtmlWrapper : IHideObjectMembers
+	public interface IHtmlWrapper
 	{
 		/// <summary>
 		/// HTML ComboBox lists generator.
diff --git a/src/Simplify.Web/Modules/Data/Html/IListsGenerator.cs b/src/Simplify.Web/Modules/Data/Html/IListsGenerator.cs
@@ -8,7 +8,7 @@ namespace Simplify.Web.Modules.Data.Html
 	/// Usable <see cref="StringTable"/> items:
 	/// "HtmlListDefaultItemLabel"
 	/// </summary>
-	public interface IListsGenerator : IHideObjectMembers
+	public interface IListsGenerator
 	{
 		/// <summary>
 		/// Generate number selected HTML list
diff --git a/src/Simplify.Web/Modules/Data/IFileReader.cs b/src/Simplify.Web/Modules/Data/IFileReader.cs
@@ -5,7 +5,7 @@ namespace Simplify.Web.Modules.Data
 	/// <summary>
 	/// Represents localizable files reader
 	/// </summary>
-	public interface IFileReader : IHideObjectMembers
+	public interface IFileReader
 	{
 		/// <summary>
 		/// Setups the file reader.
diff --git a/src/Simplify.Web/Modules/Data/IStringTable.cs b/src/Simplify.Web/Modules/Data/IStringTable.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Represent string table
 	/// </summary>
-	public interface IStringTable : IHideObjectMembers
+	public interface IStringTable
 	{
 		/// <summary>
 		/// String table items
diff --git a/src/Simplify.Web/Modules/IEnvironment.cs b/src/Simplify.Web/Modules/IEnvironment.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Represent site environment properties
 	/// </summary>
-	public interface IEnvironment : IHideObjectMembers
+	public interface IEnvironment
 	{
 		/// <summary>
 		/// Gets the site physical path.
diff --git a/src/Simplify.Web/Modules/ILanguageManager.cs b/src/Simplify.Web/Modules/ILanguageManager.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Represent current language controller and information container
 	/// </summary>
-	public interface ILanguageManager : IHideObjectMembers
+	public interface ILanguageManager
 	{
 		/// <summary>
 		/// Site current language, for example: "en", "ru", "de" etc.
diff --git a/src/Simplify.Web/Modules/IRedirector.cs b/src/Simplify.Web/Modules/IRedirector.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Represent website redirection manager, which controls current user location, url to previous page and url to specified page
 	/// </summary>
-	public interface IRedirector : IHideObjectMembers
+	public interface IRedirector
 	{
 		/// <summary>
 		/// Gets or sets the previous page url.
diff --git a/src/Simplify.Web/Modules/IWebContext.cs b/src/Simplify.Web/Modules/IWebContext.cs
@@ -5,7 +5,7 @@ namespace Simplify.Web.Modules
 	/// <summary>
 	/// Represent web context
 	/// </summary>
-	public interface IWebContext : IHideObjectMembers
+	public interface IWebContext
 	{
 		/// <summary>
 		/// Current web-site route, for example: "/" or "/user/delete/15"
@@ -57,5 +57,13 @@ public interface IWebContext : IHideObjectMembers
 		/// <c>true</c> if current request is ajax request; otherwise, <c>false</c>.
 		/// </value>
 		bool IsAjax { get; }
+
+		/// <summary>
+		/// Gets the request body.
+		/// </summary>
+		/// <value>
+		/// The request body.
+		/// </value>
+		string RequestBody { get; }
 	}
 }
diff --git a/src/Simplify.Web/Modules/WebContext.cs b/src/Simplify.Web/Modules/WebContext.cs
@@ -1,6 +1,7 @@
-﻿using System;
+﻿using Microsoft.AspNetCore.Http;
+using System;
+using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 
 namespace Simplify.Web.Modules
 {
@@ -10,6 +11,7 @@ namespace Simplify.Web.Modules
 	public class WebContext : IWebContext
 	{
 		private readonly Lazy<IFormCollection> _form;
+		private readonly Lazy<string> _requestBody;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="WebContext"/> class.
@@ -23,6 +25,7 @@ public WebContext(HttpContext context)
 			Query = context.Request.Query;
 
 			_form = new Lazy<IFormCollection>(() => Task.Run(() => context.Request.ReadFormAsync()).Result);
+			_requestBody = new Lazy<string>(() => new StreamReader(Context.Request.Body).ReadToEnd());
 
 			VirtualPath = string.IsNullOrEmpty(Request.PathBase.Value) ? "" : Request.PathBase.Value;
 
@@ -83,5 +86,13 @@ public WebContext(HttpContext context)
 		/// <c>true</c> if current request is ajax request; otherwise, <c>false</c>.
 		/// </value>
 		public bool IsAjax { get; }
+
+		/// <summary>
+		/// Gets or sets the request body.
+		/// </summary>
+		/// <value>
+		/// The request body.
+		/// </value>
+		public string RequestBody => _requestBody.Value;
 	}
 }
diff --git a/src/Simplify.Web/Owin/ApplicationBuilderExtensions.cs b/src/Simplify.Web/Owin/ApplicationBuilderExtensions.cs
@@ -1,7 +1,7 @@
-﻿using System;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Simplify.Web.Bootstrapper;
 using Simplify.Web.Core;
+using System;
 
 namespace Simplify.Web.Owin
 {
@@ -48,7 +48,7 @@ public static IApplicationBuilder UseSimplifyWebWithoutRegistrations(this IAppli
 		{
 			try
 			{
-				TerminalMiddleware = false;
+				TerminalMiddleware = true;
 
 				RegisterAsTerminal(builder);
 
diff --git a/src/Simplify.Web/Settings/ISimplifyWebSettings.cs b/src/Simplify.Web/Settings/ISimplifyWebSettings.cs
@@ -5,7 +5,7 @@ namespace Simplify.Web.Settings
 	/// <summary>
 	/// Represent Simplify.Web settings
 	/// </summary>
-	public interface ISimplifyWebSettings : IHideObjectMembers
+	public interface ISimplifyWebSettings
 	{
 		/// <summary>
 		/// Default language, for example: "en", "ru", "de" etc., default value is "en"
diff --git a/src/Simplify.Web/Simplify.Web.csproj b/src/Simplify.Web/Simplify.Web.csproj
@@ -5,14 +5,15 @@
 		<Product>Simplify</Product>
 		<Description>Lightweight and fast .NET web-framework based on MVC and OWIN</Description>
 		<Copyright>Licensed under LGPL</Copyright>
-		<Version>2.0.1</Version>
+		<Version>2.1</Version>
 		<PackageProjectUrl>https://github.com/i4004/Simplify.Web</PackageProjectUrl>
 		<PackageIconUrl>https://raw.githubusercontent.com/i4004/Simplify.Web/master/Images/Icon.png</PackageIconUrl>
 		<RepositoryUrl>https://github.com/i4004/Simplify.Web</RepositoryUrl>
 		<RepositoryType>GIT</RepositoryType>
 		<PackageTags>.NET web-framework MVC DI OWIN</PackageTags>
 		<PackageReleaseNotes>
-			Dependencies update
+			* WebContext RequestBody field added
+			* Terminal middleware set on UseSimplifyWebWithoutRegistrations fix
 		</PackageReleaseNotes>
 		<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
 		<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.xml</DocumentationFile>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class ArrayToSpecifiedListParser`
`15`	`15`	`/// </summary>`
`16`	`16`	`/// <param name="type">The type.</param>`
`17`	`17`	`/// <returns></returns>`
`18`		`- /// <exception cref="ModelNotSupportedException">Exception throws in case of underfined list type</exception>`
	`18`	`+ /// <exception cref="ModelNotSupportedException">Exception throws in case of undefined list type</exception>`
`19`	`19`	`public static bool IsTypeValidForParsing(Type type)`
`20`	`20`	`{`
`21`	`21`	`if (!type.IsGenericType \|\| type.GetGenericTypeDefinition() != typeof(IList<>))`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Various HTML generation classes container`
`5`	`5`	`/// </summary>`
`6`		`- public interface IHtmlWrapper : IHideObjectMembers`
	`6`	`+ public interface IHtmlWrapper`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// HTML ComboBox lists generator.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Simplify.Web.Modules.Data.Html`
`8`	`8`	`/// Usable <see cref="StringTable"/> items:`
`9`	`9`	`/// "HtmlListDefaultItemLabel"`
`10`	`10`	`/// </summary>`
`11`		`- public interface IListsGenerator : IHideObjectMembers`
	`11`	`+ public interface IListsGenerator`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// Generate number selected HTML list`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Simplify.Web.Modules.Data`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Represents localizable files reader`
`7`	`7`	`/// </summary>`
`8`		`- public interface IFileReader : IHideObjectMembers`
	`8`	`+ public interface IFileReader`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Setups the file reader.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Represent string table`
`5`	`5`	`/// </summary>`
`6`		`- public interface IStringTable : IHideObjectMembers`
	`6`	`+ public interface IStringTable`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// String table items`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Represent site environment properties`
`5`	`5`	`/// </summary>`
`6`		`- public interface IEnvironment : IHideObjectMembers`
	`6`	`+ public interface IEnvironment`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Gets the site physical path.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Represent current language controller and information container`
`5`	`5`	`/// </summary>`
`6`		`- public interface ILanguageManager : IHideObjectMembers`
	`6`	`+ public interface ILanguageManager`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Site current language, for example: "en", "ru", "de" etc.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Represent website redirection manager, which controls current user location, url to previous page and url to specified page`
`5`	`5`	`/// </summary>`
`6`		`- public interface IRedirector : IHideObjectMembers`
	`6`	`+ public interface IRedirector`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Gets or sets the previous page url.`