Changing root namespace so it isn't the same as the class name to fix s…

…tephenhaunts#3
ebooks-com · Jan 8, 2021 · 78c9cb0 · 78c9cb0
1 parent 28ea41a
commit 78c9cb0
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 76 deletions.
diff --git a/ProfanityFilter.Tests.Unit/AllowListTests.cs b/ProfanityFilter.Tests.Unit/AllowListTests.cs
@@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ProfanityFilter;
-using ProfanityFilter.Interfaces;
+using ProfanityDetector;
+using ProfanityDetector.Interfaces;
 
-namespace ProfanityFilter.Tests.Unit
+namespace ProfanityDetector.Tests.Unit
 {
     [TestClass]
     public class AllowListTests

diff --git a/ProfanityFilter.Tests.Unit/ProfanityBaseTests.cs b/ProfanityFilter.Tests.Unit/ProfanityBaseTests.cs
@@ -21,9 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ProfanityFilter.Interfaces;
+using ProfanityDetector.Interfaces;
 
-namespace ProfanityFilter.Tests.Unit
+namespace ProfanityDetector.Tests.Unit
 {
     [TestClass]
     public class ProfanityBaseTests

diff --git a/...ts.Unit/ProfanityFilter.Tests.Unit.csproj → ....Unit/ProfanityDetector.Tests.Unit.csproj b/...ts.Unit/ProfanityFilter.Tests.Unit.csproj → ....Unit/ProfanityDetector.Tests.Unit.csproj
@@ -1,28 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <NoStdLib>true</NoStdLib>
-    <WarningsNotAsErrors></WarningsNotAsErrors>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ProfanityFilter\ProfanityFilter\ProfanityFilter.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove=".DS_Store" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+    <ReleaseVersion>0.1.2</ReleaseVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <NoStdLib>true</NoStdLib>
+    <WarningsNotAsErrors></WarningsNotAsErrors>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ProfanityFilter\ProfanityFilter\ProfanityDetector.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove=".DS_Store" />
+  </ItemGroup>
+</Project>
diff --git a/ProfanityFilter/ProfanityFilter.sln b/ProfanityFilter/ProfanityFilter.sln
@@ -1,9 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfanityFilter", "ProfanityFilter\ProfanityFilter.csproj", "{8067C4ED-6D76-417C-A22D-BD748ED0424C}"
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30309.148
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProfanityDetector", "ProfanityFilter\ProfanityDetector.csproj", "{8067C4ED-6D76-417C-A22D-BD748ED0424C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfanityFilter.Tests.Unit", "..\ProfanityFilter.Tests.Unit\ProfanityFilter.Tests.Unit.csproj", "{4B6BFD9A-3AC0-4705-AAB6-24C688E98B8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProfanityDetector.Tests.Unit", "..\ProfanityFilter.Tests.Unit\ProfanityDetector.Tests.Unit.csproj", "{4B6BFD9A-3AC0-4705-AAB6-24C688E98B8D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,6 +21,12 @@ Global
 		{4B6BFD9A-3AC0-4705-AAB6-24C688E98B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B6BFD9A-3AC0-4705-AAB6-24C688E98B8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EC293009-F0E4-4A39-9DAD-04B1AF6BE537}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		version = 0.1.2
 	EndGlobalSection

diff --git a/ProfanityFilter/ProfanityFilter/AllowList.cs b/ProfanityFilter/ProfanityFilter/AllowList.cs
@@ -21,9 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
-using ProfanityFilter.Interfaces;
+using ProfanityDetector.Interfaces;
 
-namespace ProfanityFilter
+namespace ProfanityDetector
 {
     public class AllowList : IAllowList
     {

diff --git a/ProfanityFilter/ProfanityFilter/Interfaces/IAllowList.cs b/ProfanityFilter/ProfanityFilter/Interfaces/IAllowList.cs
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.ObjectModel;
 
-namespace ProfanityFilter.Interfaces
+namespace ProfanityDetector.Interfaces
 {
     public interface IAllowList
     {

diff --git a/ProfanityFilter/ProfanityFilter/Interfaces/IProfanityFilter.cs b/ProfanityFilter/ProfanityFilter/Interfaces/IProfanityFilter.cs
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace ProfanityFilter.Interfaces
+namespace ProfanityDetector.Interfaces
 {
     public interface IProfanityFilter
     {

diff --git a/ProfanityFilter/ProfanityFilter/ProfanityBase.cs b/ProfanityFilter/ProfanityFilter/ProfanityBase.cs
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace ProfanityFilter
+namespace ProfanityDetector
 {
     public partial class ProfanityBase
     {

diff --git a/...er/ProfanityFilter/ProfanityFilter.csproj → .../ProfanityFilter/ProfanityDetector.csproj b/...er/ProfanityFilter/ProfanityFilter.csproj → .../ProfanityFilter/ProfanityDetector.csproj
@@ -1,29 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackOnBuild>true</PackOnBuild>
-    <PackageId>Profanity.Detector</PackageId>
-    <PackageVersion>0.1.8</PackageVersion>
-    <Authors>Stephen Haunts</Authors>
-    <NeutralLanguage>en</NeutralLanguage>
-    <PackageLicenseUrl>https://github.com/stephenhaunts/ProfanityDetector/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Owners>Stephen Haunts</Owners>
-    <PackageProjectUrl>https://github.com/stephenhaunts/ProfanityDetector</PackageProjectUrl>
-    <PackageTags>Profanity Filter, Profanity Detector</PackageTags>
-    <Title>Profanity Detector</Title>
-    <Description>Profanity Filter used to detect or censor text in an application. You can use the inbuilt profanity list, or load up your organizations custom list.</Description>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Optimize>false</Optimize>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Interfaces\" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackOnBuild>true</PackOnBuild>
+    <PackageId>Profanity.Detector</PackageId>
+    <PackageVersion>0.1.8</PackageVersion>
+    <Authors>Stephen Haunts</Authors>
+    <NeutralLanguage>en</NeutralLanguage>
+    <PackageLicenseUrl>https://github.com/stephenhaunts/ProfanityDetector/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Owners>Stephen Haunts</Owners>
+    <PackageProjectUrl>https://github.com/stephenhaunts/ProfanityDetector</PackageProjectUrl>
+    <PackageTags>Profanity Filter, Profanity Detector</PackageTags>
+    <Title>Profanity Detector</Title>
+    <Description>Profanity Filter used to detect or censor text in an application. You can use the inbuilt profanity list, or load up your organizations custom list.</Description>
+    <ReleaseVersion>0.1.2</ReleaseVersion>
+    <AssemblyName>ProfanityDetector</AssemblyName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="Interfaces\" />
+  </ItemGroup>
+</Project>
diff --git a/ProfanityFilter/ProfanityFilter/ProfanityFilter.cs b/ProfanityFilter/ProfanityFilter/ProfanityFilter.cs
@@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using ProfanityFilter.Interfaces;
+using ProfanityDetector.Interfaces;
 
-namespace ProfanityFilter
+namespace ProfanityDetector
 {
     /// <summary>
     ///
@@ -276,8 +276,7 @@ public bool ContainsProfanity(string term)
 
             foreach (Match profanity in regex.Matches(term))
             {
-                // if any matches are found and aren't in the allowed list, we can return true here without checking further
-                if (!AllowList.Contains(profanity.Value.ToLower(CultureInfo.InvariantCulture)))
+                if (IsProfanity(profanity.Value))
                 {
                     return true;
                 }

diff --git a/ProfanityFilter/ProfanityFilter/ProfanityList.cs b/ProfanityFilter/ProfanityFilter/ProfanityList.cs
@@ -17,7 +17,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-namespace ProfanityFilter
+namespace ProfanityDetector
 {
     /// <summary>
     /// This class contains the profanity list.