soywiki 0.7.0 → 0.7.1

data/Gemfile

@@ -1,2 +1,3 @@
 source :rubygems
 gem "haml"
+gem "rdiscount"

data/README.markdown

@@ -4,6 +4,8 @@ SoyWiki turns Vim into a powerful, lean, and fast wiki.  It's got all the
 protein of a more conventional wiki, but less saturated fat and no
 cholesterol. 
 
+[screenshots]
+
 A quick overview of SoyWiki's characteristics and features:
 
 * flat text files
@@ -71,9 +73,6 @@ If you run into any PATH errors, try the following: Install the RVM
 Version Manager, then install Ruby 1.9.2 through RVM, and then run `gem
 install soywiki`.  This should solve any installation issues.
 
-
-
-
 If you ever want to uninstall SoyWiki from your system, execute this command:
 
     gem uninstall soywiki
@@ -441,6 +440,7 @@ dreams within dreams.
 ## Exporting to HTML
 
 * `soywiki --html` 
+* `soywiki --html --markdown` 
 
 Want to share your wiki with non-Vim-users?  You can export your wiki
 into a directory of HTML pages. Type `soywiki --html` from the root
@@ -448,22 +448,13 @@ directory of your wiki.
 
 Aside from WikiWords, SoyWiki uses no markup system whatsoever. You can
 write your content in whatever markup system you want, or no markup
-system at all. It's all plain text to SoyWiki.  The HTML export feature
-just wraps your content in <pre> tags after turning your WikiWords
-into hyperlinks, so no markup system is really necessary.
-
-HTML export is no-frills and basic. Hopefully, someday, SoyWiki will be
-able to
-
-* sport an alternative web interface that is as cool as [TiddlyWiki's][tiddly] and [GTDTiddlyWiki's][gtd] 
-* let you specify a markup system for rendering the HTML version of your content
-* come bundled with a Sinatra application that translates wiki pages into web pages upon request
+system at all. 
 
-[tiddly]:http://www.tiddlywiki.com/
-[gtd]:http://nathanbowers.com/gtdtw/
+By default, the HTML export feature just wraps your content in
+<pre> tags after turning your WikiWords into hyperlinks.
 
-If you want to contribute any of these features, please feel free to implement
-them and submit a pull request.
+If instead you want to write your pages using Markdown, you can process
+Markdown by adding the `--markdown` flag.
 
 
 ## Extra macros

data/Rakefile

@@ -30,29 +30,24 @@ end
 desc "build and push website"
 task :web => :build_webpage do
   puts "Building and pushing website"
-  `scp website/soywiki.html zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
-  `scp -r website/images-soywiki zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
-  `open http://danielchoi.com/software/soywiki.html`
-end
-
-desc "build website locally"
-task :build_web_locally => :build_webpage do
-  Dir.chdir("website") do
-    `open soywiki.html`
+  Dir.chdir "../project-webpages" do
+    `scp out/soywiki.html zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
+    `rsync -avz out/images-soywiki zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
+    `rsync -avz out/stylesheets zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
+    `rsync -avz out/lightbox2 zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
   end
+  `open http://danielchoi.com/software/soywiki.html`
 end
 
 desc "build webpage"
 task :build_webpage do
-  $LOAD_PATH.unshift 'website'
-  require 'gen'
-  Dir.chdir("website") do
-    html = Webpage.generate(Soywiki::VERSION)
-    File.open('soywiki.html', 'w') {|f| f.puts html}
+  `cp README.markdown ../project-webpages/src/soywiki.README.markdown`
+  Dir.chdir "../project-webpages" do
+    puts `ruby gen.rb soywiki #{Soywiki::VERSION}`
+    #`open out/soywiki.html`
   end
 end
 
-
 desc "Run tests"
 task :test do 
   $:.unshift File.expand_path("test")

data/lib/page_template.html.haml

@@ -24,4 +24,7 @@
             %a{:href => "#{page}.html"}= page
     .main
       %h2= title
-      %pre= body
+      - if markdown
+        != body.to_html
+      - else
+        %pre= body

data/lib/soywiki/html.rb

@@ -1,4 +1,5 @@
 require 'haml'
+require 'rdiscount'
 module Soywiki
   module Html
 
@@ -29,11 +30,18 @@ module Soywiki
 
     def self.generate_page(text, namespace, pages, namespaces)
       title = text.split("\n")[0]
-      body = process(text.split("\n")[1..-1].join("\n").strip)
+      body = if @markdown
+               RDiscount.new(text.split("\n")[1..-1].join("\n").strip)
+             else
+               process(text.split("\n")[1..-1].join("\n").strip)
+             end
+
       Haml::Engine.new(PAGE_TEMPLATE).render(nil, :body => body, 
                                              :title => title, 
                                              :namespace => namespace,
-                                             :namespaces => namespaces, :pages => pages)
+                                             :namespaces => namespaces,
+                                             :pages => pages,
+                                             :markdown => @markdown)
     end
 
 
@@ -82,7 +90,9 @@ module Soywiki
       # puts "=> Writing #{outfile}"
     end
 
-    def self.export
+    def self.export(markdown)
+      @markdown = markdown
+
       `rm -rf #{HTML_DIR}/*`
       namespaces = Dir["*"].select {|f| 
         File.directory?(f) && f != HTML_DIR

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 
@@ -22,7 +22,13 @@ called main/HomePage.
 END
       exit
     elsif ARGV.first == '--html'
-      self.html_export 
+      if ARGV[1] == '--markdown'
+        puts "Exporting html using markdown"
+        self.html_export(true)
+      else
+        puts "Exporting html"
+        self.html_export
+      end
       exit
     elsif ARGV.first == '--install-plugin'
       require 'erb'
@@ -39,9 +45,9 @@ END
     end
   end
 
-  def self.html_export
+  def self.html_export(markdown=false)
     require 'soywiki/html'
-    Html.export
+    Html.export(markdown)
   end
 end
 

data/soywiki.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'haml'
+  s.add_dependency 'rdiscount'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Daniel Choi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A personal and collaborative wiki for Vim users
 email: 
 - dhchoi@gmail.com
@@ -63,42 +76,6 @@ files:
 - lib/soywiki/html.rb
 - lib/string_ext.rb
 - soywiki.gemspec
-- website/.gitignore
-- website/bottom.markdown
-- website/gen.rb
-- website/images-soywiki/expand.png
-- website/images-soywiki/expand.xcf
-- website/images-soywiki/page-select.png
-- website/images-soywiki/page-select.xcf
-- website/images-soywiki/search.png
-- website/images-soywiki/search.xcf
-- website/images-soywiki/sm-expand.png
-- website/images-soywiki/sm-page-select.png
-- website/images-soywiki/sm-search.png
-- website/lightbox2/css/lightbox.css
-- website/lightbox2/images/bullet.gif
-- website/lightbox2/images/close.gif
-- website/lightbox2/images/closelabel.gif
-- website/lightbox2/images/donate-button.gif
-- website/lightbox2/images/download-icon.gif
-- website/lightbox2/images/image-1.jpg
-- website/lightbox2/images/loading.gif
-- website/lightbox2/images/nextlabel.gif
-- website/lightbox2/images/prevlabel.gif
-- website/lightbox2/images/thumb-1.jpg
-- website/lightbox2/index.html
-- website/lightbox2/js/builder.js
-- website/lightbox2/js/effects.js
-- website/lightbox2/js/lightbox.js
-- website/lightbox2/js/prototype.js
-- website/lightbox2/js/scriptaculous.js
-- website/soywiki-template.html
-- website/stylesheets-vmail/960.css
-- website/stylesheets-vmail/reset.css
-- website/stylesheets-vmail/site.css
-- website/stylesheets-vmail/syntax-colors.css
-- website/stylesheets-vmail/text.css
-- website/top.screenshots
 has_rdoc: true
 homepage: http://danielchoi.com/software/soywiki.html
 licenses: []

data/website/.gitignore

@@ -1 +0,0 @@
-images-original/

data/website/gen.rb

@@ -1,19 +0,0 @@
-require 'rdiscount'
-require 'liquid'
-
-module Webpage
-  def self.generate(version)
-    screenshots = RDiscount.new(File.read("top.screenshots")).to_html
-    readme = File.expand_path("../../README.markdown", __FILE__)
-    raise "No README" unless File.size?(readme)
-    md = File.read(readme).split(/^\s*$/)
-    insert_before = md.grep(/^A quick overview of/)
-    insert_at = md.index insert_before.first
-    md.insert(insert_at, screenshots) 
-    md = md.join("\n\n")
-    # for some reason markdown inserts extra blank lines
-    content = RDiscount.new(md).to_html.gsub(/\n\n{3,}/, "\n\n")
-    template = File.read("soywiki-template.html")
-    out = Liquid::Template.parse(template).render 'content' => content, 'timestamp' => Time.now.to_i, 'version' => version
-  end
-end

data/website/lightbox2/css/lightbox.css

@@ -1,27 +0,0 @@
-#lightbox{	position: absolute;	left: 0; width: 100%; z-index: 100; text-align: center; line-height: 0;}
-#lightbox img{ width: auto; height: auto;}
-#lightbox a img{ border: none; }
-
-#outerImageContainer{ position: relative; background-color: #fff; width: 250px; height: 250px; margin: 0 auto; }
-#imageContainer{ padding: 10px; }
-
-#loading{ position: absolute; top: 40%; left: 0%; height: 25%; width: 100%; text-align: center; line-height: 0; }
-#hoverNav{ position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; }
-#imageContainer>#hoverNav{ left: 0;}
-#hoverNav a{ outline: none;}
-
-#prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; }
-#prevLink { left: 0; float: left;}
-#nextLink { right: 0; float: right;}
-#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; }
-#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; }
-
-#imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100%	; }
-
-#imageData{	padding:0 10px; color: #666; }
-#imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
-#imageData #caption{ font-weight: bold;	}
-#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
-#imageData #bottomNavClose{ width: 66px; float: right;  padding-bottom: 0.7em; outline: none;}	 	
-
-#overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; }

data/website/lightbox2/index.html

@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-<head>
-	
-	<title>Lightbox JS v2.0 | Test Page</title>
-
-	<link rel="stylesheet" href="css/lightbox.css" type="text/css" media="screen" />
-	
-	<script src="js/prototype.js" type="text/javascript"></script>
-	<script src="js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
-	<script src="js/lightbox.js" type="text/javascript"></script>
-
-	<style type="text/css">
-		body{ color: #333; font: 13px 'Lucida Grande', Verdana, sans-serif;	}
-	</style>
-
-</head>
-<body>
-
-
-<h1><a href="http://www.lokeshdhakar.com/projects/lightbox2/">Lightbox JS <em>v2.04</em></a></h1>
-<p><a href="http://www.lokeshdhakar.com">by Lokesh Dhakar</a></p>
-
-<h2>Example</h2>
-
-<a href="images/image-1.jpg" rel="lightbox"><img src="images/thumb-1.jpg" width="100" height="40" alt="" /></a>
-
-
-
-
-<h2>How to Use:</h2>
-<h3>Part 1 - Setup</h3>
-<ol>
-<li>Lightbox v2.0 uses the Prototype Framework and Scriptaculous Effects Library. You will need to include these three Javascript files in your header.
-<pre><code>&lt;script type=&quot;text/javascript&quot; src=&quot;js/prototype.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot; src=&quot;js/scriptaculous.js?load=effects,builder&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot; src=&quot;js/lightbox.js&quot;&gt;&lt;/script&gt;
-</code></pre>
-</li>
-<li>Include the Lightbox CSS file (or append your active stylesheet with the Lightbox styles).
-<pre><code>&lt;link rel=&quot;stylesheet&quot; href=&quot;css/lightbox.css&quot; type=&quot;text/css&quot; media=&quot;screen&quot; /&gt;
-</code></pre>
-</li>
-<li>Check the CSS and make sure the referenced <code>prevlabel.gif</code> and <code>nextlabel.gif</code> files are in the right location. Also, make sure the <code>loading.gif</code> and <code>closelabel.gif</code> files as referenced near the top of the <code>lightbox.js</code> file are in the right location.</li>
-</ol>
-<h3>Part 2 - Activate</h3>
-<ol>
-<li>Add a <code>rel="lightbox"</code> attribute to any link tag to activate the lightbox. For example:
-<pre><code>&lt;a href=&quot;images/image-1.jpg&quot; rel=&quot;lightbox&quot; title=&quot;my caption&quot;&gt;image #1&lt;/a&gt;
-</code></pre>
-<em>Optional: </em>Use the <code>title</code> attribute if you want to show a caption.		</li>
-<li>If you have a set of related images that you would like to group, follow step one but additionally include a group name between square brackets in the rel attribute. For example: 
-<pre><code>&lt;a href=&quot;images/image-1.jpg&quot; rel=&quot;lightbox[roadtrip]&quot;&gt;image #1&lt;/a&gt;
-&lt;a href=&quot;images/image-2.jpg&quot; rel=&quot;lightbox[roadtrip]&quot;&gt;image #2&lt;/a&gt;
-&lt;a href=&quot;images/image-3.jpg&quot; rel=&quot;lightbox[roadtrip]&quot;&gt;image #3&lt;/a&gt;
-</code></pre>
-No limits to the number of image sets per page or how many images are allowed in each set. Go nuts!</li>
-</ol>	
-
-
-</body>
-</html>

data/website/lightbox2/js/builder.js

@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-    
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-      
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-    
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-    
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1]) 
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        } 
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return element;
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e)
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) { 
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
-  
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-  
-    tags.each( function(tag){ 
-      scope[tag] = function() { 
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
-      } 
-    });
-  }
-}