Fixes for GHC 8.0.1

2 files changed, 50 insertions, 16 deletions

diff --git a/client/src/Thermoprint/Client.hs b/client/src/Thermoprint/Client.hs
index 7072ad0..448a912 100644
--- a/client/src/Thermoprint/Client.hs
+++ b/client/src/Thermoprint/Client.hs
@@ -1,7 +1,10 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
 
 -- | A client library for 'Thermoprint.API'
 module Thermoprint.Client
@@ -12,8 +15,8 @@ module Thermoprint.Client
        , ServantError(..)
        , module Thermoprint.API
        , module Servant.Common.BaseUrl
-       , module Control.Monad.Trans.Either
-       , module Servant.Server.Internal.Enter
+       , module Control.Monad.Except
+       , module Servant.Utils.Enter
        ) where
 
 import Thermoprint.API
@@ -24,19 +27,20 @@ import Data.Time (UTCTime)
 import Servant.Client hiding (HasClient(..))
 import qualified Servant.Client as S
 import Servant.Common.BaseUrl
+import Network.HTTP.Client (Manager, ManagerSettings, newManager, defaultManagerSettings)
 import Servant.API
-import Servant.Server.Internal.Enter
-import Control.Monad.Trans.Either
+import Servant.Utils.Enter
+import Control.Monad.Except (ExceptT, runExceptT)
 
+import Control.Monad.Reader (ReaderT, runReaderT, ask)
 import Control.Monad.Catch (Exception, MonadThrow(..))
 import Control.Monad.IO.Class (MonadIO(..))
+import Control.Monad.Trans (lift)
 
 import Control.Monad
 import Control.Category
 import Prelude hiding (id, (.))
 
-instance Exception ServantError
-
 -- | All 'ThermoprintAPI'-functions as a record
 --
 -- Use like this:
@@ -46,7 +50,7 @@ instance Exception ServantError
 -- > main :: IO ()
 -- > -- ^ Display a list of printers with their status
 -- > main = print =<< printers
--- >   where Client{..} = mkClient' $ Http "localhost" 3000
+-- >   where Client{..} = mkClient' defaultManagerSettings $ Http "localhost" 3000
 data Client m = Client
   { printers :: m (Map PrinterId PrinterStatus)
                 -- ^ List all printers
@@ -86,27 +90,55 @@ withArgs :: (x -> a :<|> b) -> ((x -> a) :<|> (x -> b))
 -- ^ Undo factoring of APIs
 withArgs subAPI = (\(a :<|> _) -> a) . subAPI :<|> (\(_ :<|> b) -> b) . subAPI
 
-mkClient :: (EitherT ServantError IO :~> m) -- ^ A monad functor ('Nat') used to make the api functions work in any monad which can do 'IO' and handle errors
-         -> BaseUrl
-         -> Client m
+mkClientS :: Monad m
+          => (ClientM :~> m) -- ^ A monad functor ('Nat') used to make the api functions work in any monad which can do 'IO' and handle errors
+          -> ManagerSettings
+          -> BaseUrl
+          -> Client m
 -- ^ Generate a 'Client'
-mkClient n url = Client{..}
+mkClientS n mgrS url = Client
+                       { printers = clientF n printers
+                       , jobs = \a b c -> clientF n $ jobs a b c
+                       , jobCreate = \a b -> clientF n $ jobCreate a b
+                       , job = \a -> clientF n $ job a
+                       , jobStatus = \a -> clientF n $ jobStatus a
+                       , jobDelete = \a -> clientF n $ jobDelete a
+                       , drafts = clientF n drafts
+                       , draftCreate = \a b -> clientF n $ draftCreate a b
+                       , draftReplace = \a b c -> clientF n $ draftReplace a b c
+                       , draft = \a -> clientF n $ draft a
+                       , draftDelete = \a -> clientF n $ draftDelete a
+                       , draftPrint = \a b -> clientF n $ draftPrint a b
+                       }
   where
+    clientF :: Monad m => (ClientM :~> m) -> (Manager -> BaseUrl -> m a) -> m a
+    clientF n f = do
+      mgr <- unNat n $ (liftIO $ newManager mgrS :: ClientM Manager)
+      f mgr url
     printers
       :<|> (jobs :<|> jobCreate)
       :<|> (withArgs -> job :<|> (withArgs -> jobStatus :<|> jobDelete))
       :<|> (drafts :<|> draftCreate)
       :<|> (withArgs -> draftReplace :<|> (withArgs -> draft :<|> (withArgs -> draftDelete :<|> draftPrint)))
-      = enter n $ client thermoprintAPI url
+      = enter n $ client thermoprintAPI
 
+mkClient :: Monad m
+         => (ClientM :~> m) -- ^ A monad functor ('Nat') used to make the api functions work in any monad which can do 'IO' and handle errors
+         -> BaseUrl
+         -> Client m
+mkClient n url = mkClientS n defaultManagerSettings url
+  
 mkClient' :: (MonadThrow m, MonadIO m) => BaseUrl -> Client m
 -- ^ @mkClient' = mkClient $ ioNat . throwNat@
 mkClient' = mkClient $ ioNat . throwNat
 
-throwNat :: (Exception e, MonadThrow m) => EitherT e m :~> m
+throwNat :: (Exception e, MonadThrow m) => ExceptT e m :~> m
 -- ^ Squash a layer of 'EitherT' into the underlying monad supporting 'throwM'
-throwNat = Nat $ either throwM return <=< runEitherT
+throwNat = Nat $ either throwM return <=< runExceptT
 
 ioNat :: MonadIO m => IO :~> m
 -- ^ @ioNat = Nat liftIO@
 ioNat = Nat liftIO
+
+readerNat :: a -> ReaderT a m :~> m
+readerNat a = Nat $ flip runReaderT a
diff --git a/client/thermoprint-client.cabal b/client/thermoprint-client.cabal
index 9567971..9c481e3 100644
--- a/client/thermoprint-client.cabal
+++ b/client/thermoprint-client.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                thermoprint-client
-version:             0.0.0
+version:             1.0.0
 synopsis:            Client for thermoprint-spec
 -- description:         
 homepage:            http://dirty-haskell.org/tags/thermoprint.html
@@ -21,7 +21,7 @@ library
   -- other-modules:       
   -- other-extensions:    
   build-depends:       base >=4.8 && <5
-                     , thermoprint-spec ==3.0.*
+                     , thermoprint-spec ==4.0.*
                      , servant >=0.4.4 && <1
                      , servant-client >=0.4.4 && <1
                      , servant-server >=0.4.4 && <1
@@ -30,6 +30,8 @@ library
                      , time >=1.5.0 && <2
                      , exceptions >=0.8.2 && <1
                      , transformers >=0.4.2 && <1
+                     , http-client >=0.4.28 && <1
+                     , mtl >=2.2.1 && <3
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall