Changeset 948

Show
Ignore:
Timestamp:
11/11/07 08:04:25 (1 year ago)
Author:
jimfree..@gmail.com
Message:

Changed link regex to support multiple links per line.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/merki/trunk/app/models/page.rb

    r946 r948  
    22 
    33class Page < DataMapper::Base 
    4   INTERNAL_LINK_REGEX = /\[\[(.*)\]\]/ 
     4  INTERNAL_LINK_REGEX = /\[\[([^\]])*\]\]/ 
    55   
    66  ## props 
    …… 
    1818  ## validations 
    1919  validates_presence_of :title, :body 
    20    
    21      
     20 
     21 
    2222  ## class methods 
    2323  class << self 
    …… 
    3939  def to_html 
    4040    ## TODO: look up page first 
    41     converted_body.gsub(INTERNAL_LINK_REGEX) { |s| 
    42       page = $1 
    43       link = Page.escape(page) 
    44       if Page.find_by_title(page) 
    45         title = page 
     41    converted_body.gsub(INTERNAL_LINK_REGEX) { |m| 
     42      page_name = m[2..-3] 
     43      link      = Page.escape(page_name) 
     44 
     45      if Page.find_by_title(page_name) 
     46        title = page_name 
    4647      else 
    47         title = "#{page}?" 
     48        title = "#{page_name}?" 
    4849        attrs = %q{class="missing" } 
    4950      end