Merge remote-tracking branch 'origin/aeson-1.2.1.0' into francesco

Author: bitonic

solga-router/solga-router.cabal

@@ -22,7 +22,7 @@ library
                        wai,
                        bytestring,
                        containers,
-                       aeson >= 1.0.0.0,
+                       aeson >= 1.2.1.0,
                        wai-extra,
                        http-types,
                        resourcet,

solga-router/src/Solga/Router.hs

@@ -21,7 +21,10 @@ module Solga.Router
   -- * Error handling
   , SolgaError
   , badRequest
+  , unauthorized
+  , forbidden
   , notFound
+  , internalServerError
   -- * Router implementation
   , FromSegment(..)
   , Router(..)
@@ -281,9 +284,30 @@ badRequest msg = SolgaError
   , errorMessage = msg
   }
 
+-- | Create a @401 Unauthorized@ error with a given message.
+unauthorized :: Text.Text -> SolgaError
+unauthorized msg = SolgaError
+  { errorStatus = HTTP.unauthorized401
+  , errorMessage = msg
+  }
+
+-- | Create a @403 Forbidden@ error with a given message.
+forbidden :: Text.Text -> SolgaError
+forbidden msg = SolgaError
+  { errorStatus = HTTP.forbidden403
+  , errorMessage = msg
+  }
+
 -- | Create a @404 Not Found@ error with a given message.
 notFound :: Text.Text -> SolgaError
 notFound msg = SolgaError
   { errorStatus = HTTP.notFound404
   , errorMessage = msg
   }
+
+-- | Create a @500 Internal Server Error@ error with a given message.
+internalServerError :: Text.Text -> SolgaError
+internalServerError msg = SolgaError
+  { errorStatus = HTTP.internalServerError500
+  , errorMessage = msg
+  }

solga-router/test/Test.hs

@@ -94,7 +94,6 @@ spec = with (return $ serve testAPI) $ do
       resp <- get path
       liftIO $ decode (simpleBody resp) `shouldBe` Just (String seg)
 
-
 instance Arbitrary Value where
   arbitrary = sized arbJSON
    where

solga/src/Solga.hs

@@ -5,3 +5,4 @@ module Solga
 
 import Solga.Core
 import Solga.Router
+

stack.yaml

@@ -1,7 +1,7 @@
 # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: nightly-2017-07-31
+resolver: lts-9.0
 
 # Local packages, usually specified by relative directory name
 packages:
@@ -13,8 +13,8 @@ packages:
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps:
-- swagger2-2.1.4.1
-- http-media-0.7.1.1
+- safe-exceptions-0.1.1.0
+- aeson-1.2.1.0
 
 # Override default flag values for local packages and extra-deps
 flags: {}