Bring packages up to date (#722)

* Bring packages up to date

* New LTS includes deps now

Use stack to select most versions

* Alphabetize packages

* Strip down packages

Switch tests to protolude

* Appease cabal check with base version constraint

test/Feature/AuthSpec.hs

@@ -9,6 +9,8 @@ import Network.HTTP.Types
 
 import SpecHelper
 import Network.Wai (Application)
+
+import Protolude hiding (get)
 -- }}}
 
 spec :: SpecWith Application

test/Feature/ConcurrentSpec.hs

@@ -16,6 +16,8 @@ import Network.Wai.Test (Session)
 
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec =
   describe "Queryiny in parallel" $

test/Feature/CorsSpec.hs

@@ -10,6 +10,8 @@ import SpecHelper
 
 import Network.HTTP.Types
 import Network.Wai (Application)
+
+import Protolude hiding (get)
 -- }}}
 
 spec :: SpecWith Application

test/Feature/DeleteSpec.hs

@@ -7,6 +7,8 @@ import Text.Heredoc
 import Network.HTTP.Types
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec =
   describe "Deleting" $ do

test/Feature/InsertSpec.hs

@@ -8,8 +8,8 @@ import Network.Wai.Test (SResponse(simpleBody,simpleHeaders,simpleStatus))
 import SpecHelper
 
 import qualified Data.Aeson as JSON
+import Data.List (lookup)
 import Data.Maybe (fromJust)
-import Data.Monoid ((<>))
 import Text.Heredoc
 import Network.HTTP.Types.Header
 import Network.HTTP.Types
@@ -18,6 +18,8 @@ import Control.Monad (replicateM_, void)
 import TestTypes(IncPK(..), CompoundPK(..))
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec = do
   describe "Posting new record" $ do

test/Feature/NoJwtSpec.hs

@@ -7,6 +7,8 @@ import Network.HTTP.Types
 
 import SpecHelper
 import Network.Wai (Application)
+
+import Protolude hiding (get)
 -- }}}
 
 spec :: SpecWith Application

test/Feature/ProxySpec.hs

@@ -6,6 +6,8 @@ import SpecHelper
 
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec =
   describe "GET / with proxy" $

test/Feature/QueryLimitedSpec.hs

@@ -9,6 +9,8 @@ import Text.Heredoc
 import SpecHelper
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec =
   describe "Requesting many items with server limits enabled" $ do

test/Feature/QuerySpec.hs

@@ -10,6 +10,8 @@ import SpecHelper
 import Text.Heredoc
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec = do
 

test/Feature/RangeSpec.hs

@@ -12,6 +12,8 @@ import SpecHelper
 import Text.Heredoc
 import Network.Wai (Application)
 
+import Protolude hiding (get)
+
 defaultRange :: BL.ByteString
 defaultRange = [json| { "min": 0, "max": 15 } |]
 

test/Feature/StructureSpec.hs

@@ -13,6 +13,8 @@ import SpecHelper
 import Network.Wai (Application)
 import Network.Wai.Test (SResponse(..))
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec = do
 

test/Feature/UnicodeSpec.hs

@@ -6,6 +6,8 @@ import Test.Hspec.Wai.JSON
 import Network.Wai (Application)
 import Control.Monad (void)
 
+import Protolude hiding (get)
+
 spec :: SpecWith Application
 spec =
   describe "Reading and writing to unicode schema and table names" $

test/Main.hs

@@ -8,8 +8,8 @@ import qualified Hasql.Pool as P
 import PostgREST.DbStructure (getDbStructure)
 import PostgREST.App (postgrest)
 import Control.AutoUpdate
+import Data.Function (id)
 import Data.IORef
-import Data.String.Conversions (cs)
 import Data.Time.Clock.POSIX   (getPOSIXTime)
 
 import qualified Feature.AuthSpec
@@ -25,18 +25,20 @@ import qualified Feature.StructureSpec
 import qualified Feature.UnicodeSpec
 import qualified Feature.ProxySpec
 
+import Protolude
+
 main :: IO ()
 main = do
   setupDb
 
-  pool <- P.acquire (3, 10, cs testDbConn)
+  pool <- P.acquire (3, 10, toS testDbConn)
   -- ask for the OS time at most once per second
   getTime <- mkAutoUpdate
     defaultUpdateSettings { updateAction = getPOSIXTime }
 
 
   result <- P.use pool $ getDbStructure "test"
-  refDbStructure <- newIORef $ either (error.show) id result
+  refDbStructure <- newIORef $ either (panic.show) id result
   let withApp = return $ postgrest testCfg refDbStructure pool getTime
       ltdApp  = return $ postgrest testLtdRowsCfg refDbStructure pool getTime
       unicodeApp = return $ postgrest testUnicodeCfg refDbStructure pool getTime

test/SpecHelper.hs

@@ -1,10 +1,10 @@
 module SpecHelper where
 
-import Data.String.Conversions (cs)
 import Control.Monad (void)
 
 import Codec.Binary.Base64.String (encode)
 import Data.CaseInsensitive (CI(..))
+import Data.List (lookup)
 import Text.Regex.TDFA ((=~))
 import qualified Data.ByteString.Char8 as BS
 import System.Process (readProcess)
@@ -21,7 +21,7 @@ import Data.Maybe (fromJust)
 import Data.Aeson (decode)
 import qualified Data.JsonSchema.Draft4 as D4
 
-import Data.Text
+import Protolude
 
 validateOpenApiResponse :: [Header] -> WaiSession ()
 validateOpenApiResponse headers = do
@@ -98,14 +98,14 @@ acceptHdrs mime = [(hAccept, mime)]
 rangeUnit :: Header
 rangeUnit = ("Range-Unit" :: CI BS.ByteString, "items")
 
-matchHeader :: CI BS.ByteString -> String -> [Header] -> Bool
+matchHeader :: CI BS.ByteString -> BS.ByteString -> [Header] -> Bool
 matchHeader name valRegex headers =
   maybe False (=~ valRegex) $ lookup name headers
 
-authHeaderBasic :: String -> String -> Header
+authHeaderBasic :: BS.ByteString -> BS.ByteString -> Header
 authHeaderBasic u p =
-  (hAuthorization, cs $ "Basic " ++ encode (u ++ ":" ++ p))
+  (hAuthorization, "Basic " <> (toS . encode . toS $ u <> ":" <> p))
 
-authHeaderJWT :: String -> Header
+authHeaderJWT :: BS.ByteString -> Header
 authHeaderJWT token =
-  (hAuthorization, cs $ "Bearer " ++ token)
+  (hAuthorization, "Bearer " <> token)