@@ -1,12 +1,45 @@
 (ns microformats.parser
-  (:require [net.cgrand.enlive-html :as html]))
+  (:require [net.cgrand.enlive-html :as html]
+            [clojure.core.reducers :as r]
+            [clojure.string :as str]))
 
 ;;; Turn string into stream
 
+(defn mf-names-from-class
+  "Get microformat classnames from a class attribute"
+  [prefix]
+  (r/filter #(.startsWith % prefix)))
+
+(defn remove-mf-prefix
+  "Remove microformats prefixes from a class attribute"
+  [prefix]
+  (r/map #(apply str (drop (count prefix) %))))
+
+(defn- split-classes
+  "Split a whitespace-separated string."
+  [class]
+  (str/split class #"\s+"))
+
+(defn classes-to-props
+  "Convert class list to list of microformat property keywords"
+  [prefix]
+  (comp (r/map keyword)
+        (remove-mf-prefix prefix)
+        (mf-names-from-class prefix)))
+
+(defn element-to-classes
+  "Get list of classes from an element"
+  [el] (-> el
+           :attrs
+           :class
+           split-classes))
+
 (defn parse-p
   "Parse p-* classes within HTML element."
   [element]
-  (hash-map :properties (hash-map :name (first (:content (first (html/select element [(html/attr-starts :class "p-")])))))))
+  (let [el (first (html/select element [(html/attr-starts :class "p-")]))
+        props (into [] ((classes-to-props "p-") (element-to-classes el)))]
+    (hash-map :properties (apply hash-map (first props) (repeat (count props) (first (:content el)))))))
 
 (defn parse-h
   "Parse h-* classes within a HTML document."

@@ -9,5 +9,10 @@ (parse "")))))
 
 (deftest parse-p-inner-text
   (testing "Inner text of a p- property should be parsed")
-  (is (= {:items [{:properties {:name "Example User"}}] :rels {}}
-         (parse "<div class=\"h-card\"><p class=\"p-name\">Example User</p></div>"))))
+  (are [ex in] (= ex (parse in))
+       {:items [{:properties {:name "Example User"}}] :rels {}}
+       "<div class=\"h-card\"><p class=\"p-name\">Example User</p></div>"
+
+       {:items [{:properties {:nickname "exuser"}}] :rels {}}
+       "<div class=\"h-card\"><p class=\"p-nickname\">exuser</p></div>"
+       ))