Merge pull request #82 from madstap/master

Depend on enlive instead of tagsoup (to be able to upgrade to clojure 1.9.0)

project.clj

@@ -14,6 +14,6 @@
                            [selmer "1.10.3"]
                            [pandect "0.6.1"]
                            [hawk "0.2.11"]
-                           [clj-tagsoup "0.3.0" :exclusions [org.clojure/clojure]]]
+                           [enlive "1.1.6"]]
             :deploy-repositories [["snapshots" :clojars]
                                   ["releases" :clojars]])

src/cryogen_core/compiler.clj

@@ -5,8 +5,7 @@
             [clojure.java.io :refer [copy file reader writer]]
             [clojure.string :as s]
             [text-decoration.core :refer :all]
-            [pl.danieljanus.tagsoup :as tagsoup]
+            [net.cgrand.enlive-html :as enlive]
-            [hiccup.core :as hiccup]
             [cryogen-core.toc :refer [generate-toc]]
             [cryogen-core.sass :as sass]
             [cryogen-core.markup :as m]
@@ -295,23 +294,24 @@
                                      :uri         uri})))))
 
 (defn content-until-more-marker
-  [^String content]
+  "Returns the content until the <!--more--> special comment,
-  (let [index (.indexOf content "<!--more-->")]
+  closing any unclosed tags. Returns nil if there's no such comment."
-    (if (pos? index)
+  [content]
-      (let [s (subs content 0 index)]
+  (when-let [index (s/index-of content "<!--more-->")]
-        (->> ((tagsoup/parse-string s) 2)
+    (->> (subs content 0 index)
-             (drop 2)
+         enlive/html-snippet
-             hiccup/html)))))
+         enlive/emit*
+         (apply str))))
 
 (defn create-preview
   "Creates a single post preview"
   [blocks-per-preview post]
-  (merge post
+  (update post :content
-         {:content (or (content-until-more-marker (:content post))
+          #(or (content-until-more-marker %)
-                       (->> ((tagsoup/parse-string (:content post)) 2)
+               (->> (enlive/html-snippet %)
-                            (drop 2)
+                    (take blocks-per-preview)
-                            (take blocks-per-preview)
+                    enlive/emit*
-                            hiccup/html))}))
+                    (apply str)))))
 
 (defn create-previews
   "Returns a sequence of vectors, each containing a set of post previews"

test/cryogen_core/compiler_test.clj

@@ -22,7 +22,8 @@
 and more content.
   </div>
 </div>")
-         "<div id=\"post\"><div class=\"post-content\">
+         "<div id=\"post\">
+  <div class=\"post-content\">
     this post has more marker
 </div></div>")))