soywiki 0.9.8.2 → 0.9.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23618b256b4671b2d1927fb643b43286d1053d4
-  data.tar.gz: 74800d72cf547716ed9bacc3d7fe0f51689dc8e4
+  metadata.gz: 2d965f86a41dd8a0199176756ffce69430353f8d
+  data.tar.gz: 93be1425214fc3a89d46d4e4099246646ede174c
 SHA512:
-  metadata.gz: 723e319fee814129cef4652a485039f93e889fe3e0d524ab6849b72670c11523b7ccd2c0ae12a1c2b6c06cd3bc9db9e8858c5e706ee6d1a63648ba49f37a5cf4
-  data.tar.gz: f91e60b8d412a888e4a4bd0b185f465337dd2e31a7407e1a398b446616211c99d8372664669b5efb587d68a37a4afe76fe4aff301932163633d1ed813475e3a5
+  metadata.gz: 1158b3f573514e5a267929ad0934e040d7c5b73a3cef8e4b03e6ee79a3457c1512b47dad6c7748c740402f8984df3d270ec57c387344243d409a55f53a15ad27
+  data.tar.gz: 485916bcb2c38e3678000d87c23e39ed661f1a8370e2f9c72865563176f30aa443375eb0b55189385b777273152e2fdba93e9a1ad292a4234327a090706a5607

data/README.markdown

@@ -143,6 +143,46 @@ you traverse WikiLinks that don't yet reference any content.
 
 That's all you need to know to get started. 
 
+### Configuring further
+
+You can configure soywiki's vim-handling by setting certain variables
+inside of your `~/.vimrc`. This is a list of the supported settings:
+
+- `let g:soywiki_autosave = 1`  
+  activates autosaving (the default), deactivate by setting `0`.
+
+#### Mappings
+
+Default mappings can be overridden by providing a custom mapping in your vimrc,
+e.g. like this:
+
+```vim
+let g:soywiki_mapping_follow_link_under_cursor_here = '<c-f>'
+```
+
+This is a list of the standard mappings with their default values:
+
+- `g:soywiki_mapping_follow_link_under_cursor_here` *defaults* to `<cr>`
+- `g:soywiki_mapping_follow_link_under_cursor_vertical` *defaults* to `<c-l>`
+- `g:soywiki_mapping_follow_link_under_cursor_horizontal` *defaults* to `<c-h>`
+- `g:soywiki_mapping_fuzzy_follow` *defaults* to `<leader>f`
+- `g:soywiki_mapping_next_link` *defaults* to `<c-j>`
+- `g:soywiki_mapping_next_link` *defaults* to `<c-k>`
+- `g:soywiki_mapping_show_history` *defaults* to `<leader>lp`
+- `g:soywiki_mapping_show_files_history` *defaults* to `<leader>ls`
+- `g:soywiki_mapping_show_blame` *defaults* to `<leader>b`
+- `g:soywiki_mapping_expand_seamless_vertical` *defaults* to `<leader>x`
+- `g:soywiki_mapping_expand_seamful_vertical` *defaults* to `<leader>X`
+- `g:soywiki_mapping_expand_seamless_horizontal` *defaults* to `<leader>xx`
+- `g:soywiki_mapping_expand_seamful_horizontal` *defaults* to `<leader>XX`
+- `g:soywiki_mapping_goto_homepage` *defaults* to `<leader>h`
+- `g:soywiki_mapping_goto_main_homepage` *defaults* to `<leader>H`
+- `g:soywiki_mapping_show_help` *defaults* to `<leader>?`
+- `g:soywiki_mapping_format` *defaults* to `\`
+- `g:soywiki_mapping_add_delimiter_line` *defaults* to `<leader>-`
+- `g:soywiki_mapping_add_date` *defaults* to `<leader>d`
+- `g:soywiki_mapping_add_date_and_delimiter_line` *defaults* to `<leader>D`
+
 ## Namespaced WikiWords
 
 Every WikiWord in SoyWiki is implicitly or explicitly namespaced.
@@ -518,6 +558,14 @@ this problem we have added support for our own schema:
 to the wiki root or, if you use vim's
 *autochdir* option, relative to the current namespace.
 
+If you want to generate html output in order to upload it
+to a webpage you need to generate relative links if you are using
+`soyfile://` (the default is to generate absolute `file://` links).
+You can achieve this by calling:
+
+- `soywiki --html --relative`
+- `soywiki --html --markdown --relative`
+
 
 ## Bug reports and feature requests
 

data/lib/soywiki.rb

@@ -2,7 +2,7 @@ require 'string_ext'
 require 'path_helper'
 module Template_Substitution; end
 module Soywiki
-  VERSION = '0.9.8.2'
+  VERSION = '0.9.8.3'
   WIKI_WORD = /\b([a-z0-9][\w_]+\.)?[A-Z][a-z]+[A-Z0-9]\w*\b/
   SCHEMES = %w{https http file soyfile}
   HYPERLINK = %r|\b(?:#{SCHEMES.join('|')})://[^ >)\n\]]+|
@@ -15,6 +15,8 @@ module Soywiki
       [ '--version', '-v',     GetoptLong::NO_ARGUMENT],
       [ '--html',              GetoptLong::NO_ARGUMENT],
       [ '--markdown',          GetoptLong::NO_ARGUMENT],
+      [ '--absolute',          GetoptLong::NO_ARGUMENT],
+      [ '--relative',          GetoptLong::NO_ARGUMENT],
       [ '--install-plugin',    GetoptLong::NO_ARGUMENT],
       [ '--page',              GetoptLong::REQUIRED_ARGUMENT],
       [ '--index',             GetoptLong::REQUIRED_ARGUMENT],
@@ -42,6 +44,10 @@ Parse to html:
       --page template-file
     replace default haml-index-template with the one supplied:
       --index template-file
+      --absolute
+      generate absolute file://-style links
+      --relative
+      generate relative ../-style links
 Install the soywiki vim plugin:
   --install-plugin
 Show this help:
@@ -56,6 +62,7 @@ Show version info:
     html           = false
     md             = false
     index = page = nil
+    relative_soyfile = false
     opts.each do |opt, arg|
       case opt
         when '--help' then usage[]
@@ -65,11 +72,13 @@ Show version info:
         when '--install-plugin' then install_plugin = true
         when '--page' then page = arg
         when '--index' then index = arg
+        when '--absolute' then relative_soyfile = false
+        when '--relative' then relative_soyfile = true
       end
     end
     self.set_substitute %{INDEX_PAGE_TEMPLATE_SUB}.to_sym, index if index
     self.set_substitute %{PAGE_TEMPLATE_SUB}.to_sym, page if page
-    self.html_export md if html
+    self.html_export(md, relative_soyfile) if html
     if install_plugin
       require 'erb'
       plugin_template = File.read(File.join(File.dirname(__FILE__), 'plugin.erb'))
@@ -85,9 +94,9 @@ Show version info:
     end unless html
   end
 
-  def self.html_export(markdown=false)
+  def self.html_export(markdown, relative_soyfile)
     require 'soywiki/html'
-    Html.export(markdown)
+    Html.export(markdown, relative_soyfile)
   end
 
   def self.set_substitute const, substitute_path

data/lib/soywiki.vim

@@ -697,51 +697,127 @@ func! s:global_mappings()
   " autocmd  BufEnter * call s:prep_buffer() 
 endfunc 
 
+func! s:prep_mapping_default()
+  if !exists('g:soywiki_mapping_follow_link_under_cursor_here')
+    let g:soywiki_mapping_follow_link_under_cursor_here = '<cr>'
+  endif
+  if !exists('g:soywiki_mapping_follow_link_under_cursor_vertical')
+    let g:soywiki_mapping_follow_link_under_cursor_vertical = '<c-l>'
+  endif
+  if !exists('g:soywiki_mapping_follow_link_under_cursor_horizontal')
+    let g:soywiki_mapping_follow_link_under_cursor_horizontal = '<c-h>'
+  endif
+  if !exists('g:soywiki_mapping_fuzzy_follow')
+    let g:soywiki_mapping_fuzzy_follow = '<leader>f'
+  endif
+  if !exists('g:soywiki_mapping_next_link')
+    let g:soywiki_mapping_next_link = '<c-j>'
+  endif
+  if !exists('g:soywiki_mapping_previous_link')
+    let g:soywiki_mapping_previous_link = '<c-k>'
+  endif
+
+  if !exists('g:soywiki_mapping_show_history')
+    let g:soywiki_mapping_show_history = '<leader>lp'
+  endif
+  if !exists('g:soywiki_mapping_show_files_history')
+    let g:soywiki_mapping_show_files_history = '<leader>ls'
+  endif
+  if !exists('g:soywiki_mapping_show_blame')
+    let g:soywiki_mapping_show_blame = '<leader>b'
+  endif
+
+  if !exists('g:soywiki_mapping_expand_seamless_vertical')
+    let g:soywiki_mapping_expand_seamless_vertical = '<leader>x'
+  endif
+  if !exists('g:soywiki_mapping_expand_seamful_vertical')
+    let g:soywiki_mapping_expand_seamful_vertical = '<leader>X'
+  endif
+  if !exists('g:soywiki_mapping_expand_seamless_horizontal')
+    let g:soywiki_mapping_expand_seamless_horizontal = '<leader>xx'
+  endif
+  if !exists('g:soywiki_mapping_expand_seamful_horizontal')
+    let g:soywiki_mapping_expand_seamful_horizontal = '<leader>XX'
+  endif
+
+  if !exists('g:soywiki_mapping_goto_homepage')
+    let g:soywiki_mapping_goto_homepage = '<leader>h'
+  endif
+  if !exists('g:soywiki_mapping_goto_main_homepage')
+    let g:soywiki_mapping_goto_main_homepage = '<leader>H'
+  endif
+
+  if !exists('g:soywiki_mapping_show_help')
+    let g:soywiki_mapping_show_help = '<leader>?'
+  endif
+
+  if !exists('g:soywiki_mapping_format')
+    let g:soywiki_mapping_format = '\'
+  endif
+  if !exists('g:soywiki_mapping_add_delimiter_line')
+    let g:soywiki_mapping_add_delimiter_line = '<leader>-'
+  endif
+  if !exists('g:soywiki_mapping_add_date')
+    let g:soywiki_mapping_add_date = '<leader>d'
+  endif
+  if !exists('g:soywiki_mapping_add_date_and_delimiter_line')
+    let g:soywiki_mapping_add_date_and_delimiter_line = '<leader>D'
+  endif
+endfunc
+
 " this checks if the buffer is a SoyWiki file (from firstline)
 " and then turns on syntax coloring and mappings as necessary
 func! s:prep_buffer()
   if (s:is_wiki_page() && !exists("b:mappings_loaded"))
+    call s:prep_mapping_default()
     " let user decide on the textwidth
     let &filetype=g:soywiki_filetype
-    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>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>
+    execute 'nnoremap <buffer> '.g:soywiki_mapping_follow_link_under_cursor_here.' :call <SID>follow_link_under_cursor(0)<cr>'
+    execute 'nnoremap <buffer> '.g:soywiki_mapping_follow_link_under_cursor_vertical.' :call <SID>follow_link_under_cursor(2)<cr>'
+    execute 'nnoremap <buffer> '.g:soywiki_mapping_follow_link_under_cursor_horizontal.' :call <SID>follow_link_under_cursor(1)<cr>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_fuzzy_follow.' :call <SID>fuzzy_follow_link(0)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_next_link.' :call <SID>find_next_wiki_link(0)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_previous_link.' :call <SID>find_next_wiki_link(1)<CR>'
 
     command! -bar -nargs=1 -range -complete=file SWCreate :call <SID>create_page(<f-args>)
     command! -bar -nargs=1 -range -complete=file SWRenameTo :call <SID>rename_page(<f-args>)
     command! -buffer SWDelete :call s:delete_page()
 
     command! -buffer SWLog :call s:show_revision_history(0)
-    noremap <buffer> <leader>lp :call <SID>show_revision_history(0)<CR>
+    execute 'noremap <buffer> '.g:soywiki_mapping_show_history.' :call <SID>show_revision_history(0)<CR>'
     command! -buffer SWLogStat :call s:show_revision_history(1)
-    noremap <buffer> <leader>ls :call <SID>show_revision_history(1)<CR>
+    execute 'noremap <buffer> '.g:soywiki_mapping_show_files_history.' :call <SID>show_revision_history(1)<CR>'
     command! -buffer SWBlame :call s:show_blame()
-    noremap <buffer> <leader>b :call <SID>show_blame()<CR>
+    execute 'noremap <buffer> '.g:soywiki_mapping_show_blame.' :call <SID>show_blame()<CR>'
 
-    noremap <buffer> <leader>x :call <SID>expand(0,1)<CR>
-    noremap <buffer> <leader>X :call <SID>expand(1,1)<CR>
-    noremap <buffer> <leader>xx :call <SID>expand(0,0)<CR>
-    noremap <buffer> <leader>XX :call <SID>expand(1,0)<CR>
+    execute 'noremap <buffer> '.g:soywiki_mapping_expand_seamless_vertical.' :call <SID>expand(0,1)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_expand_seamful_vertical.' :call <SID>expand(1,1)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_expand_seamless_horizontal.' :call <SID>expand(0,0)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_expand_seamful_horizontal.' :call <SID>expand(1,0)<CR>'
 
-    noremap <buffer> <leader>h :call <SID>goto_homepage(0)<CR>
-    noremap <buffer> <leader>H :call <SID>goto_homepage(1)<CR>
+    execute 'noremap <buffer> '.g:soywiki_mapping_goto_homepage.' :call <SID>goto_homepage(0)<CR>'
+    execute 'noremap <buffer> '.g:soywiki_mapping_goto_main_homepage.' :call <SID>goto_homepage(1)<CR>'
 
-    noremap <silent> <leader>? :call <SID>show_help()<cr>
+    execute 'noremap <silent> '.g:soywiki_mapping_show_help.' :call <SID>show_help()<cr>'
 
-    nnoremap <buffer> \ gqap 
-    nnoremap <buffer> <Leader>- o<Esc>k72i-<Esc><CR>
-    nnoremap <buffer> <Leader>d :r !date<CR>o<Esc>
-    nnoremap <Leader>D :r !date<CR><Esc>k72i-<Esc>jo<Esc>
+    execute 'nnoremap <buffer> '.g:soywiki_mapping_format.' gqap '
+    execute 'nnoremap <buffer> '.'.g:soywiki_mapping_add_delimiter_line o<Esc>k72i-<Esc><CR>'
+    execute 'nnoremap <buffer> '.g:soywiki_mapping_add_date.' :r !date<CR>o<Esc>'
+    execute 'nnoremap '.g:soywiki_mapping_add_date_and_delimiter_line.' :r !date<CR><Esc>k72i-<Esc>jo<Esc>'
 
     "   set nu
     setlocal completefunc=CompletePageTitle
-    augroup save_revision
-      au!
-      autocmd FileWritePost,BufWritePost,BufUnload <buffer> call s:save_revision() 
-    augroup END
+
+    if !exists('g:soywiki_autosave')
+      let g:soywiki_autosave = 1
+    endif
+
+    if g:soywiki_autosave
+      augroup save_revision
+        au!
+        autocmd FileWritePost,BufWritePost,BufUnload <buffer> call s:save_revision()
+      augroup END
+    endif
     let b:mappings_loaded = 1
   endif
 endfunc

data/lib/soywiki/html.rb

@@ -1,161 +1,199 @@
 require 'haml'
 require 'rdiscount'
 module Soywiki
-  module Html
-    include Template_Substitution
-
+  class Html
     HTML_DIR = 'html-export'
     INDEX_PAGE_TEMPLATE = File.read(File.join(File.dirname(__FILE__), '..', 'index_template.html.haml'))
     BROKEN_MARKDOWN_HYPERLINK = %r|\[([^\]]+)\]\(\[(#{HYPERLINK})\]\(\2\)\)|
-    @current_namespace = nil
+    PAGE_TEMPLATE = File.read(File.join(File.dirname(__FILE__), '..', 'page_template.html.haml'))
 
-    def self.href_wiki_links(text)
-      text = text.gsub(WIKI_WORD) {|match|
-        href = if match =~ /\w\./ # namespace
-          "../#{match.gsub(".", "/")}.html"
-        else
-          match + '.html'
-        end
-        %{<a href="#{href}">#{match}</a>}
-      }
-      return text
+    include Template_Substitution
+
+    attr_reader :markdown, :relative_soyfile, :current_namespace
+
+    def self.export(markdown, relative_soyfile)
+      new(markdown, relative_soyfile).export
     end
 
-    def self.href_hyperlinks(text)
-      substitute = if @markdown then '[\\0](\\0)' else '<a href="\\0">\\0</a>' end
-      text = text.gsub(HYPERLINK, substitute)
-      if @markdown
-        text = text.gsub(BROKEN_MARKDOWN_HYPERLINK, '[\\1](\\2)')
+    def initialize(markdown, relative_soyfile)
+      @markdown = markdown
+      @relative_soyfile = relative_soyfile
+    end
+
+    def export
+      clear_html_dir
+      @current_namespace = nil
+      namespaces.each do |namespace, _count|
+        make_pages(namespace)
       end
-      text = text.gsub(HYPERLINK) { |uri| soyfile_to_uri(uri) }
-      return text
+      make_root_index_page(namespaces)
+      @current_namespace = nil
+      puts "HTML files written to #{HTML_DIR}/"
     end
 
-    def self.soyfile_to_uri(uri)
-      uri_after_scheme = %r{[^ >)\n\]]+}
-      if uri =~ %r{^soyfile://(#{uri_after_scheme})}
-        path = choose_soyfile_path($1)
-        return "file://#{path}" if path[0] == '/'
-      else
-        return uri
+    def clear_html_dir
+      `rm -rf #{HTML_DIR}/*`
+    end
+
+    def namespaces
+      @namespaces ||= Dir["*"].select do |file|
+        File.directory?(file) && file != HTML_DIR
+      end.sort.map do |namespace|
+        count = Dir["#{namespace}/*"].select { |f| wiki_page?(f) }.size
+        [namespace, count]
       end
     end
 
-    def self.choose_soyfile_path(path)
-      return path if path[0] == '/'
-      wiki_root = Dir.getwd
-      autochdir_path = File.absolute_path(
-        File.join(wiki_root, @current_namespace, path))
-      wiki_path = File.absolute_path(File.join(wiki_root, path))
-      File.exists?(autochdir_path) ? autochdir_path : wiki_path
+    def wiki_page?(file)
+      file.gsub("/", '.') =~ WIKI_WORD
     end
 
-    def self.process(t)
-      href_hyperlinks(href_wiki_links(t))
+    def make_pages(namespace)
+      `mkdir -p #{HTML_DIR}/#{namespace}`
+      pages = wiki_pages(namespace)
+      inner_pages = pages.map { |p| p.split('/')[1] }.sort
+      pages.each do |file|
+        outfile =  File.join(HTML_DIR, file + '.html')
+        html = generate_page(File.read(file), namespace, inner_pages)
+        File.open(outfile, 'w') { |f| f.write(html) }
+      end
+      make_index_page(namespace, inner_pages)
     end
 
-    PAGE_TEMPLATE = File.read(File.join(File.dirname(__FILE__), '..', 'page_template.html.haml'))
-    def self.generate_page(text, namespace, pages, namespaces)
+    def wiki_pages(namespace)
+      Dir["#{namespace}/*"].select { |file| wiki_page?(file) }
+    end
+
+    def generate_page(text, namespace, pages)
       @current_namespace = namespace
       text = text.split("\n")
 
       title = text.shift || ''
       body = ''
-      if not text.empty?
-        body = self.process(text.join("\n").strip)
-        if @markdown
-             body = RDiscount.new(body).to_html.gsub("<pre><code>","<pre><code>\n") 
-        end
+      unless text.empty?
+        body = process(text.join("\n").strip)
+        body = markdownify(body) if markdown
       end
 
-      page_template = if defined?(PAGE_TEMPLATE_SUB)
-                        PAGE_TEMPLATE_SUB
-                      else
-                        PAGE_TEMPLATE
-                      end
-      Haml::Engine.new(page_template).render(nil, :body => body,
-                                             :title => title,
-                                             :namespace => namespace,
-                                             :namespaces => namespaces,
-                                             :pages => pages,
-                                             :markdown => @markdown)
+      Haml::Engine.new(page_template).
+        render(nil, :body => body,
+               :title => title,
+               :namespace => namespace,
+               :namespaces => namespaces,
+               :pages => pages,
+               :markdown => markdown)
     end
 
+    def process(text)
+      href_hyperlinks(href_wiki_links(text))
+    end
 
+    def href_wiki_links(text)
+      text.gsub(WIKI_WORD) do |match|
+        href =
+          if match =~ /\w\./ # namespace
+            "../#{match.gsub(".", "/")}.html"
+          else
+            match + '.html'
+          end
+        %{<a href="#{href}">#{match}</a>}
+      end
+    end
 
-    def self.wiki_page?(file)
-      file.gsub("/", '.') =~ WIKI_WORD
+    def href_hyperlinks(text)
+      substitute =
+        if markdown
+          '[\\0](\\0)'
+        else
+          '<a href="\\0">\\0</a>'
+        end
+      text = text.gsub(HYPERLINK, substitute)
+      if markdown
+        text = text.gsub(BROKEN_MARKDOWN_HYPERLINK, '[\\1](\\2)')
+      end
+      text.gsub(HYPERLINK) { |uri| soyfile_to_href(uri) }
     end
 
-    def self.make_index_page(dir, pages, namespaces)
-      index_page_template = if defined?(INDEX_PAGE_TEMPLATE_SUB)
-                              INDEX_PAGE_TEMPLATE_SUB
-                            else
-                              INDEX_PAGE_TEMPLATE
-                            end
-      outfile = File.join(HTML_DIR, dir, 'index.html')
-      html = Haml::Engine.new(index_page_template).render(nil, 
-                                             :namespace => dir, 
-                                             :root => false,
-                                             :pages => pages.map {|p| p.split('/')[1]}.sort, 
-                                             :namespaces => namespaces)
-      File.open(outfile, 'w') {|f| f.write html}
-      # puts "=> Writing #{outfile}"
-    end
-
-    def self.make_pages(dir, namespaces)
-      `mkdir -p #{HTML_DIR}/#{dir}`
-      pages = Dir["#{dir}/*"].select {|file| wiki_page? file} 
-      # make pages
-      pages.each do |file|
-        outfile =  File.join(HTML_DIR, file + '.html')
-        html = Soywiki::Html.generate_page(File.read(file), 
-                                           dir, 
-                                           pages.map {|p| p.split('/')[1]}.sort, 
-                                           namespaces)
-        File.open(outfile, 'w') {|f| f.write html}
-        # puts "Writing #{outfile}"
+    def soyfile_to_href(uri)
+      match = soyfile_match(uri)
+      if match
+        path = choose_soyfile_path(match[1])
+        path[0] == '/' ? "file://#{path}" : path
+      else
+        uri
       end
-      make_index_page(dir, pages, namespaces)
     end
 
-    def self.make_root_index_page(namespaces)
-      outfile = File.join(HTML_DIR, 'index.html')
-      index_page_template = if defined?(INDEX_PAGE_TEMPLATE_SUB)
-                              INDEX_PAGE_TEMPLATE_SUB
-                            else
-                              INDEX_PAGE_TEMPLATE
-                            end
-      html = Haml::Engine.new(index_page_template).render(nil, 
-                                             :namespace => nil, 
-                                             :pages => [], 
-                                             :root => true,
-                                             :namespaces => namespaces)
-      File.open(outfile, 'w') {|f| f.write html}
-      # puts "=> Writing #{outfile}"
-    end
-
-    def self.export(markdown)
-      @markdown = markdown
+    def soyfile_match(uri)
+      uri_after_scheme = %r{[^ >)\n\]]+}
+      regex = %r{^soyfile://(#{uri_after_scheme})}
+      uri.match(regex)
+    end
 
-      `rm -rf #{HTML_DIR}/*`
-      namespaces = Dir["*"].select {|f| 
-        File.directory?(f) && f != HTML_DIR
-      }.sort.map {|namespace|
-        count = Dir["#{namespace}/*"].select {|f| wiki_page?(f)}.size
-        [namespace, count]
-      }
-      @current_namespace = nil
-      namespaces.each do |namespace_dir, count|
-        make_pages namespace_dir, namespaces
+    def choose_soyfile_path(path)
+      absolute_path = absolute_soyfile_path(path)
+      if relative_soyfile
+        Pathname.new(absolute_path).
+          relative_path_from(Pathname.new(wiki_root)).to_s
+      else
+        absolute_path
       end
-      # make root index page
-      make_root_index_page namespaces
-      @current_namespace = nil
-      puts "HTML files written to #{HTML_DIR}/"
     end
 
+    def absolute_soyfile_path(path)
+      return path if path[0] == '/'
+      autochdir_path = absolutify("#{current_namespace}/#{path}")
+      wiki_path = absolutify(path)
+      File.exists?(autochdir_path) ? autochdir_path : wiki_path
+    end
+
+    def absolutify(path)
+      File.absolute_path(File.join(wiki_root, path))
+    end
+
+    def wiki_root
+      Dir.getwd
+    end
+
+    def markdownify(text)
+      RDiscount.new(text).to_html.gsub("<pre><code>", "<pre><code>\n")
+    end
 
+    def page_template
+      if defined?(PAGE_TEMPLATE_SUB)
+        PAGE_TEMPLATE_SUB
+      else
+        PAGE_TEMPLATE
+      end
+    end
+
+    def make_index_page(namespace, inner_pages)
+      outfile = File.join(HTML_DIR, namespace, 'index.html')
+      html = Haml::Engine.new(index_page_template).
+        render(nil, :namespace => namespace,
+               :root => false,
+               :pages => inner_pages,
+               :namespaces => namespaces)
+      File.open(outfile, 'w') { |f| f.write(html) }
+    end
+
+    def index_page_template
+      if defined?(INDEX_PAGE_TEMPLATE_SUB)
+        INDEX_PAGE_TEMPLATE_SUB
+      else
+        INDEX_PAGE_TEMPLATE
+      end
+    end
+
+    def make_root_index_page(namespaces)
+      outfile = File.join(HTML_DIR, 'index.html')
+      html = Haml::Engine.new(index_page_template).
+        render(nil, :namespace => nil,
+               :pages => [],
+               :root => true,
+               :namespaces => namespaces)
+      File.open(outfile, 'w') { |f| f.write(html) }
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.8.2
+  version: 0.9.8.3
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email:
@@ -74,7 +74,7 @@ requirements:
   and for markdown support:
    - rdiscount
 rubyforge_project: soywiki
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wiki with Vim interface and Git repo