From 669a827edf4a44b1d2792b612002981528d7f118 Mon Sep 17 00:00:00 2001
From: Ryan Smith <rnsmith2@gmail.com>
Date: Tue, 31 May 2016 17:37:10 -0700
Subject: [PATCH] Upgrade prismatic schema

Also, replace the deprecated `either` schema command with the much more
efficient `cond-pre`, which for all the cases it was used before will
behave identically.
---
 project.clj                 |  2 +-
 src/om_bootstrap/input.cljs | 12 ++++++------
 src/om_bootstrap/nav.cljs   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project.clj b/project.clj
index 8086a91..6f8265b 100644
--- a/project.clj
+++ b/project.clj
@@ -21,7 +21,7 @@
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/core.async "0.2.374"]
                  [prismatic/om-tools "0.3.11" :exclusions [om]]
-                 [prismatic/schema "0.4.0"
+                 [prismatic/schema "1.1.1"
                   :exclusions [org.clojure/clojurescript]]
                  [org.omcljs/om "0.8.8" :scope "provided"]]
   :profiles {:provided
diff --git a/src/om_bootstrap/input.cljs b/src/om_bootstrap/input.cljs
index bf53fd3..c0ed216 100644
--- a/src/om_bootstrap/input.cljs
+++ b/src/om_bootstrap/input.cljs
@@ -27,11 +27,11 @@
 ;; ### Schema
 
 (def Addons
-  {(s/optional-key :addon-before) (s/either s/Str t/Component)
-   (s/optional-key :addon-after) (s/either s/Str t/Component)
-   (s/optional-key :addon-button) (s/either s/Str t/Component)
-   (s/optional-key :addon-button-before) (s/either s/Str t/Component)
-   (s/optional-key :addon-button-after) (s/either s/Str t/Component)})
+  {(s/optional-key :addon-before) (s/cond-pre s/Str t/Component)
+   (s/optional-key :addon-after) (s/cond-pre s/Str t/Component)
+   (s/optional-key :addon-button) (s/cond-pre s/Str t/Component)
+   (s/optional-key :addon-button-before) (s/cond-pre s/Str t/Component)
+   (s/optional-key :addon-button-after) (s/cond-pre s/Str t/Component)})
 
 (def FeedbackIcons
   "Helps render feedback icons."
@@ -66,7 +66,7 @@
   represents the final class to apply.
 
   TODO: Use class-set from om-tools."
-  [klasses :- {(s/either s/Str s/Keyword) s/Bool}]
+  [klasses :- {(s/cond-pre s/Str s/Keyword) s/Bool}]
   (->> (mapcat (fn [[k keep?]]
                  (when keep? [(name k)]))
                klasses)
diff --git a/src/om_bootstrap/nav.cljs b/src/om_bootstrap/nav.cljs
index 8df4bf2..3b201f5 100644
--- a/src/om_bootstrap/nav.cljs
+++ b/src/om_bootstrap/nav.cljs
@@ -49,7 +49,7 @@
 (def Nav
   (t/bootstrap
    {:bs-style (s/enum "tabs" "pills")
-    (s/optional-key :active-key) (s/either s/Str s/Num)
+    (s/optional-key :active-key) (s/cond-pre s/Str s/Num)
     (s/optional-key :active-href) s/Str
     (s/optional-key :stacked?) s/Bool
     (s/optional-key :justified?) s/Bool
@@ -171,7 +171,7 @@
   "Returns true if any of the necessary properties are in place to
   render the navbar-header and toggle button."
   [bs]
-  (boolean 
+  (boolean
     (or (:brand bs)
         (:toggle-button bs)
         (:toggle-nav-key bs))))