couchdb-conduit 0.10.1 → 0.10.2

raw patch · 3 files changed

+6/−11 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• couchdb-conduit.cabal +1/−1
• src/Database/CouchDB/Conduit/View.hs +2/−8
• src/Database/CouchDB/Conduit/View/Query.hs +3/−2

@@ -1,5 +1,5 @@ name:           couchdb-conduit-version:        0.10.1
+version:        0.10.2
 cabal-version:  >= 1.8 build-type:     Simple stability:      Testing

@@ -29,7 +29,6 @@ import qualified Data.Text as T
 import qualified Data.HashMap.Lazy as M
 import qualified Data.Aeson as A
-import Data.String.Conversions (cs, (<>))
 import Data.Attoparsec
 
 import qualified Data.Vector.Generic as V
@@ -155,11 +154,8 @@ 
 -- | Extract field from view row
 rowField :: Monad m => T.Text -> Conduit A.Object m A.Value
-rowField f = CL.mapM (\v -> case M.lookup f v of
-            (Just o) -> return o
-            _ -> throw $ CouchInternalError $ 
-                "View row does not contain \"" <> cs f <> "\": " <> cs (show v)
-            ) 
+rowField f = CL.mapMaybe (M.lookup f) 
+
 -----------------------------------------------------------------------------
 -- Internal
 -----------------------------------------------------------------------------
@@ -177,8 +173,6 @@ 
 -- | Extra
 conduitRows :: MonadResource m => Sink BS8.ByteString m (Source m A.Object)
---(Monad m1, Control.Monad.Trans.Resource.MonadThrow m) =>---Data.Conduit.Internal.Pipe BS8.ByteString BS8.ByteString o u m (Source m1 A.Object)
 conduitRows = do 
     raw <- CA.sinkParser (A.json <?> "json object")
     rows <- case raw of

@@ -81,8 +81,9 @@         -- > ...?stale=update_after
     
     | forall a . A.ToJSON a => QPKey a
-        -- ^ @key=...@ query parameter.
-        -- > key=...
+        -- ^ @key@ query parameter.
+        --
+        -- > ...?key=...
         
     | forall a . A.ToJSON a => QPStartKey a
         -- ^ Row key to start with. Becomes @endkey@ if @descending@ turned on.