couchdb-conduit 0.3.0.0 → 0.3.0.1

raw patch · 4 files changed

+69/−21 lines, 4 filesdep ~aesonPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: aeson

API changes (from Hackage documentation)

Files

• couchdb-conduit.cabal +18/−16
• test/Database/CouchDB/Conduit/Test/Base.hs +44/−0
• test/Database/CouchDB/Conduit/Test/View.hs +2/−2
• test/Main.hs +5/−3

@@ -1,5 +1,5 @@ name:           couchdb-conduit-version:        0.3.0.0
+version:        0.3.0.1
 cabal-version:  >= 1.8 build-type:     Simple stability:      Experimental@@ -26,22 +26,22 @@   hs-source-dirs:   src   build-depends:                       base >= 4 && < 5,-                   conduit == 0.1.*,+                   aeson >= 0.6 && < 0.7,                    attoparsec >= 0.8 && < 0.11,                    attoparsec-conduit >= 0.0 && < 0.1,-                   http-conduit == 1.2.*,+                   bytestring >= 0.9 && < 0.10,+                   conduit >= 0.1 && < 0.2,+                   containers >= 0.2,+                   http-conduit >= 1.2 && < 1.3,                    http-types >= 0.6 && < 0.7,                    monad-control >= 0.3 && < 0.4,-                   transformers == 0.2.*,-                   transformers-base == 0.4.*,+                   transformers >= 0.2 && < 0.3,+                   transformers-base >= 0.4 && < 0.5,                    lifted-base >= 0.1 && < 0.2,-                   bytestring >= 0.9 && < 0.10,                    utf8-string >= 0.3 && < 0.4,-                   aeson >= 0.5 && < 0.6,                    text >= 0.11 && < 0.12,                    unordered-containers >= 0.1 && < 0.2,                    syb,-                   containers >= 0.2,                    data-default,                    blaze-builder >= 0.2.1 && < 0.4   ghc-options:      -Wall@@ -69,24 +69,25 @@                    test-framework-quickcheck2,                    test-framework-hunit,                    couchdb-conduit,-                   conduit == 0.1.*,+                   aeson >= 0.6 && < 0.7,                    attoparsec >= 0.8 && < 0.11,                    attoparsec-conduit >= 0.0 && < 0.1,-                   http-conduit == 1.2.*,+                   bytestring >= 0.9 && < 0.10,+                   conduit >= 0.1 && < 0.2,+                   containers >= 0.2,+                   http-conduit >= 1.2 && < 1.3,                    http-types >= 0.6 && < 0.7,                    monad-control >= 0.3 && < 0.4,-                   transformers == 0.2.*,-                   transformers-base == 0.4.*,+                   transformers >= 0.2 && < 0.3,+                   transformers-base >= 0.4 && < 0.5,                    lifted-base >= 0.1 && < 0.2,-                   bytestring >= 0.9 && < 0.10,                    utf8-string >= 0.3 && < 0.4,-                   aeson >= 0.5 && < 0.6,                    text >= 0.11 && < 0.12,                    unordered-containers >= 0.1 && < 0.2,                    syb,-                   containers >= 0.2,                    data-default,                    blaze-builder >= 0.2.1 && < 0.4+                      ghc-options:     -Wall -rtsopts -threaded   hs-source-dirs:  test   main-is:         Main.hs@@ -95,5 +96,6 @@                    Database.CouchDB.Conduit.Test.Util,
                    Database.CouchDB.Conduit.Test.View,
                    Database.CouchDB.Conduit.Test.Generic,
-                   CouchDBAuth
+                   CouchDBAuth,
+                   Database.CouchDB.Conduit.Test.Base
 

@@ -0,0 +1,44 @@+{-# LANGUAGE OverloadedStrings #-} 
+
+-- | base tests
+module Database.CouchDB.Conduit.Test.Base (tests) where
+
+import Test.Framework (testGroup, mutuallyExclusive, Test)
+import Test.Framework.Providers.HUnit (testCase)
+import Test.HUnit (Assertion, (@=?))
+
+import CouchDBAuth
+
+import Control.Monad.IO.Class (liftIO)
+
+import qualified Data.ByteString as B
+--import Data.Conduit
+--import qualified Data.Conduit.List as CL
+
+import qualified Network.HTTP.Conduit as H
+import qualified Network.HTTP.Types as HT
+
+import Database.CouchDB.Conduit
+import Database.CouchDB.Conduit.DB
+import Database.CouchDB.Conduit.LowLevel
+
+tests :: Test
+tests = mutuallyExclusive $ testGroup "Base" [
+    testCase "Just connect" case_justConnect,
+    testCase "Put DB" case_dbPut
+    ]
+
+-- | Just connect
+case_justConnect :: Assertion
+case_justConnect = runCouch def $ do
+    H.Response (HT.Status sc _) _h _bsrc <- couch' HT.methodGet "" [] [] 
+                    (H.RequestBodyBS B.empty)
+    liftIO $ sc @=? 200
+
+-- | Put and delete
+case_dbPut :: Assertion    
+case_dbPut =  runCouch def {couchLogin = login, couchPass=pass} $ do
+    couchPutDB_ "cdbc_dbputdel"
+    couchDeleteDB "cdbc_dbputdel"
+    
+    

@@ -63,7 +63,7 @@ case_bigValues :: Assertion
 case_bigValues = bracket_
     (runCouch (conn db) $ do
-        couchPutDB db
+        couchPutDB_ db
         _ <- couchViewPut' "mydesign" "myview"
                 "function(doc){emit(doc.intV, doc);}" Nothing
         mapM_ (\n -> CCG.couchPut' (docName n) [] $ doc n) [1..20]
@@ -81,7 +81,7 @@ case_withReduce :: Assertion    
 case_withReduce = bracket_
     (runCouch (conn db) $ do
-        couchPutDB db
+        couchPutDB_ db
         _ <- couchViewPut' "mydesign" "myview"
                 "function(doc){emit(doc.intV, doc.intV);}" 
                 $ Just "function(keys, values){return sum(values);}"

@@ -3,14 +3,16 @@ 
 import Test.Framework (defaultMain)
 
+import qualified Database.CouchDB.Conduit.Test.Base
 import qualified Database.CouchDB.Conduit.Test.Explicit
 import qualified Database.CouchDB.Conduit.Test.Generic
 import qualified Database.CouchDB.Conduit.Test.View
 
 main :: IO ()
 main = defaultMain [
-    Database.CouchDB.Conduit.Test.Explicit.tests,
-    Database.CouchDB.Conduit.Test.Generic.tests,
-    Database.CouchDB.Conduit.Test.View.tests
+      Database.CouchDB.Conduit.Test.Base.tests
+    , Database.CouchDB.Conduit.Test.Explicit.tests
+    , Database.CouchDB.Conduit.Test.Generic.tests
+    , Database.CouchDB.Conduit.Test.View.tests
     ]