Merge branch 'dev'

README.md

@@ -1,7 +1,7 @@
 Current [semantic](http://semver.org/) version:
 
 ```clojure
-[com.taoensso/touchstone "0.14.0"]
+[com.taoensso/touchstone "0.15.0"]
 ```
 
 # Touchstone, a Clojure split-testing library
@@ -26,7 +26,7 @@ Touchstone is an attempt to bring **dead-simple, high-power split-testing** to a
 Depend on Touchstone in your `project.clj`:
 
 ```clojure
-[com.taoensso/touchstone "0.14.0"]
+[com.taoensso/touchstone "0.15.0"]
 ```
 
 and `require` the library:
@@ -49,7 +49,7 @@ Traditional split-testing consists of 4 steps:
 
 The particular multi-armed bandit technique used by Touchstone means that we only concern ourselves with steps 1 and 3. Steps 2 and 4 are handled automatically by the algorithm.
 
-**To optimize a Ring web application**, start by adding `(taoensso.touchstone.ring/wrap-random-test-subject-id)` to your middleware stack.
+**To optimize a Ring web application**, start by adding `(taoensso.touchstone.ring/wrap-random-subject-id)` to your middleware stack.
 
 One or more named-test selectors can then be used as part of your page content:
 

project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso/touchstone "0.14.0"
+(defproject com.taoensso/touchstone "0.15.0"
   :description "Clojure split-testing library"
   :url "https://github.com/ptaoussanis/touchstone"
   :license {:name "Eclipse Public License"}

src/taoensso/touchstone/ring.clj

@@ -14,15 +14,14 @@
 
 (comment (bot-user-agent? {"user-agent" "GoogleBot"}))
 
-(defn wrap-random-test-subject-id
+(defn wrap-test-subject-id
   "Ring middleware that generates, sessionizes, and binds a test-subject id for
   requests eligible for split-testing (by default this excludes clients that
   report themselves as bots)."
-  [handler
-   & {:keys [eligible?-fn]
-      :or   {eligible?-fn (fn [request] (not (bot-user-agent? (:headers request))))}}]
+  [handler & [wrap-pred]]
   (fn [request]
-    (if-not (eligible?-fn request)
+    (if-not ((or wrap-pred (fn [request] (not (bot-user-agent? (:headers request)))))
+             request)
       (handler request)
 
       (if (contains? (:session request) :mab-subject-id)
@@ -31,8 +30,4 @@
 
         (let [new-id   (str (rand-int 2147483647))
               response (touchstone/with-test-subject new-id (handler request))]
-          (assoc-in response [:session :mab-subject-id] new-id))))))
-
-(defn make-wrap-random-test-subject-id
-  "DEPRECATED. Please use `wrap-random-test-subject-id."
-  [& args] (fn [handler] (apply wrap-random-test-subject-id handler args)))
+          (assoc-in response [:session :mab-subject-id] new-id))))))