clwiki 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2232e70e14e34f4e8f664b0847b7e903354e6cc5a7a60eecee180309616579
-  data.tar.gz: 6070cd435e81ab9d9746ef809bababc22a977648fffc00f782441ebb4c147853
+  metadata.gz: 19d12f7ee8fbce5a07c527e9a05dd90703f5ff5f91fdb66c728295fc9c565539
+  data.tar.gz: 72daa353d7a40ebc6774c6b2a99aa665fa0483d53e40dd16af34cd22838a7c59
 SHA512:
-  metadata.gz: 3667e2163b45499cd5ad3648b0109af8577625486b8f7a8ca963e7f51668a063ce05ea27ca3a04795c8213d60d239bbb91cff5e11bef02cd48da3c4d31fc4b7e
-  data.tar.gz: 283312b0775802dc66a502ba7836ecfc4f517978c031ff2de1ba7d51199591904d619722fa3d8f0af1a253a444c0c00a276752d5966fd5f3d33904d47521309f
+  metadata.gz: 46b443d65f1bdc2403b33690e67310d07361e5b159cee18ed480932a8003685b8e6eb35004e0c18473c726c24a434fcc1b562ebca8eeac1d4555119ae988a973
+  data.tar.gz: ccf1ac19ed5f3f8f1b9ee7a013a27777f5183287ca80d3124409e2a07e642818b2da6b8368fe82738d0d9f5b6f36d566eeb338bd1fb2e61588747c9743497c8b

data/lib/cl_wiki/c_labs/wiki_diff_formatter.rb

@@ -0,0 +1,7 @@
+module CLabs
+  class WikiDiffFormatter
+    def self.format_diff(diff)
+      "<b>Diff</b><br><pre>\n#{CGI.escapeHTML(diff)}\n</pre><br><hr=width\"50%\">"
+    end
+  end
+end

data/lib/cl_wiki/custom_footer.rb

@@ -0,0 +1,7 @@
+# to create your own custom footer, see any of the files in the ./footer
+# directory and imitate.
+
+module ClWiki
+  class CustomFooter
+  end
+end

data/lib/cl_wiki/custom_footers.rb

@@ -0,0 +1,18 @@
+module ClWiki
+  class CustomFooters
+    include Singleton
+
+    def register(class_ref)
+      @footers ||= []
+      @footers << class_ref
+    end
+
+    def process_footers(page)
+      String.new.tap do |content|
+        @footers&.each do |f|
+          content << f.footer_html(page)
+        end
+      end
+    end
+  end
+end

data/lib/cl_wiki/custom_formatter.rb

@@ -0,0 +1,7 @@
+# to create your own custom formatter, see any of the files in the ./format
+# directory and imitate.
+
+module ClWiki
+  class CustomFormatter
+  end
+end

data/lib/cl_wiki/custom_formatters.rb

@@ -0,0 +1,22 @@
+module ClWiki
+  class CustomFormatters
+    include Singleton
+
+    def register(class_ref)
+      @formatters ||= []
+      @formatters << class_ref
+    end
+
+    def unregister(class_ref)
+      @formatters.delete(class_ref)
+    end
+
+    def process_formatters(content, page)
+      @formatters&.each do |f|
+        if content&.match?(f.match_re)
+          content.gsub!(f.match_re) { |match| f.format_content(match, page) }
+        end
+      end
+    end
+  end
+end

data/lib/cl_wiki/file.rb

@@ -121,98 +121,4 @@ module ClWiki
       end
     end
   end
-
-  class Metadata
-    def self.split_file_contents(content)
-      idx = content =~ /\n{3}/m
-      metadata = []
-
-      if idx
-        metadata = content[0..(idx - 1)].split(/\n/)
-        valid_metadata?(metadata) ? content = content[(idx + 3)..-1] : metadata = []
-      end
-      [self.new(metadata), content]
-    end
-
-    def self.valid_metadata?(lines)
-      lines.map { |ln| ln.scan(/\A(\w+):?/) }.flatten.
-        map { |k| supported_keys.include?(k) }.uniq == [true]
-    end
-
-    def self.supported_keys
-      %w[mtime encrypted owner]
-    end
-
-    def initialize(lines = [])
-      @hash = {}
-      @keys = Metadata.supported_keys
-      parse_lines(lines)
-    end
-
-    def [](key)
-      @hash[key]
-    end
-
-    def []=(key, value)
-      raise "Unexpected key: #{key}" unless @keys.include?(key)
-
-      @hash[key] = value
-    end
-
-    def has?(key)
-      @hash.key?(key)
-    end
-
-    def to_s
-      @hash.collect { |k, v| "#{k}: #{v}" }.join("\n") + "\n\n\n"
-    end
-
-    def to_h
-      @hash
-    end
-
-    private
-
-    def parse_lines(lines)
-      lines.each do |ln|
-        key, value = ln.split(': ')
-        @hash[key] = value.chomp if @keys.include?(key)
-      end
-    end
-  end
-
-  class Util
-    def self.raise_if_mtime_not_equal(mtime_to_compare, file_name)
-      # reading the instance .mtime appears to take Windows DST into account,
-      # whereas the static File.mtime(filename) method does not
-      current_mtime = ::File.open(file_name, &:mtime)
-      compare_read_times!(mtime_to_compare, current_mtime)
-    end
-
-    def self.compare_read_times!(a, b)
-      # ignore usec
-      a = Time.new(a.year, a.month, a.day, a.hour, a.min, a.sec)
-      b = Time.new(b.year, b.month, b.day, b.hour, b.min, b.sec)
-      if a != b
-        raise FileModifiedSinceRead, "File has been modified since it was last read. #{dump_time(a)} != #{dump_time(b)}"
-      end
-    end
-
-    def self.dump_time(time)
-      String.new.tap do |s|
-        s << time.to_s
-        s << ".#{time.usec}" if time.respond_to?(:usec)
-      end
-    end
-
-    def self.convert_to_native_path(path)
-      path.gsub(%r{/}, ::File::SEPARATOR).gsub(/\\/, ::File::SEPARATOR)
-    end
-  end
-
-  class FileError < RuntimeError
-  end
-
-  class FileModifiedSinceRead < FileError
-  end
 end

data/lib/cl_wiki/file_error.rb

@@ -0,0 +1,5 @@
+module ClWiki
+  class FileError < RuntimeError
+
+  end
+end

data/lib/cl_wiki/file_modified_since_read.rb

@@ -0,0 +1,4 @@
+module ClWiki
+  class FileModifiedSinceRead < FileError
+  end
+end

data/lib/cl_wiki/metadata.rb

@@ -0,0 +1,60 @@
+module ClWiki
+  class Metadata
+    def self.split_file_contents(content)
+      idx = content =~ /\n{3}/m
+      metadata = []
+
+      if idx
+        metadata = content[0..(idx - 1)].split(/\n/)
+        valid_metadata?(metadata) ? content = content[(idx + 3)..-1] : metadata = []
+      end
+      [self.new(metadata), content]
+    end
+
+    def self.valid_metadata?(lines)
+      lines.map { |ln| ln.scan(/\A(\w+):?/) }.flatten.
+        map { |k| supported_keys.include?(k) }.uniq == [true]
+    end
+
+    def self.supported_keys
+      %w[mtime encrypted owner]
+    end
+
+    def initialize(lines = [])
+      @hash = {}
+      @keys = Metadata.supported_keys
+      parse_lines(lines)
+    end
+
+    def [](key)
+      @hash[key]
+    end
+
+    def []=(key, value)
+      raise "Unexpected key: #{key}" unless @keys.include?(key)
+
+      @hash[key] = value
+    end
+
+    def has?(key)
+      @hash.key?(key)
+    end
+
+    def to_s
+      @hash.collect { |k, v| "#{k}: #{v}" }.join("\n") + "\n\n\n"
+    end
+
+    def to_h
+      @hash
+    end
+
+    private
+
+    def parse_lines(lines)
+      lines.each do |ln|
+        key, value = ln.split(': ')
+        @hash[key] = value.chomp if @keys.include?(key)
+      end
+    end
+  end
+end

data/lib/cl_wiki/page.rb

@@ -149,249 +149,4 @@ module ClWiki
       ClWiki::MemoryIndexer.instance.page_exists?(page_name)
     end
   end
-
-  class PageFormatter
-    FIND_PAGE_NAME = 'Find'
-    FIND_RESULTS_NAME = 'Find Results'
-
-    attr_reader :full_name
-    attr_accessor :content
-
-    def initialize(content = nil, full_name = nil)
-      @content = content
-      self.full_name = full_name
-      @wiki_index = nil
-    end
-
-    def full_name=(value)
-      @full_name = value
-      if @full_name
-        @full_name = @full_name[1..-1] if @full_name[0..1] == '//'
-      end
-    end
-
-    def header(full_page_name, page = nil)
-      search_text = ::File.basename(full_page_name)
-      page_path, page_name = ::File.split(full_page_name)
-      page_path = '/' if page_path == '.'
-      dirs = page_path.split('/')
-      dirs = dirs[1..-1] if !dirs.empty? && dirs[0].empty?
-      full_dirs = (0..dirs.length - 1).each { |i| full_dirs[i] = ('/' + dirs[0..i].join('/')) }
-      head = String.new("<div class='wikiHeader'>")
-      head << core_footer_links(full_page_name, -1).sub('wikiFooter', 'wikiFooter wikiFooterFloat')
-      if [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(full_page_name)
-        head << "<span class='pageName'>#{full_page_name}</span>"
-      else
-        head << "<span class='pageName'><a href='find?search_text=#{search_text}'>#{page_name}</a></span><br/>"
-        full_dirs.each do |dir|
-          head << "'<span class='pageTag'>'"
-          head << "<a href=#{cgifn}?page=#{dir}>#{File.split(dir)[-1]}</a></span>"
-        end
-        head << '<br/>'
-        head << "<span class='wikiPageData'>#{page_update_time(page)}</span><br/>" if page
-      end
-      head << '</div>'
-    end
-
-    def page_update_time(page)
-      mod_time = page.mtime
-      if mod_time
-        update_format = $wiki_conf.page_update_format.gsub(/ /, '&nbsp;')
-        mod_time.strftime(update_format)
-      else
-        ''
-      end
-    end
-
-    def process_custom_footers(page)
-      Dir["#{::File.dirname(__FILE__)}/footer/footer.*"].sort.each do |fn|
-        require fn
-      end
-
-      ClWiki::CustomFooters.instance.process_footers(page)
-    end
-
-    def footer(page)
-      return String.new unless page.is_a? ClWiki::Page
-      custom_footer = process_custom_footers(page)
-      custom_footer << core_footer_links(page.page_name)
-    end
-
-    def core_footer_links(wiki_name, tab_index=0)
-      # refactor string constants
-      footer = String.new("<div class='wikiFooter'>")
-      footer << '<ul>'
-      if $wiki_conf.editable
-        unless [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(wiki_name)
-          footer << "<li><span class='wikiAction'><a href='#{wiki_name}/edit' tabindex=#{tab_index}>Edit</a></span></li>"
-        end
-      end
-      footer << "<li><span class='wikiAction'><a href='find' tabindex=#{tab_index}>Find</a></span></li>"
-      if $wiki_conf.publishTag
-        footer << "<li><span class='wikiAction'><a href='recent' tabindex=#{tab_index}>Recent</a></span></li>"
-      else
-        footer << "<li><span class='wikiAction'><a href='FrontPage' tabindex=#{tab_index}>Home</a></span></li>"
-      end
-      footer << '</ul></div>'
-      footer
-    end
-
-    def src_url
-      "file://#{ClWiki::Page.read_file_full_path_and_name(@full_name)}"
-    end
-
-    def reload_url(with_global_edit_links = false)
-      result = "#{full_url}?page=#{@full_name}"
-      result << (with_global_edit_links ? '&globaledits=true' : '&globaledits=false')
-    end
-
-    def mailto_url
-      "mailto:?Subject=wikifyi:%20#{@full_name}&Body=#{reload_url}"
-    end
-
-    def gsub_words
-      @content.gsub(%r{<.+?>|</.+?>|\w+}) { |word| yield word }
-    end
-
-    def format_links
-      no_wiki_link_in_effect = false
-      inside_html_tags = false
-
-      gsub_words do |word|
-        if (word[0, 1] == '<') && (word[-1, 1] == '>')
-          # refactor to class,local constant, instead of global
-          if /<NoWikiLinks>/i.match?(word)
-            no_wiki_link_in_effect = true
-            word = ''
-            # refactor to class,local constant, instead of global
-          elsif /<\/NoWikiLinks>/i.match?(word)
-            no_wiki_link_in_effect = false
-            word = ''
-          end
-
-          if /<html>/i.match?(word)
-            inside_html_tags = true
-            word = ''
-          elsif /<\/html>/i.match?(word)
-            inside_html_tags = false
-            word = ''
-          end
-        elsif is_wiki_name?(word)
-          if !no_wiki_link_in_effect && !inside_html_tags
-            # code smell here y'all
-            word = convert_to_link(word) unless block_given?
-          end
-        end
-        if block_given?
-          yield word
-        else
-          word
-        end
-      end
-    end
-
-    def self.only_html(str)
-      only_one_tag = /\A[^<]*<[^<>]*>[^>]*\z/
-      header_tag_line = %r{\A\s*<h.>.*</h.>\s*\z}
-      (str =~ only_one_tag) || (str =~ header_tag_line)
-      # str.scan(/<.*>/).to_s == str.chomp
-    end
-
-    def starts_with_path_char(path)
-      (path[0..0] == '/') || (path[0..1] == '//')
-    end
-
-    def cgifn
-      $wiki_conf&.cgifn
-    end
-
-    def full_url
-      ($wiki_conf.url_prefix + cgifn) if $wiki_conf
-    end
-
-    def convert_to_link(page_name)
-      if ClWiki::Page.page_exists?(page_name)
-        "<a href='#{page_name}'>#{page_name}</a>"
-      else
-        @wiki_index ||= ClWiki::MemoryIndexer.instance
-        hits = @wiki_index.search(page_name, titles_only: true)
-
-        result = case hits.length
-                 when 0
-                   page_name
-                 when 1
-                   "<a href='#{hits[0]}'>#{page_name}</a>"
-                 else
-                   "<a href='find?search_text=#{page_name}'>#{page_name}</a>"
-                 end
-
-        if $wiki_conf.editable && (hits.empty? || $wiki_conf.global_edits)
-          result << "<a href='#{page_name}/edit'>?</a>"
-        end
-        result
-      end
-    end
-
-    def is_wiki_name?(string)
-      return false if string.empty?
-
-      /\A[0-9]*[A-Z][a-z]\w*?[A-Z][a-z]\w*\z/.match?(string)
-    end
-  end
-
-  class CustomFooters
-    include Singleton
-
-    def register(class_ref)
-      @footers ||= []
-      @footers << class_ref
-    end
-
-    def process_footers(page)
-      String.new.tap do |content|
-        @footers&.each do |f|
-          content << f.footer_html(page)
-        end
-      end
-    end
-  end
-
-  # to create your own custom footer, see any of the files in the ./footer
-  # directory and imitate.
-  class CustomFooter
-  end
-
-  class CustomFormatters
-    include Singleton
-
-    def register(class_ref)
-      @formatters ||= []
-      @formatters << class_ref
-    end
-
-    def unregister(class_ref)
-      @formatters.delete(class_ref)
-    end
-
-    def process_formatters(content, page)
-      @formatters&.each do |f|
-        if content&.match?(f.match_re)
-          content.gsub!(f.match_re) { |match| f.format_content(match, page) }
-        end
-      end
-    end
-  end
-
-  # to create your own custom formatter, see any of the files in the ./format
-  # directory and imitate.
-  class CustomFormatter
-  end
-end
-
-module CLabs
-  class WikiDiffFormatter
-    def self.format_diff(diff)
-      "<b>Diff</b><br><pre>\n#{CGI.escapeHTML(diff)}\n</pre><br><hr=width\"50%\">"
-    end
-  end
 end

data/lib/cl_wiki/page_formatter.rb

@@ -0,0 +1,190 @@
+module ClWiki
+  class PageFormatter
+    FIND_PAGE_NAME = 'Find'
+    FIND_RESULTS_NAME = 'Find Results'
+
+    attr_reader :full_name
+    attr_accessor :content
+
+    def initialize(content = nil, full_name = nil)
+      @content = content
+      self.full_name = full_name
+      @wiki_index = nil
+    end
+
+    def full_name=(value)
+      @full_name = value
+      if @full_name
+        @full_name = @full_name[1..-1] if @full_name[0..1] == '//'
+      end
+    end
+
+    def header(full_page_name, page = nil)
+      search_text = ::File.basename(full_page_name)
+      page_path, page_name = ::File.split(full_page_name)
+      page_path = '/' if page_path == '.'
+      dirs = page_path.split('/')
+      dirs = dirs[1..-1] if !dirs.empty? && dirs[0].empty?
+      full_dirs = (0..dirs.length - 1).each { |i| full_dirs[i] = ('/' + dirs[0..i].join('/')) }
+      head = String.new("<div class='wikiHeader'>")
+      head << core_footer_links(full_page_name, -1).sub('wikiFooter', 'wikiFooter wikiFooterFloat')
+      if [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(full_page_name)
+        head << "<span class='pageName'>#{full_page_name}</span>"
+      else
+        head << "<span class='pageName'><a href='find?search_text=#{search_text}'>#{page_name}</a></span><br/>"
+        full_dirs.each do |dir|
+          head << "'<span class='pageTag'>'"
+          head << "<a href=#{cgifn}?page=#{dir}>#{File.split(dir)[-1]}</a></span>"
+        end
+        head << '<br/>'
+        head << "<span class='wikiPageData'>#{page_update_time(page)}</span><br/>" if page
+      end
+      head << '</div>'
+    end
+
+    def page_update_time(page)
+      mod_time = page.mtime
+      if mod_time
+        update_format = $wiki_conf.page_update_format.gsub(/ /, '&nbsp;')
+        mod_time.strftime(update_format)
+      else
+        ''
+      end
+    end
+
+    def process_custom_footers(page)
+      Dir["#{::File.dirname(__FILE__)}/footer/footer.*"].sort.each do |fn|
+        require fn
+      end
+
+      ClWiki::CustomFooters.instance.process_footers(page)
+    end
+
+    def footer(page)
+      return String.new unless page.is_a? ClWiki::Page
+      custom_footer = process_custom_footers(page)
+      custom_footer << core_footer_links(page.page_name)
+    end
+
+    def core_footer_links(wiki_name, tab_index = 0)
+      # refactor string constants
+      footer = String.new("<div class='wikiFooter'>")
+      footer << '<ul>'
+      if $wiki_conf.editable
+        unless [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(wiki_name)
+          footer << "<li><span class='wikiAction'><a href='#{wiki_name}/edit' tabindex=#{tab_index}>Edit</a></span></li>"
+        end
+      end
+      footer << "<li><span class='wikiAction'><a href='find' tabindex=#{tab_index}>Find</a></span></li>"
+      if $wiki_conf.publishTag
+        footer << "<li><span class='wikiAction'><a href='recent' tabindex=#{tab_index}>Recent</a></span></li>"
+      else
+        footer << "<li><span class='wikiAction'><a href='FrontPage' tabindex=#{tab_index}>Home</a></span></li>"
+      end
+      footer << '</ul></div>'
+      footer
+    end
+
+    def src_url
+      "file://#{ClWiki::Page.read_file_full_path_and_name(@full_name)}"
+    end
+
+    def reload_url(with_global_edit_links = false)
+      result = "#{full_url}?page=#{@full_name}"
+      result << (with_global_edit_links ? '&globaledits=true' : '&globaledits=false')
+    end
+
+    def mailto_url
+      "mailto:?Subject=wikifyi:%20#{@full_name}&Body=#{reload_url}"
+    end
+
+    def gsub_words
+      @content.gsub(%r{<.+?>|</.+?>|\w+}) { |word| yield word }
+    end
+
+    def format_links
+      no_wiki_link_in_effect = false
+      inside_html_tags = false
+
+      gsub_words do |word|
+        if (word[0, 1] == '<') && (word[-1, 1] == '>')
+          # refactor to class,local constant, instead of global
+          if /<NoWikiLinks>/i.match?(word)
+            no_wiki_link_in_effect = true
+            word = ''
+            # refactor to class,local constant, instead of global
+          elsif /<\/NoWikiLinks>/i.match?(word)
+            no_wiki_link_in_effect = false
+            word = ''
+          end
+
+          if /<html>/i.match?(word)
+            inside_html_tags = true
+            word = ''
+          elsif /<\/html>/i.match?(word)
+            inside_html_tags = false
+            word = ''
+          end
+        elsif is_wiki_name?(word)
+          if !no_wiki_link_in_effect && !inside_html_tags
+            # code smell here y'all
+            word = convert_to_link(word) unless block_given?
+          end
+        end
+        if block_given?
+          yield word
+        else
+          word
+        end
+      end
+    end
+
+    def self.only_html(str)
+      only_one_tag = /\A[^<]*<[^<>]*>[^>]*\z/
+      header_tag_line = %r{\A\s*<h.>.*</h.>\s*\z}
+      (str =~ only_one_tag) || (str =~ header_tag_line)
+      # str.scan(/<.*>/).to_s == str.chomp
+    end
+
+    def starts_with_path_char(path)
+      (path[0..0] == '/') || (path[0..1] == '//')
+    end
+
+    def cgifn
+      $wiki_conf&.cgifn
+    end
+
+    def full_url
+      ($wiki_conf.url_prefix + cgifn) if $wiki_conf
+    end
+
+    def convert_to_link(page_name)
+      if ClWiki::Page.page_exists?(page_name)
+        "<a href='#{page_name}'>#{page_name}</a>"
+      else
+        @wiki_index ||= ClWiki::MemoryIndexer.instance
+        hits = @wiki_index.search(page_name, titles_only: true)
+
+        result = case hits.length
+                 when 0
+                   page_name
+                 when 1
+                   "<a href='#{hits[0]}'>#{page_name}</a>"
+                 else
+                   "<a href='find?search_text=#{page_name}'>#{page_name}</a>"
+                 end
+
+        if $wiki_conf.editable && (hits.empty? || $wiki_conf.global_edits)
+          result << "<a href='#{page_name}/edit'>?</a>"
+        end
+        result
+      end
+    end
+
+    def is_wiki_name?(string)
+      return false if string.empty?
+
+      /\A[0-9]*[A-Z][a-z]\w*?[A-Z][a-z]\w*\z/.match?(string)
+    end
+  end
+end

data/lib/cl_wiki/util.rb

@@ -0,0 +1,30 @@
+module ClWiki
+  class Util
+    def self.raise_if_mtime_not_equal(mtime_to_compare, file_name)
+      # reading the instance .mtime appears to take Windows DST into account,
+      # whereas the static File.mtime(filename) method does not
+      current_mtime = ::File.open(file_name, &:mtime)
+      compare_read_times!(mtime_to_compare, current_mtime)
+    end
+
+    def self.compare_read_times!(a, b)
+      # ignore usec
+      a = Time.new(a.year, a.month, a.day, a.hour, a.min, a.sec)
+      b = Time.new(b.year, b.month, b.day, b.hour, b.min, b.sec)
+      if a != b
+        raise FileModifiedSinceRead, "File has been modified since it was last read. #{dump_time(a)} != #{dump_time(b)}"
+      end
+    end
+
+    def self.dump_time(time)
+      String.new.tap do |s|
+        s << time.to_s
+        s << ".#{time.usec}" if time.respond_to?(:usec)
+      end
+    end
+
+    def self.convert_to_native_path(path)
+      path.gsub(%r{/}, ::File::SEPARATOR).gsub(/\\/, ::File::SEPARATOR)
+    end
+  end
+end

data/lib/cl_wiki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClWiki
-  VERSION = '3.2.1'
+  VERSION = '3.2.3'
 end

data/lib/cl_wiki_lib.rb

@@ -4,6 +4,25 @@ require File.expand_path('cl_wiki/configuration', __dir__)
 require File.expand_path('cl_wiki/user_base', __dir__)
 require File.expand_path('cl_wiki/public_user', __dir__)
 require File.expand_path('cl_wiki/memory_indexer', __dir__)
+
+require File.expand_path('cl_wiki/file_error', __dir__)
+require File.expand_path('cl_wiki/file_modified_since_read', __dir__)
 require File.expand_path('cl_wiki/file', __dir__)
+
+require File.expand_path('cl_wiki/util', __dir__)
+
+require File.expand_path('cl_wiki/custom_footer', __dir__)
+require File.expand_path('cl_wiki/custom_footers', __dir__)
+require File.expand_path('cl_wiki/custom_formatter', __dir__)
+require File.expand_path('cl_wiki/custom_formatters', __dir__)
+
+Dir[File.join(__dir__, 'cl_wiki', 'format', '*.rb')].each do |fn|
+  require fn
+end
+
+
+require File.expand_path('cl_wiki/metadata', __dir__)
+require File.expand_path('cl_wiki/page_formatter', __dir__)
+
 require File.expand_path('cl_wiki/page', __dir__)
 require File.expand_path('cl_wiki/version', __dir__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - chrismo
@@ -82,18 +82,28 @@ files:
 - config/initializers/clwiki.rb
 - config/routes.rb
 - lib/cl_wiki.rb
+- lib/cl_wiki/c_labs/wiki_diff_formatter.rb
 - lib/cl_wiki/configuration.rb
+- lib/cl_wiki/custom_footer.rb
+- lib/cl_wiki/custom_footers.rb
+- lib/cl_wiki/custom_formatter.rb
+- lib/cl_wiki/custom_formatters.rb
 - lib/cl_wiki/engine.rb
 - lib/cl_wiki/file.rb
-- lib/cl_wiki/format/format.blockquote.rb
-- lib/cl_wiki/format/format.graphviz.digraph.rb
-- lib/cl_wiki/format/format.opml.rb
-- lib/cl_wiki/format/format.pre.blockquote.rb
-- lib/cl_wiki/format/format.simpletable.rb
+- lib/cl_wiki/file_error.rb
+- lib/cl_wiki/file_modified_since_read.rb
+- lib/cl_wiki/format/format_blockquote.rb
+- lib/cl_wiki/format/format_graphviz_di_graph.rb
+- lib/cl_wiki/format/format_opml.rb
+- lib/cl_wiki/format/format_pre_blockquote.rb
+- lib/cl_wiki/format/format_simple_table.rb
 - lib/cl_wiki/memory_indexer.rb
+- lib/cl_wiki/metadata.rb
 - lib/cl_wiki/page.rb
+- lib/cl_wiki/page_formatter.rb
 - lib/cl_wiki/public_user.rb
 - lib/cl_wiki/user_base.rb
+- lib/cl_wiki/util.rb
 - lib/cl_wiki/version.rb
 - lib/cl_wiki_lib.rb
 - lib/tasks/index.rake