couchdb-conduit 0.2.1.1 → 0.2.1.2

raw patch · 6 files changed

+39/−26 lines, 6 filesdep ~conduitdep ~http-conduitdep ~transformers-base

Dependency ranges changed: conduit, http-conduit, transformers-base

Files

• couchdb-conduit.cabal +8/−7
• test/CouchDBAuth.hs +13/−0
• test/Database/CouchDB/Conduit/Test/Explicit.hs +3/−6
• test/Database/CouchDB/Conduit/Test/Generic.hs +3/−6
• test/Database/CouchDB/Conduit/Test/Util.hs +11/−2
• test/Database/CouchDB/Conduit/Test/View.hs +1/−5

@@ -1,5 +1,5 @@ name:           couchdb-conduit-version:        0.2.1.1
+version:        0.2.1.2
 cabal-version:  >= 1.8 build-type:     Simple stability:      Experimental@@ -26,14 +26,14 @@   hs-source-dirs:   src   build-depends:                       base >= 4 && < 5,-                   conduit >= 0.0.0.2 && < 0.1,+                   conduit >= 0.1,                    attoparsec >= 0.8 && < 0.11,                    attoparsec-conduit >= 0.0 && < 0.1,-                   http-conduit >= 1.1.0.1 && < 1.2,+                   http-conduit == 1.2.*,                    http-types >= 0.6 && < 0.7,-                   monad-control >= 0.3 && < 0.4,-                   transformers >= 0.2 && < 0.3,-                   transformers-base >= 0.4.1 && < 0.5,+                   monad-control == 0.3.*,+                   transformers == 0.2.*,+                   transformers-base == 0.4.*,                    lifted-base >= 0.1 && < 0.2,                    bytestring >= 0.9 && < 0.10,                    utf8-string >= 0.3 && < 0.4,@@ -93,5 +93,6 @@                    Database.CouchDB.Conduit.Test.Explicit,
                    Database.CouchDB.Conduit.Test.Util,
                    Database.CouchDB.Conduit.Test.View,
-                   Database.CouchDB.Conduit.Test.Generic
+                   Database.CouchDB.Conduit.Test.Generic,
+                   CouchDBAuth
 

@@ -0,0 +1,13 @@+{-# LANGUAGE OverloadedStrings #-} 
+
+
+module CouchDBAuth (login, pass) where
+
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 ()  -- just orchan
+
+login, pass :: ByteString
+-- | Set your login
+login = ""
+-- | Set your pass
+pass = ""

@@ -39,7 +39,7 @@ case_justPutGet :: Assertion
 case_justPutGet = bracket_
     setup teardown $
-    runCouch conn $ do
+    runCouch (conn dbName) $ do
         rev <- couchPut "doc-just" "" [] $ TestDoc "doc" 1 "1"
         rev' <- couchPut "doc-just" rev [] $ TestDoc "doc" 2 "2"
         rev'' <- couchRev "doc-just"
@@ -49,7 +49,7 @@ case_massFlow :: Assertion
 case_massFlow = bracket_
     setup teardown $
-    runCouch conn $ do
+    runCouch (conn dbName) $ do
         revs <- mapM (\n -> 
                 couchPut (docn n) "" [] $ TestDoc "doc" n $ show n
             ) [1..100]
@@ -66,7 +66,7 @@ case_massIter :: Assertion
 case_massIter = bracket_
     setup teardown $
-    runCouch conn $ 
+    runCouch (conn dbName) $ 
         mapM_ (\n -> do
             let name = docn n 
             let d = TestDoc "doc" n $ show n
@@ -85,9 +85,6 @@ setup = setupDB dbName
 teardown :: IO ()
 teardown = tearDB dbName
-
-conn :: CouchConnection
-conn = def {couchDB = dbName} 
 
 dbName :: ByteString
 dbName = "cdbc_test_explicit"   

@@ -32,7 +32,7 @@ case_justPutGet :: Assertion
 case_justPutGet = bracket_
     setup teardown $ 
-    runCouch conn $ do
+    runCouch (conn dbName) $ do
         rev <- couchPut "doc-just" "" [] $ TestDoc "doc" 1 "1"
         rev' <- couchPut "doc-just" rev [] $ TestDoc "doc" 2 "2"
         rev'' <- couchRev "doc-just"
@@ -42,7 +42,7 @@ case_massFlow :: Assertion
 case_massFlow = bracket_
     setup teardown $ 
-    runCouch conn $ do
+    runCouch (conn dbName) $ do
         revs <- mapM (\n -> 
                 couchPut (docn n) "" [] $ TestDoc "doc" n $ show n
             ) [1..100]
@@ -59,7 +59,7 @@ case_massIter :: Assertion
 case_massIter = bracket_
     setup teardown $ 
-    runCouch conn $ 
+    runCouch (conn dbName) $ 
         mapM_ (\n -> do
             let name = docn n 
             let d = TestDoc "doc" n $ show n
@@ -78,9 +78,6 @@ setup = setupDB dbName
 teardown :: IO ()
 teardown = tearDB dbName
-    
-conn :: CouchConnection
-conn = def {couchDB = dbName} 
 
 dbName :: ByteString
 dbName = "cdbc_test_generic"

@@ -7,8 +7,17 @@ import Database.CouchDB.Conduit
 import Database.CouchDB.Conduit.DB
 
+import CouchDBAuth
+
 setupDB :: ByteString -> IO ()
-setupDB n = runCouch def $ couchPutDB_ n
+setupDB n = runCouch (conn n) $ couchPutDB_ n
 
 tearDB :: ByteString -> IO ()
-tearDB n = runCouch  def $ couchDeleteDB n
+tearDB n = runCouch (conn n) $ couchDeleteDB n
+
+-- | Connection connection. See readme
+conn :: Path -> CouchConnection
+conn db = def {
+    couchDB = db, 
+    couchLogin = login,
+    couchPass = pass}

@@ -7,7 +7,7 @@ import Test.Framework (testGroup, mutuallyExclusive, Test)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.HUnit (Assertion, (@=?))
-import Database.CouchDB.Conduit.Test.Util (setupDB, tearDB)
+import Database.CouchDB.Conduit.Test.Util (setupDB, tearDB, conn)
 
 --import Control.Monad.Trans.Class (lift)
 import Control.Exception.Lifted (bracket_)
@@ -96,7 +96,3 @@     
 docName :: Int -> B.ByteString
 docName n = fromString $ "doc" ++ show n    
-
--- | connection
-conn :: Path -> CouchConnection
-conn db = def {couchDB = db}