java_utils.clj: made as-str variadic like str, fixes #18

This commit also includes tests for this function.

3 files changed, 42 insertions, 6 deletions

diff --git a/src/clojure/contrib/java_utils.clj b/src/clojure/contrib/java_utils.clj
index 75e8ca8b..5f34df16 100644
--- a/src/clojure/contrib/java_utils.clj
+++ b/src/clojure/contrib/java_utils.clj
@@ -90,11 +90,37 @@
      (reduce file (file parent child) more)))
 
 (defn as-str
-  "Returns the name or string representation of x"
-  [x]
-  (if (instance? clojure.lang.Named x)
-    (name x)
-    (str x)))
+  "Returns the name or string representation of args, concatenated to
+  a single string.  Like clojure.core/str, but uses the names of
+  keywords and symbols instead of their literal representation."
+  [& args]
+  (apply str (map (fn [x] (if (instance? clojure.lang.Named x)
+                            (name x) x))
+                  args)))
+(defn as-str
+  "Like clojure.core/str, but if an argument is a keyword or symbol,
+  its name will be used instead of its literal representation.
+
+  Example:
+     (str :foo :bar)     ;;=> \":foo:bar\"
+     (as-str :foo :bar)  ;;=> \"foobar\" 
+
+  Note that this does not apply to keywords or symbols nested within
+  data structures; they will be rendered as with str.
+
+  Example:
+     (str {:foo :bar})     ;;=> \"{:foo :bar}\"
+     (as-str {:foo :bar})  ;;=> \"{:foo :bar}\" "
+  ([] "")
+  ([x] (if (instance? clojure.lang.Named x)
+         (name x)
+         (str x)))
+  ([x & ys]
+     ((fn [#^StringBuilder sb more]
+        (if more
+          (recur (. sb  (append (as-str (first more)))) (next more))
+          (str sb)))
+      (new StringBuilder #^String (as-str x)) ys)))
 
 (defn get-system-property 
   "Get a system property."
diff --git a/src/clojure/contrib/test_contrib.clj b/src/clojure/contrib/test_contrib.clj
index 17f3e0e9..d7b2597b 100644
--- a/src/clojure/contrib/test_contrib.clj
+++ b/src/clojure/contrib/test_contrib.clj
@@ -20,7 +20,7 @@
      [:complex-numbers :fnmap :macro-utils :monads :pprint.pretty
       :pprint.cl-format :str-utils :shell-out :test-graph
       :test-dataflow :test-java-utils :test-lazy-seqs
-      :test-trace :test-jmx])
+      :test-trace :test-jmx :java-utils])
 
 (def test-namespaces
      (map #(symbol (str "clojure.contrib.test-contrib." (name %)))
diff --git a/src/clojure/contrib/test_contrib/java_utils.clj b/src/clojure/contrib/test_contrib/java_utils.clj
new file mode 100644
index 00000000..44901ad1
--- /dev/null
+++ b/src/clojure/contrib/test_contrib/java_utils.clj
@@ -0,0 +1,10 @@
+(ns clojure.contrib.test-contrib.java-utils
+  (:use clojure.test clojure.contrib.java-utils))
+
+(deftest t-as-str
+  (is (= "foo" (as-str "foo")))
+  (is (= "foo" (as-str 'foo)))
+  (is (= "foo" (as-str :foo)))
+  (is (= "[1 2 3]" (as-str [1 2 3])))
+  (is (= "Hello, World!" (as-str "Hello, " :World \!)))
+  (is (= (str {:foo :bar}) (as-str {:foo :bar}))))