meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #83 from madstap/master

Browse source 
Remove crouton dep because enlive does the same thing
This commit is contained in:
Carmen La 2017-01-16 17:55:12 -05:00 committed by GitHub
commit e1cb70dc1d
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
project.clj
View file

@ -7,7 +7,6 @@
[cheshire "5.6.3"] [cheshire "5.6.3"]
[clj-rss "0.2.3"] [clj-rss "0.2.3"]
[clj-text-decoration "0.0.3"] [clj-text-decoration "0.0.3"]
[crouton "0.1.2"]
[enlive "1.1.6"] [enlive "1.1.6"]
[hawk "0.2.11"] [hawk "0.2.11"]
[hiccup "1.0.5"] [hiccup "1.0.5"]

9
src/cryogen_core/toc.clj
View file

@ -1,6 +1,6 @@
(ns cryogen-core.toc (ns cryogen-core.toc
(:require [clojure.zip :as z] (:require [clojure.zip :as z]
[crouton.html :as html] [net.cgrand.enlive-html :as enlive]
[hiccup.core :as hiccup])) [hiccup.core :as hiccup]))
(def _h [:h1 :h2 :h3 :h4 :h5 :h6]) (def _h [:h1 :h2 :h3 :h4 :h5 :h6])
@ -102,13 +102,10 @@
:ol and true will result in an ordered list being generated for the table of :ol and true will result in an ordered list being generated for the table of
contents, while :ul will result in an unordered list. The default is an contents, while :ul will result in an unordered list. The default is an
ordered list." ordered list."
[^String html & {:keys [list-type] :or {list-type :ol}}] [html & {:keys [list-type] :or {list-type :ol}}]
(let [list-type (if (true? list-type) :ol list-type)] (let [list-type (if (true? list-type) :ol list-type)]
(-> html (-> html
(.getBytes "UTF-8") (enlive/html-snippet)
(java.io.ByteArrayInputStream.)
(html/parse)
:content
(get-headings) (get-headings)
(build-toc-tree) (build-toc-tree)
(build-toc list-type) (build-toc list-type)

6
test/cryogen_core/toc_test.clj
View file

@ -1,7 +1,7 @@
(ns cryogen-core.toc-test (ns cryogen-core.toc-test
(:require [clojure.test :refer :all] (:require [clojure.test :refer :all]
[clojure.string :as s] [clojure.string :as s]
[crouton.html :as html] [net.cgrand.enlive-html :as enlive]
[hiccup.core :as hiccup] [hiccup.core :as hiccup]
[cryogen-core.toc :refer :all])) [cryogen-core.toc :refer :all]))
@ -13,7 +13,7 @@
(defn parse-to-headings (defn parse-to-headings
[hiccup-seq] [hiccup-seq]
(-> hiccup-seq hiccup/html html/parse-string :content get-headings)) (-> hiccup-seq hiccup/html enlive/html-snippet get-headings))
; Test that the get-headings function properly filters non-headers ; Test that the get-headings function properly filters non-headers
(deftest test-get-headings (deftest test-get-headings
@ -101,5 +101,3 @@
(generate-toc htmlString :list-type :ol))) (generate-toc htmlString :list-type :ol)))
(is (= "<ul class=\"content\"><li><a href=\"#test\">Test</a></li></ul>" (is (= "<ul class=\"content\"><li><a href=\"#test\">Test</a></li></ul>"
(generate-toc htmlString :list-type :ul))))) (generate-toc htmlString :list-type :ul)))))