fix bounds ns

Author: sprocketc

src/renderer/utils/bounds.cljs

@@ -32,23 +32,25 @@
 
 (defn intersected?
   [a-bounds b-bounds]
-  (let [[a-left a-top a-right a-bottom] a-bounds
-        [b-left b-top b-right b-bottom] b-bounds]
-    (not (or (> b-left a-right)
-             (< b-right a-left)
-             (> b-top a-bottom)
-             (< b-bottom a-top)))))
+  (when (and a-bounds b-bounds)
+    (let [[a-left a-top a-right a-bottom] a-bounds
+          [b-left b-top b-right b-bottom] b-bounds]
+      (not (or (> b-left a-right)
+               (< b-right a-left)
+               (> b-top a-bottom)
+               (< b-bottom a-top))))))
 
 (defn contained?
   [a-bounds b-bounds]
-  (let [[a-left a-top a-right a-bottom] a-bounds
-        [b-left b-top b-right b-bottom] b-bounds]
-    (and (> a-left b-left)
-         (> a-top b-top)
-         (< a-right b-right)
-         (< a-bottom b-bottom))))
+  (when (and a-bounds b-bounds)
+    (let [[a-left a-top a-right a-bottom] a-bounds
+          [b-left b-top b-right b-bottom] b-bounds]
+      (and (> a-left b-left)
+           (> a-top b-top)
+           (< a-right b-right)
+           (< a-bottom b-bottom)))))
 
-(defn contain-point?
+(defn contained-point?
   [[left top right bottom] [x y]]
   (and (<= left x)
        (<= top y)

test/bounds_test.cljs

@@ -22,13 +22,13 @@
     (is (= (bounds/contained? [5 5 10 10] [0 0 20 20]) true))
     (is (= (bounds/contained? [0 0 10 10] [1 1 10 10]) false))))
 
-(deftest test-contain-point?
+(deftest test-contained-point?
   (testing "bounds contain point"
-    (is (= (bounds/contain-point? [0 0 10 10] [0 0]) true))
-    (is (= (bounds/contain-point? [0 0 10 10] [5 5]) true))
-    (is (= (bounds/contain-point? [0 0 10 10] [10 10]) true))
-    (is (= (bounds/contain-point? [0 0 10 10] [-5 5]) false))
-    (is (= (bounds/contain-point? [0 0 10 10] [5 -5]) false))))
+    (is (= (bounds/contained-point? [0 0 10 10] [0 0]) true))
+    (is (= (bounds/contained-point? [0 0 10 10] [5 5]) true))
+    (is (= (bounds/contained-point? [0 0 10 10] [10 10]) true))
+    (is (= (bounds/contained-point? [0 0 10 10] [-5 5]) false))
+    (is (= (bounds/contained-point? [0 0 10 10] [5 -5]) false))))
 
 (deftest test-center
   (testing "center of bounds"