couchdb-conduit 0.8.0 → 0.8.1

raw patch · 6 files changed

+11/−15 lines, 6 filesdep +resourcetPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: resourcet

API changes (from Hackage documentation)

Files

• couchdb-conduit.cabal +2/−2
• src/Database/CouchDB/Conduit/DB.hs +0/−2
• src/Database/CouchDB/Conduit/Design.hs +2/−2
• src/Database/CouchDB/Conduit/Internal/Connection.hs +5/−7
• src/Database/CouchDB/Conduit/Internal/Doc.hs +1/−1
• src/Database/CouchDB/Conduit/Internal/View.hs +1/−1

@@ -1,5 +1,5 @@ name:           couchdb-conduit-version:        0.8.0
+version:        0.8.1
 cabal-version:  >= 1.8 build-type:     Simple stability:      Testing
@@ -38,10 +38,10 @@                    http-types >= 0.6 && < 0.7,                    lifted-base >= 0.1 && < 0.2,                    monad-control >= 0.3 && < 0.4,+                   resourcet,                    string-conversions,                    syb,                    transformers >= 0.2 && < 0.4,-                   transformers-base >= 0.4 && < 0.5,                    text >= 0.11 && < 0.12,                    unordered-containers >= 0.1   ghc-options:      -Wall

@@ -26,8 +26,6 @@ import qualified Network.HTTP.Conduit as H
 import qualified Network.HTTP.Types as HT
 
-
-
 import Database.CouchDB.Conduit.Internal.Connection 
             (MonadCouch(..), Path, mkPath)
 import Database.CouchDB.Conduit.LowLevel (couch, couch', protect, protect')

@@ -12,7 +12,7 @@ import Control.Exception.Lifted (catch)
 
 import qualified Data.ByteString as B
-import qualified Data.Text as T
+import Data.Text (Text)
 import qualified Data.Text.Encoding as TE
 import qualified Data.HashMap.Lazy as M
 import qualified Data.Aeson as A
@@ -69,7 +69,7 @@ stripObject _ = M.empty 
 
 -- Extract views field or return empty map
-extractViews :: M.HashMap T.Text AT.Value -> M.HashMap T.Text AT.Value
+extractViews :: M.HashMap Text AT.Value -> M.HashMap Text AT.Value
 extractViews o = maybe M.empty stripObject $ M.lookup "views" o
 
 

@@ -1,8 +1,9 @@-{-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE ConstraintKinds #-}
 
 -- | CouchDB connection. 
 
@@ -32,12 +33,9 @@ import Control.Monad.Trans.Reader (ReaderT, ask, runReaderT)
 import Control.Exception (Exception)
 import Control.Monad.Trans.Class (lift)
-import Control.Monad.IO.Class (MonadIO)
-import Control.Monad.Trans.Control (MonadBaseControl (..))
+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResourceBase, 
+        MonadResource, ResourceT, runResourceT)
  
-import Data.Conduit (MonadResource, MonadThrow, MonadUnsafeIO, 
-    ResourceT, runResourceT)
-
 import Data.Generics (Typeable)
 import Data.Default (Default (def))
 import qualified Data.ByteString as B
@@ -150,7 +148,7 @@ --  
 --   If you create your own instance of 'MonadCouch' or use connection pool, 
 --   use 'withCouchConnection'.  
-runCouch :: (MonadThrow m, MonadUnsafeIO m, MonadIO m, MonadBaseControl IO m) =>+runCouch :: (MonadResourceBase m) =>        CouchConnection            -- ^ Couch connection     -> ReaderT (H.Manager, CouchConnection) (ResourceT m) a 
                                   -- ^ Actions

@@ -22,7 +22,7 @@ import qualified Data.ByteString.Lazy as BL
 import qualified Data.Text.Encoding as TE
 import qualified Data.Aeson as A
-import Data.Conduit (($$),)
+import Data.Conduit (($$))
 import qualified Data.Conduit.Attoparsec as CA
 
 import qualified Network.HTTP.Conduit as H

@@ -5,7 +5,7 @@ import Control.Exception.Lifted (throw)
 
 import qualified Data.Aeson as A
-import Data.Conduit (Conduit(..), MonadResource)
+import Data.Conduit (Conduit, MonadResource)
 import qualified Data.Conduit.List as CL (mapM)
 import Data.String.Conversions ((<>), cs)