soywiki 0.5.8 → 0.5.9

data/README.markdown

@@ -105,6 +105,24 @@ or you can `export SOYWIKI_VIM=mvim` in your `~/.bash_profile` and then
 just run `soywiki`.
 
 
+You can start SoyWiki from within a running Vim session. To set this up,
+first install or update SoyWiki, and then run
+
+    soywiki --install-plugin
+
+Please note that you will need to run this command after each time you update
+SoyWiki to a newer version.
+
+Assuming the plugin is installed, you can start SoyWiki from within a
+running Vim session by typing the command
+
+    :Soywiki
+
+Make sure when you do this that Vim's working directory is the root of
+your wiki directory. You can change the working directory for the 
+current Vim window with `:lcd`. See `:help lcd` for more info.
+
+
 ## Basic usage
 
 For basic use, SoyWiki works exactly like a typical wiki.
@@ -119,8 +137,8 @@ link them together. You'll be surprised at how powerful this simple mechanism
 is for organizing your notes. 
 
 In SoyWiki, a wiki page is a simple text file that has a WikiWord title
-on the first line and any text your want to insert below that.  (You may
-alter the title line at the top, but it helps you see what wiki page
+on the first line. Beyond that, you can append any text you want.  (You
+may alter the title line at the top, but it helps you see what wiki page
 you're on.) SoyWiki will create stub WikiPages for you automatically as
 you traverse WikiLinks that don't yet reference any content.
 
@@ -195,6 +213,7 @@ this. You can press `CTRL-^` to toggle between the current page and the
 last page you looked at.
 
 * `,m` opens the page list
+* `,n` opens the namespace list
 * `,M` opens the inbound links page list 
 
 You can view all the pages in your wiki, most recently modified first,
@@ -207,6 +226,9 @@ When you're on a wiki page and you want to see all the other wiki pages
 that link in to it, press `,M`. If there is only one page that links in,
 you'll be taken there automatically.
 
+`,n` lets you select from your namespaces. Choosing one will take you to
+the `HomePage` of that namespace.
+
 * `,o` opens the first web hyperlink under or after the cursor in the default external web browser
 * `ENTER` opens the web hyperlink under the cursor in the default external web browser
 * `,O` opens the web hyperlink under the cursor in a vertical split window

data/bin/soywiki-ls-t

@@ -10,4 +10,8 @@ xs = Dir.glob('*/*').
     sort_by {|x| File.stat(x).mtime }.
     reverse.map {|x| x.to_page_title }
 
+if ARGV.first == '-n'
+  xs = xs.map {|x| x.namespace}.uniq.sort
+end
+
 puts xs.join("\n")

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 

data/lib/soywiki.vim

@@ -106,6 +106,12 @@ func! s:list_pages()
   end
 endfunc
 
+func! s:list_namespaces()
+  let s:search_for_link = ""
+  let pages = s:get_namespace_list()
+  call s:page_list_window(pages, 'select-page', "Select namespace: ")
+endfunc
+
 func! s:trim_link(link)
   let link = matchstr(a:link, s:wiki_link_pattern)
   return link
@@ -303,7 +309,7 @@ func! s:omit_this_page(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
@@ -318,6 +324,11 @@ func! s:get_page_list()
   return pages
 endfunction
 
+func! s:get_namespace_list()
+  let pages = split(system(s:ls_command . " -n"), "\n")
+  return pages
+endfunction
+
 
 func! s:pages_in_this_namespace(pages)
   let namespace = s:page_namespace()
@@ -385,7 +396,7 @@ function! CompletePageTitle(findstart, base)
   else
     let base = s:trimString(a:base)
     if (base == '')
-      return s:get_page_list()
+      return s:matching_pages
     else
       let res = []
       if bufname('') == 'select-page'
@@ -397,7 +408,7 @@ function! CompletePageTitle(findstart, base)
         endfor
       else
         " autocomplete inline
-        let pages = base =~ '\C^[a-z]' ? s:get_page_list() : s:pages_in_this_namespace(s:get_page_list())
+        let pages = base =~ '\C^[a-z]' ? s:matching_pages : s:pages_in_this_namespace(s:matching_pages)
         for m in pages
           if m =~ '^\c' . base 
             call add(res, m)
@@ -416,9 +427,13 @@ function! s:select_page()
   if (page == '') " no selection
     return
   end
-  let match = ""
+  " if time is just a namespace, append .HomePage to it
+  if page =~ '^[a-z][[:alnum:]_]\+$'
+    let page = page . ".HomePage"
+  endif
+
 	for item in s:matching_pages
-	  if (item == page)
+	  if (page =~ item)
       call s:load_page(page, 0)
       break
     end
@@ -581,6 +596,8 @@ endfunc
 func! s:global_mappings()
   nnoremap <leader>m :call <SID>list_pages()<CR>
   nnoremap <leader>M :call <SID>list_pages_linking_in()<CR>
+  nnoremap <leader>n :call <SID>list_namespaces()<CR>
+
   nnoremap <silent> <leader>o :call <SID>find_next_href_and_open()<cr> 
   nnoremap <silent> q :close<cr>
   " for netrw vertical split

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Daniel Choi