Refactor linkification

Author: decklin

git-wiki.rb

@@ -25,6 +25,13 @@ def file_path(name)
     def url(page=nil, params=nil)
       '/' + (page && page.name != @root_page ? page.name : '') + (params ? "?#{Rack::Utils.build_query(params)}" : '')
     end
+    def expand_links(html)
+      html.gsub(@link_pattern) do
+        link_text = $1
+        page = Page.find_or_create(link_text.gsub(/[^\w\s]/, '').split.join('-').downcase)
+        "<a class='page #{'new' unless page.exists?}' href='#{url(page)}'>#{link_text}</a>"
+      end
+    end
   end
 end
 
@@ -40,16 +47,6 @@ def self.find_or_create(name, rev=nil)
     new(blob || Grit::Blob.create(GitWiki.repository, :name => path))
   end
 
-  def self.wikify(content)
-    content.gsub(GitWiki.link_pattern) {|match| link($1) }
-  end
-
-  def self.link(text)
-    page = find_or_create(text.gsub(/[^\w\s]/, '').split.join('-').downcase)
-    page_class = page.exists? ? 'existing' : 'new'
-    "<a class='page #{page_class}' href='#{GitWiki.url(page)}'>#{text}</a>"
-  end
-
   def initialize(blob)
     @blob = blob
   end
@@ -67,7 +64,7 @@ def content
   end
 
   def to_html
-    Page.wikify(RDiscount.new(content).to_html)
+    GitWiki.expand_links(RDiscount.new(content).to_html)
   end
 
   def log

views/list.haml

@@ -1,4 +1,4 @@
 %ul#list
   - @pages.each do |p|
     %li
-      %a.page.existing{:href => GitWiki.url(p)}= p.name
+      %a.page{:href => GitWiki.url(p)}= p.name