soywiki 0.9.4 → 0.9.5

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 module Template_Substitution; end
 module Soywiki
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
   WIKI_WORD = /\b([a-z0-9][\w_]+\.)?[A-Z][a-z]+[A-Z0-9]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 

data/lib/soywiki.vim

@@ -5,6 +5,7 @@
 if exists("g:SoyWikiLoaded") || &cp || version < 700
   finish
 endif
+
 let g:SoyWikiLoaded = 1
 
 let mapleader = ','
@@ -26,7 +27,15 @@ func! s:trimString(string)
 endfunc
 
 func! s:page_title()
-  return substitute(bufname(''), '\/', '.', '')
+  let path = s:wiki_root()
+  let raw_title = substitute(expand('%:p'), path, '', '')
+  let page_title = substitute(raw_title, '\/', '.', '')
+  return page_title
+endfunc
+
+func! s:wiki_root()
+  let root_path = split(system("git rev-parse --show-toplevel"), "\n")[0] . '/'
+  return root_path
 endfunc
 
 func! s:display_missing_namespace_error(num_segments, page_title)
@@ -52,6 +61,12 @@ func! s:namespace_of_title(page_title)
   endif
 endfunc
 
+func! s:namespace_path_of_title(page_title)
+  let namespace = s:namespace_of_title(a:page_title)
+  let root_path = s:wiki_root()
+  return root_path . namespace
+endfunc
+
 func! s:page_namespace()
   return s:namespace_of_title(s:page_title())
 endfunc
@@ -89,11 +104,15 @@ func! s:is_wiki_page()
 endfunc
 
 func! s:pagetitle2file(page)
-  return substitute(a:page, '\.', '/', 'g')
+  let path = s:wiki_root()
+  let filepath =  path . substitute(a:page, '\.', '/', 'g')
+  return filepath
 endfunc
 
 func! s:filename2pagetitle(page)
-  return substitute(a:page, '/', '.', 'g')
+  let path = s:wiki_root()
+  let title = substitute(substitute(a:page, path, '', 'g'), '/', '.', 'g')
+  return title
 endfunc
 
 func! s:list_pages()
@@ -201,7 +220,8 @@ func! s:load_page(page, split)
     if namespace == ""
       return
     end
-    call system("mkdir -p " . namespace)
+    let namespace_path = s:namespace_path_of_title(a:page)
+    call system("mkdir -p " . namespace_path)
     call writefile([title, '', ''], file) 
   endif
   if (a:split == 2) 

data/soywiki.gemspec

@@ -19,6 +19,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  additional_info = <<-INFO
+For optional compilation of the wiki to html you will need:
+ - haml
+and for markdown support:
+ - rdiscount
+  INFO
+
+  s.requirements = additional_info
+  s.post_install_message = additional_info
+
   #s.add_dependency 'haml'
   #s.add_dependency 'rdiscount'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email:
@@ -45,7 +45,8 @@ files:
 - soywiki.gemspec
 homepage: http://danielchoi.com/software/soywiki.html
 licenses: []
-post_install_message: 
+post_install_message: ! "For optional compilation of the wiki to html you will need:\n
+  - haml\nand for markdown support:\n - rdiscount\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -61,7 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- ! "For optional compilation of the wiki to html you will need:\n - haml\nand for
+  markdown support:\n - rdiscount\n"
 rubyforge_project: soywiki
 rubygems_version: 1.8.23
 signing_key: