on master help sign in
5 files changed+174−61
since splitsnapshots
unifiedsplit
.travis.yml+14−27 ChangeLog.md+6 src/Control/Monad/Validation.hs+147−18 test/Doc.hs+1−1 validationt.cabal+6−15
.travis.yml+14−27
@@ -4,48 +4,35 @@ language: haskell
44git:
55 depth: 5
66
7−cabal: "2.4"
8−
97cache:
108 directories:
119 - "$HOME/.cabal/store"
1210 - "$HOME/.stack"
1311 - "$TRAVIS_BUILD_DIR/.stack-work"
1412
15−matrix:
13+jobs:
1614 include:
17−
18− # Cabal
19− - ghc: 8.4.4
2015 - ghc: 8.6.5
21−
22− # Stack
23− - ghc: 8.6.5
24− env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
16+ env: SNAPSHOT="lts-14.22"
17+ - ghc: 8.6.4
18+ env: SNAPSHOT="lts-13.19"
19+ - ghc: 8.6.3
20+ env: SNAPSHOT="lts-13.11"
21+ - ghc: 8.4.4
22+ env: SNAPSHOT="lts-12.26"
2523
2624install:
2725 - |
28− if [ -z "$STACK_YAML" ]; then
29− ghc --version
30− cabal --version
31− cabal new-update
32− cabal new-build --enable-tests --enable-benchmarks
33− else
34− # install stack
35− curl -sSL https://get.haskellstack.org/ | sh
26+ # install stack
27+ curl -sSL https://get.haskellstack.org/ | sh
3628
37− # build project with stack
38− stack --version
39− stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
40− fi
29+ # build project with stack
30+ stack --version
31+ stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks --resolver=$SNAPSHOT
4132
4233script:
4334 - |
44− if [ -z "$STACK_YAML" ]; then
45− cabal new-test --enable-tests
46− else
47− stack test --system-ghc
48− fi
35+ stack test --system-ghc
4936
5037notifications:
5138 email: false
ChangeLog.md+6
@@ -1,5 +1,11 @@
11# Revision history for validationt
22
3+## 0.3.0
4+
5+* Added documentation.
6+* Fixed `textErrors` behaviour.
7+* Dropped `transformers-lift` dependency.
8+
39## 0.2.1.0
410
511* GHC 8.4 support
src/Control/Monad/Validation.hs+147−18
@@ -3,16 +3,38 @@
33{-# LANGUAGE OverloadedStrings #-}
44{-# LANGUAGE TemplateHaskell #-}
55{-# LANGUAGE TypeFamilies #-}
6+{-# LANGUAGE UndecidableInstances #-}
67
7−module Control.Monad.Validation where
8+module Control.Monad.Validation
9+ ( ValidationT(..)
10+ , runValidationT
11+ , runValidationTEither
12+ , handleValidationT
13+ , vError
14+ , vWarning
15+ , vErrorL
16+ , vWarningL
17+ , vZoom
18+ , vZoomL
19+ , mmSingleton
20+ , setMempty
21+ , neConcat
22+ , textErrors
23+ , _MonoidMap
24+ , MonoidMap(..)
25+ ) where
826
27+import Control.Applicative
928import Control.Lens hiding ((.=))
1029import Control.Monad.Base
1130import Control.Monad.Catch
1231import Control.Monad.Except
32+import Control.Monad.Fail
1333import Control.Monad.State.Strict
34+import Control.Monad.Trans.Control
1435import Data.Aeson
1536import Data.Foldable as F
37+import Data.Functor
1638import Data.List as L
1739import Data.Map.Strict as M
1840import Data.Monoid
@@ -20,20 +42,32 @@ import Data.Text as T
2042import Data.Vector as V
2143import Test.QuickCheck
2244
23−-- | Collects all throwed "warnings" throwed through StateT and "errors" throwed
24−-- through ExceptT to single value using Monoid
25−-- FIXME: give more instances like HReaderT and MonadBaseControl/MonadMask
45+
46+-- | Collects all thrown warnings in 'StateT' and errors
47+-- in 'ExceptT' into a single value using 'Monoid'.
2648newtype ValidationT e m a = ValidationT
2749 { unValidationT :: ExceptT e (StateT e m) a
2850 } deriving ( Functor, Applicative, Monad, MonadThrow, MonadCatch
29− , MonadBase b )
51+ , MonadBase b, Alternative, MonadFix, MonadFail, Contravariant
52+ , MonadIO, MonadPlus, MonadBaseControl b, MonadMask )
3053
3154instance MonadTrans (ValidationT e) where
3255 lift = ValidationT . lift . lift
3356
3457-- | Map with 'Monoid' instance which 'mappend' its values
58+--
59+-- This can be used as the `e` in `ValidationT e m a` to provide different
60+-- sets of errors and warnings for different keys.
61+--
62+-- >>> :{
63+-- mconcat
64+-- [ MonoidMap $ M.fromList [(1, "foo"), (2, "hello, "), (3, "oh no")]
65+-- , MonoidMap $ M.fromList [(1, "bar"), (2, "world")]
66+-- ]
67+-- :}
68+-- MonoidMap (fromList [(1,"foobar"),(2,"hello, world"),(3,"oh no")])
3569newtype MonoidMap k v = MonoidMap (Map k v)
36− deriving (Eq, Ord, Show, Arbitrary)
70+ deriving (Eq, Ord, Show, Arbitrary, Foldable)
3771
3872makePrisms ''MonoidMap
3973
@@ -61,7 +95,7 @@ instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where
6195 , "value" .= v ]
6296
6397instance (Ord k, FromJSON k, FromJSON v) => FromJSON (MonoidMap k v) where
64− parseJSON v = withArray "MonoidMap" go v
98+ parseJSON = withArray "MonoidMap" go
6599 where
66100 go arr = do
67101 keyvals <- traverse fromObj arr
@@ -78,14 +112,14 @@ mmAppend :: (Ord k, Monoid v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v
78112#endif
79113mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (<>) a b
80114
81−-- | Convenient for 'vZoom' as first artument. Will prevent generation
82−-- of map with 'mempty' values
115+-- | Convenient for 'vZoom' as first argument. Will prevent generation
116+-- of map with 'mempty' values.
83117mmSingleton :: (Eq v, Monoid v, Ord k) => k -> v -> MonoidMap k v
84118mmSingleton k v
85119 | v == mempty = mempty
86120 | otherwise = MonoidMap . M.singleton k $ v
87121
88−-- | Set given value to 'mempty'
122+-- | Sets given value to 'mempty'.
89123setMempty :: (Monoid s) => ASetter' s a -> a -> s
90124setMempty setter a = set setter a mempty
91125
@@ -94,12 +128,44 @@ neConcat f a
94128 | F.null a = Nothing
95129 | otherwise = Just $ F.foldr1 f a
96130
131+-- | Returns the strings, concatanated with @", "@ if the list is not empty.
132+--
133+-- Returns Nothing if the list is empty
134+--
135+-- >>> textErrors ["foo", "bar"]
136+-- Just "foo, bar"
137+--
138+-- >>> textErrors ["foo"]
139+-- Just "foo"
140+--
141+-- >>> textErrors []
142+-- Nothing
97143textErrors :: [Text] -> Maybe Text
98144textErrors = neConcat (\a b -> a <> ", " <> b)
99145
100−-- | Returns `mempty` instead of error if no warnings was occured. So, your
101−-- error should have `Eq` instance to detect that any error was occured. Returns
102−-- Nothing for second element of tuple if compuration was interruped by 'vError'
146+-- | Returns 'mempty' instead of error if no warnings have occured.
147+-- Returns 'Nothing' as the second element of tuple if computation was
148+-- interrupted by 'vError'.
149+--
150+-- Returns all concatenated errors and warnings and the result if no
151+-- errors have occured (warnings could have occured).
152+--
153+-- >>> :{
154+-- runValidationT $ do
155+-- vWarning ["warning1"]
156+-- vError ["error"]
157+-- vWarning ["warning2"]
158+-- return 8
159+-- :}
160+-- (["error","warning1"],Nothing)
161+--
162+-- >>> :{
163+-- runValidationT $ do
164+-- vWarning ["warning1"]
165+-- vWarning ["warning2"]
166+-- return 8
167+-- :}
168+-- (["warning1","warning2"],Just 8)
103169runValidationT :: (Monoid e, Monad m) => ValidationT e m a -> m (e, Maybe a)
104170runValidationT (ValidationT m) = do
105171 (res, warnings) <- runStateT (runExceptT m) mempty
@@ -107,6 +173,25 @@ runValidationT (ValidationT m) = do
107173 Left err -> (err <> warnings, Nothing)
108174 Right a -> (warnings, Just a)
109175
176+-- | Like 'runValidationT' but doesn't return the result
177+-- if any warning has occured.
178+--
179+-- >>> :{
180+-- runValidationTEither $ do
181+-- vWarning ["warning1"]
182+-- vError ["error"]
183+-- vWarning ["warning2"]
184+-- return 8
185+-- :}
186+-- Left ["error","warning1"]
187+--
188+-- >>> :{
189+-- runValidationTEither $ do
190+-- vWarning ["warning1"]
191+-- vWarning ["warning2"]
192+-- return 8
193+-- :}
194+-- Left ["warning1","warning2"]
110195runValidationTEither
111196 :: (Monoid e, Eq e, Monad m)
112197 => ValidationT e m a
@@ -117,28 +202,71 @@ runValidationTEither action = do
117202 Just a | err == mempty -> Right a
118203 _ -> Left err
119204
205+-- | Like 'runValidationTEither', but takes an error handler instead of
206+-- returning errors and warnings.
207+--
208+-- >>> :{
209+-- handleValidationT (\_ -> return 11) $ do
210+-- vWarning ["warning1"]
211+-- vError ["error"]
212+-- vWarning ["warning2"]
213+-- return 8
214+-- :}
215+-- 11
216+--
217+-- >>> :{
218+-- handleValidationT (\_ -> return 11) $ do
219+-- vWarning ["warning1"]
220+-- vWarning ["warning2"]
221+-- return 8
222+-- :}
223+-- 11
120224handleValidationT
121225 :: (Monoid e, Monad m, Eq e)
122226 => (e -> m a)
123227 -> ValidationT e m a
124228 -> m a
125−handleValidationT handler action = do
229+handleValidationT handler action =
126230 runValidationTEither action >>= either handler return
127231
128−-- | Stops further execution of validation
232+-- | Stops further execution and appends the given error.
129233vError :: (Monad m) => e -> ValidationT e m a
130234vError e = ValidationT $ throwError e
131235
132−-- | Does not stop further execution, append warning to
236+-- | Does not stop further execution and appends the given warning.
133237vWarning :: (Monad m, Monoid e) => e -> ValidationT e m ()
134238vWarning e = ValidationT $ modify' (<> e)
135239
240+-- | Like 'vError' but allows you to use a setter to insert an error somewhere
241+-- deeper into an empty ('mempty') "e" from "ValidationT e m x", which is then
242+-- combined with all gathered warnings.
136243vErrorL :: (Monad m, Monoid e) => ASetter' e a -> a -> ValidationT e m x
137244vErrorL l a = vError $ setMempty l a
138245
246+-- | Like 'vWarning' but allows you to use a setter to insert an error somewhere
247+-- deeper into an empty ('mempty') "e" from "ValidationT e m x", which is then
248+-- combined with all gathered warnings.
139249vWarningL :: (Monad m, Monoid e) => ASetter' e a -> a -> ValidationT e m ()
140250vWarningL l a = vWarning $ setMempty l a
141251
252+-- | Allows you apply a transformation to the "e" in "ValidationT e m x".
253+--
254+-- >>> :{
255+--runValidationT . vZoom (Data.Map.singleton "password errors") $ do
256+-- vWarning ["warning1"]
257+-- vError ["error"]
258+-- vWarning ["warning2"]
259+-- return 8
260+-- :}
261+-- (fromList [("password errors",["error","warning1"])],Nothing)
262+--
263+-- >>> :{
264+-- runValidationT . vZoom (Data.Map.singleton "password errors") $ do
265+-- vWarning ["warning1"]
266+-- vWarning ["warning2"]
267+-- return 8
268+-- :}
269+-- (fromList [("password errors",["warning1","warning2"])],Just 8)
142270vZoom
143271 :: (Monad m, Monoid a, Monoid b)
144272 => (a -> b)
@@ -148,11 +276,12 @@ vZoom up action = do
148276 (err, res) <- lift $ runValidationT action
149277 case res of
150278 Nothing -> vError $ up err
151− Just a -> vWarning (up err) *> return a
279+ Just a -> vWarning (up err) $> a
152280
281+-- | Like 'vZoom' but takes a setter instead of a function.
153282vZoomL
154283 :: (Monad m, Monoid a, Monoid b)
155284 => ASetter' b a
156285 -> ValidationT a m x
157286 -> ValidationT b m x
158−vZoomL l action = vZoom (setMempty l) action
287+vZoomL l = vZoom (setMempty l)
test/Doc.hs+1−1
@@ -3,4 +3,4 @@ module Main (main) where
33import Test.DocTest
44
55main :: IO ()
6−main = doctest [ "-XOverloadedStrings", "src" ]
6+main = doctest [ "-XOverloadedStrings", "-isrc", "src" ]
validationt.cabal+6−15
@@ -2,7 +2,7 @@
22-- documentation, see http://haskell.org/cabal/users-guide/
33
44name: validationt
5−version: 0.2.1.0
5+version: 0.3.0
66synopsis: Straightforward validation monad.
77description: Convenient solution for validating web forms and APIs.
88homepage: https://github.com/typeable/validationt
@@ -50,21 +50,12 @@ library
5050 -Wmissing-export-lists
5151
5252test-suite doctest
53+ default-language: Haskell2010
5354 type: exitcode-stdio-1.0
5455 hs-source-dirs: test
5556 ghc-options: -Wall
5657 main-is: Doc.hs
57− build-depends: base >=4.8 && < 5
58− , aeson >= 1.0
59− , doctest
60− , containers
61− , exceptions
62− , lens
63− , monad-control
64− , mtl
65− , QuickCheck
66− , text
67− , transformers
68− , transformers-base
69− , vector
70− , doctest
58+ build-depends:
59+ base >= 4.10.0.0
60+ , doctest >= 0.11.4
61+ , validationt