gollum-lib 5.0.a.3 → 5.0.a.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c107b8b3bc278c630d0b4e3eae7ef36333ad7ec
-  data.tar.gz: f4cf906bf8898dfb676f1130a2c3e2b270d15f41
+SHA256:
+  metadata.gz: 16e15f2728c7f9506c74ec5883137e962998c444a5891469c7eae14aa3f09485
+  data.tar.gz: 9387c63c0f369902cf50439b750864fc2c4f86834da46576da7e1c8dc51464c6
 SHA512:
-  metadata.gz: 2e3fae109029c96762da698e4338fe4f789c287b63b5a085c0403daf399d670bc0ce767d26aaf8eb15380b31543b9dae2a5086d8adeb27d54bab33cd045ce6ef
-  data.tar.gz: fff6e1c352190df905559ad9d53fea8dd3feb9973696e5dfbb5ce2576d67f6c2529b737ce9600ec5d78ab7a1295121445cda73f9df9a4a5b13f2611f1b1f149e
+  metadata.gz: eef2301efb002a266600420ea073f5933c0a3ac7e23e613b39b492435383b3ded492b3756eb9e294683a7660a7d71be294c05e6e8ce8ce9a2a27338ba56dd092
+  data.tar.gz: 29ac662c80e6b90fad991b7bb421486cf2b1a5b5a3838f342bbdfb0d26f23a6680a98cd6372077a5ed3e8e07578a9470600a4c9a427346fcc36700e735f8f9c5

data/HISTORY.md

@@ -1,3 +1,10 @@
+# v5.0
+
+For a detailed overview of changes in 5.0 and a guide to migrating your wiki, see https://github.com/gollum/gollum/wiki/5.0-release-notes
+
+* Removed support for Web Sequence Diagroms, PlantUML now default.
+  ** PlantUML users in 4.x please note: in this release PlantUML uses the server at https://plantuml.com by default, not `localhost`. Use the config option to keep using your own server.
+
 # v4.2.1
 
 * Performances improvements

data/gemspec.rb

@@ -8,6 +8,7 @@ def specification(version, default_adapter, platform = nil)
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
+    s.date              = '2018-09-17'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
@@ -25,19 +26,22 @@ def specification(version, default_adapter, platform = nil)
     s.extra_rdoc_files = %w(README.md LICENSE)
 
     s.add_dependency *default_adapter
-    s.add_dependency 'rouge', '~> 2.0'
-    s.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1'
+    s.add_dependency 'rouge', '~> 3.1'
+    s.add_dependency 'nokogiri', '~> 1.8'
     s.add_dependency 'stringex', '~> 2.6'
     s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'
     s.add_dependency 'gemojione', '~> 3.2'
+    s.add_dependency 'twitter-text', '1.14.7'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
     s.add_development_dependency 'kramdown', '~> 1.13'
     s.add_development_dependency 'RedCloth', '~> 4.2.9'
-    s.add_development_dependency 'mocha', '~> 1.1.0'
+    s.add_development_dependency 'mocha', '~> 1.2.0'
     s.add_development_dependency 'shoulda', '~> 3.5.0'
     s.add_development_dependency 'wikicloth', '~> 0.8.3'
+    s.add_development_dependency 'bibtex-ruby', '~> 4.3'
+    s.add_development_dependency 'citeproc-ruby', '~> 1.1'
     s.add_development_dependency 'rake', '~> 10.4.0'
     s.add_development_dependency 'pry', '~> 0.10.1'
     # required by pry
@@ -71,9 +75,11 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/file.rb
     lib/gollum-lib/file_view.rb
     lib/gollum-lib/filter.rb
+    lib/gollum-lib/filter/bibtex.rb
     lib/gollum-lib/filter/code.rb
     lib/gollum-lib/filter/emoji.rb
     lib/gollum-lib/filter/macro.rb
+    lib/gollum-lib/filter/pandoc_bib.rb
     lib/gollum-lib/filter/plain_text.rb
     lib/gollum-lib/filter/plantuml.rb
     lib/gollum-lib/filter/remote_code.rb
@@ -81,7 +87,6 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/filter/sanitize.rb
     lib/gollum-lib/filter/tags.rb
     lib/gollum-lib/filter/toc.rb
-    lib/gollum-lib/filter/wsd.rb
     lib/gollum-lib/filter/yaml.rb
     lib/gollum-lib/git_access.rb
     lib/gollum-lib/helpers.rb
@@ -91,6 +96,7 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/macro/global_toc.rb
     lib/gollum-lib/macro/navigation.rb
     lib/gollum-lib/macro/series.rb
+    lib/gollum-lib/macro/video.rb
     lib/gollum-lib/markup.rb
     lib/gollum-lib/markups.rb
     lib/gollum-lib/page.rb

data/lib/gollum-lib.rb

@@ -5,13 +5,10 @@ require 'digest/sha1'
 require 'ostruct'
 require 'pathname'
 
-DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit_adapter' : 'grit_adapter'
+DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit' : 'grit'
 
-if defined?(Gollum::GIT_ADAPTER)
-  require "#{Gollum::GIT_ADAPTER.downcase}_adapter"
-else
-  require DEFAULT_ADAPTER
-end
+Gollum::GIT_ADAPTER = DEFAULT_ADAPTER if !defined?(Gollum::GIT_ADAPTER)
+require "#{Gollum::GIT_ADAPTER.downcase}_adapter"
 
 # external
 require 'github/markup'

data/lib/gollum-lib/file.rb

@@ -26,6 +26,13 @@ module Gollum
       path
     end
 
+    # Public: The SHA hash identifying this file
+    #
+    # Returns the String SHA.
+    def sha
+      @blob && @blob.id
+    end
+
     # Public: The url_path, but CGI escaped.
     #
     # Returns the String url_path

data/lib/gollum-lib/filter.rb

@@ -55,12 +55,12 @@ module Gollum
       @map    = {}
     end
 
-    def extract(_d)
+    def extract(data)
       raise RuntimeError,
             "#{self.class} has not implemented ##extract!"
     end
 
-    def process(_d)
+    def process(data)
       raise RuntimeError,
             "#{self.class} has not implemented ##process!"
     end

data/lib/gollum-lib/filter/bibtex.rb

@@ -0,0 +1,55 @@
+begin
+  require 'bibtex'
+  require 'citeproc'
+  require 'csl'
+  require 'csl/styles'
+rescue LoadError => error
+end
+
+# Render BibTeX files.
+class Gollum::Filter::BibTeX < Gollum::Filter
+
+  def extract(data)
+    return data unless supported_format? && gems_available? && bib = ::BibTeX.parse(data).convert(:latex)
+    style = find_csl_data('csl') || ::CSL::Style.default
+    locale = find_csl_data('locale') || ::CSL::Locale.default
+
+    begin
+      style = ::CSL::Style.load(style)
+      ::CSL::Locale.load(locale)
+    rescue ::CSL::ParseError => error
+      log_failure(error.to_s)
+      return CGI.escapeHTML(data)
+    end
+
+    citeproc = ::CiteProc::Processor.new(style: style, locale: locale, format: 'html')
+    citeproc.import(bib.to_citeproc)
+    citeproc.bibliography.references.join('<br/>')
+  end
+
+  def process(data)
+    data
+  end
+
+  private
+
+  def log_failure(msg)
+    @markup.metadata = {} unless @markup.metadata
+    @markup.metadata['errors'] = [] unless @markup.metadata['errors']
+    @markup.metadata['errors'] << "Could not render the bibliography because no valid CSL or locale file was found in the wiki or in the CSL directory. Please commited a valid file, or install the csl-styles gem. The message from the parser was: #{msg.to_s}."
+  end
+
+  def supported_format?
+    @markup.format == :bib
+  end
+
+  def gems_available?
+    ::Gollum::Markup.formats[:bib][:enabled]
+  end
+
+  def find_csl_data(key)
+    path = @markup.metadata ? @markup.metadata[key] : nil
+    file = path ? @markup.wiki.file(path) : nil
+    file.nil? ? path : file.raw_data
+  end
+end

data/lib/gollum-lib/filter/code.rb

@@ -6,8 +6,6 @@
 class Gollum::Filter::Code < Gollum::Filter
   def extract(data)
     case @markup.format
-    when :txt
-      return data
     when :asciidoc
       data.gsub!(/^(\[source,([^\r\n]*)\]\n)?----\n(.+?)\n----$/m) do
         cache_codeblock(Regexp.last_match[2], Regexp.last_match[3])

data/lib/gollum-lib/filter/emoji.rb

@@ -2,12 +2,15 @@
 
 # Emoji
 #
-# Render emoji such as :smile:
+# Render an emoji tag such as ":smile:". In some rare situations, you have
+# to escape emoji tags e.g. when your content contains something like
+# "hh:mm:ss" or "rake app:shell:install". Prefix the leading colon with a
+# backslash to disable this emoji tag e.g. "hh\:mm:ss".
 class Gollum::Filter::Emoji < Gollum::Filter
 
   EXTRACT_PATTERN = %r{
     (?<!\[{2})
-    :(?<name>[\w-]+):
+    (?<escape>\\)?:(?<name>[\w-]+):
     (?!\]{^2})
   }ix
 
@@ -19,7 +22,11 @@ class Gollum::Filter::Emoji < Gollum::Filter
 
   def extract(data)
     data.gsub! EXTRACT_PATTERN do
-      emoji_exists?($~[:name]) ? "=EEMMOOJJII=#{$~[:name]}=IIJJOOMMEE=" : $&
+      case
+        when $~[:escape] then $&[1..-1]
+        when emoji_exists?($~[:name]) then "=EEMMOOJJII=#{$~[:name]}=IIJJOOMMEE="
+        else $&
+      end
     end
     data
   end

data/lib/gollum-lib/filter/pandoc_bib.rb

@@ -0,0 +1,52 @@
+require 'yaml'
+require 'pathname'
+
+# When using pandoc, put relevant bibliography metadata extracted in the YAML filter back in the document so it gets passed on to pandoc.
+class Gollum::Filter::PandocBib < Gollum::Filter
+
+  BIB_PATH_KEYS = ['bibliography', 'csl']
+  BIB_KEYS = ['link-citations', 'nocite']
+  ALL_BIB_KEYS = BIB_PATH_KEYS + BIB_KEYS
+  
+  def process(data)
+    data
+  end
+
+  def extract(data)
+    return data unless supported_format? && bibliography_metadata_present?
+    bib_metadata = {}
+    bib_metadata.merge!(@markup.metadata.select {|key, _value| BIB_KEYS.include?(key)})
+
+    BIB_PATH_KEYS.each do |bibliography_key|
+      if path = @markup.metadata[bibliography_key]
+        next unless file = @markup.wiki.file(path)
+        bib_metadata[bibliography_key] = path_for_bibfile(file)
+      end
+    end
+    bib_metadata.empty? ? data : "#{bib_metadata.to_yaml}---\n#{data}"
+  end
+
+  private
+
+  def path_for_bibfile(file)
+    if @markup.wiki.repo_is_bare
+      path = Pathname.new("#{::File.join(::Dir.tmpdir, file.sha)}#{::File.extname(file.path)}")
+        unless path.exist?
+          path.open('w') do |copy_file|
+            copy_file.write(file.raw_data)
+          end
+        end
+      path.to_s
+    else
+      ::File.expand_path(::File.join(@markup.wiki.path, file.path))
+    end
+  end
+
+  def supported_format?
+    @markup.format == :markdown
+  end
+
+  def bibliography_metadata_present?
+     @markup.metadata && @markup.metadata.keys.any? {|key| ALL_BIB_KEYS.include?(key)}
+  end
+end

data/lib/gollum-lib/filter/plain_text.rb

@@ -6,6 +6,10 @@
 
 class Gollum::Filter::PlainText < Gollum::Filter
 
+    def do_process(_d)
+      skip? ? _d : process(_d)
+    end
+
   def extract(data)
     @markup.format == :txt ? "<pre>#{CGI.escapeHTML(data)}</pre>" : data
   end

data/lib/gollum-lib/filter/plantuml.rb

@@ -37,7 +37,7 @@ require 'zlib'
 #
 class Gollum::Filter::PlantUML < Gollum::Filter
 
-  DEFAULT_URL = "http://localhost:8080/plantuml/png"
+  DEFAULT_URL = "http://www.plantuml.com/plantuml/png"
 
   # Configuration class used to change the behaviour of the PlatnUML filter.
   #
@@ -69,7 +69,6 @@ class Gollum::Filter::PlantUML < Gollum::Filter
   # Extract all sequence diagram blocks into the map and replace with
   # placeholders.
   def extract(data)
-    return data if @markup.format == :txt
     data.gsub(/(@startuml\r?\n.+?\r?\n@enduml\r?$)/m) do
       id       = Digest::SHA1.hexdigest($1)
       @map[id] = { :code => $1 }
@@ -115,9 +114,9 @@ class Gollum::Filter::PlantUML < Gollum::Filter
   # Transcoder class in the PlantUML java code.
   def gen_url(text)
     result = ""
-    compressedData = Zlib::Deflate.deflate(text)
+    compressedData = Zlib::Deflate.new(nil, -Zlib::MAX_WBITS).deflate(text, Zlib::FINISH)
+
     compressedData.chars.each_slice(3) do |bytes|
-      #print bytes[0], ' ' , bytes[1] , ' ' , bytes[2]
       b1 = bytes[0].nil? ? 0 : (bytes[0].ord & 0xFF)
       b2 = bytes[1].nil? ? 0 : (bytes[1].ord & 0xFF)
       b3 = bytes[2].nil? ? 0 : (bytes[2].ord & 0xFF)

data/lib/gollum-lib/filter/remote_code.rb

@@ -13,7 +13,6 @@ require 'open-uri'
 #
 class Gollum::Filter::RemoteCode < Gollum::Filter
   def extract(data)
-    return data if @markup.format == :txt
     data.gsub(/^[ \t]*``` ?([^:\n\r]+):((http)?[^`\n\r]+)```/) do
       language = Regexp.last_match[1]
       uri      = Regexp.last_match[2]

data/lib/gollum-lib/filter/sanitize.rb

@@ -10,7 +10,7 @@ class Gollum::Filter::Sanitize < Gollum::Filter
       doc = Nokogiri::HTML::DocumentFragment.parse(data)
       doc = @markup.sanitize.clean_node!(doc)
 
-      doc.to_xml(@markup.to_xml_opts)
+      doc.to_xml(@markup.to_xml_opts).gsub(/<p><\/p>/, '')
     else
       data
     end

data/lib/gollum-lib/filter/tags.rb

@@ -4,7 +4,6 @@
 class Gollum::Filter::Tags < Gollum::Filter
   # Extract all tags into the tagmap and replace with placeholders.
   def extract(data)
-    return data if @markup.format == :txt || @markup.format == :asciidoc
     data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/) do
       if Regexp.last_match[1] == "'" && Regexp.last_match[3] != "'"
         "[[#{Regexp.last_match[2]}]]#{Regexp.last_match[3]}"
@@ -28,12 +27,6 @@ class Gollum::Filter::Tags < Gollum::Filter
     data
   end
 
-  def register_tag(tag)
-    id       = "TAG#{Digest::SHA1.hexdigest(tag)}TAG"
-    @map[id] = tag
-    id
-  end
-
   # Process all text nodes from the doc and replace the placeholders with the
   # final markup.
   def process(rendered_data)
@@ -60,6 +53,13 @@ class Gollum::Filter::Tags < Gollum::Filter
   private
 
   PREFORMATTED_TAGS = %w(code tt)
+  INCLUDE_TAG = 'include:'
+
+  def register_tag(tag)
+    id       = "TAG#{Digest::SHA1.hexdigest(tag)}TAG"
+    @map[id] = tag
+    id
+  end
 
   def is_preformatted?(node)
     node && (PREFORMATTED_TAGS.include?(node.name) ||
@@ -73,20 +73,43 @@ class Gollum::Filter::Tags < Gollum::Filter
   #
   # Returns the String HTML version of the tag.
   def process_tag(tag)
-    if tag =~ /^_TOC_/
+    link_part, extra = parse_tag_parts(tag)
+    return generate_link('', nil, nil, :page_absent) if link_part.nil?
+    img_args = extra ? [extra, link_part] : [link_part]
+    mime = MIME::Types.type_for(::File.extname(img_args.first.to_s)).first
+
+    result = if tag =~ /^_TOC_/
       %{[[#{tag}]]}
-    elsif tag =~ /^_$/
+    elsif link_part =~ /^_$/
       %{<div class="clearfloats"></div>}
-    elsif (html = process_include_tag(tag))
-      html
-    elsif (html = process_image_tag(tag))
-      html
-    elsif (html = process_external_link_tag(tag))
-      html
-    elsif (html = process_file_link_tag(tag))
-      html
+    elsif link_part =~ /^#{INCLUDE_TAG}/
+      process_include_tag(link_part)
+    elsif mime && mime.content_type =~ /^image/
+      process_image_tag(*img_args)
+    elsif external = process_external_link_tag(link_part, extra)
+      external
+    end
+    result ? result : process_link_tag(link_part, extra)
+  end
+
+  # Process the tag parts as an internal link to a File or Page. 
+  def process_link_tag(link_part, pretty_name)
+    process_file_link_tag(link_part, pretty_name) || process_page_link_tag(link_part, pretty_name)
+  end
+  
+  # Parse the tag (stuff between the double brackets) into a link part and additional information (a pretty name, description, or image options).
+  #
+  # tag       - The String tag contents (the stuff inside the double
+  #             brackets).
+  #
+  # Returns an Array of the form [link_part, extra], where both elements are Strings and the second element may be nil.
+  def parse_tag_parts(tag)
+    parts = tag.split('|').map(&:strip)[0..1]
+    parts.reverse! if @markup.reverse_links?
+    if parts[1]
+      return parts[1], parts[0]
     else
-      process_page_link_tag(tag)
+      return parts[0], nil
     end
   end
 
@@ -94,16 +117,14 @@ class Gollum::Filter::Tags < Gollum::Filter
   #
   # tag - The String tag contents (the  stuff inside the double brackets).
   #
-  # Returns the String HTML if the tag is a valid image tag or nil
-  #   if it is not.
-  #
+  # Returns the String HTML if the tag includes a valid page or an error message if the page could not be found.
   def process_include_tag(tag)
-    return unless /^include:/.match(tag)
-    page_name          = tag[8..-1]
-    resolved_page_name = ::File.expand_path(page_name, "/"+@markup.dir)
-
+    len = INCLUDE_TAG.length
+    return html_error('Cannot process include directive: no page name given') if tag.length <= len
+    page_name          = tag[len..-1]
+    resolved_page_name = ::File.expand_path(page_name, "#{::File::SEPARATOR}#{@markup.dir}")
     if @markup.include_levels > 0
-      page = find_page_from_name(resolved_page_name)
+      page = find_page_from_path(resolved_page_name)
       if page
         page.formatted_data(@markup.encoding, @markup.include_levels-1)
       else
@@ -116,110 +137,42 @@ class Gollum::Filter::Tags < Gollum::Filter
 
   # Attempt to process the tag as an image tag.
   #
-  # tag - The String tag contents (the stuff inside the double brackets).
+  # path - The String path to the image.
+  # options - The String of options for the image (the stuff after the '|'). Optional.
   #
   # Returns the String HTML if the tag is a valid image tag or nil
   #   if it is not.
-  def process_image_tag(tag)
-    parts = tag.split('|')
-    return if parts.size.zero?
-
-    name = parts[0].strip
-    if (file = @markup.find_file(name))
-      path = ::File.join @markup.wiki.base_path, file.path
-    elsif name =~ /^https?:\/\/.+(jpg|png|gif|svg|bmp)$/i
-      path = name
-    elsif name =~ /.+(jpg|png|gif|svg|bmp)$/i
-      # If is image, file not found and no link, then populate with empty String
-      # We can than add an image not found alt attribute for this later
-      path = ""
-    end
-
-    if path
-      opts = parse_image_tag_options(tag)
-
-      containered = false
-
-      classes = [] # applied to whatever the outermost container is
-      attrs   = [] # applied to the image
-
-      align = opts['align']
-      if opts['float']
-        containered = true
-        align       ||= 'left'
-        if %w{left right}.include?(align)
-          classes << "float-#{align}"
-        end
-      elsif %w{top texttop middle absmiddle bottom absbottom baseline}.include?(align)
-        attrs << %{align="#{align}"}
-      elsif align
-        if %w{left center right}.include?(align)
-          containered = true
-          classes << "align-#{align}"
-        end
-      end
-
-      if (width = opts['width'])
-        if width =~ /^\d+(\.\d+)?(em|px)$/
-          attrs << %{width="#{width}"}
-        end
-      end
-
-      if (height = opts['height'])
-        if height =~ /^\d+(\.\d+)?(em|px)$/
-          attrs << %{height="#{height}"}
-        end
-      end
-
-      if path != "" && (alt = opts['alt'])
-        attrs << %{alt="#{alt}"}
-      elsif path == ""
-        attrs << %{alt="Image not found"}
-      end
-
-      attr_string = attrs.size > 0 ? attrs.join(' ') + ' ' : ''
-
-      if opts['frame'] || containered
-        classes << 'frame' if opts['frame']
-        %{<span class="#{classes.join(' ')}">} +
-            %{<span>} +
-            %{<img src="#{path}" #{attr_string}/>} +
-            (alt ? %{<span>#{alt}</span>} : '') +
-            %{</span>} +
-            %{</span>}
-      else
-        %{<img src="#{path}" #{attr_string}/>}
-      end
+  def process_image_tag(path, options = nil)
+    opts = parse_image_tag_options(options)
+    if path =~ /^https?:\/\/.+$/i
+      generate_image(path, opts)
+    elsif file = @markup.find_file(path)
+      generate_image(generate_href_for_path(file.path), opts)
+    else
+      generate_image('', opts)
     end
   end
 
-  # Parse any options present on the image tag and extract them into a
+  # Parse any options present on the image tag (comma separated) and extract them into a
   # Hash of option names and values.
   #
-  # tag - The String tag contents (the stuff inside the double brackets).
+  # options - The String image options (the stuff in the after '|').
   #
   # Returns the options Hash:
   #   key - The String option name.
   #   val - The String option value or true if it is a binary option.
-  def parse_image_tag_options(tag)
-    tag.split('|')[1..-1].inject({}) do |memo, attr|
-      parts          = attr.split('=').map { |x| x.strip }
-      memo[parts[0]] = (parts.size == 1 ? true : parts[1])
+  def parse_image_tag_options(options)
+    return {} if options.nil?
+    options.split(',').inject({}) do |memo, attr|
+      parts                 = attr.split('=').map { |x| x.strip }
+      memo[parts[0].to_sym] = (parts.size == 1 ? true : parts[1])
       memo
     end
   end
 
   # Return the String HTML if the tag is a valid external link tag or
   # nil if it is not.
-  def process_external_link_tag(tag)
-    parts = tag.split('|')
-    parts.reverse! if @markup.reverse_links?
-    return if parts.size.zero?
-    if parts.size == 1
-      url = parts[0].strip
-    else
-      name, url = *parts.compact.map(&:strip)
-    end
+  def process_external_link_tag(url, pretty_name = nil)
     accepted_protocols = @markup.wiki.sanitization.protocols['a']['href'].dup
     if accepted_protocols.include?(:relative)
       accepted_protocols.select!{|protocol| protocol != :relative}
@@ -228,40 +181,22 @@ class Gollum::Filter::Tags < Gollum::Filter
       regexp = %r{^((#{accepted_protocols.join("|")}):)}
     end
     if url =~ regexp
-      if name.nil?
-        %{<a href="#{url}">#{url}</a>}
-      else
-        %{<a href="#{url}">#{name}</a>}
-      end
+      generate_link(url, pretty_name, nil, :external)
     else
       nil
     end
-
   end
 
   # Attempt to process the tag as a file link tag.
   #
-  # tag       - The String tag contents (the stuff inside the double
-  #             brackets).
+  # link_part      - The String part of the tag containing the link
+  # pretty_name    - The String name for the link (optional)
   #
   # Returns the String HTML if the tag is a valid file link tag or nil
   #   if it is not.
-  def process_file_link_tag(tag)
-    parts = tag.split('|')
-    return if parts.size.zero?
-
-    name = parts[0].strip
-    path = parts[1] && parts[1].strip
-    if path && file = @markup.find_file(path)
-      path = ::File.join @markup.wiki.base_path, file.path
-    else
-      path = nil
-    end
-
-    if name && path && file
-      %{<a href="#{::File.join @markup.wiki.base_path, file.path}">#{name}</a>}
-    elsif name && path
-      %{<a href="#{path}">#{name}</a>}
+  def process_file_link_tag(link_part, pretty_name)
+    if file = @markup.find_file(link_part)
+      generate_link(file.path, pretty_name, nil, :file)
     else
       nil
     end
@@ -269,59 +204,147 @@ class Gollum::Filter::Tags < Gollum::Filter
 
   # Attempt to process the tag as a page link tag.
   #
-  # tag       - The String tag contents (the stuff inside the double
-  #             brackets).
+  # link_part      - The String part of the tag containing the link
+  # pretty_name    - The String name for the link (optional)
   #
   # Returns the String HTML if the tag is a valid page link tag or nil
   #   if it is not.
-  def process_page_link_tag(tag)
-    parts = tag.split('|')
-    parts.reverse! if @markup.reverse_links?
+  def process_page_link_tag(link_part, pretty_name = nil)
+    presence  = :page_absent
+    link      = link_part
+    page      = find_page_from_path(link)
+
+    # If no match yet, try finding page with anchor removed
+    if (page.nil? && pos = link.rindex('#'))
+      extra     = link[pos..-1]
+      link      = link[0...pos]
+      page      = find_page_from_path(link)
+    end
+    presence  = :page_present if page
+
+    name = pretty_name ? pretty_name : link
+    link = page ? page.escaped_url_path : CGI.escape(link)
+    generate_link(link, name, extra, presence)
+  end
 
-    name, page_name = *parts.compact.map(&:strip)
-    cname           = page_name ? page_name : name.to_s
+  # Find a page from a given path
+  #
+  # path - The String path to search for.
+  #
+  # Returns a Gollum::Page instance if a page is found, or nil otherwise
+  def find_page_from_path(path)
+    slash = path.rindex('/')
 
-    presence    = "absent"
-    link_name   = cname
-    page, extra = find_page_from_name(cname)
-    if page
-      link_name = page.name
-      presence  = "present"
+    unless slash.nil?
+      name = path[slash+1..-1]
+      path = path[0..slash]
+      @markup.wiki.paged(name, path)
+    else
+      @markup.wiki.page(path)
     end
-    link = ::File.join(@markup.wiki.base_path, page ? page.escaped_url_path : CGI.escape(link_name))
-
-    # //page is invalid
-    # strip all duplicate forward slashes using helpers.rb trim_leading_slash
-    # //page => /page
-    link = trim_leading_slash link
+  end
 
-    %{<a class="internal #{presence}" href="#{link}#{extra}">#{name}</a>}
+  # Generate an HTML link tag.
+  #
+  # path     - The String path (href) to construct a link to.
+  # name     - The String name of the link (text inside the link tag). Optional.
+  # extra    - The String anchor to add the link. Optional.
+  # kind     - A Symbol indicating whether this is a Page, File, or External link.
+  #
+  # Returns a String HTML link tag.
+  def generate_link(path, name = nil, extra = nil, kind = nil)
+    url = kind == :external ? path : generate_href_for_path(path, extra)
+    %{<a #{css_options_for_link(kind)} href="#{url}">#{name || path}</a>}
   end
 
-  # Find a page from a given cname.  If the page has an anchor (#) and has
-  # no match, strip the anchor and try again.
+  # Generate a normalized href for a path, taking into consideration the wiki's path settings.
   #
-  # cname - The String canonical page name including path.
+  # path     - The String path to generate an href for.
+  # extra    - The String anchor to add to the href. Optional.
   #
-  # Returns a Gollum::Page instance if a page is found, or an Array of
-  # [Gollum::Page, String extra] if a page without the extra anchor data
-  # is found.
-  def find_page_from_name(cname)
-    slash = cname.rindex('/')
+  # Returns a String href.
+  def generate_href_for_path(path, extra = nil)
+   "#{trim_leading_slash(::File.join(@markup.wiki.base_path, path))}#{extra}"
+  end
 
-    unless slash.nil?
-      name = cname[slash+1..-1]
-      path = cname[0..slash]
-      page = @markup.wiki.paged(name, path)
+  # Construct a CSS class and attribute string for different kinds of links: internal Pages (absent or present) and Files, and External links.
+  #
+  # kind     - The Symbol indicating the kind of link. Can be one of: :page_absent, :page_present, :file, :external.
+  # 
+  # Returns the String CSS class and attributes.
+  def css_options_for_link(kind)
+    case kind
+    when :page_absent
+      'class="internal absent"'
+    when :page_present
+      'class="internal present"'
+    when :file
+      nil
+    when :external
+      nil
+    else
+      nil
+    end
+  end
+
+  # Generate an HTML image tag.
+  #
+  # path     - The String path (href) of the image.
+  # options  - The Hash of parsed image options.
+  #
+  # Returns a String HTML img tag.
+  def generate_image(path, options = nil)
+    classes, attrs, containered = generate_image_attributes(options)
+    attrs[:alt] = 'Image not found' if path.empty?
+    attr_string = attrs.map {|key, value| "#{key}=\"#{value}\""}.join(' ')
+
+    if containered
+      %{<span class="#{classes.join(' ')}">} +
+          %{<span>} +
+          %{<img src="#{path}" #{attr_string}/>} +
+          (attrs[:alt] ? %{<span>#{attrs[:alt]}</span>} : '') +
+          %{</span>} +
+          %{</span>}
     else
-      page = @markup.wiki.paged(cname, '/') || @markup.wiki.page(cname)
+      %{<img src="#{path}" #{attr_string}/>}
     end
+  end
 
-    if page
-      return page
+  # Helper method to generate the styling attributes and elements for an image tag.
+  #
+  # options  - The Hash of parsed image options.
+  #
+  # Returns an Array of CSS classes, a Hash of CSS attributes, and a Boolean indicating whether or not the image is containered.
+  def generate_image_attributes(options)
+    containered = false
+    classes = [] # applied to whatever the outermost container is
+    attrs   = {} # applied to the image
+
+    align = options[:align]
+    if options[:float]
+      containered = true
+      align       ||= 'left'
+      if %w{left right}.include?(align)
+        classes << "float-#{align}"
+      end
+    elsif %w{top texttop middle absmiddle bottom absbottom baseline}.include?(align)
+      attrs[:align] = align
+    elsif align
+      if %w{left center right}.include?(align)
+        containered = true
+        classes << "align-#{align}"
+      end
     end
-    if (pos = cname.index('#'))
-      [@markup.wiki.page(cname[0...pos]), cname[pos..-1]]
+
+    if options[:frame]
+      containered = true
+      classes << 'frame'
     end
+
+    attrs[:alt]    = options[:alt]    if options[:alt]
+    attrs[:width]  = options[:width]  if options[:width]  =~ /^\d+(\.\d+)?(em|px)$/
+    attrs[:height] = options[:height] if options[:height] =~ /^\d+(\.\d+)?(em|px)$/
+
+    return classes, attrs, containered
   end
 end