yam-redis 0.6.3 → 0.7

raw patch · 2 files changed

+12/−13 lines, 2 filesdep ~salakdep ~servant-serverdep ~yamPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: salak, servant-server, yam

API changes (from Hackage documentation)

- Yam.Redis: instance Salak.Prop.FromProp Database.Redis.Core.ConnectInfo

- Yam.Redis: instance Salak.Prop.FromProp Database.Redis.ProtocolPipelining.PortID

+ Yam.Redis: instance Control.Monad.Catch.MonadCatch m => Salak.Internal.Prop.FromProp m Database.Redis.Core.ConnectInfo

+ Yam.Redis: instance Control.Monad.Catch.MonadThrow m => Salak.Internal.Prop.FromProp m Database.Redis.ProtocolPipelining.PortID

- Yam.Redis: redisMiddleware :: RunSalak (AppMiddleware a (REDIS : a))

+ Yam.Redis: redisMiddleware :: HasSalaks a => AppMiddleware a (REDIS : a)

Files

src/Yam/Redis.hs +6/−7
yam-redis.cabal +6/−6

src/Yam/Redis.hs view

@@ -33,7 +33,7 @@ instance Default ConnectInfo where   def = defaultConnectInfo -instance FromProp ConnectInfo where+instance MonadCatch m => FromProp m ConnectInfo where   fromProp = ConnInfo     <$> "host"      .?: connectHost     <*> "port"      .?: connectPort@@ -44,8 +44,8 @@     <*> return Nothing     <*> return Nothing -instance FromProp PortID where-  fromProp = PortNumber . fromIntegral <$> (fromProp :: Prop Word16)+instance MonadThrow m => FromProp m PortID where+  fromProp = PortNumber . fromIntegral <$> (fromProp :: Prop m Word16)  -- | Middleware context type. newtype REDIS = REDIS Connection@@ -71,11 +71,10 @@     go  TxAborted    = Left $ Error "RedisTx aborted"     go (TxError   e) = Left $ Error $ BC.pack e -redisMiddleware :: RunSalak (AppMiddleware a (REDIS : a))-redisMiddleware = do-  ci <- require "redis"-  return $ AppMiddleware $ \cxt m h f -> do+redisMiddleware :: HasSalaks a => AppMiddleware a (REDIS : a)+redisMiddleware = AppMiddleware $ \cxt m h f -> do     logInfo "Redis loaded"+    ci <- runAppT cxt (require "redis")     lf <- askLoggerIO     liftIO       $ bracket (connect ci) disconnect

yam-redis.cabal view

@@ -1,9 +1,9 @@ cabal-version: 1.12 name: yam-redis-version: 0.6.3+version: 0.7 license: BSD3 license-file: LICENSE-copyright: (c) Daniel YU+copyright: (c) 2018 Daniel YU maintainer: Daniel YU <leptonyu@gmail.com> author: Daniel YU homepage: https://github.com/leptonyu/yam#readme@@ -32,7 +32,7 @@                         RecordWildCards ScopedTypeVariables StandaloneDeriving                         TupleSections TypeApplications TypeFamilies TypeOperators                         TypeSynonymInstances ViewPatterns-    ghc-options: -Wall+    ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures     build-depends:         base >=4.10 && <5,         bytestring >=0.10.8.2 && <0.11,@@ -41,7 +41,7 @@         menshen >=0.0.3 && <0.1,         monad-logger >=0.3.30 && <0.4,         mtl >=2.2.2 && <2.3,-        salak >=0.2.9.3 && <0.3,-        servant-server ==0.16.*,+        salak ==0.3.*,+        servant-server >=0.16.1 && <0.17,         text >=1.2.3.1 && <1.3,-        yam >=0.6.3 && <0.7+        yam ==0.7.*