also store binding version as data for use in various places

Author: milt

src/main/com/yetanalytics/lrs/pedestal/interceptor.cljc

@@ -74,14 +74,16 @@
    {:name  ::set-version-bindings
     :enter (fn [ctx]
              (if-let [version (:com.yetanalytics.lrs/version ctx)]
-               (update
-                ctx
-                :bindings
-                assoc
-                #'xapi-schema.spec/*xapi-version*
-                (cond
-                  (cstr/starts-with? version "1") "1.0.3"
-                  (cstr/starts-with? version "2") "2.0.0"))
+               (let [spec-version (cond
+                                    (cstr/starts-with? version "1") "1.0.3"
+                                    (cstr/starts-with? version "2") "2.0.0")]
+                 (-> ctx
+                     (assoc :com.yetanalytics.lrs/spec-version spec-version)
+                     (update
+                      :bindings
+                      assoc
+                      #'xapi-schema.spec/*xapi-version*
+                      spec-version)))
                ctx))
     :leave (fn [ctx]
              (update ctx :bindings dissoc #'xapi-schema.spec/*xapi-version*))}))
@@ -176,7 +178,7 @@
              (assoc-in ctx
                        [:response :headers "x-experience-api-version"]
                        ;; Get version from context or latest patch
-                       (:com.yetanalytics.lrs/version ctx "2.0.0")))}))
+                       (:com.yetanalytics.lrs/spec-version ctx "2.0.0")))}))
 
 (defn calculate-etag [x]
   (sha-1 x))

src/main/com/yetanalytics/lrs/pedestal/interceptor/xapi.cljc

@@ -52,7 +52,7 @@
               (let [version (:com.yetanalytics.lrs/version ctx)]
                 ;; Version 2.0.0 and up do not allow this so we error
                 (if (or (nil? version)
-                        (not (.startsWith ^String version "1.0")))
+                        (not (.startsWith ^String version "1")))
                     (error!
                      ctx
                      "xAPI alternate request syntax not supported!")
@@ -190,13 +190,8 @@
            #?(:clj (conform-cheshire spec-kw raw-params)
               ;; Force binding of spec version in cljs
               :cljs
-              (let [v (:com.yetanalytics.lrs/version ctx)]
-                (binding [xs/*xapi-version*
-                          (cond
-                            (cstr/starts-with? v "1")
-                            "1.0.3"
-                            (cstr/starts-with? v "2")
-                            "2.0.0")]
+              (let [v (:com.yetanalytics.lrs/spec-version ctx)]
+                (binding [xs/*xapi-version* (or v "2.0.0")]
                   (conform-cheshire spec-kw raw-params))))
            {:keys [path-info
                    request-method]} request]

src/main/com/yetanalytics/lrs/pedestal/interceptor/xapi/statements.cljc

@@ -240,13 +240,8 @@
      #?(:clj (validate-request-statements* ctx)
         ;; Force binding of spec version in cljs
         :cljs
-        (let [version (:com.yetanalytics.lrs/version ctx)]
-          (binding [xs/*xapi-version* (cond
-                                        (cs/starts-with? version "1")
-                                        "1.0.3"
-                                        (cs/starts-with? version "2")
-                                        "2.0.0")]
-            (validate-request-statements* ctx)))))})
+        (binding [xs/*xapi-version* (:com.yetanalytics.lrs/spec-version ctx "2.0.0")]
+          (validate-request-statements* ctx))))})
 
 (defn scan-attachments
   "Scan attachment files with a user-provided function."

src/main/com/yetanalytics/lrs/pedestal/routes/documents.cljc

@@ -303,7 +303,7 @@
                   (if (and (or
                             ;; In 2.0, no headers ok for no doc
                             (= "2.0.0"
-                               (:com.yetanalytics.lrs/version ctx))
+                               (:com.yetanalytics.lrs/spec-version ctx))
                             ;; prior tests seem to want this for everything but
                             ;; profiles
                             (not (#{:xapi.activities.profile.PUT.request/params
@@ -338,7 +338,7 @@
                 (if (and (or
                           ;; In 2.0, no headers ok for no doc
                           (= "2.0.0"
-                             (:com.yetanalytics.lrs/version ctx))
+                             (:com.yetanalytics.lrs/spec-version ctx))
                           ;; prior tests seem to want this for everything but
                           ;; profiles
                           (not (#{:xapi.activities.profile.PUT.request/params