Merge branch 'main' into small-docs-changes

Author: jkone27

ApiStub.FSharp.Stubbery/ApiStub.FSharp.Stubbery.fsproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>ApiStub.FSharp.Stubbery</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Authors>jkone27</Authors>
     <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

ApiStub.FSharp.Stubbery/Library.fs

@@ -65,6 +65,19 @@ module StubberyCE =
         member this.Put(x, route, stub) =
             this.Stub(x, [| HttpMethod.Put |], route, stub)
 
+        [<CustomOperation("PUT_OBJ")>]
+        member this.PutObj(x, route, stub) =
+            this.StubObj(x, [| HttpMethod.Put |], route, (fun _ -> stub))
+
+        [<CustomOperation("PATCH")>]
+        member this.Patch(x, route, stub) =
+            this.Stub(x, [| HttpMethod.Patch |], route, stub)
+
+        [<CustomOperation("PATCH_OBJ")>]
+        member this.PatchObj(x, route, stub) =
+            this.StubObj(x, [| HttpMethod.Patch |], route, (fun _ -> stub))
+
+
         [<CustomOperation("DELETE")>]
         member this.Delete(x, route, stub) =
             this.Stub(x, [| HttpMethod.Delete |], route, stub)

ApiStub.FSharp/ApiStub.FSharp.fsproj

@@ -3,7 +3,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>ApiStub.FSharp</PackageId>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
     <Authors>jkone27</Authors>
     <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

ApiStub.FSharp/CE.fs

@@ -25,11 +25,10 @@ module CE =
         let mutable httpMessageHandler: DelegatingHandler = null
 
         let customConfigureServices =
-            new ResizeArray<IServiceCollection -> IServiceCollection>()
+            ResizeArray<IServiceCollection -> IServiceCollection>()
 
         let customConfigureTestServices =
-            new ResizeArray<IServiceCollection -> IServiceCollection>()
-
+            ResizeArray<IServiceCollection -> IServiceCollection>()
 
         interface IDisposable with
             member this.Dispose() = factory.Dispose()
@@ -52,13 +51,12 @@ module CE =
                 useRealHttpClient
             ) =
 
-            let routeValueDict = new RouteValueDictionary()
+            let routeValueDict = RouteValueDictionary()
 
             let templateMatcher =
                 try
-
                     let rt = TemplateParser.Parse(routeTemplate.TrimStart('/'))
-                    let tm = new TemplateMatcher(rt, routeValueDict)
+                    let tm = TemplateMatcher(rt, routeValueDict)
                     Some(tm)
                 with _ ->
                     None
@@ -167,6 +165,21 @@ module CE =
         member this.PutJson(x, route, stub: obj) =
             this.StubJson(x, [| HttpMethod.Put |], route, stub)
 
+        /// stub PATCH json
+        [<CustomOperation("PATCH_ASYNC")>]
+        member this.PatchAsync(x, route, stub) =
+            this.StubAsync(x, [| HttpMethod.Patch |], route, stub)
+
+        /// stub PATCH
+        [<CustomOperation("PATCH")>]
+        member this.Patch(x, route, stub) =
+            this.Stub(x, [| HttpMethod.Patch |], route, stub)
+
+        /// stub PATCH json
+        [<CustomOperation("PATCHJ")>]
+        member this.PatchJson(x, route, stub: obj) =
+            this.StubJson(x, [| HttpMethod.Patch |], route, stub)
+
         /// stub DELETE
         [<CustomOperation("DELETE")>]
         member this.Delete(x, route, stub) =
@@ -207,7 +220,7 @@ module CE =
                             else
                                 String.Empty
 
-                        let newBase = new Uri(new Uri("http://127.0.0.1/"), path)
+                        let newBase = Uri(Uri("http://127.0.0.1/"), path)
                         c.BaseAddress <- newBase)
                     |> ignore)
                 |> ignore

ApiStub.FSharp/Csharp.fs

@@ -19,3 +19,7 @@ type CsharpExtensions =
     [<Extension>]
     static member DELETEJ<'a when 'a: not struct>(x: TestClient<'a>, route: string, stub: obj) =
         x.DeleteJson(x, route, stub)
+
+    [<Extension>]
+    static member PATCHJ<'a when 'a: not struct>(x: TestClient<'a>, route: string, stub: obj) =
+        x.PatchJson(x, route, stub)

docs/index.md

@@ -76,7 +76,17 @@ module Tests =
 
 if you prefer to use C# for testing, some extension methods are provided to use with C# as well:  
 
-`GETJ, PUTJ, POSTJ, DELETEJ`
+`GETJ, PUTJ, POSTJ, DELETEJ, PATCHJ`
+
+Remember to add this snippet at the end of your `Program.cs` file for the `TestClient` to be able to pick up your configuration:
+
+```csharp
+// Program.cs
+
+// ... all your code, until end of file. 
+
+public partial class Program { }
+```
 
 If you want to access more overloads, you can access the inspect `TestClient<T>` members and create your custom extension methods easilly.
 
@@ -128,7 +138,7 @@ Available HTTP methods in the test dsl to "mock" HTTP client responses are the f
 
 ### Basic
 
-* `GET`, `PUT`, `POST`, `DELETE` - for accessing request, route parameters and sending back HttpResponseMessage (e.g. using R_JSON or other constructors)
+* `GET`, `PUT`, `POST`, `DELETE`, `PATCH` - for accessing request, route parameters and sending back HttpResponseMessage (e.g. using R_JSON or other constructors)
 
 ```fsharp
     // example of control on request and route value dictionary
@@ -141,15 +151,15 @@ Available HTTP methods in the test dsl to "mock" HTTP client responses are the f
 
 ### JSON 📒
 
-* `GETJ`, `PUTJ`, `POSTJ`, `DELETEJ` - for objects converted to JSON content
+* `GETJ`, `PUTJ`, `POSTJ`, `DELETEJ`, `PATCHJ` - for objects converted to JSON content
 
 ```fsharp
 GETJ "/yetAnotherOne" {| Success = true |}
 ```
 
 ### ASYNC Overloads (task) ⚡️
 
-* `GET_ASYNC`, `PUT_ASYNC`, `POST_ASYNC`, `DELETE_ASYNC` - for handling asynchronous requests inside a task computation expression (async/await) and mock dynamically
+* `GET_ASYNC`, `PUT_ASYNC`, `POST_ASYNC`, `DELETE_ASYNC`, `PATCH_ASYNC` - for handling asynchronous requests inside a task computation expression (async/await) and mock dynamically
 
 ```fsharp
 // example of control on request and route value dictionary