conferer-snap 0.1.0.4 → 0.2.0.0

raw patch · 2 files changed

+12/−8 lines, 2 filesdep ~confererPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: conferer

API changes (from Hackage documentation)

Files

• conferer-snap.cabal +4/−4
• src/Conferer/FetchFromConfig/Snap.hs +8/−4

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 1727a12ce92aee7d31bf2097df67c819c8d04a5f087bb4877485d4bcf75d86cf+-- hash: c3fb3465cdfcdbd877ac1a90998917be21c2be3174c9e635942c41abe78ea795  name:           conferer-snap-version:        0.1.0.4+version:        0.2.0.0 synopsis:       conferer's FromConfig instances for snap Config  description:    Library to abstract the parsing of many haskell config values from different config sources@@ -33,7 +33,7 @@   default-extensions: OverloadedStrings LambdaCase QuasiQuotes ScopedTypeVariables   build-depends:       base >=4.3 && <5-    , conferer >=0.1.0.2 && <0.2.0.0+    , conferer >=0.2.0.0 && <0.3.0.0     , snap-core >=1.0 && <2.0     , snap-server >=1.0 && <2.0     , text >=1.1 && <1.3@@ -49,7 +49,7 @@   default-extensions: OverloadedStrings LambdaCase QuasiQuotes ScopedTypeVariables   build-depends:       base >=4.3 && <5-    , conferer >=0.1.0.2 && <0.2.0.0+    , conferer >=0.2.0.0 && <0.3.0.0     , conferer-snap     , hspec     , snap-core >=1.0 && <2.0

@@ -32,13 +32,16 @@   fetch k config = do     getKey k config       >>= \case-        Right "NoLog" -> return $ Right $ Snap.ConfigNoLog-        Right t -> return $ Right $ Snap.ConfigFileLog $ unpack t-        Left e -> return $ Left e+        Just "NoLog" -> return $ Just $ Snap.ConfigNoLog+        Just t -> return $ Just $ Snap.ConfigFileLog $ unpack t+        Nothing -> return $ Nothing +instance (Snap.MonadSnap m) => DefaultConfig (Snap.Config m a) where+  configDef = Snap.defaultConfig+ instance (FetchFromConfig a, Snap.MonadSnap m) => FetchFromConfig (Snap.Config m a) where   fetch k config = do-    pure (Right Snap.defaultConfig)+    pure (configDef)       >>= findKeyAndApplyConfig config k "default-timeout" Snap.setDefaultTimeout       >>= findKeyAndApplyConfig config k "access-log" Snap.setAccessLog       >>= findKeyAndApplyConfig config k "bind" Snap.setBind@@ -57,3 +60,4 @@       >>= findKeyAndApplyConfig config k "verbose" Snap.setVerbose       >>= findKeyAndApplyConfig config k "unix-socket" Snap.setUnixSocket       >>= findKeyAndApplyConfig config k "unix-socket-access-mode" Snap.setUnixSocketAccessMode+      >>= (return . return)