Testing #7.

Merge remote-tracking branch 'matevarga/master'

* matevarga/master:
  Removing ObjMap patching as it's deprecated. Fixing namespace usages.
  Updated cljs and clojure version. Fixed namespace of recurse-from-hyde-cache in funpatcher.cljs Fixed incorrect reference to re-matches.

Author: dribnet

project.clj

@@ -3,8 +3,8 @@
   :url "https://github.com/dribnet/mrhyde"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-1878"]]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [org.clojure/clojurescript "0.0-2665"]]
   :min-lein-version "2.0.0"
   :source-paths ["src/clj" "src/cljs"]
 

src/cljs/mrhyde/funpatcher.cljs

@@ -1,5 +1,6 @@
 (ns mrhyde.funpatcher
-  (:require [mrhyde.mrhyde :refer [hyde-array? recurse-from-hyde-cache IHyde]]
+  (:require [mrhyde.mrhyde :refer [hyde-array? IHyde]]
+            [mrhyde.typepatcher :refer [recurse-from-hyde-cache]]
             [mrhyde.guts :refer [get-store-cur-js-fn restore-original-js-fn
                                  hyde-proto-array-marker hyde-proto-object-marker]]
             ))

src/cljs/mrhyde/mrhyde.cljs

@@ -1,6 +1,6 @@
 ; providing clojure data a split personality: don't be afraid to let it all out
 (ns mrhyde.mrhyde
-  (:require [clojure.string :refer [join re-matches]]
+  (:require [clojure.string :refer [join]]
             [cljs.reader :refer [read-string]]
             [mrhyde.guts :refer [hyde-proto-array-marker hyde-proto-object-marker]]
             ))

src/cljs/mrhyde/typepatcher.cljs

@@ -527,13 +527,13 @@
 
 (defn patch-known-mappish-types [] 
   (patch-sequential-type cljs.core.LazySeq) ; <-- TODO BUG - this should not be necessary!
-  (doseq [t [[cljs.core.ObjMap, "ObjMap"]
-             [cljs.core.PersistentHashMap, "PersistentHashMap"]
+  (doseq [t [[cljs.core.PersistentHashMap, "PersistentHashMap"]
              [cljs.core.PersistentArrayMap, "PersistentArrayMap"]]]
     (if (= (first t) (aget cljs.core (second t)))
       (patch-map-type t)))
   ; existant magic constant instances need to be patched in place...
-  (set! cljs.core.ObjMap/EMPTY (patch-map cljs.core.ObjMap/EMPTY)))
+  ;(set! cljs.core.ObjMap/EMPTY (patch-map cljs.core.ObjMap/EMPTY)) 
+  )
 
 ; on any object, someone somewhere is getting the parition key
 (defn get-partition-key []

test/cljs/mrhyde/test.cljs

@@ -12,7 +12,8 @@
                               patch-args-clj-to-js]]
       ))
 
-(def DummyLib (this-as ct (aget ct "DummyLib")))
+;(def DummyLib (this-as ct (aget ct "DummyLib")))
+(def DummyLib (js-obj))
 
 (defn init []
   ; patch the dummy library
@@ -51,7 +52,7 @@
   (add-test "js access cljs vector as array"
     (fn []
       (let [v [1 2 3 4 5]]
-        (assert (= 5 v/length))
+        (assert (= 5 (.-length v)))
         (assert (= 1 (aget v 0)))
         (assert (= 3 (aget v "2")))
         (assert (= 5 (aget v 4)))
@@ -66,7 +67,7 @@
         (assert (= 1 (aget l 0)))
         (assert (= 21 (aget l 10)))
         (assert (= js/undefined (aget l 70)))
-        (assert (= 50 l/length))
+        (assert (= 50 (.-length l)))
         )))
 
   (add-test "js access lazy seq of vectors as array of arrays"
@@ -80,13 +81,13 @@
         ; (assert (js-arrays-equal (array 2 1) (aget l 5)))
         (assert (= js/undefined (aget l 7)))
         (assert (= js/undefined (aget (aget l 0) 3)))
-        (assert (= 6 l/length))
+        (assert (= 6 (.-length l)))
         )))
 
   (add-test "js access maps as object fields"
     (fn []
       (let [m {:one 1 :two 2 :three 3}]
-        (assert (= 1 m/one))
+        (assert (= 1 (.-one m)))
         (assert (= 2 (aget m "two")))
         (assert (= 3 (.-three m)))
         (assert (= js/undefined (.-four m)))
@@ -101,7 +102,7 @@
     (fn []
       (let [v [1,2]
             m {:one 1, :two 2}
-            [r0 r1 r2] (DummyLib/wrapArgs0and2 v m m)]
+            [r0 r1 r2] (.wrapArgs0and2 js/DummyLib  v m m)]
 
         ; (.log js/console r0)
         ; (.log js/console (array 1 2))
@@ -128,10 +129,10 @@
 
 (add-test "patch-return-value-to-clj"
     (fn []
-      (let [ra (DummyLib/wrapReturnArgsIntoArray 0 1 2)
-            rav (DummyLib/wrapReturnArgsIntoArray (array 0 1) (array 2 3) (array 4 5))
-            ro (DummyLib/wrapReturnArgsIntoObject 1 2 3)
-            rov (DummyLib/wrapReturnArgsIntoObject (array 0 1) (array 2 3) (array 4 5))]
+      (let [ra (.wrapReturnArgsIntoArray js/DummyLib 0 1 2)
+            rav (.wrapReturnArgsIntoArray js/DummyLib (array 0 1) (array 2 3) (array 4 5))
+            ro (.wrapReturnArgsIntoObjectjs/DummyLib 1 2 3)
+            rov (.wrapReturnArgsIntoObjectjs/DummyLib (array 0 1) (array 2 3) (array 4 5))]
 
         ; (.log js/console (str rov))
 
@@ -151,16 +152,16 @@
       (let [m {:one 1 :two 2 :three 3}]
 
         ; check equality where you can
-        (assert (= 1 (DummyLib/wrapCall0on1 :one m)))
-        (assert (= 3 (DummyLib/wrapCall0on1 :three m)))
-        (assert (= nil (DummyLib/wrapCall0on1 :four m)))
+        (assert (= 1 (.wrapCall0on1 js/DummyLib :one m)))
+        (assert (= 3 (.wrapCall0on1 js/DummyLib :three m)))
+        (assert (= nil (.wrapCall0on1 js/DummyLib :four m)))
         )))
 
 (add-test "patch everything in to-js and out to-clj"
     (fn []
-      (let [ra (DummyLib/wrapArraysInAndOut 1 2 3)
-            rav (DummyLib/wrapArraysInAndOut [0 1] [2 3] [4 5])
-            [r1 r2 r3] (DummyLib/wrapArraysInAndOut [:a :b :c] [#{:a, :b, :c}] ["a" "b" "c"])]
+      (let [ra (.wrapArraysInAndOut js/DummyLib 1 2 3)
+            rav (.wrapArraysInAndOut js/DummyLib [0 1] [2 3] [4 5])
+            [r1 r2 r3] (.wrapArraysInAndOut js/DummyLib [:a :b :c] [#{:a, :b, :c}] ["a" "b" "c"])]
 
         ; (.log js/console r2)
         ; (.log js/console (str (r2 0)))
@@ -183,7 +184,7 @@
         (assert (hyde? v))
         (assert (not (has-cache? v)))
         (assert (= (v (from-cache v))))
-        (let [[ra rv] (DummyLib/zeroOutFirstArrayElement v)]
+        (let [[ra rv] (.zeroOutFirstArrayElement js/DummyLib v)]
           ; the method thinks it changed the vector
           (assert (= rv 0))
           ; locally the vector remains unchanged
@@ -204,7 +205,7 @@
         (assert (hyde? m))
         (assert (not (has-cache? m)))
         (assert (= (m (from-cache m))))
-        (let [[rm rv] (DummyLib/zeroOutMapKeyOne m)]
+        (let [[rm rv] (.zeroOutMapKeyOne js/DummyLib m)]
           ; the method thinks it changed the map
           (assert (= rv 0))
           ; locally the vector remains unchanged
@@ -225,7 +226,7 @@
         (assert (hyde? m))
         (assert (not (has-cache? m)))
         (assert (= (m (from-cache m))))
-        (let [[rm rv] (DummyLib/zeroOutMapKeyTen m)]
+        (let [[rm rv] (.zeroOutMapKeyTen js/DummyLib m)]
           ; (-> js/fdebug (set! m))
           ; (-> js/gdebug (set! rm))
           ; (-> js/has (set! has-cache?))
@@ -249,8 +250,8 @@
         (assert (hyde? m))
         (assert (not (has-cache? m)))
         (assert (= (m (from-cache m))))
-        (let [[rm1 rv1] (DummyLib/zeroOutMapKeyOne m)
-              [rm2 rv2] (DummyLib/zeroOutMapKeyTen rm1)]
+        (let [[rm1 rv1] (.zeroOutMapKeyOne js/DummyLib m)
+              [rm2 rv2] (.zeroOutMapKeyTen js/DummyLib rm1)]
           ; remote additons to the maps
           (assert (= rv1 0))
           (assert (= rv2 0))
@@ -284,10 +285,10 @@
         (assert (not (has-cache? d)))
         (let [
               ;[rm1 rv1] (DummyLib/zeroOutFirstArrayElement d)
-              [rm2 rv2] (DummyLib/zeroOutMapKeyOne (nth d 2))
-              [rm3 rv3] (DummyLib/zeroOutMapKeyTen (nth d 2))
-              [rm4 rv4] (DummyLib/zeroOutFirstArrayElement (get-in d [2 :vec]))
-              [rm5 rv5] (DummyLib/zeroOutFirstArrayElement (get-in d [2 :vec 2]))]
+              [rm2 rv2] (.zeroOutMapKeyOne js/DummyLib (nth d 2))
+              [rm3 rv3] (.zeroOutMapKeyTen js/DummyLib (nth d 2))
+              [rm4 rv4] (.zeroOutFirstArrayElement js/DummyLib (get-in d [2 :vec]))
+              [rm5 rv5] (.zeroOutFirstArrayElement js/DummyLib (get-in d [2 :vec 2]))]
 
           ; cache information is only known locally
           (assert (not (has-cache? d)))
@@ -299,7 +300,7 @@
           ; (-> js/fdebug3 (set! (nth d 2)))
           ; (.log js/console (str (recurse-from-hyde-cache d)))
 
-          (assert (= 
+          (assert (=
             (recurse-from-hyde-cache d)
             [ {:bye 1, :now 2, :zero 3}
               {:two [], :three 3}
@@ -341,7 +342,7 @@
 
 ; (add-test "js->clj with cycle?"
 ;     (fn []
-;         (let [a (js-obj) b (js-obj)] (set! (.-a b) a) (set! (.-b a) b) (js->clj a)) ; #cljs surprise of the day 
+;         (let [a (js-obj) b (js-obj)] (set! (.-a b) a) (set! (.-b a) b) (js->clj a)) ; #cljs surprise of the day
 ;         (let [c (js->clj js/p)])))
 ;      ))