soywiki 0.9.5 → 0.9.6

data/.gitignore

@@ -11,5 +11,4 @@ wiki/
 soywiki.html
 wiki2/
 responses/
-*.gem
 

data/README.markdown

@@ -497,26 +497,19 @@ SoyWiki is very new, so there are kinks and bugs to iron out and lot of
 desirable features to add.  If you have a bug to report or a good feature to
 suggest, please file it on the [issue tracker][1].  That will help a lot.
 
-[1]:https://github.com/0robustus1/soywiki/issues
+[1]:https://github.com/danchoi/soywiki/issues
 
 You can also join the [Google Group][group] and comment there.
 
 [group]:http://groups.google.com/group/soywiki-users?msg=new&lnk=gcis
 
-## How to contact the developer
+## Maintainer
 
-My name is Daniel Choi. I am based in Cambridge, Massachusetts, USA, and you
-can email me at dhchoi {at} gmail.com.  
+The original version of Soywiki was created by Daniel Choi (email: dhchoi at gmail.com).  
 
-## Maintainer of project
+Soywiki is now being maintained and extended by Tim r. Reddehase (github: [@0robustus1][tim]).
 
-Since Daniel doesn't have the time anymore, the project will be maintained
-by Tim Reddehase. You can contact me via email at
-robustus {at} rightsrestricted.com.
+[tim]:https://github.com/0robustus1
 
-This also means, that current development and changes will be done
-from my [fork][2] at github.
-
-[2]: https://github.com/0robustus1/soywiki
 
 

data/lib/soywiki/html.rb

@@ -6,6 +6,7 @@ module Soywiki
 
     HTML_DIR = 'html-export'
     INDEX_PAGE_TEMPLATE = File.read(File.join(File.dirname(__FILE__), '..', 'index_template.html.haml'))
+    BROKEN_MARKDOWN_HYPERLINK = %r|\[([^\]]+)\]\(\[(#{HYPERLINK})\]\(\2\)\)|
 
     def self.href_wiki_links(text)
       text = text.gsub(WIKI_WORD) {|match|
@@ -20,9 +21,11 @@ module Soywiki
     end
 
     def self.href_hyperlinks(text)
-      text = text.gsub(HYPERLINK) {|match|
-        %{<a href="#{match}">#{match}</a>}
-      }
+      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)')
+      end
       return text
     end
 
@@ -35,13 +38,13 @@ module Soywiki
       text = text.split("\n")
 
       title = text.shift || ''
-      body = if text.empty?
-               ''
-             elsif @markdown
-               RDiscount.new(text.join("\n").strip).to_html.gsub("<pre><code>","<pre><code>\n") 
-             else
-               process(text.join("\n").strip)
-             end
+      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
+      end
 
       page_template = if defined?(PAGE_TEMPLATE_SUB)
                         PAGE_TEMPLATE_SUB

data/lib/soywiki.rb

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

data/lib/soywiki.vim

@@ -12,7 +12,7 @@ let mapleader = ','
 
 " This regex matches namedspaced WikiWords and unqualified WikiWords 
 let s:wiki_link_pattern =  '\C\m\<\([a-z0-9][[:alnum:]_]\+\.\)\?[A-Z][a-z]\+[A-Z0-9]\w*\>'
-let s:http_link_pattern = 'https\?:[^ >)\]]\+'
+let s:http_link_pattern = '\v(https|http|file|):[^ >)\]]+\V'
 let s:wiki_or_web_link_pattern =  '\C\<\([a-z0-9][[:alnum:]_]\+\.\)\?[A-Z][a-z]\+[A-Z0-9]\w*\>\|https\?:[^ >)\]]\+'
 
 let s:rename_links_command = 'soywiki-rename '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email: