Merge branch 'build-0.4.1.0'

CHANGELOG.md

@@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Added
+
+### Fixed
+
+## [0.4.1.0] - 2017-04-25
+
 ### Added
 - Allow requesting binary output on GET - @steve-chavez
 - Accept clients requesting `Content-Type: application/json` from / - @feynmanliang
@@ -19,7 +25,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Resource embedding in views referencing tables in public schema - @fab1an
 - #777, Empty body is allowed when calling a non-parameterized RPC - @koulakis
 - #831, Fix proc resource embedding issue with search_path - @steve-chavez
-- #857, Fix swagger-ui when "server-proxy-uri" is not set - @feynmanliang
 - #547, Use read-only transaction for stable/immutable RPC - @begriffs
 
 ## [0.4.0.0] - 2017-01-19

app.json

@@ -10,7 +10,7 @@
     },
     "POSTGREST_VER": {
       "description": "Version of PostgREST to deploy",
-      "value": "0.4.0.0"
+      "value": "0.4.1.0"
     },
     "DB_URI": {
       "description": "Database connection string",

circle.yml

@@ -15,7 +15,7 @@ dependencies:
 
 test:
   override:
-    - POSTGREST_TEST_CONNECTION=$(test/create_test_db "postgres://ubuntu@localhost" postgrest_test) stack test --test-arguments "--skip \"returns a valid openapi\""
+    - POSTGREST_TEST_CONNECTION=$(test/create_test_db "postgres://ubuntu@localhost" postgrest_test) stack test
     - git ls-files | grep '\.l\?hs$' | xargs stack exec -- hlint -X QuasiQuotes -X NoPatternSynonyms "$@"
     - stack exec -- cabal update
     - stack exec --no-ghc-package-path -- cabal install --only-d --dry-run

docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:jessie
 
-ENV POSTGREST_VERSION 0.4.0.0
+ENV POSTGREST_VERSION 0.4.1.0
 
 RUN apt-get update && \
     apt-get install -y tar xz-utils wget libpq-dev && \

postgrest.cabal

@@ -2,7 +2,7 @@ name:                  postgrest
 description:           Reads the schema of a PostgreSQL database and creates RESTful routes
                        for the tables and views, supporting all HTTP verbs that security
                        permits.
-version:               0.4.0.0
+version:               0.4.1.0
 synopsis:              REST API for any Postgres database
 license:               MIT
 license-file:          LICENSE

src/PostgREST/App.hs

@@ -245,7 +245,7 @@ app dbStructure conf apiRequest =
           let host = configHost conf
               port = toInteger $ configPort conf
               proxy = pickProxy $ toS <$> configProxyUri conf
-              uri Nothing = ("http", host, port, "")
+              uri Nothing = ("http", host, port, "/")
               uri (Just Proxy { proxyScheme = s, proxyHost = h, proxyPort = p, proxyPath = b }) = (s, h, p, b)
               uri' = uri proxy
               encodeApi ti = encodeOpenAPI (M.elems $ dbProcs dbStructure) ti uri'