soywiki 0.2.1 → 0.2.2

data/lib/soywiki.rb

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

data/lib/soywiki.vim

@@ -112,28 +112,27 @@ func! s:link_under_cursor()
     let link = s:infer_namespace(link)
   endif
   if match(link, s:wiki_link_pattern) == -1
-    if match(link, s:http_link_pattern) != -1
-      call s:open_href()
-    endif
     return ""
   else
     return link
   end
 endfunc
 
-" follows a camel case link to a new page 
-func! s:follow_link(split)
-  let link = s:link_under_cursor()
-  if link == ""
-    let link = s:find_next_wiki_link(0)
-    if link == ""
-      return ""
-    endif
-  endif
-  call s:load_page(link, a:split)  
+func! s:find_next_wiki_link(backward)
+  let n = 0
+  " don't wrap
+  let result = search(s:wiki_link_pattern, 'W' . (a:backward == 1 ? 'b' : ''))
+  if (result == 0) 
+    return ""
+  end
+  return s:link_under_cursor()
 endfunc
 
 func! s:follow_link_under_cursor(split)
+  if match(expand("<cWORD>>"), s:http_link_pattern) != -1
+    call s:open_href_under_cursor()
+    return
+  endif
   let link = s:link_under_cursor()
   if link == ""
     echom link . " is not a wiki link"
@@ -150,14 +149,18 @@ func! s:follow_link_under_cursor(split)
   endif
 endfunc
 
-func! s:find_next_wiki_link(backward)
-  let n = 0
-  " don't wrap
-  let result = search(s:wiki_link_pattern, 'W' . (a:backward == 1 ? 'b' : ''))
-  if (result == 0) 
-    return ""
-  end
-  return s:link_under_cursor()
+
+" If no link under cursor, tries to find the next one
+func! s:fuzzy_follow_link(split)
+  let link = s:link_under_cursor()
+  if link == ""
+    let link = s:find_next_wiki_link(0)
+    if link == ""
+      echom "No links found"
+      return
+    endif
+  endif
+  call s:load_page(link, a:split)  
 endfunc
 
 " -------------------------------------------------------------------------------- 
@@ -527,13 +530,20 @@ func! s:expand(seamless, vertical)
   echom "Expanded " . (a:seamless == 0 ? 'seamfully' : 'seamlessly') . "."
 endfunc
 "------------------------------------------------------------------------
-func! s:open_href()
-  let line = search(s:http_link_pattern, 'cw')
+func! s:open_href_under_cursor()
   let href = expand("<cWORD>") 
   let command = g:SoyWiki#browser_command . " '" . href . "' "
   call system(command)
   echom command 
 endfunc
+
+func! s:find_next_href_and_open()
+  let res = search(s:http_link_pattern, 'cw')
+  if res != 0
+    call s:open_href_under_cursor()
+  endif
+endfunc
+
 " -------------------------------------------------------------------------------- 
 "  HELP
 func! s:show_help()
@@ -545,7 +555,7 @@ endfunc
 func! s:global_mappings()
   noremap <leader>m :call <SID>list_pages()<CR>
   noremap  <leader>M :call <SID>list_pages_linking_in()<CR>
-  noremap <silent> <leader>o :call <SID>open_href()<cr> 
+  noremap <silent> <leader>o :call <SID>find_next_href_and_open()<cr> 
   nnoremap <silent> q :close<cr>
 
   " reflow text
@@ -575,7 +585,7 @@ func! s:prep_buffer()
     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-h> :call <SID>follow_link_under_cursor(1)<cr> 
-    noremap <buffer> <leader>f :call <SID>follow_link(0)<CR>
+    noremap <buffer> <leader>f :call <SID>fuzzy_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
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Daniel Choi