Soks 0.0.4 → 0.0.5

data/README.txt

@@ -4,9 +4,9 @@ h1. SOKS: Another Ruby Wiki
 * The project has been kindly hosted at http://rubyforge.org/projects/soks/
 
 Quickstart:
-1. gem install Soks
-2. soks-create-wiki.rb
-3. http://localhost:8000
+# gem install Soks
+# soks-create-wiki.rb
+# http://localhost:8000
 
 h2. REQUIRES
 
@@ -21,13 +21,13 @@ h2. AUTHOR
 h2. INSTALL
 
 Preferably:
-1. Install rubygems from http://rubyforge.org/projects/rubygems/
-2. gem install Soks (you may need to be root first)
+# Install rubygems from http://rubyforge.org/projects/rubygems/
+# gem install Soks (you may need to be root first)
 
 Alternatively
-1. Download the tar or zip file from http://rubyforge.org/projects/soks/
-2. Unzip or untar it
-3. Change into the soks directory
+# Download the tar or zip file from http://rubyforge.org/projects/soks/
+# Unzip or untar it
+# Change into the soks directory
 
 h2. USE
 
@@ -40,22 +40,24 @@ To change the settings (url, port, etc) edit the start.rb file in the soks-wiki
 
 h2. FEATURES
 
-  1. Runs on its own webrick server (no independent web server required)
-  2. Uses textile as its text coding (a proto-standard) 
-  3, Uses a combination of flat and yaml files for storage (no database, and page content human readable outside of soks)
-  3. Allows uploads
-  4. Allows authentication
-  5. Automatically links pages within the wiki
-  6. Pages can be deleted and moved easily (and these can be undone)
-  7. Has a mechanism for external classes to manipulate the wiki to provide, for instance, automatic calendar pages, or automatic summaries or blog like pages.
+# Runs on its own webrick server (no independent web server required)
+# Uses textile as its text coding (a proto-standard) 
+# Uses a combination of flat and yaml files for storage (no database, and page content human readable outside of soks)
+# Allows uploads
+# Allows authentication
+# Automatically links pages within the wiki
+# Pages can be deleted and moved easily (and these can be undone)
+# Has a mechanism for external classes to manipulate the wiki to provide, for instance, automatic calendar pages, or automatic summaries or blog like pages.
 
 h2. BUGS
 
 I suspect there are many, as befits its version number.  In particular it has:
-* Not got any way of securing pictures or attachments added to the wiki
-* Uses RedCloth 2.0.11 which has some formatting bugs (and no doubt some extra ones introduced by my clumsy extentions).  RedCloth 3.0.1 is included but not enabled because it tends to hit stack overflows frequently for me.
+* No authentication on pictures and attachments
+* Punctuation in page titles problematic. ? <> and [] cause problems.  : and / are ok.
+* Insert page commands are not inhibited by notextile, pre or code tags
 
 h2. RELEASES
 
-2005 Jan 24 - soks-0.0.3 - Second public release  (alpha)
-2005 Jan 11 - soks-0.0.2 - First public release (alpha)
+# 2005 Feb 12 - soks-0.0.5 - Third public release (alpha)
+# 2005 Jan 24 - soks-0.0.4 - Second public release  (alpha)
+# 2005 Jan 11 - soks-0.0.2 - First public release (alpha)

data/bin/soks-create-wiki.rb

@@ -38,11 +38,20 @@ def backup_directory( directory )
 	backup_dir
 end
 
+# Used to remove the content of a directory (FileUtils.rm_r seems to fail for me?)
+def remove_directory( directory )
+	Dir.entries(directory).each do |file|
+		next if File.directory?( file )
+		File.delete( File.join( directory, file ) )
+	end
+	Dir.rmdir( directory )
+end
+
 #Find where we are
 $SOKS_APPLICATION_DIRECTORY, this_script =  File.split(File.expand_path(File.dirname(__FILE__)))
 
 #Make sure we can find our libraries
-soks_library = [ File.join( $SOKS_APPLICATION_DIRECTORY,'lib') , File.join( $SOKS_APPLICATION_DIRECTORY,'/contrib' ) ]
+soks_library = [ File.join( $SOKS_APPLICATION_DIRECTORY,'lib') , File.join( $SOKS_APPLICATION_DIRECTORY,'lib','helpers'), File.join( $SOKS_APPLICATION_DIRECTORY,'/contrib' ) ]
 $:.push( *soks_library )
 
 require 'easyprompt'
@@ -114,7 +123,7 @@ if upgrade
 		puts "Copied #{source} to #{destination}"
 		
 		if keep_content
-			FileUtils.rm_rf( File.join( destination, 'content' ) )
+			remove_directory( File.join( destination, 'content' ) )
 			FileUtils.cp_r( File.join( old_wiki, 'content'), destination )
 			puts "Copied content from #{old_wiki} to #{destination}"
 			if wiki_version == '0.0.2'

data/contrib/{redcloth-3.0.1.rb → redcloth-3.0.3.rb}

@@ -1,3 +1,4 @@
+# NOTE THERE ARE SLIGHT TWEAKS TO THIS VERSION MADE BY TAMC
 #                                vim:ts=4:sw=4:
 # = RedCloth - Textile and Markdown Hybrid for Ruby
 #
@@ -166,7 +167,8 @@
 
 class RedCloth < String
 
-    VERSION = '3.0.1'
+    VERSION = '3.0.3'
+    DEFAULT_RULES = [:textile, :markdown]
 
     #
     # Two accessor for setting security restrictions.
@@ -192,6 +194,16 @@ class RedCloth < String
     #
     attr_accessor :hard_breaks
 
+    #
+    # Accessor for toggling span caps.
+    #
+    # Textile places `span' tags around capitalized
+    # words by default, but this wreaks havoc on Wikis.
+    # If +:no_span_caps+ is set, this will be
+    # suppressed.
+    #
+    attr_accessor :no_span_caps
+
     #
     # Establishes the markup predence.  Available rules include:
     #
@@ -230,7 +242,6 @@ class RedCloth < String
     #
     def initialize( string, restrictions = [] )
         restrictions.each { |r| method( "#{ r }=" ).call( true ) }
-        @rules = [:textile, :markdown]
         super( string )
     end
 
@@ -242,7 +253,7 @@ class RedCloth < String
     #     #=>"And then? She <strong>fell</strong>!"
     #
     def to_html( *rules )
-        rules = @rules if rules.empty?
+        rules = DEFAULT_RULES if rules.empty?
         # make our working copy
         text = self.dup
         
@@ -268,18 +279,22 @@ class RedCloth < String
         # standard clean up
         incoming_entities text 
         clean_white_space text 
+        no_textile text
 
         # start processor
-        pre_list = rip_offtags text
+        @pre_list = []
+        rip_offtags text
+        hard_break text
         refs text
         blocks text
         inline text
-        smooth_offtags text, pre_list
+        smooth_offtags text
 
         retrieve text
 
         text.gsub!( /<\/?notextile>/, '' )
         text.gsub!( /x%x%/, '&#38;' )
+        clean_html text if filter_html
         text.strip!
         text
 
@@ -340,7 +355,7 @@ class RedCloth < String
         [ /"/, '&#8220;' ], # double opening
         [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
         [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
-        [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]{2,})([^<a-z0-9]|$)/, '\1<span class="caps">\2</span>\3' ], # 3+ uppercase caps
+        [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]{2,})([^<a-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
         [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
         [ /\s->\s/, ' &rarr; ' ], # right arrow
         [ /\s-\s/, ' &#8211; ' ], # en dash
@@ -366,20 +381,36 @@ class RedCloth < String
     QTAGS = [
         ['**', 'b'],
         ['*', 'strong'],
-        ['??', 'cite'],
-        ['-', 'del'],
+        ['??', 'cite', :limit],
+        ['-', 'del', :limit],
         ['__', 'i'],
-        ['_', 'em'],
-        ['%', 'span'],
-        ['+', 'ins'],
+        ['_', 'em', :limit],
+        ['%', 'span', :limit],
+        ['+', 'ins', :limit],
         ['^', 'sup'],
         ['~', 'sub']
     ] 
-    QTAGS_RE = /(#{ QTAGS.collect { |rc, ht| Regexp::quote( rc ) }.join( '|' ) })
-        (#{C})
-        (?::(\S+?))?
-        ([^\s\1]+?(?:[^\n]|\n(?!\n))*?)
-        \1/xm 
+    QTAGS.collect! do |rc, ht, rtype|
+        rcq = Regexp::quote rc
+        re =
+            case rtype
+            when :limit
+                /(\W)
+                (#{rcq})
+                (#{C})
+                (?::(\S+?))?
+                (.+?)
+                #{rcq}
+                (?=\W)/x
+            else
+                /(#{rcq})
+                (#{C})
+                (?::(\S+?))?
+                (.+?)
+                #{rcq}/xm 
+            end
+        [rc, ht, re, rtype]
+    end
 
     #
     # Flexible HTML escaping
@@ -394,7 +425,8 @@ class RedCloth < String
 
     # Search and replace for Textile glyphs (quotes, dashes, other symbols)
     def pgl( text )
-        GLYPHS.each do |re, resub|
+        GLYPHS.each do |re, resub, tog|
+            next if tog and method( tog ).call
             text.gsub! re, resub
         end
     end
@@ -412,7 +444,7 @@ class RedCloth < String
             style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
         end
 
-        style << "#{ $1 };" if not @filter_styles and
+        style << "#{ $1 };" if not filter_styles and
             text.sub!( /\{([^}]*)\}/, '' )
 
         lang = $1 if
@@ -526,20 +558,18 @@ class RedCloth < String
         end
     end
 
-    CODE_RE = /
-            (^|[\s>#{PUNCT}{(\[])            # 1 open bracket?
-            @                                # opening
-            (?:\|(\w+?)\|)?                  # 2 language
-            (\S(?:[^\n]|\n(?!\n))*?)         # 3 code
-            @                                # closing
-            (?=[\s\]}\)<#{PUNCT}]|$)         # 4 closing bracket?
-        /x 
+    CODE_RE = /(\W)
+        @
+        (?:\|(\w+?)\|)?
+        (.+?)
+        @
+        (?=\W)/x
 
     def inline_textile_code( text ) 
         text.gsub!( CODE_RE ) do |m|
             before,lang,code,after = $~[1..4]
             lang = " lang=\"#{ lang }\"" if lang
-            "#{ before }<code#{ lang }>#{ code }</code>#{ after }"
+            rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
         end
     end
 
@@ -548,14 +578,14 @@ class RedCloth < String
     end
 
     def hard_break( text )
-        text.gsub!( /(.)\n(?! *[#*\s|])/, "\\1<br />" ) if @hard_breaks
+        text.gsub!( /(.)\n(?! *[#*\s|]|$)/, "\\1<br />" ) if hard_breaks
     end
 
-    BLOCKS_GROUP_RE = /((?:\n*([#*> ])(?:[^\n]|\n+\2|\n(?!\n|\Z))+))|((?:[^\n]+|\n+ +|\n(?![#*\n]|\Z))+)/m
+    BLOCKS_GROUP_RE = /\n{2,}(?! )/m
 
     def blocks( text, deep_code = false )
-        text.gsub!( BLOCKS_GROUP_RE ) do |blk|
-            plain = $3 ? true : false
+        text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
+            plain = blk !~ /\A[#*> ]/
 
             # skip blocks that are complex HTML
             if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
@@ -578,11 +608,11 @@ class RedCloth < String
                         end
                     end
 
-                    block_applied = nil
+                    block_applied = 0 
                     @rules.each do |rule_name|
-                        break if block_applied = ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
+                        block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
                     end
-                    unless block_applied
+                    if block_applied.zero?
                         if deep_code
                             blk = "\t<pre><code>#{ blk }</code></pre>"
                         else
@@ -594,7 +624,7 @@ class RedCloth < String
                 end
             end
 
-        end
+        end.join( "\n\n" ) )
     end
 
     def textile_bq( tag, atts, cite, content )
@@ -694,16 +724,23 @@ class RedCloth < String
     end
 
     def inline_textile_span( text ) 
-        text.gsub!( QTAGS_RE ) do |m|
-         
-            qtag,atts,cite,content = $~[1..4]
-            ht = QTAGS.assoc( qtag ).last
-            atts = pba( atts )
-            atts << " cite=\"#{ cite }\"" if cite
-            atts = shelve( atts ) if atts
+        QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
+            text.gsub!( qtag_re ) do |m|
+             
+                case rtype
+                when :limit
+                    sta,qtag,atts,cite,content = $~[1..5]
+                else
+                    qtag,atts,cite,content = $~[1..4]
+                    sta = ''
+                end
+                atts = pba( atts )
+                atts << " cite=\"#{ cite }\"" if cite
+                atts = shelve( atts ) if atts
 
-            "<#{ ht }#{ atts }>#{ content }</#{ ht }>"
+                "#{ sta }<#{ ht }#{ atts }>#{ content }</#{ ht }>"
 
+            end
         end
     end
 
@@ -865,14 +902,14 @@ class RedCloth < String
         end
     end
 
-    def shelve( val ) 
-        @shelf << val
-        " <#{ @shelf.length }>"
+    def shelve( val )
+         @shelf << val
+         "<#{ @shelf.length }>"
     end
     
     def retrieve( text ) 
         @shelf.each_with_index do |r, i|
-            text.gsub!( " <#{ i + 1 }>", r )
+            text.gsub!( "<#{ i + 1 }>", r )
         end
     end
 
@@ -885,9 +922,9 @@ class RedCloth < String
     end
 
     def no_textile( text ) 
-        text.gsub!( /(^|\s)==(.*?)==(\s|$)?/,
+        text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
             '\1<notextile>\2</notextile>\3' )
-        text.gsub!( /^ *==(.*?)==/m,
+        text.gsub!( /^ *==([^=]+.*?)==/m,
             '\1<notextile>\2</notextile>\3' )
     end
 
@@ -907,11 +944,13 @@ class RedCloth < String
 
     def flush_left( text )
         indt = 0
-        while text !~ /^ {#{indt}}\S/
-            indt += 1
-        end
-        if indt.nonzero?
-            text.gsub!( /^ {#{indt}}/, '' )
+        if text =~ /^ /
+            while text !~ /^ {#{indt}}\S/
+                indt += 1
+            end unless text.empty?
+            if indt.nonzero?
+                text.gsub!( /^ {#{indt}}/, '' )
+            end
         end
     end
 
@@ -936,9 +975,7 @@ class RedCloth < String
             text.gsub!( ALLTAG_MATCH ) do |line|
                 ## matches are off if we're between <code>, <pre> etc.
                 if $1
-                    if @filter_html
-                        htmlesc( line, :NoQuotes )
-                    elsif line =~ OFFTAG_OPEN
+                    if line =~ OFFTAG_OPEN
                         codepre += 1
                     elsif line =~ OFFTAG_CLOSE
                         codepre -= 1
@@ -957,7 +994,6 @@ class RedCloth < String
     end
 
     def rip_offtags( text )
-        pre_list = []
         if text =~ /<.*>/
             ## strip and encode <pre> content
             codepre, used_offtags = 0, {}
@@ -968,17 +1004,17 @@ class RedCloth < String
                     used_offtags[offtag] = true
                     if codepre - used_offtags.length > 0
                         htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
-                        pre_list.last << line
+                        @pre_list.last << line
                         line = ""
                     else
                         htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
-                        line = "<redpre##{ pre_list.length }>"
-                        pre_list << "#{ $3 }#{ aftertag }"
+                        line = "<redpre##{ @pre_list.length }>"
+                        @pre_list << "#{ $3 }#{ aftertag }"
                     end
                 elsif $1 and codepre > 0
                     if codepre - used_offtags.length > 0
                         htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
-                        pre_list.last << line
+                        @pre_list.last << line
                         line = ""
                     end
                     codepre -= 1 unless codepre.zero?
@@ -987,13 +1023,13 @@ class RedCloth < String
                 line
             end
         end
-        pre_list
+        text
     end
 
-    def smooth_offtags( text, pre_list )
-        unless pre_list.empty?
+    def smooth_offtags( text )
+        unless @pre_list.empty?
             ## replace <pre> content
-            text.gsub!( /<redpre#(\d+)>/ ) { pre_list[$1.to_i] }
+            text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
         end
     end
 
@@ -1015,5 +1051,64 @@ class RedCloth < String
         ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '" onclick="window.open(this.href, \'popupwindow\', \'width=' + windowW + ',height=' + windowH + ',scrollbars,resizable\'); return false;">' + name + '</a><br />'
     end
 
+    # HTML cleansing stuff
+    BASIC_TAGS = {
+        'a' => ['href', 'title'],
+        'img' => ['src', 'alt', 'title'],
+        'br' => [],
+        'i' => nil,
+        'u' => nil, 
+        'b' => nil,
+        'pre' => nil,
+        'kbd' => nil,
+        'code' => ['lang'],
+        'cite' => nil,
+        'strong' => nil,
+        'em' => nil,
+        'ins' => nil,
+        'sup' => nil,
+        'sub' => nil,
+        'del' => nil,
+        'table' => nil,
+        'tr' => nil,
+        'td' => ['colspan', 'rowspan'],
+        'th' => nil,
+        'ol' => nil,
+        'ul' => nil,
+        'li' => nil,
+        'p' => nil,
+        'h1' => nil,
+        'h2' => nil,
+        'h3' => nil,
+        'h4' => nil,
+        'h5' => nil,
+        'h6' => nil, 
+        'blockquote' => ['cite']
+    }
+
+    def clean_html( text, tags = BASIC_TAGS )
+        text.gsub!( /<!\[CDATA\[/, '' )
+        text.gsub!( /<(\/?)(\w+)(.*?)(\/?)>/ ) do
+            raw = $~
+            tag = raw[2].downcase
+            if tags.has_key? tag
+                pcs = [tag]
+                tags[tag].each do |prop|
+                    ['"', "'", ''].each do |q|
+                        q2 = ( q != '' ? q : '\s' )
+                        if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
+                            attrv = $1
+                            next if prop == 'src' and attrv !~ /^http/
+                            pcs << "#{prop}=\"#{attrv.gsub('"', '\\"')}\""
+                            break
+                        end
+                    end
+                end if tags[tag]
+                "<#{raw[1]}#{pcs.join " "}#{raw[4]}>"
+            else
+                " "
+            end
+        end
+    end
 end
 

data/lib/authenticators.rb

@@ -37,7 +37,7 @@ module WEBrick
 		     unless basic_credentials = check_scheme(req)
 		       challenge(req, res)
 		     end
-		     userid, password = decode64(basic_credentials).split(":", 2) 
+		     userid, password = Base64.decode64(basic_credentials).split(":", 2) 
 		     if userid.empty?
 		       error("user id was not given.")
 		       challenge(req, res)
@@ -70,7 +70,7 @@ module WEBrick
         unless basic_credentials = check_scheme(req)
           challenge(req, res)
         end
-        userid, password = decode64(basic_credentials).split(":", 2) 
+        userid, password = Base64.decode64(basic_credentials).split(":", 2) 
         password ||= ""
         if userid.empty?
           error("user id was not given.")

data/lib/helpers/mail2wiki-helper.rb

@@ -0,0 +1,101 @@
+require 'net/imap'
+
+class Message
+	
+	attr_reader :message_id, :subject, :sender_name, :sender_email, :date, :text
+
+	def initialize( imap, message_id )
+		@imap, @message_id = imap, message_id
+		envelope = @imap.fetch( @message_id, 'ENVELOPE' ).first.attr['ENVELOPE']
+		@subject = envelope['subject']
+		@sender_name = envelope['from'].first['name']
+		@sender_email = envelope['from'].first['mailbox'] + '@' + envelope['from'].first['host']
+		@text = plain_text_content_from_message( message_id )
+	end
+	
+	def plain_text_content_from_message( id )
+		text = @imap.fetch( id, 'BODY[1]' ).first.attr['BODY[1]']
+		text.gsub!(/\r\n/,"\n")
+		text.gsub!(/\r/,"\n")
+		text.gsub!(/=\n/,'')
+		text.gsub!(/((?:=[0-9a-fA-F]{2})+)/n) { [$1.delete('=')].pack('H*') }
+		text
+	end
+
+end
+
+class Mail2WikiHelper
+
+	DEFAULT_SETTINGS = {
+		:server => 'imap.hermes.cam.ac.uk',
+		:username => 'tamc2',
+		:password => '',
+		:mailbox => 'mcr notices',
+		:check_frequency => 600, # Seconds
+		:subject_regexp => /.*/,
+	}
+	
+	def initialize( wiki, settings = {} )
+		@settings = DEFAULT_SETTINGS.merge( settings )
+		@wiki = wiki
+		check_mailbox
+		Thread.new do 
+			loop do
+				sleep @settings[:check_frequency ]
+				check_mailbox
+			end
+		end
+	end
+	
+	private
+	
+	def check_mailbox
+		login
+		select_mailbox
+		p "Checking for emails in #{@settings[:server]}"
+		new_messages_for_wiki do |message_id|
+			this_message = Message.new( @imap, message_id )
+			if this_message.subject =~ @settings[:subject_regexp]
+				add_message_to_wiki( this_message ) 
+				mark_as_added( message_id )
+			end
+		end
+		logout
+	end
+	
+	def add_message_to_wiki( message )
+		current_page = @wiki.page( message.subject )
+		if current_page.empty?
+			text = "h1. #{message.subject}"
+		else
+			text = current_page.textile
+		end
+		text << "\n\n----\n\n"
+		text << "#{message.date} from #{message.sender_name} #{message.sender_email}\n"
+		text << message.text.gsub(/[\*-]{2,}/,'').gsub(/\n\s+/,"\n").gsub(/\n/,"\n\n") 		
+		@wiki.revise(message.subject, text, message.sender_name )
+	end
+	
+	def login
+		@imap = Net::IMAP.new(@settings[:server])
+		@imap.login( @settings[:username], @settings[:password] )
+	end
+	
+	def logout
+		@imap.logout
+		@imap.disconnect
+	end
+	
+	def select_mailbox
+		@imap.select @settings[:mailbox]
+	end
+	
+	def new_messages_for_wiki 
+		@imap.search('UNKEYWORD PutInWiki').each { |id| yield id } 		
+	end
+	
+	def mark_as_added( id )
+		# @imap.store( id, '+FLAGS', ['PutInWiki'] )
+	end
+	
+end

data/lib/helpers/rss2wiki-helper.rb

@@ -0,0 +1,48 @@
+require 'rss/1.0'
+require 'rss/2.0'
+require 'open-uri'
+
+class RSS2WikiHelper
+
+	DEFAULT_SETTINGS = {
+		:url => 'http://localhost:8000/rss/recent%20changes%20to%20this%20site',
+		:pagename => nil, # If nil, uses channel title,
+		:check_frequency => 1200,
+		:author => 'AutomaticRSS2Wiki',
+	}
+	
+	def initialize( wiki, settings = {} )
+		@settings = DEFAULT_SETTINGS.merge( settings )
+		@wiki = wiki
+		Thread.new do
+			loop do
+				update_rss
+				update_wiki
+				sleep @settings[ :check_frequency ]
+			end
+		end
+	end
+	
+	def update_wiki
+		@wiki.revise( @settings[:pagename] || @rss.channel.title, render, @rss.items.first.respond_to?('author') ? @rss.items.first.author : "AutomaticRSS" )
+	end
+
+	def render
+		content = "h1. #{@rss.channel.title}\n\n"
+		@rss.items.each do |item| 
+			content << "# [[ #{escape(item.title)} => #{item.link} ]]\n"
+		end
+		content
+	end
+
+	def update_rss
+		$stderr.puts "Updating feed"
+		open(@settings[:url]) do |http| 
+			@rss = RSS::Parser.parse( http.read , false) 
+		end
+	end
+	
+	def escape( string )
+		string.tr('[]=>','')
+	end
+end