Fixed #14, You can now have a top border (before header) and a bottom border as well (after last line)

* Added tests to test various use cases
* Added .travis.yml for travis integration

.gitignore

@@ -1 +1,2 @@
 tags
+.vim-flavor/

.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: rake ci

CHANGELOG.md

@@ -1,4 +1,16 @@
 # Change Log
+## Version 3.2
+* Added tests to test various use cases using <a
+  href='https://github.com/kana/vim-vspec'>Vspec</a>..
+* Added travis integration for automated tests.
+
+## Version 3.1
+* Removed borders. You can now optionally create a table header by simply
+  adding a header border immidiately after the header line by using the
+  iabbrev trigger '+-'. Just type that on the line immidiately after the
+  header and press space / \<CR\> to complete the header border.
+* Some Bug Fixes
+
 ## Version 3.0
 * Removed dependence on Tabular and added code borrowed from Tabular for
   aligning the table rows.

Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'vim-flavor', '~> 1.1'

Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    blankslate (2.1.2.4)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    rake (10.1.0)
+    thor (0.18.1)
+    vim-flavor (1.1.2)
+      parslet (~> 1.0)
+      thor (~> 0.14)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  vim-flavor (~> 1.1)

README.md

@@ -1,4 +1,4 @@
-# VIM Table Mode
+# VIM Table Mode [![Build Status](https://travis-ci.org/dhruvasagar/soulmate_rails.png?branch=master)](https://travis-ci.org/dhruvasagar/soulmate_rails)
 
 An awesome automatic table creator & formatter allowing one to create neat
 tables as you type.
@@ -11,17 +11,21 @@ CHANGELOG.md </a>
 ## Getting Started
 ### Installation
 
-There are 2 ways to do this
+There are several ways to do this
 
 1. I recommend installing <a
-   href="https://github.com/tpope/vim-pathogen">pathogen.vim</a> and then
-   adding a git submodule for your plugin:
+   href="https://github.com/Shougo/neobundle.vim">NeoBundle</a> and then just
+   add `NeoBundle 'dhruvasagar/vim-table-mode'` to your ~/.vimrc
+
+2. If you are using <a
+   href="https://github.com/tpope/vim-pathogen">pathogen.vim</a>, then
+   add a git submodule for your plugin:
 
    ```sh
 $ cd ~/.vim
 $ git submodule add git@github.com:dhruvasagar/vim-table-mode.git bundle/table-mode
    ```
-2. Copy autoload/todomode.vim, plugin/todo-mode.vim, doc/todo-mode.txt to
+3. Copy autoload/todomode.vim, plugin/todo-mode.vim, doc/todo-mode.txt to
    respective ~/.vim/autoload/, ~/.vim/plugin and ~/.vim/doc under UNIX or 
    vimfiles/autoload/, vimfiles/plugin/ and vimfiles/doc under WINDOWS and
    restart VIM

Rakefile

@@ -0,0 +1,13 @@
+#!/usr/bin/env rake
+
+task :ci => [:dump, :test]
+
+task :dump do
+  sh 'vim --version'
+end
+
+task :test do
+  sh 'bundle exec vim-flavor test'
+end
+
+task :default => :test

VimFlavor.lock

@@ -0,0 +1 @@
+kana/vim-vspec (1.1.2)

autoload/tablemode.vim

@@ -1,10 +1,10 @@
-" ==============================  Header ==================================={{{
+" ==============================  Header ======================================
 " File:          autoload/tablemode.vim
 " Description:   Table mode for vim for creating neat tables.
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       3.0
+" Version:       3.2
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.
@@ -17,7 +17,7 @@
 "                of any kind, either expressed or implied. In no event will
 "                the copyright holder be liable for any damamges resulting
 "                from the use of this software.
-" ==========================================================================}}}
+" =============================================================================
 
 " Private Functions {{{1
 
@@ -25,30 +25,25 @@ if exists('g:autoloaded_table_mode') "{{{2
   finish
 endif
 let g:autoloaded_table_mode = 1
-" }}}2
 
 function! s:throw(string) abort "{{{2
   let v:errmsg = 'table-mode: ' . a:string
   throw v:errmsg
 endfunction
-" }}}2
 
 function! s:sub(str,pat,rep) abort "{{{2
   return substitute(a:str,'\v\C'.a:pat,a:rep,'')
 endfunction
-" }}}2
 
 function! s:gsub(str,pat,rep) abort "{{{2
   return substitute(a:str,'\v\C'.a:pat,a:rep,'g')
 endfunction
-" }}}2
 
 function! s:SetBufferOptDefault(opt, val) "{{{2
   if !exists('b:' . a:opt)
     let b:{a:opt} = a:val
   endif
 endfunction
-" }}}2
 
 function! s:Line(line) "{{{2
   if type(a:line) == type('')
@@ -57,19 +52,16 @@ function! s:Line(line) "{{{2
     return a:line
   endif
 endfunction
-" }}}2
 
 " function! s:Strlen(text) - Count multibyte characters accurately {{{2
 " See :h strlen() for more details
 function! s:Strlen(text)
   return strlen(substitute(a:text, '.', 'x', 'g'))
 endfunction
-" }}}2
 
 function! s:Strip(string) "{{{2
   return matchstr(a:string, '^\s*\zs.\{-}\ze\s*$')
 endfunction
-" }}}2
 
 function! s:Sum(list) "{{{2
   let result = 0.0
@@ -84,12 +76,10 @@ function! s:Sum(list) "{{{2
   endfor
   return result
 endfunction
-" }}}2
 
 function! s:Average(list) "{{{2
   return s:Sum(a:list)/len(a:list)
 endfunction
-" }}}2
 
 function! s:GetCommentStart() "{{{2
   let cstring = &commentstring
@@ -99,7 +89,6 @@ function! s:GetCommentStart() "{{{2
     return ''
   endif
 endfunction
-" }}}2
 
 function! s:GetCommentEnd() "{{{2
   let cstring = &commentstring
@@ -114,7 +103,6 @@ function! s:GetCommentEnd() "{{{2
     return ''
   endif
 endfunction
-" }}}2
 
 function! s:StartExpr() "{{{2
   let cstart = s:GetCommentStart()
@@ -124,7 +112,7 @@ function! s:StartExpr() "{{{2
     return '^\s*'
   endif
 endfunction
-" }}}2
+
 
 function! s:EndExpr() "{{{2
   let cend = s:GetCommentEnd()
@@ -134,7 +122,14 @@ function! s:EndExpr() "{{{2
     return '\s*$'
   endif
 endfunction
-" }}}2
+
+function! s:HeaderBorderExpr() "{{{2
+  return s:StartExpr() .
+        \ '[' . g:table_mode_corner . g:table_mode_separator . ']' .
+        \ '[' . g:table_mode_fillchar . g:table_mode_corner . ']*' .
+        \ '[' . g:table_mode_corner . g:table_mode_separator . ']' .
+        \ s:EndExpr()
+endfunction
 
 function! s:StartCommentExpr() "{{{2
   let cstartexpr = s:GetCommentStart()
@@ -144,7 +139,6 @@ function! s:StartCommentExpr() "{{{2
     return ''
   endif
 endfunction
-" }}}2
 
 function! s:EndCommentExpr() "{{{2
   let cendexpr = s:GetCommentEnd()
@@ -154,7 +148,6 @@ function! s:EndCommentExpr() "{{{2
     return ''
   endif
 endfunction
-" }}}2
 
 function! s:IsTableModeActive() "{{{2
   if g:table_mode_always_active | return 1 | endif
@@ -162,12 +155,11 @@ function! s:IsTableModeActive() "{{{2
   call s:SetBufferOptDefault('table_mode_active', 0)
   return b:table_mode_active
 endfunction
-" }}}2
 
 function! s:RowGap() "{{{2
-  return g:table_mode_border ? 2 : 1
+  " Getting rid of borders, so the row gap is now just 1
+  return 1
 endfunction
-" }}}2
 
 function! s:ToggleMapping() "{{{2
   if exists('b:table_mode_active') && b:table_mode_active
@@ -177,64 +169,48 @@ function! s:ToggleMapping() "{{{2
 
     execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
           \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
+
+    execute "inoremap <silent> <buffer> " . g:table_mode_corner .
+          \ g:table_mode_fillchar . " <Esc>:call tablemode#AddHeaderBorder('.')<CR>A"
   else
     execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
+
+    execute "iunmap <silent> <buffer> " . g:table_mode_corner . g:table_mode_fillchar
   endif
 endfunction
-" }}}2
 
 function! s:SetActive(bool) "{{{2
   let b:table_mode_active = a:bool
   call s:ToggleMapping()
 endfunction
-" }}}2
 
-function! s:GenerateBorder(line) "{{{2
-  let line_val = getline(a:line)
-  let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
-  let border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
-
-  let cstartexpr = s:StartCommentExpr()
-  if s:Strlen(cstartexpr) > 0 && getline(a:line) =~# cstartexpr
-    let sce = matchstr(line_val, s:StartCommentExpr())
-    let ece = matchstr(line_val, s:EndCommentExpr())
-    return sce . border . ece
-  elseif getline(a:line) =~# s:StartExpr()
-    let indent = matchstr(line_val, s:StartExpr())
-    return indent . border
-  else
-    return border
-  endif
-endfunction
-" }}}2
-
-function! s:UpdateLineBorder(line) "{{{2
+function! s:GenerateHeaderBorder(line) "{{{2
   let line = s:Line(a:line)
-
-  let hf = s:StartExpr() . g:table_mode_corner . '[' . g:table_mode_corner .
-        \  g:table_mode_fillchar . ']*' . g:table_mode_corner . '\?' . s:EndExpr()
-
-  let rowgap = s:RowGap()
-  let border = s:GenerateBorder(line)
-
-  let [prev_line, next_line] = [getline(line-1), getline(line+1)]
-  if next_line =~# hf
-    if s:Strlen(border) > s:Strlen(s:GenerateBorder(line + rowgap)) || !tablemode#IsATableRow(line + rowgap)
-      call setline(line+1, border)
+  if tablemode#IsATableRow(line - s:RowGap()) || tablemode#IsATableRow(line + s:RowGap())
+    let line_val = ''
+    if tablemode#IsATableRow(line + s:RowGap())
+      let line_val = getline(line + s:RowGap())
     endif
-  else
-    call append(line, border)
-  endif
-
-  if prev_line =~# hf
-    if s:Strlen(border) > s:Strlen(s:GenerateBorder(line - rowgap)) || !tablemode#IsATableRow(line - rowgap)
-      call setline(line-1, border)
+    if tablemode#IsATableRow(line - s:RowGap()) && s:Strlen(line_val) < s:Strlen(getline(line - s:RowGap()))
+      let line_val = getline(line - s:RowGap())
+    endif
+    let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
+    let border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
+    let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_separator . '\1' . g:table_mode_separator , '')
+
+    let cstartexpr = s:StartCommentExpr()
+    if s:Strlen(cstartexpr) > 0 && getline(line) =~# cstartexpr
+      let sce = matchstr(line_val, s:StartCommentExpr())
+      let ece = matchstr(line_val, s:EndCommentExpr())
+      return sce . border . ece
+    elseif getline(line) =~# s:StartExpr()
+      let indent = matchstr(line_val, s:StartExpr())
+      return indent . border
+    else
+      return border
     endif
-  else
-    call append(line-1, border)
   endif
 endfunction
-" }}}2
 
 function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
   let delim = g:table_mode_delimiter
@@ -242,31 +218,34 @@ function! s:ConvertDelimiterToSeparator(line, ...) "{{{2
   if delim ==# ','
     silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs,\\ze[^\'\"]*[\'\"]/__COMMA__/g"
   endif
-  silent! execute a:line . 's/' . s:StartExpr() . '\zs\ze.\|' . delim .  '\|.\zs\ze' . s:EndExpr() . '/' .
+
+  let [cstart, cend] = [s:GetCommentStart(), s:GetCommentEnd()]
+  let [match_char_start, match_char_end] = ['.', '.']
+  if s:Strlen(cend) > 0 | let match_char_end = '[^' . cend . ']' | endif
+  if s:Strlen(cstart) > 0 | let match_char_start = '[^' . cstart . ']' | endif
+
+  silent! execute a:line . 's/' . s:StartExpr() . '\zs\ze' . match_char_start .
+        \ '\|' . delim .  '\|' . match_char_end . '\zs\ze' . s:EndExpr() . '/' .
         \ g:table_mode_separator . '/g'
+
   if delim ==# ','
     silent! execute a:line . 's/' . "[\'\"][^\'\"]*\\zs__COMMA__\\ze[^\'\"]*[\'\"]/,/g"
   endif
 endfunction
-" }}}2
 
 function! s:Tableizeline(line, ...) "{{{2
   let delim = g:table_mode_delimiter
   if a:0 && type(a:1) == type('') && !empty(a:1) | let delim = a:1[1:-1] | endif
   call s:ConvertDelimiterToSeparator(a:line, delim)
-  if g:table_mode_border | call s:UpdateLineBorder(a:line) | endif
 endfunction
-" }}}2
 
 function! s:IsFirstCell() "{{{2
   return tablemode#ColumnNr('.') ==# 1
 endfunction
-" }}}2
 
 function! s:IsLastCell() "{{{2
   return tablemode#ColumnNr('.') ==# tablemode#ColumnCount('.')
 endfunction
-" }}}2
 
 function! s:GetFirstRow(line) "{{{2
   if tablemode#IsATableRow(a:line)
@@ -279,14 +258,12 @@ function! s:GetFirstRow(line) "{{{2
     return line
   endif
 endfunction
-" }}}2
 
 function! s:MoveToFirstRow() "{{{2
   if tablemode#IsATableRow('.')
     call cursor(s:GetFirstRow('.'), col('.'))
   endif
 endfunction
-" }}}2
 
 function! s:GetLastRow(line) "{{{2
   if tablemode#IsATableRow(a:line)
@@ -299,14 +276,12 @@ function! s:GetLastRow(line) "{{{2
     return line
   endif
 endfunction
-" }}}2
 
 function! s:MoveToLastRow() "{{{2
   if tablemode#IsATableRow('.')
     call cursor(s:GetLastRow('.'), col('.'))
   endif
 endfunction
-" }}}2
 
 function! s:MoveToStartOfCell() "{{{2
   if getline('.')[col('.')-1] ==# g:table_mode_separator && !s:IsLastCell()
@@ -315,7 +290,6 @@ function! s:MoveToStartOfCell() "{{{2
     execute 'normal! F' . g:table_mode_separator . '2l'
   endif
 endfunction
-" }}}2
 
 " function! s:GetCells() - Function to get values of cells in a table {{{2
 " s:GetCells(row) - Get values of all cells in a row as a List.
@@ -338,7 +312,7 @@ function! s:GetCells(line, ...) abort
       let line = s:GetFirstRow(line)
       while tablemode#IsATableRow(line)
         let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
-        call add(values, s:Strip(split(row_line, g:table_mode_separator)[colm>0?colm-1:colm]))
+        call add(values, s:Strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
         let line = line + s:RowGap()
       endwhile
       return values
@@ -353,12 +327,12 @@ function! s:GetCells(line, ...) abort
       if colm == 0
         return map(split(row_line, g:table_mode_separator), 's:Strip(v:val)')
       else
-        return s:Strip(split(row_line, g:table_mode_separator)[colm>0?colm-1:colm])
+        let split_line = split(row_line, g:table_mode_separator)
+        return s:Strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
       endif
     endif
   endif
 endfunction
-" }}}2
 
 function! s:GetCell(...) "{{{2
   if a:0 == 0
@@ -369,7 +343,6 @@ function! s:GetCell(...) "{{{2
 
   return s:GetCells('.', row, col)
 endfunction
-" }}}2
 
 function! s:SetCell(val, ...) abort "{{{2
   if a:0 == 0
@@ -385,6 +358,7 @@ function! s:SetCell(val, ...) abort "{{{2
     let line_val = getline(line)
     let cstartexpr = s:StartCommentExpr()
     let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
+    if len(values) < colm | return | endif
     let values[colm-1] = a:val
     let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
     if s:Strlen(cstartexpr) > 0 && line_val =~# cstartexpr
@@ -396,33 +370,28 @@ function! s:SetCell(val, ...) abort "{{{2
     call tablemode#TableRealign(line)
   endif
 endfunction
-" }}}2
 
 function! s:GetRow(row, ...) abort "{{{2
   let line = a:0 < 1 ? '.' : a:1
   return s:GetCells(line, a:row)
 endfunction
-" }}}2
 
 function! s:GetRowColumn(col, ...) abort "{{{2
   let line = a:0 < 1 ? '.' : a:1
   let row = tablemode#RowNr('.')
   return s:GetCells(line, row, a:col)
 endfunction
-" }}}2
 
 function! s:GetColumn(col, ...) abort "{{{2
   let line = a:0 < 1 ? '.' : a:1
   return s:GetCells(line, 0, a:col)
 endfunction
-" }}}2
 
 function! s:GetColumnRow(row, ...) abort "{{{2
   let line = a:0 < 1 ? '.' : a:1
   let col = tablemode#ColumnNr('.')
   return s:GetCells(line, a:row, col)
 endfunction
-" }}}2
 
 function! s:ParseRange(range, ...) "{{{2
   if a:0 < 1
@@ -451,10 +420,9 @@ function! s:ParseRange(range, ...) "{{{2
   else
     let [row2, col2] = [rcs2[0], default_col]
   endif
-  
+
   return [row1, col1, row2, col2]
 endfunction
-" }}}2
 
 " function! s:GetCellRange(range, ...) {{{2
 " range: A string representing range of cells.
@@ -498,7 +466,6 @@ function! s:GetCellRange(range, ...) abort
 
   return values
 endfunction
-" }}}2
 
 " Borrowed from Tabular : {{{2
 
@@ -507,7 +474,6 @@ endfunction
 function! s:StripTrailingSpaces(string)
   return matchstr(a:string, '^.\{-}\ze\s*$')
 endfunction
-" }}}3
 
 function! s:Padding(string, length, where) "{{{3
   let gap_length = a:length - s:Strlen(a:string)
@@ -521,7 +487,6 @@ function! s:Padding(string, length, where) "{{{3
     return repeat(" ", left) . a:string . repeat(" ", right)
   endif
 endfunction
-" }}}3
 
 " function! s:Split() - Split a string into fields and delimiters {{{3
 " Like split(), but include the delimiters as elements
@@ -565,7 +530,6 @@ function! s:Split(string, delim)
 
   return rv
 endfunction
-" }}}3
 
 function! s:Align(lines) "{{{3
   let lines = map(a:lines, 's:Split(v:val, g:table_mode_separator)')
@@ -614,23 +578,27 @@ function! s:Align(lines) "{{{3
 
   return lines
 endfunction
-" }}}3
 
-" }}}2
 
-" }}}1
 
 " Public API {{{1
 
+function! tablemode#sid() "{{{2
+  return maparg('<SID>', 'n')
+endfunction
+nnoremap <SID> <SID>
+
+function! tablemode#scope() "{{{2
+  return s:
+endfunction
+
 function! tablemode#GetLastRow(line) "{{{2
   return s:GetLastRow(a:line)
 endfunction
-" }}}2
 
 function! tablemode#GetFirstRow(line) "{{{2
   return s:GetFirstRow(a:line)
 endfunction
-" }}}2
 
 function! tablemode#TableizeInsertMode() "{{{2
   if s:IsTableModeActive() && getline('.') =~# (s:StartExpr() . g:table_mode_separator)
@@ -641,17 +609,14 @@ function! tablemode#TableizeInsertMode() "{{{2
     call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
   endif
 endfunction
-" }}}2
 
 function! tablemode#TableModeEnable() "{{{2
   call s:SetActive(1)
 endfunction
-" }}}2
 
 function! tablemode#TableModeDisable() "{{{2
   call s:SetActive(0)
 endfunction
-" }}}2
 
 function! tablemode#TableModeToggle() "{{{2
   if g:table_mode_always_active
@@ -661,25 +626,17 @@ function! tablemode#TableModeToggle() "{{{2
   call s:SetBufferOptDefault('table_mode_active', 0)
   call s:SetActive(!b:table_mode_active)
 endfunction
-" }}}2
 
 function! tablemode#TableizeRange(...) range "{{{2
-  let shift = 1
-  if g:table_mode_border | let shift += 1 | endif
-  call s:Tableizeline(a:firstline, a:1)
-  undojoin
-  " The first one causes 2 extra lines for top & bottom border while the
-  " following lines cause only 1 for the bottom border.
-  let lnum = a:firstline + shift + (g:table_mode_border > 0)
-  while lnum < (a:firstline + (a:lastline - a:firstline + 1)*shift)
+  let lnum = a:firstline
+  while lnum < (a:firstline + (a:lastline - a:firstline + 1)*s:RowGap())
     call s:Tableizeline(lnum, a:1)
     undojoin
-    let lnum = lnum + shift
+    let lnum = lnum + s:RowGap()
   endwhile
 
-  if g:table_mode_border | call tablemode#TableRealign(lnum - shift) | endif
+  call tablemode#TableRealign(lnum - s:RowGap())
 endfunction
-" }}}2
 
 function! tablemode#TableizeByDelimiter() "{{{2
   let delim = input('/')
@@ -689,21 +646,35 @@ function! tablemode#TableizeByDelimiter() "{{{2
     exec line("'<") . ',' . line("'>") . "call tablemode#TableizeRange('/' . delim)"
   endif
 endfunction
-" }}}2
+
+function! tablemode#AddHeaderBorder(line) "{{{2
+  call setline(a:line, s:GenerateHeaderBorder(a:line))
+endfunction
 
 function! tablemode#TableRealign(line) "{{{2
   let line = s:Line(a:line)
 
   let [lnums, lines] = [[], []]
-  let tline = line
-  while tablemode#IsATableRow(tline)
+  let [tline, blines] = [line, []]
+  while tablemode#IsATableRow(tline) || getline(tline) =~# s:HeaderBorderExpr()
+    if getline(tline) =~# s:HeaderBorderExpr()
+      call insert(blines, tline)
+      let tline = tline - s:RowGap()
+      continue
+    endif
     call insert(lnums, tline)
     call insert(lines, getline(tline))
     let tline = tline - s:RowGap()
   endwhile
 
   let tline = line + s:RowGap()
-  while tablemode#IsATableRow(tline)
+
+  while tablemode#IsATableRow(tline) || getline(tline) =~# s:HeaderBorderExpr()
+    if getline(tline) =~# s:HeaderBorderExpr()
+      call insert(blines, tline)
+      let tline = tline + s:RowGap()
+      continue
+    endif
     call add(lnums, tline)
     call add(lines, getline(tline))
     let tline = tline + s:RowGap()
@@ -714,16 +685,32 @@ function! tablemode#TableRealign(line) "{{{2
   for lnum in lnums
     let index = index(lnums, lnum)
     call setline(lnum, lines[index])
-    undojoin
-    call s:UpdateLineBorder(lnum)
+  endfor
+
+  for bline in blines
+    call tablemode#AddHeaderBorder(bline)
   endfor
 endfunction
-" }}}2
 
 function! tablemode#IsATableRow(line) "{{{2
-  return getline(a:line) =~# (s:StartExpr() . g:table_mode_separator)
+  return getline(a:line) =~# (s:StartExpr() . g:table_mode_separator . '[^' .
+        \ g:table_mode_fillchar . ']*[^' . g:table_mode_corner . ']*$')
+endfunction
+
+function! tablemode#IsATableHeader(line) "{{{2
+  return getline(a:line) =~# s:HeaderBorderExpr()
+endfunction
+
+function! tablemode#LineNr(row) "{{{2
+  if tablemode#IsATableRow('.')
+    let line = s:Line('.')
+    let row = tablemode#RowNr('.')
+    if a:row != row
+      let line += a:row - row
+    endif
+    return line
+  endif
 endfunction
-" }}}2
 
 function! tablemode#RowCount(line) "{{{2
   let line = s:Line(a:line)
@@ -742,7 +729,6 @@ function! tablemode#RowCount(line) "{{{2
 
   return totalRowCount
 endfunction
-" }}}2
 
 function! tablemode#RowNr(line) "{{{2
   let line = s:Line(a:line)
@@ -755,14 +741,12 @@ function! tablemode#RowNr(line) "{{{2
 
   return rowNr
 endfunction
-" }}}2
 
 function! tablemode#ColumnCount(line) "{{{2
   let line = s:Line(a:line)
 
   return s:Strlen(substitute(getline(line), '[^' . g:table_mode_separator . ']', '', 'g'))-1
 endfunction
-" }}}2
 
 function! tablemode#ColumnNr(pos) "{{{2
   let pos = []
@@ -776,13 +760,14 @@ function! tablemode#ColumnNr(pos) "{{{2
   let row_start = stridx(getline(pos[0]), g:table_mode_separator)
   return s:Strlen(substitute(getline(pos[0])[(row_start):pos[1]-2], '[^' . g:table_mode_separator . ']', '', 'g'))
 endfunction
-" }}}2
 
 function! tablemode#TableMotion(direction) "{{{2
   if tablemode#IsATableRow('.')
     if a:direction ==# 'l'
       if s:IsLastCell()
-        if !tablemode#IsATableRow(line('.') + s:RowGap()) | return | endif
+        if !tablemode#IsATableHeader(line('.') + s:RowGap()) && !tablemode#IsATableRow(line('.') + s:RowGap())
+          return
+        endif
         call tablemode#TableMotion('j')
         normal! 0
       endif
@@ -795,7 +780,9 @@ function! tablemode#TableMotion(direction) "{{{2
       endif
     elseif a:direction ==# 'h'
       if s:IsFirstCell()
-        if !tablemode#IsATableRow(line('.') - s:RowGap()) | return | endif
+        if !tablemode#IsATableHeader(line('.') - s:RowGap()) && !tablemode#IsATableRow(line('.') - s:RowGap())
+          return
+        endif
         call tablemode#TableMotion('k')
         normal! $
       endif
@@ -807,13 +794,20 @@ function! tablemode#TableMotion(direction) "{{{2
         execute 'normal! 2F' . g:table_mode_separator . '2l'
       endif
     elseif a:direction ==# 'j'
-      if tablemode#IsATableRow(line('.') + s:RowGap()) | execute 'normal ' . s:RowGap() . 'j' | endif
+      if tablemode#IsATableRow(line('.') + s:RowGap())
+        execute 'normal ' . s:RowGap() . 'j'
+      elseif tablemode#IsATableHeader(line('.') + s:RowGap())
+        execute 'normal ' . (s:RowGap() + 1) . 'j'
+      endif
     elseif a:direction ==# 'k'
-      if tablemode#IsATableRow(line('.') - s:RowGap()) | execute 'normal ' . s:RowGap() . 'k' | endif
+      if tablemode#IsATableRow(line('.') - s:RowGap())
+        execute 'normal ' . s:RowGap() . 'k'
+      elseif tablemode#IsATableHeader(line('.') - s:RowGap())
+        execute 'normal ' . (s:RowGap() + 1) . 'k'
+      endif
     endif
   endif
 endfunction
-" }}}2
 
 function! tablemode#CellTextObject() "{{{2
   if tablemode#IsATableRow('.')
@@ -827,12 +821,25 @@ function! tablemode#CellTextObject() "{{{2
     endif
   endif
 endfunction
-" }}}2
 
 function! tablemode#DeleteColumn() "{{{2
   if tablemode#IsATableRow('.')
     for i in range(v:count1)
-      call s:MoveToFirstRow()
+      call s:MoveToStartOfCell()
+
+      if tablemode#IsATableRow(line('.') + 1)
+        call s:MoveToFirstRow()
+        " If we have a header delete it first
+        if tablemode#IsATableRow(line('.')-2)
+          call cursor(line('.')-2, col('.'))
+          silent! execute "normal! h\<C-V>f" . g:table_mode_separator
+          normal! jdjj
+        endif
+      else " We're already on the header
+        silent! execute "normal! h\<C-V>f" . g:table_mode_separator
+        normal! jdjj
+      endif
+
       call s:MoveToStartOfCell()
       silent! execute "normal! h\<C-V>f" . g:table_mode_separator
       call s:MoveToLastRow()
@@ -842,20 +849,15 @@ function! tablemode#DeleteColumn() "{{{2
     call tablemode#TableRealign('.')
   endif
 endfunction
-" }}}2
 
 function! tablemode#DeleteRow() "{{{2
   if tablemode#IsATableRow('.')
     for i in range(v:count1)
-      if tablemode#RowCount('.') ==# 1
-        normal! kVjjd
-      else
-        normal! kVjd
+      if tablemode#IsATableRow('.')
+        normal! dd
       endif
 
-      if tablemode#IsATableRow(line('.')+1)
-        normal! j
-      else
+      if !tablemode#IsATableRow('.')
         normal! k
       endif
     endfor
@@ -863,51 +865,48 @@ function! tablemode#DeleteRow() "{{{2
     call tablemode#TableRealign('.')
   endif
 endfunction
-" }}}2
 
 function! tablemode#GetCells(...) abort "{{{2
   let args = copy(a:000)
   call insert(args, '.')
   return call('s:GetCells', args)
 endfunction
-" }}}2
 
 function! tablemode#SetCell(val, ...) "{{{2
   let args = copy(a:000)
   call insert(args, a:val)
   call call('s:SetCell', args)
 endfunction
-" }}}2
 
 function! tablemode#GetCellRange(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
   return call('s:GetCellRange', args)
 endfunction
-" }}}2
 
 function! tablemode#Sum(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
   return s:Sum(call('s:GetCellRange', args))
 endfunction
-" }}}2
 
 function! tablemode#Average(range, ...) abort "{{{2
   let args = copy(a:000)
   call insert(args, a:range)
   return s:Average(call('s:GetCellRange', args))
 endfunction
-" }}}2
 
 function! tablemode#AddFormula() "{{{2
   let fr = input('f=')
   let row = tablemode#RowNr('.')
   let colm = tablemode#ColumnNr('.')
+  let indent = indent('.')
+  let indent_str = repeat(' ', indent)
 
   if fr !=# ''
     let fr = '$' . row . ',' . colm . '=' . fr
     let fline = tablemode#GetLastRow('.') + s:RowGap()
+    if getline(fline) =~# s:HeaderBorderExpr() | let fline += s:RowGap() | endif
     let cursor_pos = [line('.'), col('.')]
     if getline(fline) =~# 'tmf: '
       " Comment line correctly
@@ -927,14 +926,13 @@ function! tablemode#AddFormula() "{{{2
           let [cmss, cmse] = [cms[0], '']
         endif
       endif
-      let fr = cmss . ' tmf: ' . fr . ' ' . cmse
+      let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
       call append(fline-1, fr)
       call cursor(cursor_pos)
     endif
     call tablemode#EvaluateFormulaLine()
   endif
 endfunction
-" }}}2
 
 function! tablemode#EvaluateExpr(expr, line) abort "{{{2
   let line = s:Line(a:line)
@@ -980,9 +978,8 @@ function! tablemode#EvaluateExpr(expr, line) abort "{{{2
     endwhile
   endif
 endfunction
-" }}}2
 
-function! tablemode#EvaluateFormulaLine() "{{{2
+function! tablemode#EvaluateFormulaLine() abort "{{{2
   let exprs = []
   let cstring = &commentstring
   let matchexpr = ''
@@ -998,11 +995,14 @@ function! tablemode#EvaluateFormulaLine() "{{{2
   endif
   if tablemode#IsATableRow('.') " We're inside the table
     let line = s:GetLastRow('.')
-    if getline(line + s:RowGap()) =~# 'tmf: '
-      let exprs = split(matchstr(getline(line + s:RowGap()), matchexpr), ';')
+    let fline = line + s:RowGap()
+    if getline(fline) =~# s:HeaderBorderExpr() | let fline += s:RowGap() | endif
+    if getline(fline) =~# 'tmf: '
+      let exprs = split(matchstr(getline(fline), matchexpr), ';')
     endif
   elseif getline('.') =~# 'tmf: ' " We're on the formula line
     let line = line('.') - s:RowGap()
+    if getline(line) =~# s:HeaderBorderExpr() | let line -= s:RowGap() | endif
     if tablemode#IsATableRow(line)
       let exprs = split(matchstr(getline('.'), matchexpr), ';')
     endif
@@ -1012,8 +1012,5 @@ function! tablemode#EvaluateFormulaLine() "{{{2
     call tablemode#EvaluateExpr(expr, line)
   endfor
 endfunction
-" }}}2
-
-" }}}1
 
 " vim: sw=2 sts=2 fdl=0 fdm=marker

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*			Table Mode for easy table formatting. v3.0
+*table-mode.txt*			Table Mode for easy table formatting. v3.2
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 3.0
+				 VERSION 3.2
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -29,14 +29,14 @@ GETTING STARTED					*table-mode-getting-started*
 
 Create Table on the fly:
 	Using Table Mode is dead simple. You simply start typing on a new line
-	with the table separator - |g:table-mode-separator|, and you just type
+	with the table separator - |table-mode-separator|, and you just type
 	away! The plugin does the rest automatically for you as you type. With
 	each additional separator you add, it aligns the table properly,
 	without having to do anything else.
 
 	The table mode is disabled by default and you can enter table mode
 	using |table-mode-toggle-map| or you can also enable it permanently
-	using |table-mode-always-active| if you wish.
+	using |table-mode-always-active| if you wish though not recommended.
 
 	Table Mode allows for creation of tables within comments, it looks at
 	the 'commentstring' setting to identify whether the current line is
@@ -130,7 +130,6 @@ OPTIONS							*table-mode-options*
 
 Overview:
 	|table-mode-loaded| ............. Disable the plugin.
-	|table-mode-border| ............. Enable border.
 	|table-mode-corner| ............. Set corner character.
 	|table-mode-separator| .......... Set separator character.
 	|table-mode-fillchar| ........... Set table fillchar character.
@@ -154,12 +153,6 @@ g:loaded_table_mode					*table-mode-loaded*
 	Use this option to disable the plugin: >
 		let g:loaded_table_mode = 1
 <
-
-g:table_mode_border					*table-mode-border*
-	Use this option to enable / disable table border: >
-		let g:table_mode_border = 1
-<
-
 g:table_mode_corner					*table-mode-corner*
 	Use this option to define the table corner character: >
 		let g:table_mode_corner = '+'
@@ -172,7 +165,7 @@ g:table_mode_separator					*table-mode-separator*
 	table row in insert mode.
 
 g:table_mode_fillchar					*table-mode-fillchar*
-	Use this option to define the table border fill character: >
+	Use this option to define the table header border fill character: >
 		let g:table_mode_fillchar = '-'
 <
 
@@ -330,6 +323,12 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
 
++-              Expands to a header border, the line immidiately above this
+                will be considered as the table header. You can change this by
+                changing |table-mode-corner| and |table-mode-fillchar|
+                options. This is an iabbrev so is triggered when you press
+                space or <CR> after typing the mapping.
+
 ===============================================================================
 COMMANDS						*table-mode-commands*
 

plugin/table-mode.vim

@@ -4,7 +4,7 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       2.4.0
+" Version:       3.2
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.
@@ -24,22 +24,18 @@ if exists('g:loaded_table_mode')
   finish
 endif
 let g:loaded_table_mode = 1
-"}}}1
 
 " Avoiding side effects {{{1
 let s:save_cpo = &cpo
 set cpo&vim
-" }}}1
 
 function! s:SetGlobalOptDefault(opt, val) "{{{1
   if !exists('g:' . a:opt)
     let g:{a:opt} = a:val
   endif
 endfunction
-" }}}1
 
 " Set Global Defaults {{{1
-call s:SetGlobalOptDefault('table_mode_border', 1)
 call s:SetGlobalOptDefault('table_mode_corner', '+')
 call s:SetGlobalOptDefault('table_mode_separator', '|')
 call s:SetGlobalOptDefault('table_mode_fillchar', '-')
@@ -55,7 +51,6 @@ call s:SetGlobalOptDefault('table_mode_delete_row_map', 'dd')
 call s:SetGlobalOptDefault('table_mode_delete_column_map', 'dc')
 call s:SetGlobalOptDefault('table_mode_add_formula_map', 'fa')
 call s:SetGlobalOptDefault('table_mode_eval_expr_map', 'fe')
-"}}}1
 
 function! s:TableMotion() "{{{1
   let direction = nr2char(getchar())
@@ -63,7 +58,6 @@ function! s:TableMotion() "{{{1
     call tablemode#TableMotion(direction)
   endfor
 endfunction
-" }}}1
 
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
@@ -108,11 +102,9 @@ execute "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_add_formul
       \ " :TableAddFormula<CR>"
 execute "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_eval_expr_map .
       \ " :TableEvalFormulaLine<CR>"
-"}}}1
 
 " Avoiding side effects {{{1
 let &cpo = s:save_cpo
-" }}}1
 
 " ModeLine {{{
 " vim: sw=2 sts=2 fdl=0 fdm=marker

t/tablemode.vim

@@ -0,0 +1,162 @@
+let g:table_mode_corner = '+'
+let g:table_mode_separator = '|'
+let g:table_mode_fillchar = '-'
+let g:table_mode_map_prefix = '<Leader>t'
+let g:table_mode_toggle_map = 'm'
+let g:table_mode_always_active = 0
+let g:table_mode_delimiter = ','
+let g:table_mode_tableize_map = 't'
+let g:table_mode_tableize_op_map = '<Leader>T'
+let g:table_mode_realign_map = 'r'
+let g:table_mode_cell_text_object = 'tc'
+let g:table_mode_delete_row_map = 'dd'
+let g:table_mode_delete_column_map = 'dc'
+let g:table_mode_add_formula_map = 'fa'
+let g:table_mode_eval_expr_map = 'fe'
+
+call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
+
+describe 'tablemode'
+  describe 'Activation'
+    describe 'tablemode#TableModeEnable()'
+      before
+        call tablemode#TableModeEnable()
+      end
+
+      it 'should enable table mode'
+        Expect b:table_mode_active to_be_true
+      end
+    end
+
+    describe 'tablemode#TableModeDisable()'
+      before
+        call tablemode#TableModeDisable()
+      end
+
+      it 'should disable table mode'
+        Expect b:table_mode_active to_be_false
+      end
+    end
+
+    describe 'tablemode#TableModeToggle()'
+      it 'should toggle table mode'
+        call tablemode#TableModeToggle()
+        Expect b:table_mode_active to_be_true
+        call tablemode#TableModeToggle()
+        Expect b:table_mode_active to_be_false
+      end
+    end
+  end
+
+  describe 'API'
+    before
+      normal! ggdG
+      call tablemode#TableModeEnable()
+      normal! i
+|test11|test12|
+|test21|test22|
+    end
+
+    it 'should return true when inside a table'
+      Expect tablemode#IsATableRow(2) to_be_true
+    end
+
+    it 'should return false when outside a table'
+      Expect tablemode#IsATableRow(4) to_be_false
+    end
+
+    it 'should return the row count'
+      Expect tablemode#RowCount(2) == 2
+      Expect tablemode#RowCount(3) == 2
+    end
+
+    it 'should return the row number'
+      Expect tablemode#RowNr(2) == 1
+      Expect tablemode#RowNr(3) == 2
+    end
+
+    it 'should return the column count'
+      Expect tablemode#ColumnCount(2) == 2
+      Expect tablemode#ColumnCount(3) == 2
+    end
+
+    it 'should return the line number of the first row'
+      Expect tablemode#GetFirstRow(2) == 2
+      Expect tablemode#GetFirstRow(3) == 2
+    end
+
+    it 'should return the line nuber of the last row'
+      Expect tablemode#GetLastRow(2) == 3
+      Expect tablemode#GetLastRow(3) == 3
+    end
+
+    it 'should return the cells'
+      Expect Call('s:GetCells', 2, 1, 1) ==# 'test11'
+      " Get Rows
+      Expect Call('s:GetCells', 2, 1) == ['test11', 'test12']
+      Expect Call('s:GetCells', 2, 2) == ['test21', 'test22']
+      " Get Columns
+      Expect Call('s:GetCells', 2, 0, 1) == ['test11', 'test21']
+      Expect Call('s:GetCells', 2, 0, 2) == ['test12', 'test22']
+    end
+
+    it 'should return the cells in a range'
+      " Entire table as range
+      Expect Call('s:GetCellRange', '1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+
+      " Get Rows given different seed lines and columns
+      Expect Call('s:GetCellRange', '1,1:1,2', 2, 1) == ['test11', 'test12']
+      Expect Call('s:GetCellRange', '1,1:1,2', 2, 2) == ['test11', 'test12']
+      Expect Call('s:GetCellRange', '1,1:1,2', 3, 1) == ['test11', 'test12']
+      Expect Call('s:GetCellRange', '1,1:1,2', 3, 2) == ['test11', 'test12']
+      Expect Call('s:GetCellRange', '2,1:2,2', 2, 1) == ['test21', 'test22']
+      Expect Call('s:GetCellRange', '2,1:2,2', 2, 2) == ['test21', 'test22']
+      Expect Call('s:GetCellRange', '2,1:2,2', 3, 1) == ['test21', 'test22']
+      Expect Call('s:GetCellRange', '2,1:2,2', 3, 2) == ['test21', 'test22']
+
+      " Get Columns given different seed lines and column
+      Expect Call('s:GetCellRange', '1:2', 2, 1) == ['test11', 'test21']
+      Expect Call('s:GetCellRange', '1:2', 2, 2) == ['test12', 'test22']
+      Expect Call('s:GetCellRange', '1:2', 3, 1) == ['test11', 'test21']
+      Expect Call('s:GetCellRange', '1:2', 3, 2) == ['test12', 'test22']
+
+      " Get Column given negative values in range for representing rows from
+      " the end, -1 being the second last row.
+      Expect Call('s:GetCellRange', '1:-1', 2, 1) == ['test11']
+      Expect Call('s:GetCellRange', '1:-1', 3, 1) == ['test11']
+      Expect Call('s:GetCellRange', '1:-1', 2, 2) == ['test12']
+      Expect Call('s:GetCellRange', '1:-1', 3, 2) == ['test12']
+    end
+  end
+
+  describe 'Tableize'
+    before
+      normal! ggdG
+      normal! i
+asd,asd;asd,asd
+asd,asd;asd,asd
+    end
+
+    it 'should tableize with default delimiter'
+      :2,3call tablemode#TableizeRange('')
+      Expect tablemode#IsATableRow(2) to_be_true
+      Expect tablemode#RowCount(2) == 2
+      Expect tablemode#ColumnCount(2) == 3
+    end
+
+    it 'should tableize with given delimiter'
+      :2,3call tablemode#TableizeRange('/;')
+      Expect tablemode#IsATableRow(2) to_be_true
+      Expect tablemode#RowCount(2) == 2
+      Expect tablemode#ColumnCount(2) == 2
+    end
+  end
+
+  describe 'Motions'
+    it 'should work'
+      TODO
+    end
+  end
+
+  describe 'Manipulations'
+    it 'should work'