Merge pull request #1 from Cheshirrrrrr/develop

version 0.1.0.4: added JsonException

Author: ozzzzz

src/Web/Template.hs

@@ -1,11 +1,8 @@
 module Web.Template
-  ( UserId, Port, Env, WebM, ScottyM
-  , CustomWebServer (..), Process (..), Route (..)
-  , runWebServer
-  , JsonWebError (..)
+  (
+    module Web.Template.Except
+  , module Web.Template.Server
   ) where
 
-import           Web.Template.Except (JsonWebError (..))
-import           Web.Template.Server (CustomWebServer (..), Env, Port,
-                                      Process (..), Route (..), ScottyM, UserId,
-                                      WebM, runWebServer)
+import           Web.Template.Except
+import           Web.Template.Server

src/Web/Template/Except.hs

@@ -1,30 +1,33 @@
-{-# LANGUAGE DeriveGeneric     #-}
+{-# LANGUAGE DeriveGeneric #-}
 
 module Web.Template.Except
-  ( Except (..), JsonWebError (..)
+  (
+    Except (..)
+  , JsonWebError (..)
+  , ScottyError (..)
   , handleEx
   ) where
 
-import           Data.Aeson                (ToJSON (..))
+import           Data.Aeson                (FromJSON (..), ToJSON (..))
 import           Data.String               (fromString)
 import           GHC.Generics              (Generic)
-import           Network.HTTP.Types.Status (status403, status404,
-                                            status500)
+import           Network.HTTP.Types.Status (status403, status404, status500)
 import           Web.Scotty.Trans          (ActionT, ScottyError (..), json,
                                             status)
 
 
 instance ScottyError Except where
-    stringError = StringEx
+    stringError = JsonException
     showError = fromString . show
 
-data Except = Forbidden | NotFound Int | StringEx String
+data Except = Forbidden | NotFound Int | StringException String | JsonException String
     deriving (Show, Eq)
 
 newtype JsonWebError = JsonWebError { error :: String }
   deriving (Generic)
 
 instance ToJSON JsonWebError
+instance FromJSON JsonWebError
 
 handleEx :: Monad m => Except -> ActionT Except m ()
 handleEx Forbidden = do
@@ -33,6 +36,9 @@ handleEx Forbidden = do
 handleEx (NotFound i) = do
     status status404
     json . JsonWebError $ "Can't find " ++ show i
-handleEx (StringEx str)  = do
+handleEx (StringException str)  = do
     status status500
     json . JsonWebError $ "Server problem: " ++ str
+handleEx (JsonException str)  = do
+    status status500
+    json . JsonWebError $ str

web-template.cabal

@@ -1,5 +1,5 @@
 name:                web-template
-version:             0.1.0.3
+version:             0.1.0.4
 synopsis:            Web template
 description:
             Web template includes: