Merge pull request #40 from inaka/harenson.25.add-basePath-to-trails-…

…path [#25] Add basePath to swaggerSpec
inaka · Dec 2, 2015 · 089a3f6 · 089a3f6
2 parents 72f5bba + baf0b34
commit 089a3f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ rel/example_project
 .concrete/DEV_MODE
 .rebar
 .erlang.mk
+log
 logs
diff --git a/src/cowboy_swagger.erl b/src/cowboy_swagger.erl
@@ -55,7 +55,9 @@ to_json(Trails) ->
   GlobalSpec = normalize_map_values(
     application:get_env(cowboy_swagger, global_spec, Default)),
   SanitizeTrails = filter_cowboy_swagger_handler(Trails),
-  SwaggerSpec = GlobalSpec#{paths => swagger_paths(SanitizeTrails)},
+  ApiRoot = list_to_binary(trails:api_root()),
+  SwaggerSpec = GlobalSpec#{paths => swagger_paths(SanitizeTrails),
+                            basePath => ApiRoot},
   enc_json(SwaggerSpec).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%