gollum 5.0.0 → 5.2

data/lib/gollum/views/commit.rb

@@ -0,0 +1,45 @@
+require_relative 'compare.rb'
+
+module Precious
+  module Views
+    class Commit < Compare
+
+      attr_reader :version
+
+      def title
+        "Changes in #{@version[0..6]}: #{message}"
+      end
+
+      def author
+        @commit.author.name
+      end
+
+      def authored_date
+        @commit.authored_date
+      end
+
+      def message
+        @commit.message
+      end
+
+      def files
+        files = @diff.force_encoding(Encoding::UTF_8).scan(%r{
+          ^diff\ --git\         # diff start
+          .+?                   # diff body
+          (?=^diff\ --git|\Z)   # scan until next diff or string
+        }sxmu)
+
+        files.map do |diff|
+          match = diff.match(%r{^diff --git (")?[ab]/(.+)(?(1)") (")?[ab]/(.+)(?(3)")})
+          path = match[2]
+          path = match[4] if path.nil?
+
+          {
+            path: path,
+            lines: lines(diff)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/gollum/views/compare.rb

@@ -17,18 +17,23 @@ module Precious
         @versions[1][0..6]
       end
 
-      def lines
+      def lines(diff = @diff)
         lines = []
-        lines_to_parse = @diff.split("\n")[4..-1]
-        # If the diff is of a rename, the diff header will be one line longer than normal because it will contain a line starting with '+++' to indicate the 'new' filename.
-        # Make sure to skip that header line if it is present.
-        lines_to_parse = lines_to_parse[1..-1] if lines_to_parse[0].start_with?('+++')
+        lines_to_parse = diff.split("\n")[3..-1]
+        lines_to_parse = lines_to_parse[2..-1] if lines_to_parse[0] =~ /^(---|rename to )/
+
+        if lines_to_parse.nil? || lines_to_parse.empty?
+          lines_to_parse = []  # File is created without content
+        else
+          lines_to_parse = lines_to_parse[1..-1] if lines_to_parse[0].start_with?('+++')
+        end
+
         lines_to_parse.each_with_index do |line, line_index|
           lines << { :line  => line,
                      :class => line_class(line),
                      :ldln  => left_diff_line_number(line),
                      :rdln  => right_diff_line_number(line) }
-        end if @diff
+        end
         lines
       end
 
@@ -41,6 +46,8 @@ module Precious
       def line_class(line)
         if line =~ /^@@/
           'gc'
+        elsif git_line?(line)
+          'gg'
         elsif line =~ /^\+/
           'gi'
         elsif line =~ /^\-/
@@ -53,7 +60,7 @@ module Precious
       @left_diff_line_number = nil
 
       def left_diff_line_number(line)
-        if line =~ /^@@/
+        if git_line?(line)
           m, li                  = *line.match(/\-(\d+)/)
           @left_diff_line_number = li.to_i
           @current_line_number   = @left_diff_line_number
@@ -75,7 +82,7 @@ module Precious
       @right_diff_line_number = nil
 
       def right_diff_line_number(line)
-        if line =~ /^@@/
+        if git_line?(line)
           m, ri                   = *line.match(/\+(\d+)/)
           @right_diff_line_number = ri.to_i
           @current_line_number    = @right_diff_line_number
@@ -93,6 +100,10 @@ module Precious
         end
         ret
       end
+
+      def git_line?(line)
+        !!(line =~ /^(\\ No newline|Binary files|@@)/)
+      end
     end
   end
 end

data/lib/gollum/views/has_page.rb

@@ -15,9 +15,5 @@ module Precious
     def id
       @page.sha
     end
-
-    def full_url_path
-      ::File.join(@base_url, escaped_url_path)
-    end
   end
 end

data/lib/gollum/views/helpers.rb

@@ -39,7 +39,7 @@ module Precious
             route_path = "#{prefix}/#{path}"
             @@route_methods[name.to_s] = route_path
             define_method :"#{name.to_s}_path" do
-              "#{base_url}/#{route_path}".gsub(/\/{2,}/, '/') # remove double slashes
+              page_route(route_path)
             end
           end
         end
@@ -53,8 +53,18 @@ module Precious
         end
       end
 
-      def page_route(page)
-        "#{base_url}/#{page}".gsub(/\/{2,}/, '/') # remove double slashes
+      def page_route(page = nil)
+        clean_url("/#{@base_url}", page)
+      end
+
+      def clean_url(*url)
+        url.compact!
+        return nil if url.empty?
+
+        _url = ::File.join(*url)
+        _url.gsub!(%r{/{2,}}, '/')
+        _url.gsub!(%r{\?}, '%3F')
+        _url
       end
     end
 

data/lib/gollum/views/history.rb

@@ -17,15 +17,18 @@ module Precious
         i = @versions.size + 1
         @versions.map do |v|
           i -= 1
+          filename = path_for_version(v.tracked_pathname)
           { :id        => v.id,
             :id7       => v.id[0..6],
+            :href      => page_route("gollum/commit/#{v.id}"),
+            :href_page => page_route("#{filename}/#{v.id}"),
             :num       => i,
             :selected  => @page.version.id == v.id,
             :author    => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
             :message   => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
             :date      => v.authored_date.strftime("%B %d, %Y"),
             :user_icon => self.user_icon_code(v.author.email),
-            :filename  => path_for_version(v.tracked_pathname),
+            :filename  => filename,
             :date_full => v.authored_date,
           }
         end

data/lib/gollum/views/latest_changes.rb

@@ -16,6 +16,7 @@ module Precious
           i -= 1
           { :id        => v.id,
             :id7       => v.id[0..6],
+            :href      => page_route("gollum/commit/#{v.id}"),
             :num       => i,
             :author    => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
             :message   => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,

data/lib/gollum/views/layout.rb

@@ -31,7 +31,23 @@ module Precious
       end
 
       def custom_path
-        "#{@base_url}"
+        @base_url
+      end
+
+      def custom_css
+        clean_url(custom_path, "custom.css")
+      end
+
+      def custom_js
+        clean_url(custom_path, "custom.js")
+      end
+
+      def mathjax_config_path
+        page_route(@mathjax_config)
+      end
+
+      def mathjax_js
+        page_route("gollum/assets/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML")
       end
 
       def css # custom css

data/lib/gollum/views/overview.rb

@@ -4,6 +4,7 @@ module Precious
   module Views
     class Overview < Layout
       attr_reader :results, :ref, :allow_editing, :newable
+      HIDDEN_PATHS = ['.gitkeep']
 
       def title
         "Overview of #{@ref}"
@@ -25,9 +26,9 @@ module Precious
             title = crumb.basename
 
             if title == path.basename
-              breadcrumb << %{<li class="breadcrumb-item" aria-current="page">#{title}</li>}
+              breadcrumb << %{<li class="breadcrumb-item" aria-current="page">#{CGI.escapeHTML(title.to_s)}</li>}
             else
-              breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{title}</a></li>}
+              breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{CGI.escapeHTML(title.to_s)}</a></li>}
             end
           end
           breadcrumb << %{</ol></nav>}
@@ -51,9 +52,9 @@ module Precious
               folder_path = @path ? "#{@path}/#{folder_name}" : folder_name
               folder_url  = "#{overview_path}/#{folder_path}/"
               files_and_folders << {name: folder_name, icon: rocticon('file-directory'), type: 'dir', url: folder_url, is_file: false}
-            elsif result_path != '.gitkeep'
-              file_url = "#{@base_url}/#{result.escaped_url_path}"
-              files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, is_file: true}
+            elsif !HIDDEN_PATHS.include?(result_path) 
+              file_url = page_route(result.escaped_url_path)
+              files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, file_path: result.escaped_url_path, is_file: true}
             end
           end
           # 1012: Overview should list folders first, followed by files and pages sorted alphabetically

data/lib/gollum/views/page.rb

@@ -16,15 +16,10 @@ module Precious
       DEFAULT_AUTHOR = 'you'
       @@to_xml       = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
 
-      def title
-        h1 = @h1_title ? page_header_from_content(@content) : false
-        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
-      end
-
       def page_header
         title
       end
-            
+
       def breadcrumb
         path = Pathname.new(@page.url_path).parent
         return '' if path.to_s == '.'
@@ -32,7 +27,7 @@ module Precious
         path.descend do |crumb|
           element = "#{crumb.basename}"
           next if element == @page.title
-          breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{element}</a></li>}
+          breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{CGI.escapeHTML(element.to_s)}</a></li>}
         end
         breadcrumb << %{</ol></nav>}
         breadcrumb.join("\n")
@@ -123,7 +118,11 @@ module Precious
       def bar_side
         @bar_side.to_s
       end
-      
+
+      def body_side
+        @bar_side == :right ? "left" : "right"
+      end
+
       def left_bar
         @bar_side == :left
       end
@@ -169,6 +168,10 @@ module Precious
         @navbar
       end
 
+      def full_url_path
+        page_route(@page.escaped_url_path)
+      end
+
       # Access to embedded metadata.
       #
       # Returns Hash.
@@ -261,6 +264,10 @@ module Precious
         result << "</tr>\n</table>\n"
       end
 
+      def title
+        h1 = @h1_title ? page_header_from_content(@content) : false
+        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
+      end
     end
   end
 end

data/lib/gollum/views/search.rb

@@ -5,7 +5,7 @@ module Precious
       include Pagination
 
       def results
-        @results.sort do |a, b|
+        sorted = @results.sort do |a, b|
           if b.nil?
             b_filename_count = 0
             b_count          = 0
@@ -15,6 +15,7 @@ module Precious
           end
           [a[:filename_count], a[:count]] <=> [b_filename_count, b_count]
         end.reverse.slice((@page_num - 1) * @max_count, @max_count)
+        sorted.each {|x| x[:href] = page_route(x[:name])}
       end
 
       def query_string

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: '5.2'
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Rick Olson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-lib
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -82,25 +82,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mustache
+  name: mustache-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.99.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.99.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: useragent
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -345,6 +339,7 @@ files:
 - bin/gollum-migrate-tags
 - config.rb
 - config.ru
+- contrib/automation/gollum-post
 - contrib/openrc/conf.d/gollum
 - contrib/openrc/init.d/gollum
 - contrib/systemd/gollum@.service
@@ -354,15 +349,15 @@ files:
 - lib/gollum/app.rb
 - lib/gollum/assets.rb
 - lib/gollum/helpers.rb
-- lib/gollum/public/assets/.sprockets-manifest-3edc7e21737459b21fbf150f5dccd15c.json
-- lib/gollum/public/assets/app-982c7fca1832732a24e92474ca2729aeb56f2d0c05bb7a8ff913e9f58a6500d5.js
-- lib/gollum/public/assets/app-982c7fca1832732a24e92474ca2729aeb56f2d0c05bb7a8ff913e9f58a6500d5.js.gz
-- lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css
-- lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css.gz
+- lib/gollum/public/assets/.sprockets-manifest-e3f9b0be36ac3bccc4c006a52e352500.json
+- lib/gollum/public/assets/app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css
+- lib/gollum/public/assets/app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css.gz
+- lib/gollum/public/assets/app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js
+- lib/gollum/public/assets/app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js.gz
 - lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css
 - lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css.gz
-- lib/gollum/public/assets/editor-0dbae28c53db5a73d666d30504946671eb09948ffdaf1fdd9d1c8d856d4c0ba1.js
-- lib/gollum/public/assets/editor-0dbae28c53db5a73d666d30504946671eb09948ffdaf1fdd9d1c8d856d4c0ba1.js.gz
+- lib/gollum/public/assets/editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js
+- lib/gollum/public/assets/editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js.gz
 - lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css
 - lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css.gz
 - lib/gollum/public/gollum/javascript/HOWTO_UPDATE_ACE.md
@@ -1460,22 +1455,23 @@ files:
 - lib/gollum/public/gollum/javascript/jquery-1.7.2.min.js
 - lib/gollum/public/gollum/javascript/jquery.resize.js
 - lib/gollum/public/gollum/javascript/mousetrap.min.js
+- lib/gollum/public/gollum/javascript/polyfills.js
 - lib/gollum/public/gollum/stylesheets/_base.scss
 - lib/gollum/public/gollum/stylesheets/_breakpoint.scss
 - lib/gollum/public/gollum/stylesheets/_component.scss
 - lib/gollum/public/gollum/stylesheets/_features.scss
-- lib/gollum/public/gollum/stylesheets/_layout.scss
 - lib/gollum/public/gollum/stylesheets/_spinners.scss
 - lib/gollum/public/gollum/stylesheets/app.scss
 - lib/gollum/public/gollum/stylesheets/criticmarkup.scss
 - lib/gollum/public/gollum/stylesheets/dialog.scss
 - lib/gollum/public/gollum/stylesheets/editor.scss
 - lib/gollum/public/gollum/stylesheets/emoji.scss
-- lib/gollum/public/gollum/stylesheets/primer.scss
+- lib/gollum/public/gollum/stylesheets/primer.css
 - lib/gollum/public/gollum/stylesheets/print.scss
 - lib/gollum/public/gollum/stylesheets/spinner.scss
 - lib/gollum/public/gollum/stylesheets/tables.scss
 - lib/gollum/public/gollum/stylesheets/template.scss.erb
+- lib/gollum/templates/commit.mustache
 - lib/gollum/templates/compare.mustache
 - lib/gollum/templates/create.mustache
 - lib/gollum/templates/edit.mustache
@@ -1487,6 +1483,7 @@ files:
 - lib/gollum/templates/history_authors/none.mustache
 - lib/gollum/templates/latest_changes.mustache
 - lib/gollum/templates/layout.mustache
+- lib/gollum/templates/mobilenav.mustache
 - lib/gollum/templates/navbar.mustache
 - lib/gollum/templates/overview.mustache
 - lib/gollum/templates/page.mustache
@@ -1495,6 +1492,7 @@ files:
 - lib/gollum/templates/searchbar.mustache
 - lib/gollum/templates/wiki_content.mustache
 - lib/gollum/uri_encode_component.rb
+- lib/gollum/views/commit.rb
 - lib/gollum/views/compare.rb
 - lib/gollum/views/create.rb
 - lib/gollum/views/edit.rb
@@ -1516,7 +1514,7 @@ homepage: http://github.com/gollum/gollum
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -1532,8 +1530,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []