gollum-lib 5.0.a.4-java → 5.0.5-java

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

@@ -14,17 +14,11 @@ class Gollum::Filter::Emoji < Gollum::Filter
     (?!\]{^2})
   }ix
 
-  PROCESS_PATTERN = %r{
-    =EEMMOOJJII=
-    (?<name>[\w-]+)
-    =IIJJOOMMEE=
-  }ix
-
   def extract(data)
     data.gsub! EXTRACT_PATTERN do
       case
         when $~[:escape] then $&[1..-1]
-        when emoji_exists?($~[:name]) then "=EEMMOOJJII=#{$~[:name]}=IIJJOOMMEE="
+        when emoji_exists?($~[:name]) then "#{open_pattern}#{$~[:name]}#{close_pattern}"
         else $&
       end
     end
@@ -32,12 +26,21 @@ class Gollum::Filter::Emoji < Gollum::Filter
   end
 
   def process(data)
-    data.gsub! PROCESS_PATTERN, %q(<img src="/emoji/\k<name>" alt="\k<name>" class="emoji">)
+    src = ::File.join(@markup.wiki.base_path, '/gollum/emoji/\\k<name>')
+    data.gsub! process_pattern, %Q(<img src="#{src}" alt="\\k<name>" class="emoji">)
     data
   end
 
   private
 
+  def process_pattern
+    %r{
+    #{open_pattern}
+    (?<name>[\w-]+)
+    #{close_pattern}
+  }ix
+  end
+
   def emoji_exists?(name)
     @index ||= Gemojione::Index.new
     !!@index.find_by_name(name)

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

@@ -1,4 +1,5 @@
 # ~*~ encoding: utf-8 ~*~
+require 'octicons'
 
 # Replace specified tokens with dynamically generated content.
 class Gollum::Filter::Macro < Gollum::Filter
@@ -12,7 +13,7 @@ class Gollum::Filter::Macro < Gollum::Filter
 
     data.gsub(/('?)\<\<\s*([A-Z][A-Za-z0-9]*)\s*\(#{arg_list}\)\s*\>\>/) do
       next CGI.escape_html($&[1..-1]) unless Regexp.last_match[1].empty?
-      id = Digest::SHA1.hexdigest(Regexp.last_match[2] + Regexp.last_match[3])
+      id = "#{open_pattern}#{Digest::SHA1.hexdigest(Regexp.last_match[2] + Regexp.last_match[3])}#{close_pattern}"
       macro = Regexp.last_match[2]
       argstr = Regexp.last_match[3]
       args = []
@@ -47,7 +48,9 @@ class Gollum::Filter::Macro < Gollum::Filter
         begin
           Gollum::Macro.instance(macro, @markup.wiki, @markup.page).render(*args)
         rescue StandardError => e
-          "!!!Macro Error: #{e.message}!!!"
+          icon = Octicons::Octicon.new('zap', {width: 24, height: 24})
+          icon.options[:class] << ' mr-2'
+          "<div class='flash flash-error'>#{icon.to_svg}Macro Error for #{macro}: #{e.message}</div>"
         end
       end
     end

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

@@ -70,7 +70,7 @@ class Gollum::Filter::PlantUML < Gollum::Filter
   # placeholders.
   def extract(data)
     data.gsub(/(@startuml\r?\n.+?\r?\n@enduml\r?$)/m) do
-      id       = Digest::SHA1.hexdigest($1)
+      id       = "#{open_pattern}#{Digest::SHA1.hexdigest($1)}#{close_pattern}"
       @map[id] = { :code => $1 }
       id
     end

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

@@ -20,7 +20,7 @@ class Gollum::Filter::RemoteCode < Gollum::Filter
 
       # Detect local file
       if protocol.nil?
-        if (file = @markup.find_file(uri, @markup.wiki.ref))
+        if (file = @markup.wiki.file(uri, @markup.wiki.ref))
           contents = file.raw_data
         else
           # How do we communicate a render error?
@@ -45,7 +45,8 @@ class Gollum::Filter::RemoteCode < Gollum::Filter
     return "Too many redirects or retries" if cut >= 10
     http         = Net::HTTP.new uri.host, uri.port
     http.use_ssl = true
-    resp         = http.get uri.path, {
+    path         = uri.path.empty? ? '/' : uri.path
+    resp         = http.get path, {
         'Accept'        => 'text/plain',
         'Cache-Control' => 'no-cache',
         'Connection'    => 'keep-alive',

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

@@ -3,7 +3,11 @@
 class Gollum::Filter::Render < Gollum::Filter
   def extract(data)
     begin
-      data = GitHub::Markup.render(@markup.name, data)
+      working_dir = Pathname.new(@markup.wiki.path).join(@markup.dir)
+      working_dir = working_dir.exist? ? working_dir.to_s : '.'
+      Dir.chdir(working_dir) do
+        data = GitHub::Markup.render_s(@markup.format, data)
+      end
       if data.nil?
         raise "There was an error converting #{@markup.name} to HTML."
       end
@@ -15,6 +19,25 @@ class Gollum::Filter::Render < Gollum::Filter
   end
 
   def process(data)
+    data = add_editable_header_class(data)
     data
   end
-end
+
+  private
+
+  def add_editable_header_class(data)
+    doc = Nokogiri::HTML::DocumentFragment.parse(data)
+    doc.css('h1,h2,h3,h4,h5,h6').each_with_index do |header, i|
+      next if header.content.empty?
+      next if header.inner_html.match(PLACEHOLDER_PATTERN)
+      klass = header['class']
+      if klass
+        header['class'] = klass << ' editable'
+      else
+        header['class'] = 'editable'
+      end
+    end
+    doc.to_xml(@markup.class.to_xml_opts)
+  end
+
+end

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

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

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

@@ -34,7 +34,7 @@ class Gollum::Filter::Tags < Gollum::Filter
     doc.traverse do |node|
       if node.text? then
         content = node.content
-        content.gsub!(/TAG[a-f0-9]+TAG/) do |id|
+        content.gsub!(%r{#{open_pattern}[a-f0-9]+#{close_pattern}}) do |id|
           if (tag = @map[id]) then
             if is_preformatted?(node) then
               "[[#{tag}]]"
@@ -56,7 +56,7 @@ class Gollum::Filter::Tags < Gollum::Filter
   INCLUDE_TAG = 'include:'
 
   def register_tag(tag)
-    id       = "TAG#{Digest::SHA1.hexdigest(tag)}TAG"
+    id       = "#{open_pattern}#{Digest::SHA1.hexdigest(tag)}#{close_pattern}"
     @map[id] = tag
     id
   end
@@ -77,7 +77,6 @@ class Gollum::Filter::Tags < Gollum::Filter
     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 link_part =~ /^_$/
@@ -122,9 +121,9 @@ class Gollum::Filter::Tags < Gollum::Filter
     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}")
+    resolved_page_name = ::File.join(@markup.dir, page_name)
     if @markup.include_levels > 0
-      page = find_page_from_path(resolved_page_name)
+      page = find_page_or_file_from_path(resolved_page_name)
       if page
         page.formatted_data(@markup.encoding, @markup.include_levels-1)
       else
@@ -146,8 +145,8 @@ class Gollum::Filter::Tags < Gollum::Filter
     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)
+    elsif file = find_page_or_file_from_path(path, :file)
+      generate_image(generate_href_for_path(file.url_path), opts)
     else
       generate_image('', opts)
     end
@@ -173,14 +172,8 @@ class Gollum::Filter::Tags < Gollum::Filter
   # Return the String HTML if the tag is a valid external link tag or
   # nil if it is not.
   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}
-      regexp = %r{^((#{accepted_protocols.join("|")}):)?(//)}
-    else
-      regexp = %r{^((#{accepted_protocols.join("|")}):)}
-    end
-    if url =~ regexp
+    @accepted_protocols_regex ||= %r{^((#{::Gollum::Sanitization.accepted_protocols.join('|')}):)?(//)} 
+    if url =~ @accepted_protocols_regex
       generate_link(url, pretty_name, nil, :external)
     else
       nil
@@ -195,8 +188,9 @@ class Gollum::Filter::Tags < Gollum::Filter
   # Returns the String HTML if the tag is a valid file link tag or nil
   #   if it is not.
   def process_file_link_tag(link_part, pretty_name)
-    if file = @markup.find_file(link_part)
-      generate_link(file.path, pretty_name, nil, :file)
+    return nil if ::Gollum::Page.valid_extension?(link_part)
+    if file = find_page_or_file_from_path(link_part, :file)
+      generate_link(file.url_path, pretty_name, nil, :file)
     else
       nil
     end
@@ -212,18 +206,32 @@ class Gollum::Filter::Tags < Gollum::Filter
   def process_page_link_tag(link_part, pretty_name = nil)
     presence  = :page_absent
     link      = link_part
-    page      = find_page_from_path(link)
+    page      = find_page_or_file_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)
+    if page.nil?
+      if pos = link.rindex('#')
+        extra = link[pos..-1]
+        link  = link[0...pos]
+      else
+        extra = nil
+      end
+
+      if link.empty? && extra # Internal anchor link, don't search for the page but return immediately
+        return generate_link(nil, pretty_name, extra, :internal_anchor)
+      end
+
+      page  = find_page_or_file_from_path(link)
+    end
+    presence = :page_present if page
+    
+    if pretty_name
+      name = pretty_name
+    else
+      name = page ? path_to_link_text(link) : link
     end
-    presence  = :page_present if page
 
-    name = pretty_name ? pretty_name : link
-    link = page ? page.escaped_url_path : CGI.escape(link)
+    link = page ? page.escaped_url_path : ERB::Util.url_encode(link).force_encoding('utf-8')
     generate_link(link, name, extra, presence)
   end
 
@@ -232,15 +240,15 @@ class Gollum::Filter::Tags < Gollum::Filter
   # 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('/')
-
-    unless slash.nil?
-      name = path[slash+1..-1]
-      path = path[0..slash]
-      @markup.wiki.paged(name, path)
+  def find_page_or_file_from_path(path, kind = :page)
+    if Pathname.new(path).relative?
+      result = @markup.wiki.send(kind, ::File.join(@markup.dir, path))
+      if result.nil? && @markup.wiki.global_tag_lookup # 4.x link compatibility option. Slow!
+        result = @markup.wiki.send(kind, path, nil, true)
+      end
+      result
     else
-      @markup.wiki.page(path)
+      @markup.wiki.send(kind, path)
     end
   end
 
@@ -264,7 +272,8 @@ class Gollum::Filter::Tags < Gollum::Filter
   #
   # Returns a String href.
   def generate_href_for_path(path, extra = nil)
-   "#{trim_leading_slash(::File.join(@markup.wiki.base_path, path))}#{extra}"
+    return extra if !path && extra # Internal anchor link
+    "#{trim_leading_slashes(::File.join(@markup.wiki.base_path, path))}#{extra}"
   end
 
   # Construct a CSS class and attribute string for different kinds of links: internal Pages (absent or present) and Files, and External links.
@@ -278,6 +287,8 @@ class Gollum::Filter::Tags < Gollum::Filter
       'class="internal absent"'
     when :page_present
       'class="internal present"'
+    when :internal_anchor
+      'class="internal anchorlink"'
     when :file
       nil
     when :external
@@ -299,10 +310,10 @@ class Gollum::Filter::Tags < Gollum::Filter
     attr_string = attrs.map {|key, value| "#{key}=\"#{value}\""}.join(' ')
 
     if containered
-      %{<span class="#{classes.join(' ')}">} +
-          %{<span>} +
+      %{<span class="d-flex #{classes[:container].join(' ')}">} +
+          %{<span class="#{classes[:nested].join(' ')}">} +
           %{<img src="#{path}" #{attr_string}/>} +
-          (attrs[:alt] ? %{<span>#{attrs[:alt]}</span>} : '') +
+          (options[:frame] && attrs[:alt] ? %{<span class="clearfix">#{attrs[:alt]}</span>} : '') +
           %{</span>} +
           %{</span>}
     else
@@ -314,31 +325,31 @@ class Gollum::Filter::Tags < Gollum::Filter
   #
   # 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.
+  # Returns a Hash containing CSS class Arrays, 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
+    classes = {container: [], nested: []} # applied to the container(s)
     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
+      align = 'left' unless align == 'right'
+      classes[:container] << "float-#{align} pb-4"
     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}"
+        text_align = "text-#{align}"
+        align = 'end' if align == 'right'
+        classes[:container] << "flex-justify-#{align} #{text_align}"
       end
     end
 
-    if options[:frame]
+    if options[:frame] 
       containered = true
-      classes << 'frame'
+      classes[:nested] << 'border p-4'
     end
 
     attrs[:alt]    = options[:alt]    if options[:alt]

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

@@ -21,15 +21,14 @@ class Gollum::Filter::TOC < Gollum::Filter
         next if (i == 0 && header.name =~ /[Hh]1/) && @markup.wiki && @markup.wiki.h1_title
 
         anchor_name = generate_anchor_name(header)
-        
         add_anchor_to_header header, anchor_name
         add_entry_to_toc     header, anchor_name
       end
       if not @toc_doc.nil?
-        toc_str = @toc_doc.to_xml(@markup.to_xml_opts)
+        toc_str = @toc_doc.to_xml(@markup.class.to_xml_opts)
       end
 
-      data  = @doc.to_xml(@markup.to_xml_opts)
+      data  = @doc.to_xml(@markup.class.to_xml_opts)
     end
 
     @markup.toc = toc_str
@@ -51,7 +50,7 @@ class Gollum::Filter::TOC < Gollum::Filter
             e.remove
           end
         end
-        toc_clone.to_xml(@markup.to_xml_opts)
+        toc_clone.to_xml(@markup.class.to_xml_opts)
       end
     end
 
@@ -60,9 +59,9 @@ class Gollum::Filter::TOC < Gollum::Filter
 
   private
 
-  # Generates the anchor name from the given header element 
+  # Generates the anchor name from the given header element
   # removing all non alphanumeric characters, replacing them
-  # with single dashes.  
+  # with single dashes.
   #
   # Generates heading ancestry prefixing the headings
   # ancestor names to the generated name.
@@ -70,31 +69,28 @@ class Gollum::Filter::TOC < Gollum::Filter
   # Prefixes duplicate anchors with an index
   def generate_anchor_name(header)
     name = header.content
-    level = header.name.gsub(/[hH]/, '').to_i
+    level = header.name[1..-1].to_i
 
     # normalize the header name
-    name.gsub!(/[^\d\w\u00C0-\u1FFF\u2C00-\uD7FF]/, "-")
-    name.gsub!(/-+/, "-")
-    name.gsub!(/^-/, "")
-    name.gsub!(/-$/, "")
+    name.gsub!(/[^\d\w\u00C0-\u1FFF\u2C00-\uD7FF]/, '-')
+    name.gsub!(/-+/, '-')
+    name.gsub!(/^-/, '')
+    name.gsub!(/-$/, '')
     name.downcase!
 
-    @current_ancestors[level - 1] = name
-    @current_ancestors = @current_ancestors.take(level)
-    anchor_name = @current_ancestors.compact.join("_")
-
     # Ensure duplicate anchors have a unique prefix or the toc will break
-    index = increment_anchor_index(anchor_name)
-    anchor_name = "#{index}-#{anchor_name}" unless index.zero? # if the index is zero this name is unique
-
-    anchor_name
+    index = increment_anchor_index(name)
+    index.zero? ? name : "#{name}-#{index}"
   end
 
   # Creates an anchor element with the given name and adds it before
   # the given header element.
   def add_anchor_to_header(header, name)
-    anchor_element = %Q(<a class="anchor" id="#{name}" href="##{name}"><i class="fa fa-link"></i></a>)
-    header.children.before anchor_element # Add anchor element before the header
+    a = Nokogiri::XML::Node.new('a', @doc)
+    a['class'] = 'anchor'
+    a['id'] = name
+    a['href'] = "##{name}"
+    header.children.before(a) # Add anchor element before the header
   end
 
   # Adds an entry to the TOC for the given header.  The generated entry

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

@@ -10,7 +10,7 @@ class Gollum::Filter::YAML < Gollum::Filter
     data.gsub!(YAML_FRONT_MATTER_REGEXP) do
       @markup.metadata ||= {}
       begin
-        frontmatter = ::YAML.safe_load(@markup.sanitize.clean(Regexp.last_match[1]))
+        frontmatter = ::YAML.safe_load(sanitize(Regexp.last_match[1]))
         @markup.metadata.merge!(frontmatter) if frontmatter.respond_to?(:keys) && frontmatter.respond_to?(:values)
       rescue ::Psych::SyntaxError, ::Psych::DisallowedClass, ::Psych::BadAlias => error
         @markup.metadata['errors'] ||= []