From 007b5fcadc67d622a25842485027f0b5d22809eb Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Sun, 3 Aug 2014 16:44:07 -0400
Subject: [PATCH] Don't allow field names to start with hyphen

---
 doclet/src/clojure/play_clj_doclet/core.clj | 26 ++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/doclet/src/clojure/play_clj_doclet/core.clj b/doclet/src/clojure/play_clj_doclet/core.clj
index 6d84a08..6967c6c 100644
--- a/doclet/src/clojure/play_clj_doclet/core.clj
+++ b/doclet/src/clojure/play_clj_doclet/core.clj
@@ -16,36 +16,46 @@
 (defn split-string
   [s]
   (if (= s (string/upper-case s))
-    [s]
+    (string/split s #"_")
     (string/split s #"(?=[A-Z])")))
 
-(defn camel->keyword
+(defn string->keyword
   [s]
-  (->> (string/replace s "_" "-")
-       split-string
+  (->> (split-string s)
        (map string/lower-case)
        (string/join "-")
        keyword))
 
 (defn parse-param
   [^Parameter p]
-  [(.typeName p) (-> (.name p) camel->keyword name)])
+  [(.typeName p) (-> (.name p) string->keyword name)])
 
 (defn parse-doc-name
   [^Doc d]
   (cond
     (isa? (type d) ConstructorDoc)
     nil
+
     (isa? (type d) ClassDoc)
-    (subs (.name d) (+ 1 (.lastIndexOf (.name d) ".")))
+    (->> (+ 1 (.lastIndexOf (.name d) "."))
+         (subs (.name d))
+         string->keyword)
+
+    (isa? (type d) FieldDoc)
+    (let [k (string->keyword (.name d))
+          s (name k)]
+      (if (= \- (first s))
+        (keyword (subs s 1))
+        k))
+
     :else
-    (.name d)))
+    (string->keyword (.name d))))
 
 (defn parse-doc
   [^Doc d clj-name]
   (merge {}
          {:name (->> [(second (string/split clj-name #" "))
-                      (some-> (parse-doc-name d) camel->keyword)]
+                      (parse-doc-name d)]
                      (remove nil?)
                      (string/join " "))}
          (when (> (count (.commentText d)) 0)