Add some method.

Author: hoangnh

README.md

@@ -74,8 +74,8 @@ see [CHANGES.md](CHANGES.md)
 + prepare couchbase for testing
 ```shell script
 docker run -d --name cb -p 8091-8094:8091-8094 -p 11210:11210 couchbase:5.0.1
-docker cp travis-cb-prepare.sh cb:/tmp
-docker exec -i cb /tmp/travis-cb-prepare.sh
+docker cp cb-test-prepare.sh cb:/tmp
+docker exec -i cb /tmp/cb-test-prepare.sh
 ```
 or, if you have prepared before => only run `docker start cb`
 

core/src/main/scala/com/sandinh/couchbase/access/WithCaoKey1.scala

@@ -1,7 +1,7 @@
 package com.sandinh.couchbase.access
 
 import com.couchbase.client.java.document.Document
-import com.couchbase.client.java.error.DocumentDoesNotExistException
+import com.couchbase.client.java.error.{CASMismatchException, DocumentDoesNotExistException}
 
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -38,12 +38,29 @@ private[access] trait WithCaoKey1[T, A, U, D <: Document[U]]
   final def getWithCAS(a: A): Future[(T, Long)] = self.getWithCAS(key(a))
 
   final def set(a: A, t: T): Future[D] = self.set(key(a), t)
+
   final def update(a: A, t: T, cas: Long = 0): Future[D] =
     self.update(key(a), t, cas)
 
   /** @deprecated use `update` instead */
-  final def updateWithCAS(a: A, t: T, cas: Long = 0): Future[D] =
-    self.update(key(a), t, cas)
+  final def updateWithCAS(a: A, t: T, cas: Long = 0): Future[D] = {
+    cas match {
+      case -1 => set(a, t)
+      case _ => self.update(key(a), t, cas)
+    }
+  }
+
+  final def updateWithCASNew(a: A, t: T): Future[T] = {
+    getWithCAS(a).flatMap { case (_, cas) =>
+      updateWithCAS(a, t, cas).map { _ => t }
+    }.recoverWith { case _: CASMismatchException => updateWithCASNew(a, t) }
+  }
+
+  final def getOrSetDefaultWithCAS(a: A)(default: T): Future[(T, Long)] = {
+    getWithCAS(a) recoverWith {
+      case _: DocumentDoesNotExistException => set(a, default).map(d => (default, d.cas()))
+    }
+  }
 
   final def remove(a: A): Future[D] = self.remove(key(a))
 }

core/src/main/scala/com/sandinh/couchbase/access/WithCaoKey2.scala

@@ -1,7 +1,8 @@
 package com.sandinh.couchbase.access
 
 import com.couchbase.client.java.document.Document
-import com.couchbase.client.java.error.DocumentDoesNotExistException
+import com.couchbase.client.java.error.{CASMismatchException, DocumentDoesNotExistException}
+
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
 
@@ -25,8 +26,27 @@ private[access] trait WithCaoKey2[T, A, B, U, D <: Document[U]] {
     self.getOrElseWithCAS(key(a, b))(default)
 
   final def set(a: A, b: B, t: T): Future[D] = self.set(key(a, b), t)
+
   final def updateWithCAS(a: A, b: B, t: T, cas: Long = 0): Future[D] =
-    self.update(key(a, b), t, cas)
+    cas match {
+      case -1 => set(key(a, b), t)
+      case _ => self.update(key(a, b), t, cas)
+    }
+
+  final def update(a: A, b: B, t: T): Future[D] =
+    self.update(key(a, b), t)
+
+  final def updateWithCASNew(a: A, b: B, t: T): Future[T] = {
+    getWithCAS(key(a, b)).flatMap { case (_, cas) =>
+      updateWithCAS(a, b, t, cas).map { _ => t }
+    }.recoverWith { case _: CASMismatchException => updateWithCASNew(a, b, t) }
+  }
+
+  final def getOrSetDefaultWithCAS(a: A, b: B)(default: T): Future[(T, Long)] = {
+    getWithCAS(key(a, b)) recoverWith {
+      case _: DocumentDoesNotExistException => set(key(a, b), default).map(d => (default, d.cas()))
+    }
+  }
 
   /** convenient method. = set(..).map(_ => t) */
   final def setT(a: A, b: B, t: T): Future[T] =