Merge branch 'jamesjrg-master'

Author: haf

.semver

@@ -1,6 +1,6 @@
 ---
 :major: 0
-:minor: 6
+:minor: 7
 :patch: 0
 :special: ''
 :metadata: ''

paket.dependencies

@@ -2,9 +2,9 @@ source https://www.nuget.org/api/v2
 
 nuget FsCheck ~> 1.0
 nuget FSharp.Core ~> 3.1
-nuget Fuchu-suave ~> 0.6
-nuget Fuchu-suave.FsCheck ~> 0.6
+nuget Fuchu-suave ~> 0.6.1
+nuget Fuchu-suave.FsCheck ~> 0.6.1
 nuget NodaTime ~> 1.3
 nuget NuGet.CommandLine
-nuget Suave ~> 0.21
-nuget Suave.Testing ~> 0.21
+nuget Suave ~> 0.25
+nuget Suave.Testing ~> 0.25

paket.lock

@@ -3,7 +3,7 @@ NUGET
   specs:
     FsCheck (1.0.4)
     FSharp.Core (3.1.2.1)
-    FsPickler (1.0.6)
+    FsPickler (1.0.11)
     Fuchu-suave (0.6.1)
       FSharp.Core (>= 3.1.2.1)
     Fuchu-suave.FsCheck (0.6.1)
@@ -12,10 +12,9 @@ NUGET
       Fuchu-suave (>= 0.6.1)
     NodaTime (1.3.0)
     NuGet.CommandLine (2.8.3)
-    Suave (0.21.0)
-      FSharp.Core (>= 3.1.2.1)
-      FsPickler (>= 1.0.6)
-    Suave.Testing (0.21.0)
+    Suave (0.25.0)
       FSharp.Core (>= 3.1.2.1)
+      FsPickler (>= 1.0.7)
+    Suave.Testing (0.25.0)
       Fuchu-suave (>= 0.6.1)
-      Suave (>= 0.21.0)
+      Suave (>= 0.25.0)

src/logibit.hawk.sln

@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{7B11D818-C87B-4943-867A-6CA34064B720}"
 	ProjectSection(SolutionItems) = preProject
 		..\paket.dependencies = ..\paket.dependencies

src/logibit.hawk.suave.tests/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/logibit.hawk.suave.tests/Hawk.fs

@@ -24,7 +24,7 @@ open Suave.Testing
 
 open Fuchu
 
-let run_with' = run_with default_config
+let runWithDefaultConfig = runWith defaultConfig
 
 let creds_inner id =
   { id        = id
@@ -51,7 +51,7 @@ let making_request =
       (fun (attr, creds, user) -> OK (sprintf "authenticated user '%s'" user.real_name))
 
   let req m data f_req f_resp =
-    req_resp m "/" "" data None System.Net.DecompressionMethods.None f_req f_resp
+    reqResp m "/" "" data None System.Net.DecompressionMethods.None f_req f_resp
 
   let ensure_auth_header = function
     | Choice1Of2 res -> res
@@ -68,7 +68,7 @@ let making_request =
 
   testList "authentication cases" [
     testCase "when not signing request" <| fun _ ->
-      run_with' sample_app |> req HttpMethod.GET None id (fun resp ->
+      runWithDefaultConfig sample_app |> req HttpMethod.GET None id (fun resp ->
         Assert.Equal("unauthorised", HttpStatusCode.Unauthorized, resp.StatusCode)
         let res_str = resp.Content.ReadAsStringAsync().Result
         Assert.StringContains("body", "Missing header 'authorization'", res_str)
@@ -77,7 +77,7 @@ let making_request =
     testCase "when signing GET request" <| fun _ ->
       let opts = ClientOptions.mk' (creds_inner "1")
       let request = set_auth_header HM.GET opts
-      run_with' sample_app |> req HttpMethod.GET None request (fun resp ->
+      runWithDefaultConfig sample_app |> req HttpMethod.GET None request (fun resp ->
         Assert.StringContains("successful auth", "authenticated user", resp.Content.ReadAsStringAsync().Result)
         Assert.Equal("OK", HttpStatusCode.OK, resp.StatusCode)
         )
@@ -87,7 +87,7 @@ let making_request =
       let request =
         set_auth_header HM.POST opts
         >> set_bytes [| 0uy; 1uy |]
-      run_with' sample_app |> req HttpMethod.POST None request (fun resp ->
+      runWithDefaultConfig sample_app |> req HttpMethod.POST None request (fun resp ->
         Assert.StringContains("successful auth", "authenticated user", resp.Content.ReadAsStringAsync().Result)
         Assert.Equal("OK", HttpStatusCode.OK, resp.StatusCode)
         )

src/logibit.hawk.suave.tests/logibit.hawk.suave.tests.fsproj

@@ -41,6 +41,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App.config" />
     <Compile Include="AssemblyVersionInfo.fs" />
     <Compile Include="Hawk.fs" />
     <Compile Include="Program.fs" />

src/logibit.hawk.suave/Hawk.fs

@@ -79,10 +79,10 @@ let bind_req (s : Settings<'a>)
     { ``method``    = Impl.from_suave_method s_req.``method``
       uri           = ub.Uri
       authorisation = auth
-      payload       = if s_req.raw_form.Length = 0 then None else Some ctx.request.raw_form
+      payload       = if s_req.rawForm.Length = 0 then None else Some ctx.request.rawForm
       host          = None
       port          = None
-      content_type  = "content-type" |> HttpRequest.header ctx.request })
+      content_type  = ctx.request.header "content-type"})
 
 // Example functor of the bind_req function:
 //let bind_req' s =
@@ -118,7 +118,7 @@ let authenticate (s : Settings<'a>)
   fun ctx ->
     match auth_ctx s f_req ctx with
     | Choice1Of2 res ->
-      (Writers.set_user_data HawkDataKey res
+      (Writers.setUserData HawkDataKey res
        >>= f_cont res) ctx
     | Choice2Of2 err ->
       f_err err ctx
@@ -131,6 +131,6 @@ module HttpContext =
 
   /// Find the Hawk auth data from the context.
   let hawk_data (ctx : HttpContext) =
-    ctx.user_state
+    ctx.userState
     |> Map.tryFind HawkDataKey
     |> Option.map (fun x -> x :?> HawkAttributes * Credentials * 'a)