diff --git a/app/models/chunks/category.rb b/app/models/chunks/category.rb index aa1ea7e3..a352851c 100644 --- a/app/models/chunks/category.rb +++ b/app/models/chunks/category.rb @@ -8,7 +8,8 @@ require 'chunks/chunk' # # Category lines can be hidden using ':category: news', for example class Category < Chunk::Abstract - def self.pattern() return /^(:)?category\s*:(.*)$/i end + CATEGORY_PATTERN = /^(:)?category\s*:(.*)$/i + def self.pattern() CATEGORY_PATTERN end attr_reader :hidden, :list diff --git a/app/models/chunks/include.rb b/app/models/chunks/include.rb index 65459bbe..add2f4cf 100644 --- a/app/models/chunks/include.rb +++ b/app/models/chunks/include.rb @@ -7,7 +7,8 @@ require 'chunks/wiki' # of changes to that page. # If the included page could not be found, a warning is displayed. class Include < WikiChunk::WikiLink - def self.pattern() /^\[\[!include(.*)\]\]\s*$/i end + INCLUDE_PATTERN = /^\[\[!include(.*)\]\]\s*$/i + def self.pattern() INCLUDE_PATTERN end attr_reader :page_name diff --git a/app/models/chunks/literal.rb b/app/models/chunks/literal.rb index b4e36da4..4fc1cd30 100644 --- a/app/models/chunks/literal.rb +++ b/app/models/chunks/literal.rb @@ -8,12 +8,14 @@ module Literal # A literal chunk that protects 'code' and 'pre' tags from wiki rendering. class Pre < Chunk::Abstract PRE_BLOCKS = "a|pre|code" - def self.pattern() Regexp.new('<('+PRE_BLOCKS+')\b[^>]*?>.*?', Regexp::MULTILINE) end + PRE_PATTERN = Regexp.new('<('+PRE_BLOCKS+')\b[^>]*?>.*?', Regexp::MULTILINE) + def self.pattern() PRE_PATTERN end end # A literal chunk that protects HTML tags from wiki rendering. class Tags < Chunk::Abstract TAGS = "a|img|em|strong|div|span|table|td|th|ul|ol|li|dl|dt|dd" - def self.pattern() Regexp.new('<(?:'+TAGS+')[^>]*?>', Regexp::MULTILINE) end + TAGS_PATTERN = Regexp.new('<(?:'+TAGS+')[^>]*?>', Regexp::MULTILINE) + def self.pattern() TAGS_PATTERN end end end diff --git a/app/models/chunks/nowiki.rb b/app/models/chunks/nowiki.rb index ec135a93..ae1e3181 100644 --- a/app/models/chunks/nowiki.rb +++ b/app/models/chunks/nowiki.rb @@ -14,8 +14,8 @@ require 'chunks/chunk' # Author: Mark Reid # Created: 8th June 2004 class NoWiki < Chunk::Abstract - - def self.pattern() Regexp.new('(.*?)') end + NOWIKI_PATTERN = Regexp.new('(.*?)') + def self.pattern() NOWIKI_PATTERN end attr_reader :plain_text