karottenreibe-qwicky 0.0.6 → 0.0.7

data/HISTORY.markdown

@@ -1,3 +1,10 @@
+0.0.7
+=====
+
+*   No, the last release didn't fix the wikilinks,
+    this one does ;-)
+*   Fixed a little indentation bug in simple markup
+
 0.0.6
 =====
 

data/README.markdown

@@ -2,7 +2,7 @@ Share and enjoy!
 ================
 
 Hi dear visitor, this is the README file of
-**[Qwicky] [2]**, the REALLY quick wiki. (and
+**[Qwicky] [qwicky]**, the REALLY quick wiki. (and
 small as well!)
 
 You are obviously reading this, so the README
@@ -70,10 +70,16 @@ But DON'T PANIC, it's easy:
 
         gem install rdiscount
 
-    or any of the other nice Markdown libraries, e.g.
-    peg-markdown etc.
+    or
+
+        gem install rpeg-markdown
+
+    or
+
+        gem install bluecloth
+
     I wouldn't recommend BlueCloth, unless you really
-    think you need that, see [this Blog post] [1].
+    think you need that, see [this Blog post] [antiblue].
     (As you might have already guessed from the layout
     of this document, I prefer Markdown. But it's your
     choice.)
@@ -104,7 +110,7 @@ that's impossible... silly...
 But in any case, if you create a file called _qwicky.sass_
 in the directory where your database and settings are
 stored, qwicky will automatically run it through
-[Sass] [3] and apply it.
+[Sass] [sass] and apply it.
 
 Running Qwucky on a server
 ==========================
@@ -118,10 +124,10 @@ Running Qwucky on a server
 
 
 
-[1]: http://tomayko.com/writings/ruby-markdown-libraries-real-cheap-for-you-two-for-price-of-one
+[antiblue]: http://tomayko.com/writings/ruby-markdown-libraries-real-cheap-for-you-two-for-price-of-one
     "Post about why not to use BlueCloth"
-[2]: http://github.com/karottenreibe/qwicky/
+[qwicky]: http://github.com/karottenreibe/qwicky/
     "Qwicky's Homepage/Git repo/Wiki/whatever :-)"
-[3]: http://haml.hamptoncatlin.com/docs/rdoc/classes/Sass.html
+[sass]: http://haml.hamptoncatlin.com/docs/rdoc/classes/Sass.html
     "Documentation of Sass syntax"
 

data/bin/qwicky

@@ -56,8 +56,11 @@ end
 
 # Markup stuff. {{{1
 module Markup
+
     # Base class. {{{2
     class Markup
+        WIKILINK = %r{\[\[([^|\]]+)(\|([^\]]+))?\]\]}
+
         class << self
             attr_reader :description, :link
 
@@ -76,6 +79,16 @@ module Markup
                 @description = description
                 @link = link
             end
+
+            def linkify page, display_name
+                nexist = Page.first(:name => page).nil?
+
+                klass = nexist ? 'bad' : 'good'
+                title = nexist ? "Create page `#{page}'" : "Page `#{page}'"
+                link = '/' + page
+                text = display_name || page
+                "<a href=#{link.inspect} title=#{title.inspect} class=#{klass.inspect}>#{text}</a>"
+            end
         end
 
         def description
@@ -87,11 +100,9 @@ module Markup
         end
 
         def format text
-            text
-        end
-
-        def linkify link, title, klass, text
-            "<a href=#{link.inspect} title=#{title.inspect} class=#{klass.inspect}>#{text}</a>"
+            text.gsub Markup::WIKILINK do |match|
+                Markup::linkify $1, $3
+            end
         end
     end
 
@@ -100,7 +111,7 @@ module Markup
         type 'text', 'Simple text'
 
         def format text
-            "<span style='white-space:pre'>#{text}</span>"
+            "<pre class='simple'>#{super}</pre>"
         end
     end
 
@@ -124,13 +135,14 @@ module Markup
 
                 begin
                     require 'bluecloth'
+                    Object.const_set(:Markdown, BlueCloth)
                     return
                 rescue LoadError => boom
                     puts "Looks like you don't have a Markdown interpreter installed!"
-                    puts "Please get one, like"
-                    puts "* RDiscount"
-                    puts "* peg-markdown"
-                    puts "* BlueCloth"
+                    puts "Please get one of the following gems:"
+                    puts "* rdiscount"
+                    puts "* rpeg-markdown"
+                    puts "* bluecloth (not recommended)"
                     puts "Reverting to simple text markup"
                     throw :revert
                 end
@@ -138,7 +150,7 @@ module Markup
         end
 
         def format text
-            Markdown.new(text.gsub("\0foo\0", '')).to_html
+            super(Markdown.new(text).to_html)
         end
     end
 
@@ -160,7 +172,11 @@ module Markup
         end
 
         def format text
-            RedCloth.new(text).to_html
+            text = text.gsub Markup::WIKILINK do |match|
+                "]#{match}"
+            end
+
+            super(RedCloth.new(text).to_html.gsub(%r{\](\[\[.*?\]\])}, '\1'))
         end
     end
 
@@ -180,17 +196,23 @@ module Markup
                     throw :revert
                 end
             end
+
+            SM::ToHtml.class_eval do
+                define_method :handle_special_WIKILINK do |special|
+                    match = Markup::WIKILINK.match(special.text)
+                    Markup::linkify match[1], match[3]
+                end
+            end
         end
 
         def format text
-            ret = SM::SimpleMarkup.new.convert(text, SM::ToHtml.new)
-            ret.gsub %r{\[\[([^|]+)\|([^|]+)\|([^|]+)\|([^|]+)\]\]} do
-                "<a href=#{$1.inspect} title=#{$2.inspect} class=#{$3.inspect}>#{$4}</a>"
+            text = text.gsub Markup::WIKILINK do |link|
+                "]#{link}"
             end
-        end
 
-        def linkify link, title, klass, text
-            "[[#{link}|#{title}|#{klass}|#{text}]]"
+            sm = SM::SimpleMarkup.new
+            sm.add_special(%r{\]\[\[.*?\]\]}, :WIKILINK)
+            sm.convert(text, SM::ToHtml.new)
         end
     end
 end
@@ -230,16 +252,7 @@ class Qwicky
     end
 
     def format text
-        markup.format(
-            text.gsub %r{\[\[([^|\]]+)(\|([^\]]+))?\]\]} do |match|
-                page = $1
-                nexist = Page.first(:name => page).nil?
-                klass = nexist ? 'bad' : 'good'
-                title = nexist ? "Create page `#{page}'" : "Page `#{page}'"
-                link = '/' + page
-                markup.linkify(link, title, klass, ($3 || $1))
-            end
-        )
+        markup.format(text)
     end
 end
 
@@ -546,6 +559,10 @@ form
     :border-left= 3px solid !border
     :padding 10px
 
+  pre.simple
+    :border none
+    :padding none
+    :font-family normal
 
   blockquote
     :margin 0px

data/qwicky.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qwicky}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors =  ["Fabian Streitel"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karottenreibe-qwicky
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Fabian Streitel