Fix different behaviour in coercion to string for JVM and JS runt… (#97)

Author: DeLaGuardo

src/axel_f/excel/coerce.cljc

@@ -3,6 +3,7 @@
 
 (defn excel-type [x]
   (cond
+    #?@(:clj [(ratio? x) :ratio])
     (number? x) :number
     (string? x) :string
     (boolean? x) :boolean
@@ -17,6 +18,9 @@
 
 (defmethod excel-number :number [n] n)
 
+#?(:clj
+   (defmethod excel-number :ratio [r] r))
+
 (defmethod excel-number :string [s]
   (try
     (let [n (when (not-empty s)
@@ -36,11 +40,20 @@
 
 (defmethod excel-number :null [_] 0)
 
-(defn excel-str [item]
-  (case item
-    true "TRUE"
-    false "FALSE"
-    (str item)))
+(defmulti excel-str excel-type)
+
+(defmethod excel-str :default [x]
+  (str x))
+
+(defmethod excel-str :boolean [b]
+  (if b "TRUE" "FALSE"))
+
+(defmethod excel-str :null [_]
+  "NULL")
+
+#?(:clj
+   (defmethod excel-str :ratio [r]
+     (str (double r))))
 
 (defn to-string*
   "Tries to coerce given value to a string type. Returns null for empty value."

src/axel_f/excel/jws.cljc

@@ -27,4 +27,5 @@
 
 (def env
   {"JWS" {"EXTRACT" jws-extract
-          "VERIFY" jws-verify}})
+          "VERIFY" jws-verify
+          "SIGN" jws-sign}})

src/axel_f/excel/text.cljc

@@ -73,7 +73,7 @@
 (defn CONCATENATE*
   "Appends strings to one another."
   [st1 & stx]
-  (apply TEXTJOIN "" false st1 stx))
+  (apply TEXTJOIN "" true st1 stx))
 
 (def CONCATENATE #'CONCATENATE*)
 
@@ -350,13 +350,11 @@
 (defn TEXTJOIN*
   "Combines the text from multiple strings and/or arrays, with a specifiable delimiter separating the different texts."
   [delimeter ignore-empty & items]
-  (->> items
-       flatten
-       (map coerce/excel-str)
-       (filter (if ignore-empty
-                 not-empty
-                 identity))
-       (string/join delimeter)))
+  (let [items (flatten items)
+        items (if ignore-empty (keep identity items) items)]
+    (->> items
+         (map coerce/excel-str)
+         (string/join delimeter))))
 
 (def TEXTJOIN #'TEXTJOIN*)
 

test/axel_f/functions_test.cljc

@@ -577,7 +577,7 @@
   (t/is (= "foo, baz"
            ((af/compile "TEXTJOIN(\", \", TRUE, _)") ["foo" nil "baz"])))
 
-  (t/is (= "foo, , baz"
+  (t/is (= "foo, NULL, baz"
            ((af/compile "TEXTJOIN(\", \", FALSE, _)") ["foo" nil "baz"]))))
 
 (t/deftest complex-example

test/axel_f/issue_96_test.cljc

@@ -0,0 +1,10 @@
+(ns axel-f.issue-96-test
+  (:require #?(:clj [clojure.test :as t]
+               :cljs [cljs.test :as t :include-macros true])
+            [axel-f.excel :as af]))
+
+(t/deftest coercion-to-string-in-text-functions
+
+  (t/testing "ratio"
+
+    (t/is (= "310.3333333333333333" ((af/compile "CONCATENATE(.x, .y, .y / .x)") {"x" 3 "y" 1})))))

test/axel_f/jws_test.cljc

@@ -4,7 +4,7 @@
                :cljs [cljs.test :as t :include-macros true])))
 
 (t/deftest jws-hs256
-  #_(t/testing "Sign payload using HS256"
+  (t/testing "Sign payload using HS256"
     (t/is (= "eyJhbGciOiJIUzI1NiJ9.eyJmb28iOjEsImJhciI6WzQsNSwicXdlIl19.HU45XthYzICLPj8RvTeVQum2FLPdynx0MTsSCs5l-O0"
              ((af/compile "JWS.SIGN('HS256', JSON.ENCODE(OBJECT.NEW({{\"foo\", 1}, {\"bar\", {4, 5, 'qwe'}}})), 'password')")))))