Skip to content

Improved URL construction #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergey-tihon merged 2 commits into from
Mar 12, 2017
Merged

Improved URL construction #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef3ecd2
Improved URL construction
sergey-tihon Mar 12, 2017
b0ecc9f
Dependencies update
sergey-tihon Mar 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ NUGET
YamlDotNet (4.1)
GITHUB
remote: fsharp/FSharp.Data
src/CommonRuntime/IO.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/CommonRuntime/NameUtils.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/CommonRuntime/Pluralizer.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/CommonRuntime/StructuralTypes.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/CommonRuntime/TextConversions.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/Json/JsonConversions.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/Json/JsonExtensions.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/Json/JsonValue.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/Net/Http.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/Net/UriUtils.fs (8aa6e7fea6fa826b6fd9e89478d9cb2c32cda57a)
src/CommonRuntime/IO.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/CommonRuntime/NameUtils.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/CommonRuntime/Pluralizer.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/CommonRuntime/StructuralTypes.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/CommonRuntime/TextConversions.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/Json/JsonConversions.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/Json/JsonExtensions.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/Json/JsonValue.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/Net/Http.fs (1608eee2235784205b870979d9f7aa88d09f506b)
src/Net/UriUtils.fs (1608eee2235784205b870979d9f7aa88d09f506b)
remote: fsprojects/FSharp.TypeProviders.StarterPack
src/ProvidedTypes.fs (2bf9330417734c6e4976691bc88c9335f2337c6e)
src/ProvidedTypes.fsi (2bf9330417734c6e4976691bc88c9335f2337c6e)
src/ProvidedTypesTesting.fs (2bf9330417734c6e4976691bc88c9335f2337c6e)
src/ProvidedTypes.fs (45f4d8780b3213ef61ba4fccc716cd495565c1a4)
src/ProvidedTypes.fsi (45f4d8780b3213ef61ba4fccc716cd495565c1a4)
src/ProvidedTypesTesting.fs (45f4d8780b3213ef61ba4fccc716cd495565c1a4)
remote: fsprojects/FSharp.Configuration
src/FSharp.Configuration/TypeProviders.Helper.fs (bc5ec3a8537a79f81ddc9f90eccdc37e383535ad)
GROUP Build
FRAMEWORK: NET45
NUGET
remote: https://www.nuget.org/api/v2
DotLiquid (2.0.64)
FAKE (4.50.1)
FAKE (4.52)
FSharp.Compiler.Service (2.0.0.6)
FSharp.Core (4.1)
FSharp.Core (4.1.0.2)
System.ValueTuple (>= 4.3)
FSharp.Formatting (2.14.4)
FSharp.Compiler.Service (2.0.0.6)
Expand All @@ -41,7 +41,7 @@ NUGET
System.ValueTuple (4.3)
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (33e702f6c220f3facaf41f20dae03a912eeebf9a)
modules/Octokit/Octokit.fsx (5499b06bef2e13aa45f57b614b762ccb69bd966e)
Octokit (>= 0.20)
GROUP OWIN
FRAMEWORK: NET45
Expand Down Expand Up @@ -80,7 +80,7 @@ NUGET
Argu (>= 3.2)
FSharp.Core (>= 3.1.2.5)
Mono.Cecil (>= 0.9.6.4)
FSharp.Compiler.Service (10.0.3)
FSharp.Compiler.Service (11.0.6)
System.Collections.Immutable (>= 1.2)
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
FSharp.Core (4.0.0.1) - redirects: force
Expand Down
4 changes: 2 additions & 2 deletions src/SwaggerProvider.DesignTime/OperationCompiler.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type OperationCompiler (schema:SwaggerObject, defCompiler:DefinitionCompiler) =

let basePath =
let basePath = schema.BasePath
<@ (%%host : string) + basePath @>
<@ SwaggerProvider.Internal.RuntimeHelpers.combineUrl (%%host : string) basePath @>

// Fit headers into quotation
let headers =
Expand Down Expand Up @@ -138,7 +138,7 @@ type OperationCompiler (schema:SwaggerObject, defCompiler:DefinitionCompiler) =
(<@@ mPath @@>, None, <@@ ([] : (string*string) list) @@>, headers)


let address = <@@ %basePath + (%%path :string ) @@>
let address = <@@ SwaggerProvider.Internal.RuntimeHelpers.combineUrl %basePath (%%path :string ) @@>
let restCall = op.Type.ToString()

let customizeHttpRequest =
Expand Down
5 changes: 4 additions & 1 deletion src/SwaggerProvider.Runtime/RuntimeHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,7 @@ module RuntimeHelpers =
settings.Converters.Add(new OptionConverter () :> JsonConverter)
settings.Converters.Add(new ByteArrayConverter () :> JsonConverter)
fun value (retTy:Type) ->
JsonConvert.DeserializeObject(value, retTy, settings)
JsonConvert.DeserializeObject(value, retTy, settings)

let combineUrl (urlA:string) (urlB:string) =
sprintf "%s/%s" (urlA.TrimEnd('/')) (urlB.TrimStart('/'))