jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78 from begriffs/lookup

Browse Source 
Remove getHeader, fixes #77
This commit is contained in:
Joe Nelson
2014-10-14 11:14:48 -07:00
parent 605c876bf5 80c55789b5
commit 17ada69411
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Feature/InsertSpec.hs
+1 -1
View File
@@ -39,7 +39,7 @@ spec = around appWithFixture $ do
simpleBody p `shouldBe` "" simpleBody p `shouldBe` ""
simpleHeaders p `shouldSatisfy` matchHeader hLocation "/auto_incrementing_pk\\?id=eq\\.[0-9]+" simpleHeaders p `shouldSatisfy` matchHeader hLocation "/auto_incrementing_pk\\?id=eq\\.[0-9]+"
simpleStatus p `shouldBe` created201 simpleStatus p `shouldBe` created201
let Just location = getHeader hLocation $ simpleHeaders p let Just location = lookup hLocation $ simpleHeaders p
r <- get location r <- get location
let [record] = fromJust (JSON.decode $ simpleBody r :: Maybe [IncPK]) let [record] = fromJust (JSON.decode $ simpleBody r :: Maybe [IncPK])
liftIO $ do liftIO $ do
test/SpecHelper.hs
+1 -4
View File
@@ -75,12 +75,9 @@ rangeHdrs r = [rangeUnit, (hRange, renderByteRange r)]
rangeUnit :: Header rangeUnit :: Header
rangeUnit = ("Range-Unit" :: CI BS.ByteString, "items") rangeUnit = ("Range-Unit" :: CI BS.ByteString, "items")
getHeader :: CI BS.ByteString -> [Header] -> Maybe BS.ByteString
getHeader = lookup
matchHeader :: CI BS.ByteString -> String -> [Header] -> Bool matchHeader :: CI BS.ByteString -> String -> [Header] -> Bool
matchHeader name valRegex headers = matchHeader name valRegex headers =
maybe False (=~ valRegex) $ getHeader name headers maybe False (=~ valRegex) $ lookup name headers
authHeader :: String -> String -> Header authHeader :: String -> String -> Header
authHeader user pass = authHeader user pass =