status-im/reagent
2
0
Fork 0
mirror of https://github.com/status-im/reagent.git synced 2025-01-13 21:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Rename monitor -> track, and monitor! -> track!

Browse Source
This commit is contained in:
Dan Holmsand 2015-09-19 16:49:13 +02:00
parent ea7cd26cf5
commit ca5ce00c34
3 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demo/reagentdemo/news/news050.cljs
View File

@ -32,7 +32,7 @@
(defn name-part [key]
(get-in @person [:name key]))
(def monitor reagent.ratom/monitor)
(def track reagent.ratom/track)
(defn foo [])
@ -40,12 +40,12 @@
(let [{:keys [first-name last-name]} @n]
[:div
[:p "I'm editing " first-name " " last-name "."]
[:p "I'm editing " @(monitor name-part :first-name) " "
@(monitor name-part :last-name) "."]
[:p "I'm editing " @(monitor name-part :first-name) " "
@(monitor name-part :last-name) "."]
[:p "I'm editing " @(monitor name-part :first-name) " "
@(monitor name-part :last-name) "."]
[:p "I'm editing " @(track name-part :first-name) " "
@(track name-part :last-name) "."]
[:p "I'm editing " @(track name-part :first-name) " "
@(track name-part :last-name) "."]
[:p "I'm editing " @(track name-part :first-name) " "
@(track name-part :last-name) "."]
[input "First name: " (r/wrap first-name
swap! n assoc :first-name)]

16
src/reagent/ratom.cljs
View File

@ -110,7 +110,7 @@
;;; monitor
;;; track
(declare make-reaction)
@ -135,7 +135,7 @@
v)
(f))))
(deftype Monitor [f key ^:mutable reaction]
(deftype Track [f key ^:mutable reaction]
IReactiveAtom
IDeref
@ -146,7 +146,7 @@
IEquiv
(-equiv [o other]
(and (instance? Monitor other)
(and (instance? Track other)
(= key (.-key other))))
IHash
@ -154,17 +154,17 @@
IPrintWithWriter
(-pr-writer [a writer opts]
(-write writer (str "#<Monitor: " key " "))
(-write writer (str "#<Track: " key " "))
(binding [*ratom-context* nil]
(pr-writer (-deref a) writer opts))
(-write writer ">")))
(defn monitor [f & args]
(defn track [f & args]
{:pre [(ifn? f)]}
(Monitor. #(apply f args) [f args] nil))
(Track. #(apply f args) [f args] nil))
(defn monitor! [f & args]
(let [r (make-reaction #(deref (apply monitor f args))
(defn track! [f & args]
(let [r (make-reaction #(deref (apply track f args))
:auto-run :async)]
@r
r))

53
test/reagenttest/testmonitor.cljs
View File

@ -1,7 +1,6 @@
(ns reagenttest.testmonitor
(:require [cljs.test :as t :refer-macros [is deftest testing]]
[reagent.ratom :as rv :refer [monitor]
:refer-macros [run! reaction]]
[reagent.ratom :as rv :refer [track] :refer-macros [run! reaction]]
[reagent.debug :refer-macros [dbg]]
[reagent.core :as r]))
@ -23,16 +22,16 @@
(let [runs (running)
start (rv/atom 0)
svf (fn [] @start)
sv (monitor svf)
sv (track svf)
compf (fn [x] @sv (+ x @sv))
comp (monitor compf 2)
comp (track compf 2)
c2f (fn [] (inc @comp))
count (rv/atom 0)
out (rv/atom 0)
resf (fn []
(swap! count inc)
(+ @sv @(monitor c2f) @comp))
res (monitor resf)
(+ @sv @(track c2f) @comp))
res (track resf)
const (run!
(reset! out @res))]
(is (= @count 1) "constrain ran")
@ -43,21 +42,21 @@
(dispose const)
(is (= (running) runs))))
(deftest test-monitor!
(deftest test-track!
(let [runs (running)
start (rv/atom 0)
svf (fn [] @start)
sv (monitor svf)
sv (track svf)
compf (fn [x] @sv (+ x @sv))
comp (monitor compf 2)
comp (track compf 2)
c2f (fn [] (inc @comp))
count (rv/atom 0)
out (rv/atom 0)
resf (fn []
(swap! count inc)
(+ @sv @(monitor c2f) @comp))
res (monitor resf)
const (rv/monitor!
(+ @sv @(track c2f) @comp))
res (track resf)
const (rv/track!
#(reset! out @res))]
(is (= @count 1) "constrain ran")
(is (= @out 5))
@ -83,7 +82,7 @@
c3 (rv/make-reaction
(fn []
(swap! c3-count inc)
(+ @(monitor c1f) @(monitor c2f)))
(+ @(track c1f) @(track c2f)))
:auto-run true)]
(is (= @c3-count 0))
(is (= @c3 1))
@ -99,7 +98,7 @@
(let [runs (running)]
(let [!x (rv/atom 0)
f #(inc @!x)
!co (run! @(monitor f))]
!co (run! @(track f))]
(is (= 1 @!co) "CO has correct value on first deref")
(swap! !x inc)
(is (= 2 @!co) "CO auto-updates")
@ -112,8 +111,8 @@
(let [runs (running)
a (rv/atom 0)
af (fn [x] (+ @a x))
a1 (monitor af 1)
a2 (monitor af 0)
a1 (track af 1)
a2 (track af 0)
b-changed (rv/atom 0)
c-changed (rv/atom 0)
mf (fn [v x spy]
@ -121,8 +120,8 @@
(+ @v x))
res (run!
(if (< @a2 1)
@(monitor mf a1 1 b-changed)
@(monitor mf a2 10 c-changed)))]
@(track mf a1 1 b-changed)
@(track mf a2 10 c-changed)))]
(is (= @res (+ 2 @a)))
(is (= @b-changed 1))
(is (= @c-changed 0))
@ -157,9 +156,9 @@
(let [runs (running)
a (rv/atom 0)
f (fn [x] (+ x @a))
b (monitor f 1)
c (monitor f -1)
d (monitor #(str @b))
b (track f 1)
c (track f -1)
d (track #(str @b))
res (rv/atom 0)
cs (run!
(reset! res @d))]
@ -169,14 +168,14 @@
;; but isnt
(let [a (rv/atom 0)
f (fn [x] (+ x @a))
b (monitor f 1)
d (run! [@b @(monitor f -1)])]
b (track f 1)
d (run! [@b @(track f -1)])]
(is (= @d [1 -1]))
(dispose d))
(let [a (rv/atom 0)
f (fn [x] (+ x @a))
c (monitor f -1)
d (run! [@(monitor f 1) @c])
c (track f -1)
d (run! [@(track f 1) @c])
res (rv/atom 0)]
(is (= @d [1 -1]))
(let [e (run! (reset! res @d))]
@ -188,7 +187,7 @@
(deftest non-reactive-deref
(let [runs (running)
a (rv/atom 0)
b (monitor #(+ 5 @a))]
b (track #(+ 5 @a))]
(is (= @b 5))
(is (= runs (running)))
@ -200,7 +199,7 @@
(let [runs (running)
a (rv/atom false)
catch-count (atom 0)
b (monitor #(if @a (throw (js/Error. "fail"))))
b (track #(if @a (throw (js/Error. "fail"))))
c (run! (try @b (catch :default e
(swap! catch-count inc))))]
(set! rv/silent true)