1.2.2 merges across fix for github issue #4 and additional tests

project.clj

@@ -1,4 +1,4 @@
-(defproject necessary-evil "1.2.1"
+(defproject necessary-evil "1.2.2"
   :description "An implementation of XML-RPC for the Clojure Ring HTTP stack"
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [org.clojure/clojure-contrib "1.2.0"]

src/necessary_evil/methodcall.clj

@@ -35,7 +35,7 @@
 
 (defn parse-params
   "returns a vector containing one element for each param in the method call"
-  [x] (vec (map parse-value (xml-> x :params :param :value first-child))))
+  [x] (vec (map (comp parse-value first-child) (xml-> x :params :param :value))))
 
 (defn parse
   "Takes xml structure representing an RPC method call and returns a new

src/necessary_evil/value.clj

@@ -80,7 +80,7 @@
 (defn parse-array [v] (vec (map parse-value
                                 (xml-> v :array :data :value first-child))))
 
-(defmulti parse-value #(:tag (zip/node %)))
+(defmulti parse-value #(when % (:tag (zip/node %))))
 
 (defmethod parse-value :i4               [v] (parse-int v))
 (defmethod parse-value :int              [v] (parse-int v))
@@ -94,7 +94,7 @@
 (defmethod parse-value :base64           [v] (-> (text v) Base64/decodeBase64))
 (defmethod parse-value :struct           [v] (parse-struct v))
 (defmethod parse-value :array            [v] (parse-array v))
-(defmethod parse-value :default          [v] (text v))
+(defmethod parse-value :default          [v] (if v (text v) ""))
 
 (defmethod parse-value :nil              [v]
   (if *allow-nils* nil

test/necessary_evil/test/core.clj

@@ -1,9 +1,12 @@
 (ns necessary-evil.test.core
   (:use [necessary-evil.core] :reload)
-  (:require [necessary-evil.methodcall :as methodcall] :reload)
+  (:require [necessary-evil.methodcall :as methodcall]
+            [necessary-evil.methodresponse :as methodresponse]
+            :reload)
   (:use [necessary-evil.value] :reload)
   (:use [clojure.test]
         [necessary-evil.xml-utils :only [to-xml emit]])
+  (:use [ring.adapter.jetty :only [run-jetty]])
   (:require [clj-time.core :as time]
             [clojure.xml :as xml])
   (:import org.apache.commons.codec.binary.Base64))
@@ -35,6 +38,15 @@
             <params><param><value>string</value></param></params>
         </methodCall>")
 
+(defxml method-call-empty-default-arg xml-prolog
+        "<methodCall>
+            <methodName>test.method.name</methodName>
+            <params><param><value></value></param></params>
+        </methodCall>")
+
+(defxml github-issue-4-xml xml-prolog
+  "<methodResponse><params><param><value><struct><member><name>foo</name><value></value></member><member><name>bar</name><value>xyz</value></member></struct></value></param></params></methodResponse>")
+
 (defxml method-call-string-arg xml-prolog
         "<methodCall>
             <methodName>test.method.name</methodName>
@@ -230,6 +242,8 @@
 (deftest params
   (is (= (methodcall/parse-params method-call-default-arg) ["string"]) 
       "did not parse untyped string correctly")
+  (is (= (methodcall/parse-params method-call-empty-default-arg) [""])
+      "did not parse untyped empty string correctly")
   (is (= (methodcall/parse-params method-call-string-arg) ["string"]) 
       "did not parse string correctly")
   (is (= (methodcall/parse-params method-call-int-arg)
@@ -275,5 +289,27 @@
 (deftest emit-method-call-test
     (is (= (to-xml (with-out-str (emit (methodcall/unparse (necessary-evil.methodcall.MethodCall. :test.method.name [])))))
          method-call-test-method-name)))
-
-
+
+
+(defn- ping-server [port]
+ (let [ep (end-point {"method" (fn [argument] {"argument" argument})})]
+   (run-jetty ep {:port port :join? false})))
+
+(deftest chars-rountrip
+ (let [port 12254
+       jetty-server (ping-server port)
+       non-US-ASCII "Eléonore"]
+   (try
+     ;; test non-US-ASCII chars roundtrip
+     (is (= non-US-ASCII
+            (:argument (call (str "http://localhost:" port)
+                             "method"
+                             non-US-ASCII))))
+     (finally (.stop jetty-server)))))
+
+
+(deftest github-issue-4
+  (is (methodresponse/parse github-issue-4-xml)
+      {:foo ""
+       :bar "xyz"}))
+