servant-subscriber 0.6.0.0 → 0.6.0.1

raw patch · 2 files changed

+18/−2 lines, 2 filesdep ~websocketsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: websockets

API changes (from Hackage documentation)

Files

• servant-subscriber.cabal +9/−2
• src/Servant/Subscriber/Client.hs +9/−0

@@ -1,5 +1,5 @@ name:                servant-subscriber-version:             0.6.0.0+version:             0.6.0.1 synopsis:            When REST is not enough ... description:         Please see Readme.md homepage:            http://github.com/eskimor/servant-subscriber#readme@@ -15,8 +15,16 @@  extra-source-files:  Readme.md +Flag WEBSOCKETS_0_11+               + library   hs-source-dirs:      src+  if flag(WEBSOCKETS_0_11)+     cpp-options: -DWEBSOCKETS_0_11+     build-depends: websockets >= 0.11+  else+     build-depends: websockets < 0.11   exposed-modules:                        Servant.Subscriber                      , Servant.Subscriber.Backend@@ -52,7 +60,6 @@                      , wai                      , wai-websockets                      , warp-                     , websockets   default-language:    Haskell2010  executable subscriber-psGenerator

@@ -1,4 +1,5 @@ {-# LANGUAGE TemplateHaskell #-}+{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} module Servant.Subscriber.Client where@@ -84,9 +85,17 @@   , readRequest = do       msg <- WS.receiveDataMessage c       case msg of+#ifdef WEBSOCKETS_0_11+        WS.Text bs _ -> return $ decode bs+#else         WS.Text bs  -> return $ decode bs+#endif         WS.Binary _ -> error "Sorry - binary connections currently unsupported!"+#ifdef WEBSOCKETS_0_11+  , writeResponse = \msg -> sendDataMessage c $ WS.Text (encode msg) Nothing+#else   , writeResponse = sendDataMessage c . WS.Text . encode+#endif   , pongCommandRef = myRef   , closeCommandRef = closeVar   }