Deadpan-DDP 0.9.1.0 → 0.9.3.0

raw patch · 4 files changed

+26/−8 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• Deadpan-DDP.cabal +1/−1
• changelog.md +13/−0
• src/Web/DDP/Deadpan/Callbacks.hs +10/−6
• src/Web/DDP/Deadpan/GUID.hs +2/−1

@@ -1,5 +1,5 @@ name:                Deadpan-DDP-version:             0.9.1.0+version:             0.9.3.0 synopsis:            Write clients for Meteor's DDP Protocol description:         The Deadpan-DDP project includes a debugging-tool, as well as a general purpose library.                      .

@@ -1,5 +1,18 @@ # Deadpan-DDP Change Log +## 0.9.3.0++* RPC now only takes a list of params++## 0.9.2.0++* Hex GUID strings++## 0.9.1.0++* Better TODO Example+* Added subscription methods that return the subscription id+ ## 0.9.0.0  * Fixed the exit error

@@ -113,22 +113,26 @@       randomSeed: optional JSON value           (an arbitrary client-determined seed for pseudo-random generators)   @ -}-clientRPCMethod :: Text -> Maybe [EJsonValue] -> GUID -> Maybe Text -> DeadpanApp ()+clientRPCMethod :: Text -> [EJsonValue] -> GUID -> Maybe Text -> DeadpanApp GUID clientRPCMethod method params rpcid seed = do-  let msg = [("method", ejstring method)]-         &~ do forOf_ _Just params $ \v -> modify (("params", ejarray  v):)-               forOf_ _Just seed   $ \v -> modify (("seed",   ejstring v):)+  let msg = [ ("method", ejstring method)+            , ("params", ejarray  params) ]+         &~ (forOf_ _Just seed   $ \v -> modify (("seed",   ejstring v):))    sendMessage "method" (makeEJsonId rpcid <> ejobject msg)+  return rpcid +rpc :: Text -> [EJsonValue] -> DeadpanApp GUID+rpc method params = newID >>= \guid -> clientRPCMethod method params guid Nothing+ -- | Like clientRPCMethod, except that it blocks, returning the response from the server. -- -- TODO: Should we use the seed? ---rpcWait :: Text -> Maybe [EJsonValue] -> DeadpanApp (Either EJsonValue EJsonValue)+rpcWait :: Text -> [EJsonValue] -> DeadpanApp (Either EJsonValue EJsonValue) rpcWait method params = do   mv         <- liftIO newEmptyMVar-  rpcId      <- newID+  rpcId      <- newID -- Can't use rpc, since we need the ID to set handlers first...   handlerId  <- setMatchHandler (makeEJsonId rpcId) (handler mv)   _          <- clientRPCMethod method params rpcId Nothing   res        <- liftIO $ readMVar mv

@@ -41,6 +41,7 @@ import System.CPUTime import Data.Time import Data.Text+import Text.Printf import Data.Hashable import GHC.Generics @@ -69,7 +70,7 @@ newGuidInt = hash `fmap` hashTriple  newGuidString :: IO String-newGuidString = (show . hash) `fmap` hashTriple+newGuidString = printf "%016x" `fmap` newGuidInt  newGuidText :: IO Text newGuidText = pack `fmap` newGuidString