apiary-helics 1.1.4 → 1.2.0

raw patch · 2 files changed

+21/−18 lines, 2 filesdep ~apiary

Dependency ranges changed: apiary

Files

• apiary-helics.cabal +2/−2
• src/Web/Apiary/Helics.hs +19/−16

@@ -1,5 +1,5 @@ name:                apiary-helics-version:             1.1.4+version:             1.2.0 synopsis:            helics support for apiary web framework. description:         helics support for apiary web framework. license:             MIT@@ -19,7 +19,7 @@   exposed-modules:     Web.Apiary.Helics   other-modules:          build-depends:       base               >=4.6   && <4.8-                     , apiary             >=1.1   && <1.2+                     , apiary             >=1.1   && <1.3                      , helics             >=0.5   && <0.6                      , helics-wai         >=0.5   && <0.6                      , vault              >=0.3   && <0.4

@@ -1,9 +1,8 @@-{-# LANGUAGE Rank2Types #-}-{-# LANGUAGE TypeOperators #-}-{-# LANGUAGE DataKinds #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleContexts #-}-{-# LANGUAGE NoMonomorphismRestriction #-}+{-# LANGUAGE TypeOperators #-}+{-# LANGUAGE Rank2Types #-}+{-# LANGUAGE DataKinds #-}  module Web.Apiary.Helics     ( Helics@@ -35,20 +34,24 @@     , H.DatastoreSegment(..)     ) where -import Control.Concurrent-import Control.Applicative-import Control.Monad.Apiary.Action-import Control.Monad.IO.Class-import Control.Monad.Trans.Control+import Control.Concurrent(ThreadId, forkIO)+import Control.Applicative((<$>))+import Control.Monad.Apiary.Action(ActionT, getRequest)+import Control.Monad.IO.Class(MonadIO(liftIO))+import Control.Monad.Trans.Control(MonadBaseControl, control) -import Network.Wai+import qualified Network.Wai as Wai import qualified Network.Helics as H import qualified Network.Helics.Wai.Safe as Safe -import Data.Apiary.Compat+import Data.Apiary.Compat(Proxy(..)) import Data.Apiary.Extension-import Web.Apiary.Heroku-import Data.Default.Class+    ( Has, Extension(extMiddleware)+    , Initializer', initializerBracket'+    , Initializer, initializerBracket, getExt+    )+import Web.Apiary.Heroku(Heroku, getHerokuEnv)+import Data.Default.Class(Default(..)) import qualified Data.Vault.Lazy as V import qualified Data.ByteString as S import qualified Data.Text.Encoding as T@@ -69,7 +72,7 @@     , statusCallback     :: Maybe (H.StatusCode -> IO ())      , useDummyMiddleware :: Bool-    , transactionName    :: Request -> S.ByteString+    , transactionName    :: Wai.Request -> S.ByteString      , samplerFrequency   :: Int     }@@ -81,7 +84,7 @@         , language           = H.language def         , languageVersion    = H.languageVersion def         , statusCallback     = H.statusCallback def-        , transactionName    = rawPathInfo+        , transactionName    = Wai.rawPathInfo         , useDummyMiddleware = False         , samplerFrequency   = 20         }@@ -125,7 +128,7 @@ transactionId = do     Helics key _ _ <- getExt Proxy     maybe (error "apiary-helics: vault value not found.") id .-        V.lookup key . vault <$> getRequest+        V.lookup key . Wai.vault <$> getRequest  addAttribute :: (MonadIO m, Has Helics exts)              => S.ByteString -> S.ByteString -> ActionT exts prms m ()