diff options
| -rwxr-xr-x | src/main/clojure/clojure/contrib/prxml.clj | 17 | ||||
| -rw-r--r-- | src/test/clojure/clojure/contrib/test_prxml.clj | 10 |
2 files changed, 21 insertions, 6 deletions
diff --git a/src/main/clojure/clojure/contrib/prxml.clj b/src/main/clojure/clojure/contrib/prxml.clj index a2362223..e99b11b6 100755 --- a/src/main/clojure/clojure/contrib/prxml.clj +++ b/src/main/clojure/clojure/contrib/prxml.clj @@ -27,7 +27,8 @@ :doc "Compact syntax for generating XML. See the documentation of \"prxml\" for details."} clojure.contrib.prxml - (:use [clojure.contrib.lazy-xml :only (escape-xml)])) + (:use [clojure.contrib.string :only (escape)] + [clojure.contrib.java :only (as-str)])) (def #^{:doc "If true, empty tags will have a space before the closing />"} @@ -38,16 +39,20 @@ for details."} and no extra line-breaks."} *prxml-indent* nil) -(defn- namestr [x] - (if (or (symbol? x) (keyword? x)) (name x) (str x))) - (def #^{:private true} *prxml-tag-depth* 0) (def #^{:private true} print-xml) ; forward declaration +(defn- escape-xml [s] + (escape {\< "<" + \> ">" + \& "&" + \' "'" + \" """} s)) + (defn- prxml-attribute [name value] (print " ") - (print (namestr name)) + (print (as-str name)) (print "=\"") (print (escape-xml (str value))) (print "\"")) @@ -88,7 +93,7 @@ for details."} (print ">")) (defmethod print-xml-tag :default [tag attrs contents] - (let [tag-name (namestr tag)] + (let [tag-name (as-str tag)] (when *prxml-indent* (newline) (dotimes [n (* *prxml-tag-depth* *prxml-indent*)] (print " "))) diff --git a/src/test/clojure/clojure/contrib/test_prxml.clj b/src/test/clojure/clojure/contrib/test_prxml.clj new file mode 100644 index 00000000..53b2b388 --- /dev/null +++ b/src/test/clojure/clojure/contrib/test_prxml.clj @@ -0,0 +1,10 @@ +(ns clojure.contrib.test-prxml + (:use clojure.test clojure.contrib.prxml)) + +(deftest prxml-basic + (is (= "<p>Hello, World!</p>" + (with-out-str (prxml [:p "Hello, World!"]))))) + +(deftest prxml-escaping + (is (= "<a href=\"foo&bar\">foo<bar</a>" + (with-out-str (prxml [:a {:href "foo&bar"} "foo<bar"]))))) |