Merge pull request #81 from begriffs/content-location

Fix Content-Location header when there are no params

src/Dbapi.hs

@@ -91,7 +91,7 @@ app conn req respond =
                         rawQueryString req
         return $ addHeaders [
           ("Content-Location",
-           "/" <> cs table <> "?" <> cs canonical
+           "/" <> cs table <> if null canonical then "" else "?" <> cs canonical
           )] r
 
     ([table], "POST") ->

test/Feature/QuerySpec.hs

@@ -36,7 +36,7 @@ spec = around appWithFixture $ do
         , matchHeaders = ["Content-Range" <:> "0-1/2"]
         }
 
-  describe "Canonical location" $
+  describe "Canonical location" $ do
     it "Sets Content-Location with alphabetized params" $
       get "/no_pk?b=eq.1&a=eq.1"
         `shouldRespondWith` ResponseMatcher {
@@ -44,3 +44,11 @@ spec = around appWithFixture $ do
         , matchStatus  = 200
         , matchHeaders = ["Content-Location" <:> "/no_pk?a=eq.1&b=eq.1"]
         }
+
+    it "Omits question mark when there are no params" $
+      get "/no_pk"
+        `shouldRespondWith` ResponseMatcher {
+          matchBody    = Just "[]"
+        , matchStatus  = 200
+        , matchHeaders = ["Content-Location" <:> "/no_pk"]
+        }