soywiki 0.9.2 → 0.9.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0d1d5102e2bf2eb59f9c54cf9343c9667ec8039c
+  data.tar.gz: e4c1daeaffa441119b6d1326ace05f04c92ad20b
+SHA512:
+  metadata.gz: f5587968c6a7d5bed8efd78d282c98fc95ac3841b14a403ff8427fb0228c54252875d85d6b44d23df463e8f9a099792adcbe4aedf288085d77e657c72c951cf3
+  data.tar.gz: 294dce3c0cc16a3bac73b9c9f226be1ea9f5d8e961cfaaefef4f55774919c1ae5032759339087fbe1810690068e9ec8f802f02d3887f4b57b6157c248e0a29ac

data/lib/soywiki.rb

@@ -1,12 +1,23 @@
 require 'string_ext'
-
+module Template_Substitution; end
 module Soywiki
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
   WIKI_WORD = /\b([a-z0-9][\w_]+\.)?[A-Z][a-z]+[A-Z0-9]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 
   def self.run
-    if %W( -v --version -h --help).include?(ARGV.first)
+    require 'getoptlong'
+
+    opts = GetoptLong.new(
+      [ '--help',    '-h',     GetoptLong::NO_ARGUMENT],
+      [ '--version', '-v',     GetoptLong::NO_ARGUMENT],
+      [ '--html',              GetoptLong::NO_ARGUMENT],
+      [ '--markdown',          GetoptLong::NO_ARGUMENT],
+      [ '--page',              GetoptLong::REQUIRED_ARGUMENT],
+      [ '--index',             GetoptLong::REQUIRED_ARGUMENT],
+    )
+
+    usage =->  do
       puts "soywiki #{Soywiki::VERSION}"
       puts "by Daniel Choi dhchoi@gmail.com"
       puts
@@ -18,19 +29,38 @@ Run the command in a directory you've made to contain soywiki files.
 
 Soywiki will open the most recently modified wiki file or create a file
 called main/HomePage. 
+
+Parse to html:
+-- html
+  assume that wiki-files are in markdown syntax:
+  --markdown 
+  replace default haml-page-template with the one supplied:
+  --page template-file
+  replace default haml-index-template with the one supplied:
+  --index template-file
 ---
 END
       exit
-    elsif ARGV.first == '--html'
-      if ARGV[1] == '--markdown'
-        puts "Exporting html using markdown"
-        self.html_export(true)
-      else
-        puts "Exporting html"
-        self.html_export
+    end
+    install_plugin = false
+    html           = false
+    md             = false
+    index = page = nil
+    opts.each do |opt, arg|
+      case opt
+        when '--help' then usage[]
+        when '--version' then usage[]
+        when '--html' then html = true
+        when '--markdown' then md = true
+        when '--install-plugin' then install_plugin = true
+        when '--page' then page = arg
+        when '--index' then index = arg
       end
-      exit
-    elsif ARGV.first == '--install-plugin'
+    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
+    if install_plugin
       require 'erb'
       plugin_template = File.read(File.join(File.dirname(__FILE__), 'plugin.erb'))
       vimscript_file = File.join(File.dirname(__FILE__), 'soywiki.vim')
@@ -42,13 +72,18 @@ END
       vimscript = File.expand_path("../soywiki.vim", __FILE__)
       vim_command = "#{vim} -S #{vimscript}"
       exec vim_command
-    end
+    end unless html
   end
 
   def self.html_export(markdown=false)
     require 'soywiki/html'
     Html.export(markdown)
   end
+
+  def self.set_substitute const, substitute_path
+    substitute = File.read(substitute_path)
+    Template_Substitution.const_set const.to_sym, substitute
+  end
 end
 
 if __FILE__ == $0

data/lib/soywiki.vim

@@ -574,7 +574,8 @@ func! s:expand(seamless, vertical)
 endfunc
 "------------------------------------------------------------------------
 func! s:open_href_under_cursor()
-  let href = expand("<cWORD>") 
+  let word = expand("<cWORD>")
+  let href = matchstr(word, s:http_link_pattern)
   let command = g:SoyWiki#browser_command . " '" . href . "' "
   call system(command)
   echom command 

data/lib/soywiki/html.rb

@@ -2,6 +2,7 @@ require 'haml'
 require 'rdiscount'
 module Soywiki
   module Html
+    include Template_Substitution
 
     HTML_DIR = 'html-export'
     INDEX_PAGE_TEMPLATE = File.read(File.join(File.dirname(__FILE__), '..', 'index_template.html.haml'))
@@ -42,7 +43,12 @@ module Soywiki
                process(text.join("\n").strip)
              end
 
-      Haml::Engine.new(PAGE_TEMPLATE).render(nil, :body => body,
+      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,
@@ -57,8 +63,13 @@ module Soywiki
     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, 
+      html = Haml::Engine.new(index_page_template).render(nil, 
                                              :namespace => dir, 
                                              :root => false,
                                              :pages => pages.map {|p| p.split('/')[1]}.sort, 
@@ -85,7 +96,12 @@ module Soywiki
 
     def self.make_root_index_page(namespaces)
       outfile = File.join(HTML_DIR, 'index.html')
-      html = Haml::Engine.new(INDEX_PAGE_TEMPLATE).render(nil, 
+      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,

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 0.9.3
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email:
@@ -45,26 +44,25 @@ files:
 - soywiki.gemspec
 homepage: http://danielchoi.com/software/soywiki.html
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: soywiki
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wiki with Vim interface and Git repo
 test_files: []