Merge branch '0.11.2'

Author: amalloy

.gitignore

@@ -13,3 +13,5 @@ target/
 .ritz*
 .project
 .classpath
+doc/
+/.nrepl-port

build-docs.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+lein doc
+echo "*** Docs built ***"
+tmpdir=`mktemp -d /tmp/flatland-useful.XXXXXX`
+mv doc/** $tmpdir
+rmdir doc
+git checkout gh-pages
+git rm -rf .
+mv $tmpdir/** .
+git add -Av .
+git commit -m "Updated docs"
+echo "*** gh-pages branch updated ***"
+rmdir $tmpdir
+git checkout -
+echo "Run this to complete:"
+echo "git push origin gh-pages:gh-pages"

project.clj

@@ -1,12 +1,17 @@
-(defproject org.flatland/useful "0.10.0"
+(defproject org.flatland/useful "0.11.2"
   :description "A collection of generally-useful Clojure utility functions"
   :license {:name "Eclipse Public License - v 1.0"
             :url "http://www.eclipse.org/legal/epl-v10.html"
             :distribution :repo}
   :url "https://github.com/flatland/useful"
-  :dependencies [[org.clojure/clojure "1.5.0"]
+  :dependencies [[org.clojure/clojure "1.6.0"]
                  [org.clojure/tools.macro "0.1.1"]
                  [org.clojure/tools.reader "0.7.2"]]
-  :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.5,default" "test"]}
-  :profiles {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
-             :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}})
+  :aliases {"testall" ["with-profile" "dev,default:dev,1.3,default:dev,1.4,default:dev,1.5,default:dev,1.7,default" "test"]}
+  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0-alpha2"]]}
+             :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
+             :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
+             :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]} }
+  :plugins [[codox "0.8.0"]]
+  :codox {:src-dir-uri "http://github.com/flatland/useful/blob/develop/"
+          :src-linenum-anchor-prefix "L"})

src/flatland/useful/cli.clj

@@ -1,4 +1,5 @@
 (ns flatland.useful.cli
+  (:refer-clojure :exclude [update])
   (:use [flatland.useful.experimental :only [cond-let]]
         [flatland.useful.map :only [update]]))
 

src/flatland/useful/core.clj

@@ -1,4 +1,5 @@
 (ns flatland.useful.datatypes
+  (:refer-clojure :exclude [update])
   (:use [flatland.useful.map :only [position into-map update]]
         [flatland.useful.utils :only [invoke]]
         [flatland.useful.fn :only [fix]])

src/flatland/useful/datatypes.clj

@@ -28,7 +28,7 @@
   wrap a form with ?, and the form will be printed alongside
   its result. The result will still be passed along."
     [val]
-    (interrogate-form `(print) val))
+    (interrogate-form `(#(do (print %) (flush))) val))
 
   (defmacro ^{:dont-test "Complicated to test, and should work if ? does"}
     ?!

src/flatland/useful/debug.clj

@@ -14,7 +14,10 @@
   [dispatch-fn & options]
   (let [{:keys [hierarchy wrap default]} (into-map options)
         wrap    (or wrap identity)
-        require (memoize require)]
+        publics (memoize (fn [ns]
+                           (try (require ns)
+                                (ns-publics (find-ns ns))
+                                (catch java.io.FileNotFoundException e))))]
     (fn [& args]
       (let [fname   (apply dispatch-fn args)
             default (or default
@@ -23,10 +26,7 @@
                           {:no-wrap true}))]
         (loop [[ns method] (map symbol ((juxt namespace name) (symbol fname)))]
           (if-let [f (if ns
-                       (try (require ns)
-                            (-> (ns-publics (find-ns ns))
-                                (get method))
-                            (catch java.io.FileNotFoundException e))
+                       (get (publics ns) method)
                        default)]
             (let [wrap (if (:no-wrap (meta f))
                          identity

src/flatland/useful/dispatch.clj

@@ -230,7 +230,7 @@
 
 (defn lift-meta
   "Move some of the keys from m into its metadata, overriding existing values.
-   (lift-meta {:a 1 :b 2} [:a]) -> ^{:a 1} {:b 2]"
+   (lift-meta {:a 1 :b 2} [:a]) -> ^{:a 1} {:b 2}"
   [m & ks]
   (-> (apply dissoc m ks)
       (vary-meta merge (select-keys m ks))))

src/flatland/useful/experimental.clj

@@ -132,9 +132,9 @@
   (transform y)."
   ([modifier]
      (fn [a b]
-       (- (modifier a) (modifier b))))
+       (compare (modifier a) (modifier b))))
   ([direction modifier]
-     (let [f (comparator modifier)]
+     (let [f (key-comparator modifier)]
        (condp #(% %2) direction
          #{:desc :descending -} (comp - f)
          #{:asc :ascending +} f))))
@@ -169,3 +169,10 @@
                        (if (= args (get cache :args ::not-found))
                          cache
                          {:args args, :value (apply f args)})))))))
+
+(defn applied
+  "A version of f that uses apply on its args."
+  [f]
+  (partial apply f))
+
+(def ap "A shorthand version of applied" applied)