Deadpan-DDP 0.9.3.0 → 0.9.4.0
raw patch · 6 files changed
+12/−12 lines, 6 filesdep +filemanipPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependencies added: filemanip
API changes (from Hackage documentation)
- Data.EJson.Aeson: instance FromJSON EJsonValue
- Data.EJson.Aeson: instance ToJSON EJsonValue
- Data.EJson.EJson: instance Eq EJsonValue
- Data.EJson.EJson: instance IsString EJsonValue
- Data.EJson.EJson: instance Monoid EJsonValue
- Data.EJson.EJson: instance Num EJsonValue
- Data.EJson.EJson2Value: instance Show EJsonValue
- Web.DDP.Deadpan.DSL: _body :: LookupItem a -> a
- Web.DDP.Deadpan.DSL: _callbackSet :: AppState cb -> Lookup cb
- Web.DDP.Deadpan.DSL: _collections :: AppState cb -> EJsonValue
- Web.DDP.Deadpan.DSL: _connection :: AppState cb -> Connection
- Web.DDP.Deadpan.DSL: _deadpanApp :: DeadpanApp a -> ReaderT (TVar (AppState Callback)) IO a
- Web.DDP.Deadpan.DSL: _ident :: LookupItem a -> GUID
- Web.DDP.Deadpan.DSL: instance Applicative DeadpanApp
- Web.DDP.Deadpan.DSL: instance Bounded Version
- Web.DDP.Deadpan.DSL: instance Enum Version
- Web.DDP.Deadpan.DSL: instance Eq Version
- Web.DDP.Deadpan.DSL: instance Functor DeadpanApp
- Web.DDP.Deadpan.DSL: instance Monad DeadpanApp
- Web.DDP.Deadpan.DSL: instance MonadIO DeadpanApp
- Web.DDP.Deadpan.DSL: instance Ord Version
- Web.DDP.Deadpan.DSL: instance Read Version
- Web.DDP.Deadpan.DSL: instance Show Version
- Web.DDP.Deadpan.GUID: instance Constructor C1_0Day
- Web.DDP.Deadpan.GUID: instance Constructor C1_0GUID
- Web.DDP.Deadpan.GUID: instance Constructor C1_0UTCTime
- Web.DDP.Deadpan.GUID: instance Datatype D1Day
- Web.DDP.Deadpan.GUID: instance Datatype D1GUID
- Web.DDP.Deadpan.GUID: instance Datatype D1UTCTime
- Web.DDP.Deadpan.GUID: instance Eq GUID
- Web.DDP.Deadpan.GUID: instance Generic Day
- Web.DDP.Deadpan.GUID: instance Generic GUID
- Web.DDP.Deadpan.GUID: instance Generic UTCTime
- Web.DDP.Deadpan.GUID: instance Hashable Day
- Web.DDP.Deadpan.GUID: instance Hashable DiffTime
- Web.DDP.Deadpan.GUID: instance Hashable GUID
- Web.DDP.Deadpan.GUID: instance Hashable UTCTime
- Web.DDP.Deadpan.GUID: instance Ord GUID
- Web.DDP.Deadpan.GUID: instance Selector S1_0_0Day
- Web.DDP.Deadpan.GUID: instance Selector S1_0_0GUID
- Web.DDP.Deadpan.GUID: instance Selector S1_0_0UTCTime
- Web.DDP.Deadpan.GUID: instance Selector S1_0_1UTCTime
- Web.DDP.Deadpan.GUID: instance Show GUID
+ Data.EJson.Aeson: instance Data.Aeson.Types.Class.FromJSON Data.EJson.EJson.EJsonValue
+ Data.EJson.Aeson: instance Data.Aeson.Types.Class.ToJSON Data.EJson.EJson.EJsonValue
+ Data.EJson.EJson: instance Data.String.IsString Data.EJson.EJson.EJsonValue
+ Data.EJson.EJson: instance GHC.Base.Monoid Data.EJson.EJson.EJsonValue
+ Data.EJson.EJson: instance GHC.Classes.Eq Data.EJson.EJson.EJsonValue
+ Data.EJson.EJson: instance GHC.Num.Num Data.EJson.EJson.EJsonValue
+ Data.EJson.EJson2Value: instance GHC.Show.Show Data.EJson.EJson.EJsonValue
+ Web.DDP.Deadpan.DSL: [_body] :: LookupItem a -> a
+ Web.DDP.Deadpan.DSL: [_callbackSet] :: AppState cb -> Lookup cb
+ Web.DDP.Deadpan.DSL: [_collections] :: AppState cb -> EJsonValue
+ Web.DDP.Deadpan.DSL: [_connection] :: AppState cb -> Connection
+ Web.DDP.Deadpan.DSL: [_deadpanApp] :: DeadpanApp a -> ReaderT (TVar (AppState Callback)) IO a
+ Web.DDP.Deadpan.DSL: [_ident] :: LookupItem a -> GUID
+ Web.DDP.Deadpan.DSL: instance Control.Monad.IO.Class.MonadIO Web.DDP.Deadpan.DSL.DeadpanApp
+ Web.DDP.Deadpan.DSL: instance GHC.Base.Applicative Web.DDP.Deadpan.DSL.DeadpanApp
+ Web.DDP.Deadpan.DSL: instance GHC.Base.Functor Web.DDP.Deadpan.DSL.DeadpanApp
+ Web.DDP.Deadpan.DSL: instance GHC.Base.Monad Web.DDP.Deadpan.DSL.DeadpanApp
+ Web.DDP.Deadpan.DSL: instance GHC.Classes.Eq Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.DSL: instance GHC.Classes.Ord Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.DSL: instance GHC.Enum.Bounded Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.DSL: instance GHC.Enum.Enum Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.DSL: instance GHC.Read.Read Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.DSL: instance GHC.Show.Show Web.DDP.Deadpan.DSL.Version
+ Web.DDP.Deadpan.GUID: instance Data.Hashable.Class.Hashable Data.Time.Calendar.Days.Day
+ Web.DDP.Deadpan.GUID: instance Data.Hashable.Class.Hashable Data.Time.Clock.Scale.DiffTime
+ Web.DDP.Deadpan.GUID: instance Data.Hashable.Class.Hashable Data.Time.Clock.UTC.UTCTime
+ Web.DDP.Deadpan.GUID: instance Data.Hashable.Class.Hashable Web.DDP.Deadpan.GUID.GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Classes.Eq Web.DDP.Deadpan.GUID.GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Classes.Ord Web.DDP.Deadpan.GUID.GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Constructor Web.DDP.Deadpan.GUID.C1_0Day
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Constructor Web.DDP.Deadpan.GUID.C1_0GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Constructor Web.DDP.Deadpan.GUID.C1_0UTCTime
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Datatype Web.DDP.Deadpan.GUID.D1Day
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Datatype Web.DDP.Deadpan.GUID.D1GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Datatype Web.DDP.Deadpan.GUID.D1UTCTime
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Generic Data.Time.Calendar.Days.Day
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Generic Data.Time.Clock.UTC.UTCTime
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Generic Web.DDP.Deadpan.GUID.GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Selector Web.DDP.Deadpan.GUID.S1_0_0Day
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Selector Web.DDP.Deadpan.GUID.S1_0_0GUID
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Selector Web.DDP.Deadpan.GUID.S1_0_0UTCTime
+ Web.DDP.Deadpan.GUID: instance GHC.Generics.Selector Web.DDP.Deadpan.GUID.S1_0_1UTCTime
+ Web.DDP.Deadpan.GUID: instance GHC.Show.Show Web.DDP.Deadpan.GUID.GUID
- Web.DDP.Deadpan.DSL: body :: Lens (LookupItem a_ajLX) (LookupItem a_ajMW) a_ajLX a_ajMW
+ Web.DDP.Deadpan.DSL: body :: Lens (LookupItem a_amNT) (LookupItem a_amOR) a_amNT a_amOR
- Web.DDP.Deadpan.DSL: callbackSet :: Lens (AppState cb_ajNd) (AppState cb_ajOF) (Lookup cb_ajNd) (Lookup cb_ajOF)
+ Web.DDP.Deadpan.DSL: callbackSet :: Lens (AppState cb_amP8) (AppState cb_amQx) (Lookup cb_amP8) (Lookup cb_amQx)
- Web.DDP.Deadpan.DSL: collections :: Lens' (AppState cb_ajNd) EJsonValue
+ Web.DDP.Deadpan.DSL: collections :: Lens' (AppState cb_amP8) EJsonValue
- Web.DDP.Deadpan.DSL: connection :: Lens' (AppState cb_ajNd) Connection
+ Web.DDP.Deadpan.DSL: connection :: Lens' (AppState cb_amP8) Connection
- Web.DDP.Deadpan.DSL: deadpanApp :: Iso (DeadpanApp a_ajP6) (DeadpanApp a_ajTA) (ReaderT (TVar (AppState Callback)) IO a_ajP6) (ReaderT (TVar (AppState Callback)) IO a_ajTA)
+ Web.DDP.Deadpan.DSL: deadpanApp :: Iso (DeadpanApp a_amQZ) (DeadpanApp a_amW3) (ReaderT (TVar (AppState Callback)) IO a_amQZ) (ReaderT (TVar (AppState Callback)) IO a_amW3)
- Web.DDP.Deadpan.DSL: ident :: Lens' (LookupItem a_ajLX) GUID
+ Web.DDP.Deadpan.DSL: ident :: Lens' (LookupItem a_amNT) GUID
Files
- Deadpan-DDP.cabal +2/−2
- src/Data/EJson.hs +3/−2
- src/Data/EJson/EJson.hs +0/−2
- src/Web/DDP/Deadpan/Callbacks.hs +1/−0
- src/Web/DDP/Deadpan/Websockets.hs +1/−0
- test/DocTestTests.hs +5/−6
Deadpan-DDP.cabal view
@@ -1,5 +1,5 @@ name: Deadpan-DDP-version: 0.9.3.0+version: 0.9.4.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. .@@ -71,5 +71,5 @@ type: exitcode-stdio-1.0 ghc-options: -threaded main-is: test/DocTestTests.hs- build-depends: base, doctest >= 0.8, QuickCheck+ build-depends: base, doctest >= 0.8, QuickCheck, filemanip default-language: Haskell2010
src/Data/EJson.hs view
@@ -31,6 +31,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE NoMonomorphismRestriction #-}+{-# LANGUAGE FlexibleContexts #-} module Data.EJson ( @@ -67,9 +68,8 @@ import Data.EJson.EJson as Exports import Data.EJson.EJson2Value as Exports-import Data.Monoid as Exports import Control.Lens as Exports-import Control.Monad.State (execState)+import Control.Monad.State (execState, MonadState()) import Data.Text (Text()) import Data.Aeson (decode) import Data.EJson.Aeson()@@ -196,6 +196,7 @@ simpleMerge :: EJsonValue -> EJsonValue -> EJsonValue simpleMerge modifications = execState $ traverseOf_ _EJObject (mapM_ setPair . HM.toList) modifications where+ setPair :: MonadState EJsonValue m => (Text, EJsonValue) -> m () setPair (k,v) = _EJObjectKey k .= Just v -- | A variatnt of modifyInPath that leaves the EJsonValue unchanged if the update is not sensible.
src/Data/EJson/EJson.hs view
@@ -55,7 +55,6 @@ , _EJNull ) where -import Data.Monoid import Control.Monad import Data.Aeson import Data.Scientific@@ -68,7 +67,6 @@ import Data.Maybe import Data.String import Control.Lens-import Control.Applicative import qualified Data.Vector import qualified Data.HashMap.Strict as HM
src/Web/DDP/Deadpan/Callbacks.hs view
@@ -18,6 +18,7 @@ import Web.DDP.Deadpan.DSL import Control.Concurrent.MVar import Control.Monad.State+import Data.Monoid -- Old Stuff...
src/Web/DDP/Deadpan/Websockets.hs view
@@ -48,6 +48,7 @@ return (domain, port, path) -- | prop> prop_getURI_full+-- | prop> prop_getURI_missingPort prop_getURI_full, prop_getURI_missingPort :: Bool prop_getURI_full = getURI "http://localhost:1234/testing" == Right ("localhost", 1234, "/testing") prop_getURI_missingPort = getURI "http://localhost/testing" == Right ("localhost", 80, "/testing")
test/DocTestTests.hs view
@@ -2,10 +2,9 @@ module Main where import Test.DocTest+import System.FilePath.Glob -main = doctest [ "-isrc"- , "src/Web/DDP/Deadpan.hs"- , "src/Data/EJson.hs"- , "src/Data/EJson/Props.hs"- , "src/Web/DDP/Deadpan/Websockets.hs"- ]+main :: IO ()+main = do+ sources <- namesMatching "src/**/*.hs"+ doctest $ "-isrc" : sources