Skip to content

Adds option to omit headers #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danilomo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds option to omit headers #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/table/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns table.core
(:require table.width)
(:use [clojure.string :only [join]] ))
(:use [clojure.string :only [join blank?]] ))

(declare style-for format-cell render-rows-with-fields escape-newline render-rows table-str)

Expand All @@ -18,8 +18,11 @@
:top-dash "─" :dash "─" :bottom-dash "═"
:header-walls ["│ " " │ " " ║"] :body-walls ["│ " " │ " " ║"] }
:github-markdown {:top ["" "" ""] :middle ["|-" " | " "-|"] :bottom ["" "" ""]
:top-dash "" :dash "-" :bottom-dash "" :header-walls walls :body-walls walls }
})
:top-dash "" :dash "-" :bottom-dash "" :header-walls walls :body-walls walls }})

(defn with-separator [separator]
{:top ["" "" ""] :middle ["" "" ""] :bottom ["" "" ""]
:top-dash "" :dash "" :bottom-dash "" :header-walls ["" "" ""] :body-walls ["" separator ""] })

(defn table
"Generates an ascii table for almost any input that fits in your terminal.
Expand Down Expand Up @@ -47,14 +50,16 @@
"Returns rows and fields. Rows are a vector of vectors containing string cell values."
[table options]
(let [
skip-header (:skip-header options)
top-level-vec (not (coll? (first table)))
fields (cond
top-level-vec [:value]
(map? (first table)) (or (:fields options)
(distinct (vec (flatten (map keys table)))))
(map? table) [:key :value]
:else (first table))
rows (cond
rows (cond
skip-header table
top-level-vec (map #(vector %) table)
(map? (first table)) (map #(map (fn [k] (get % k)) fields) table)
(map? table) table
Expand All @@ -79,6 +84,7 @@

(defn- render-rows-with-fields [rows fields options]
(let [
skip-header (:skip-header options)
headers (map #(if (keyword? %) (name %) (str %)) fields)
widths (table.width/get-widths (cons headers rows))
fmt-row (fn [row]
Expand All @@ -96,8 +102,10 @@
header (wrap-row headers (style-for :header-walls))
body (map #(wrap-row (fmt-row %) (style-for :body-walls)) rows) ]

(concat [(border-for :top :top-dash) header (border-for :middle :dash)]
body [( border-for :bottom :bottom-dash)])))
(remove blank? (concat [(border-for :top :top-dash)]
(if skip-header [] [header (border-for :middle :dash)])
body
[( border-for :bottom :bottom-dash)]))))

(defn- escape-newline [string]
(clojure.string/replace string (str \newline) (char-escape-string \newline)))
Expand Down