Deadpan-DDP 0.2.0.1 → 0.2.1.1

raw patch · 5 files changed

+21/−7 lines, 5 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Web.DDP.Deadpan.DSL: callbackSet :: Lens' (AppState cb_ah4O) (Lookup cb_ah4O)

+ Web.DDP.Deadpan.DSL: callbackSet :: Lens' (AppState cb_agTS) (Lookup cb_agTS)

- Web.DDP.Deadpan.DSL: collections :: Lens' (AppState cb_ah4O) (TVar EJsonValue)

+ Web.DDP.Deadpan.DSL: collections :: Lens' (AppState cb_agTS) (TVar EJsonValue)

- Web.DDP.Deadpan.DSL: deadpanApp :: Iso (DeadpanApp a_aiFM) (DeadpanApp a_aiKb) (RWST Connection () (AppState Callback) IO a_aiFM) (RWST Connection () (AppState Callback) IO a_aiKb)

+ Web.DDP.Deadpan.DSL: deadpanApp :: Iso (DeadpanApp a_aiuQ) (DeadpanApp a_aizf) (RWST Connection () (AppState Callback) IO a_aiuQ) (RWST Connection () (AppState Callback) IO a_aizf)

- Web.DDP.Deadpan.DSL: defaultCallback :: Lens' (AppState cb_ah4O) cb_ah4O

+ Web.DDP.Deadpan.DSL: defaultCallback :: Lens' (AppState cb_agTS) cb_agTS

Files

Deadpan-DDP.cabal +1/−1
LICENSE +1/−1
changelog.md +5/−0
src/Data/EJson/EJson.hs +8/−1
src/Main.hs +6/−4

Deadpan-DDP.cabal view

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

LICENSE view

@@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) <year> <copyright holders>+Copyright (c) 2014 Lyndon Maydwell  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal

changelog.md view

@@ -1,5 +1,10 @@ # Deadpan-DDP Change Log +## 0.2.1.0++* Custom Show instance to render prettier output in debugging app [09c9876]+* Improved error reporting in debugging app [6dcf272]+ ## 0.2.0.1  * Added a Changelog

src/Data/EJson/EJson.hs view

@@ -57,6 +57,9 @@ import Data.Convertible import System.Posix.Types (EpochTime) +-- Display purposes+import qualified Data.ByteString.Lazy.Char8 as BC8+ data EJsonValue =     EJObject !(Data.HashMap.Strict.HashMap Text EJsonValue)   | EJArray  !(Data.Vector.Vector EJsonValue)@@ -67,7 +70,11 @@   | EJBinary !ByteString   | EJUser   !Text !EJsonValue   | EJNull-  deriving (Eq, Show)+  deriving (Eq)++instance Show EJsonValue+  where+  show = BC8.unpack . Data.Aeson.encode . ejson2value  instance IsString EJsonValue   where

src/Main.hs view

@@ -1,7 +1,9 @@ module Main (main) where -import System.Environment+import System.IO+import System.Exit import Web.DDP.Deadpan+import System.Environment  main :: IO () main = getArgs >>= go@@ -9,10 +11,10 @@ go :: [String] -> IO () go xs | hashelp xs = help go [url]           = run $ getURI url-go _               = help+go _               = help >> exitFailure  run :: Either Error Params -> IO ()-run (Left  err   ) = print err+run (Left  err   ) = hPutStrLn stderr err >> exitFailure run (Right params) = do logger <- loggingClient                         runClient logger params (liftIO $ void getLine) @@ -20,4 +22,4 @@ hashelp xs = any (flip elem xs) (words "-h --help")  help :: IO ()-help = putStrLn "Usage: deadpan [-h | --help] <URL>"+help = hPutStrLn stderr "Usage: deadpan [-h | --help] <URL>"