soywiki 0.1.5 → 0.1.6

data/README.markdown

@@ -157,9 +157,10 @@ commands:
 * `CTRL-k` and `CTRL-j` move the cursor directly to the next or previous WikiLink on the page
 * `ENTER` follows the WikiLink under the cursor
 * `,f` follows the first WikiLink after the cursor
-* `CTRL-l` opens a WikiLink in a vertical split window
-* `CTRL-n` does the same, but in a regular split window
-* Both `CTRL-h` and `q` close a split window 
+* `CTRL-l` opens a WikiLink in a vertical split window; press again
+while the cursor is on the top line to close the new window 
+* `CTRL-h` does the same, but in a regular split window
+* `q` closes a split window 
 
 These key mappings may not be very mnemonic, but they are easy to
 memorize through muscle memory and were chosen to keep the hands

data/Rakefile

@@ -9,6 +9,10 @@ require 'soywiki'
 
 Bundler::GemHelper.install_tasks
 
+
+desc "release and build and push new website"
+task :push => [:release, :build_webpage]
+
 desc "build and push website"
 task :web => :build_webpage do
   `scp website/soywiki.html zoe2@instantwatcher.com:~/danielchoi.com/public/software/`

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
 
   def self.run

data/lib/soywiki.vim

@@ -91,7 +91,12 @@ endfunc
 
 func! s:list_pages()
   let s:search_for_link = ""
-  call s:page_list_window(s:get_page_list(), 'select-page', "Select page: ")
+  let pages = s:get_page_list()
+  if len(pages) == 0
+    echom "There are no wiki pages yet but this one."
+  else
+    call s:page_list_window(pages, 'select-page', "Select page: ")
+  end
 endfunc
 
 func! s:trim_link(link)
@@ -133,6 +138,13 @@ func! s:follow_link_under_cursor(split)
   if link == ""
     echom link . " is not a wiki link"
     return ""
+  elseif line('.') == 1
+    " SPECIAL CASE
+    " close window
+    if winnr('$') > 1
+      close
+    endif
+    return
   else
     call s:load_page(link, a:split)
   endif
@@ -148,12 +160,19 @@ func! s:find_next_wiki_link(backward)
   return s:link_under_cursor()
 endfunc
 
+" -------------------------------------------------------------------------------- 
+" LOAD PAGE
+
 func! s:load_page(page, split)
   if (s:is_wiki_page())
     write
   endif
   let file = s:pagetitle2file(a:page)
   let title = s:filename2pagetitle(a:page)
+  if bufwinnr(file) != -1
+    exec bufwinnr(file)."wincmd w"    
+    return
+  endif
   if (!filereadable(file)) 
     " create the file
     let namespace = s:namespace_of_title(a:page)
@@ -164,17 +183,17 @@ func! s:load_page(page, split)
     call writefile([title, '', ''], file) 
   endif
   if (a:split == 2) 
-    exec "botright vsplit ". file
-  else
-    exec "botright split ". file
-  endif
-  if (a:split == 0) 
-    wincmd p 
-    close
+    exec "rightbelow vsplit ". file
+  elseif (a:split == 1)
+    exec "rightbelow split ". file
+  elseif (a:split == 0) 
+    exec "e ".file
   endif
-  if len(s:search_for_link) > 0 
+  if s:search_for_link != ''
     let res = search(s:search_for_link, 'cw')
     let s:search_for_link = ''
+  else 
+    normal gg
   endif
 endfunc
 
@@ -252,19 +271,29 @@ endfunc
 " -------------------------------------------------------------------------------
 " select Page
 
+func! s:omit_this_page(page_list)
+  if exists("s:return_to_bufname")
+    let page_list = filter( a:page_list,  'v:val != "'.s:return_to_bufname.'"')
+    return page_list
+  else
+    return a:page_list
+  endif
+endfunc
+
 " This function both sets a script variable and returns the value.
 func! s:get_page_list()
   " no file current in buffer
-  if len(bufname('%')) == 0
+  if len(bufname('')) == 0
     return split(system(s:ls_command), "\n")
   elseif bufname('') == 'pages-linking-in'
     " this needs refactoring to rely less on state
     return s:pages_linking_in
   else
-    return split(system(s:ls_command . " | grep -vF '" . s:page_title() . "'" ), "\n")
+    return s:omit_this_page(split(system(s:ls_command), "\n"))
   endif
 endfunction
 
+
 func! s:pages_in_this_namespace(pages)
   let namespace = s:page_namespace()
   let pages = filter( a:pages,  'v:val =~ "^' . namespace . '\."')
@@ -297,6 +326,7 @@ endfunc
 function! s:page_list_window(page_match_list, buffer_name, prompt)
   " remember the original window 
   let s:return_to_winnr = winnr()
+  let s:return_to_bufname = s:filename2pagetitle(bufname(''))
   let s:matching_pages = a:page_match_list
   exec "topleft split ".a:buffer_name
   setlocal completefunc=CompletePageTitle 
@@ -426,7 +456,7 @@ func! s:extract(...) range
       endif
       call writefile([page_title, '', ''], file) 
     endif
-    exec "split ".file
+    exec "rightbelow vsplit ".file
   else
     let targetWindow = bufwinnr(bufnr(file))
     exe targetWindow."wincmd w"
@@ -478,7 +508,7 @@ func! s:expand(seamless, vertical)
     let res = system(s:expand_command . " seamful " . bufname('%'))
   endif
   if a:vertical
-    botright vnew 
+    rightbelow vnew 
   else
     new 
   endif
@@ -511,7 +541,6 @@ func! s:global_mappings()
   noremap  <leader>M :call <SID>list_pages_linking_in()<CR>
   noremap <silent> <leader>o :call <SID>open_href()<cr> 
   nnoremap <silent> q :close<cr>
-  nnoremap <silent> <C-h> :close<cr>
 
   " reflow text
   nnoremap \ gwap 
@@ -539,7 +568,7 @@ func! s:prep_buffer()
     set textwidth=72
     nnoremap <buffer> <cr> :call <SID>follow_link_under_cursor(0)<cr> 
     nnoremap <buffer> <c-l> :call <SID>follow_link_under_cursor(2)<cr> 
-    nnoremap <buffer> <c-n> :call <SID>follow_link_under_cursor(1)<cr> 
+    nnoremap <buffer> <c-h> :call <SID>follow_link_under_cursor(1)<cr> 
     noremap <buffer> <leader>f :call <SID>follow_link(0)<CR>
     noremap <buffer> <c-j> :call <SID>find_next_wiki_link(0)<CR>
     noremap <buffer> <c-k> :call <SID>find_next_wiki_link(1)<CR>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Daniel Choi