Merge pull request #238 from ah45/update-promesa-dependency

sovelten · web-flow · commit 8de42ed26d39 · 2020-04-07T14:32:45.000-03:00
Update Promesa dependency
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog #
 
+## Version 2.3.6
+
+Date: 2020-04-07
+
+- Bump Promesa version from 1.9.0 to 5.1.0
+
 ## Version 2.3.5
 
 Date: 2020-02-21
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject funcool/cats "2.3.5"
+(defproject funcool/cats "2.3.6"
   :description "Category Theory abstractions for Clojure"
   :url         "https://github.com/funcool/cats"
   :license {:name "BSD (2 Clause)"
@@ -9,7 +9,7 @@
                  [org.clojure/test.check "0.9.0" :scope "provided"]
                  [org.clojure/core.match "0.3.0-alpha4" :scope "provided"]
                  [manifold "0.1.6" :scope "provided"]
-                 [funcool/promesa "1.9.0" :scope "provided"]]
+                 [funcool/promesa "5.1.0" :scope "provided"]]
   :deploy-repositories {"releases"  :clojars
                         "snapshots" :clojars}
   :source-paths   ["src"]
diff --git a/src/cats/labs/promise.cljc b/src/cats/labs/promise.cljc
@@ -4,19 +4,34 @@
             [cats.context :as mc]
             [cats.protocols :as mp]
             [promesa.core :as p]
+            [promesa.impl :as pi]
             [promesa.protocols :as pp])
   #?(:clj
      (:import java.util.concurrent.CompletableFuture)))
 
 (declare context)
 
-(extend-type #?(:cljs p/Promise :clj CompletableFuture)
-  mp/Contextual
-  (-get-context [_] context)
+#?(:cljs
+   (defn extend-promise!
+     [t]
+     (extend-type t
+       mp/Contextual
+       (-get-context [_] context)
 
-  mp/Extract
-  (-extract [it]
-    (pp/-extract it)))
+       mp/Extract
+       (-extract [it]
+         (pp/-extract it)))))
+
+#?(:cljs (extend-promise! pi/*default-promise*))
+
+#?(:clj
+   (extend-type CompletableFuture
+     mp/Contextual
+     (-get-context [_] context)
+
+     mp/Extract
+     (-extract [it]
+       (pp/-extract it))))
 
 (def ^:no-doc context
   (reify
@@ -29,7 +44,7 @@
     (-bimap [_ err succ mv]
       (-> mv
           (pp/-map succ)
-          (pp/-catch err)))
+          (pp/-thenErr err)))
 
     mp/Monad
     (-mreturn [_ v]
diff --git a/test/cats/labs/promise_spec.cljc b/test/cats/labs/promise_spec.cljc
@@ -4,31 +4,21 @@
                      [cats.context :as ctx :include-macros true]
                      [cats.core :as m :include-macros true]
                      [cats.labs.promise :as pm]
-                     [promesa.core :as p])
+                     [promesa.core :as p]
+                     [promesa.impl :as pi]
+                     [promesa.exec :as pe])
      :clj  (:require [clojure.test :as t]
                      [cats.builtin :as b]
                      [cats.context :as ctx]
                      [cats.core :as m]
                      [cats.labs.promise :as pm]
-                     [promesa.core :as p])))
+                     [promesa.core :as p]
+                     [promesa.exec :as pe])))
 
 
 (defn future-ok
   [sleep value]
-  (p/promise (fn [resolve reject]
-               (p/schedule sleep #(resolve value)))))
-
-(defn future-fail
-  [sleep value]
-  (p/promise (fn [_ reject]
-               (p/schedule sleep #(reject value)))))
-
-
-#?(:cljs
-   (t/deftest extract-from-rejected-promise
-     (let [p1 (p/rejected 42)]
-       (t/is (p/rejected? p1))
-       (t/is (= (p/extract p1) 42)))))
+  (p/delay sleep value))
 
 (t/deftest chaining-using-bind
   #?(:cljs
