gollum 5.0.1 → 5.1

data/lib/gollum/templates/history.mustache

@@ -7,7 +7,7 @@
 
   {{>pagination}}
 
-    <form name="selection-form" id="selection-form" method="post" action="{{compare_path}}/{{escaped_url_path}}"></form>
+    <form name="selection-form" id="selection-form" method="get" action="{{compare_path}}/{{escaped_url_path}}"></form>
 
 	<div id="page-history-list" class="Box Box--condensed flex-auto">
 		<form id="version-form">
@@ -18,7 +18,10 @@
 					<span class="float-left col-2" id="user-icons">{{>author_template}}</span>
 					<span class="flex-auto col-1 text-gray-light">{{date}}</span>
 					<span class="flex-auto col-5">{{message}}</span>
-					<span class="pl-4 float-right">[<a href="{{base_url}}/{{filename}}/{{id}}" title="View commit">{{id7}}</a>]</span>
+					<span class="pl-4 float-right">
+						<a href="{{href}}" class="btn btn-outline text-mono">{{id7}}</a>
+						<a href="{{href_page}}" title="Browse the page at this point in the history" class="btn btn-outline">{{#octicon}}code{{/octicon}}</a>
+					</span>
 				</li>
 				{{/versions}}
 			</ul>

data/lib/gollum/templates/latest_changes.mustache

@@ -8,9 +8,9 @@
 
 <div id="wiki-history">
 
-<div class="Box flex-auto">
+<ul class="Box flex-auto">
 	{{#versions}}
-		<div class="Box-row Box-row--hover-gray border-top d-flex flex-items-center">
+		<li class="Box-row Box-row--hover-gray border-top d-flex flex-items-center">
 			<span class="float-left col-2" id="user-icons">{{>author_template}}</span>
 			<span class="flex-auto col-1 text-gray-light">{{date}}</span>
 			<span class="flex-auto col-7">{{message}}<br/>
@@ -18,10 +18,12 @@
 			  <span class="flex-auto col-2">{{#renamed}}{{renamed}} -> {{/renamed}}<a href="{{link}}">{{file}}</a></span><br/>
 			{{/files}}
 			</span>
-			<span class="pl-4 float-right">[{{id7}}]</span>
-		</div>
+			<span class="pl-4 float-right">
+				<a href="{{href}}" class="btn btn-outline text-mono">{{id7}}</a>
+			</span>
+		</li>
 	{{/versions}}
-</div>
+</ul>
 
  
 </div>

data/lib/gollum/templates/layout.mustache

@@ -8,7 +8,7 @@
   {{#sprockets_stylesheet_tag}}app{{/sprockets_stylesheet_tag}}
   {{#sprockets_stylesheet_tag}}print print{{/sprockets_stylesheet_tag}}
 
-  {{#css}}<link rel="stylesheet" type="text/css" href="{{custom_path}}/custom.css" media="all">{{/css}}
+  {{#css}}<link rel="stylesheet" type="text/css" href="{{custom_css}}" media="all">{{/css}}
   {{#noindex}}<meta name="robots" content="noindex, nofollow" />{{/noindex}}
 
 
@@ -49,11 +49,11 @@
     };
   </script>
   {{#mathjax_config}}
-  <script type="text/javascript" src="{{base_url}}/{{mathjax_config}}"></script>
+  <script type="text/javascript" src="{{mathjax_config_path}}"></script>
   {{/mathjax_config}}
-  <script defer src="{{base_url}}/gollum/assets/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+  <script defer src="{{mathjax_js}}"></script>
   {{/mathjax}}
-  {{#js}}<script type="text/javascript" src="{{custom_path}}/custom.js"></script>{{/js}}
+  {{#js}}<script type="text/javascript" src="{{custom_js}}"></script>{{/js}}
 
   <title>{{title}}</title>
 </head>

data/lib/gollum/templates/navbar.mustache

@@ -2,7 +2,7 @@
 	
 	<div class="TableObject">
 		<div class="TableObject-item">
-	    <a class="btn" href="{{base_url}}/">Home</a>
+	    <a class="btn" id="minibutton-home" href="{{page_route}}">Home</a>
 	  </div>
 
 
@@ -11,13 +11,13 @@
 	  </div>
 		
 	  <div class="TableObject-item">
-	    {{#overview}}<a class="btn" href="{{overview_path}}">Overview</a>{{/overview}}
-			{{#latest_changes}}<a class="btn" href="{{latest_changes_path}}">Latest Changes</a>{{/latest_changes}}
+	    {{#overview}}<a class="btn" id="minibutton-overview" href="{{overview_path}}">Overview</a>{{/overview}}
+			{{#latest_changes}}<a class="btn" id="minibutton-latest-changes" href="{{latest_changes_path}}">Latest Changes</a>{{/latest_changes}}
 	  </div>
 	
 		{{#history}}
 		<div class="TableObject-item pl-1">
-			<a class="btn" href="{{history_path}}/{{escaped_url_path}}">Page History</a>
+			<a class="btn" id="minibutton-history" href="{{history_path}}/{{escaped_url_path}}">Page History</a>
 		</div>
 		{{/history}}
 		

data/lib/gollum/templates/overview.mustache

@@ -16,9 +16,9 @@
 				{{#files_folders}}
 					<li class="Box-row">
 						<span class="pr-2">{{{icon}}}</span>
-						<span><a href={{url}}>{{name}}</a></span>
+						<span><a href="{{url}}">{{name}}</a></span>
 						{{#allow_editing}}
-							{{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path={{name}} data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trashcan{{/octicon}}</button>{{/is_file}}
+							{{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path="{{url}}" data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trashcan{{/octicon}}</button>{{/is_file}}
 						{{/allow_editing}}
 		      </li>
 				{{/files_folders}}

data/lib/gollum/templates/search.mustache

@@ -13,9 +13,8 @@
   <div class="Box-header border-bottom p-0"></div>
   {{#results}}
     <li class="Box-row Box-row--gray">
-            <span class="Counter Counter--gray tooltipped tooltipped-w" aria-label="{{filename_count}} hits in filename - {{count}} hits in content">{{filename_count}} - {{count}}</span>&nbsp;
-
-      <span class="text-bold"><a href="{{base_url}}/{{name}}">{{name}}</a></span>
+      <span class="Counter Counter--gray tooltipped tooltipped-w" aria-label="{{filename_count}} hits in filename - {{count}} hits in content">{{filename_count}} - {{count}}</span>&nbsp;
+      <span class="text-bold"><a href="{{href}}">{{name}}</a></span>
       <button class="btn-link tooltipped tooltipped-w float-right toggle-context" aria-label="Show all {{count}} hits in this page">{{#octicon}}search{{/octicon}}</button>
     </li>
 

data/lib/gollum/templates/wiki_content.mustache

@@ -36,7 +36,7 @@
 	    </div>
 	  </div>
 	  {{/has_footer}}
-	  </div>
+
 
 	</div>
 

data/lib/gollum/views/commit.rb

@@ -0,0 +1,38 @@
+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.split(%r{^diff --git a/.+ b/.+$}).reject(&:empty?)
+        files.map do |diff|
+          matched = diff.match(%r{(?<=^--- a/).+$})
+          matched = diff.match(%r{(?<=^\+\+\+ b/).+$}) if matched.nil?
+          {
+            path: matched[0],
+            lines: lines(diff)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/gollum/views/compare.rb

@@ -17,9 +17,9 @@ module Precious
         @versions[1][0..6]
       end
 
-      def lines
+      def lines(diff = @diff)
         lines = []
-        lines_to_parse = @diff.split("\n")[4..-1]
+        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?('+++')
@@ -28,7 +28,7 @@ module Precious
                      :class => line_class(line),
                      :ldln  => left_diff_line_number(line),
                      :rdln  => right_diff_line_number(line) }
-        end if @diff
+        end if diff
         lines
       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,15 @@ 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?
+
+        ::File.join(*url).gsub(%r{/{2,}}, '/')
       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

@@ -52,7 +52,7 @@ module Precious
               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}"
+              file_url = page_route(result.escaped_url_path)
               files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, is_file: true}
             end
           end

data/lib/gollum/views/page.rb

@@ -169,6 +169,10 @@ module Precious
         @navbar
       end
 
+      def full_url_path
+        page_route(@page.escaped_url_path)
+      end
+
       # Access to embedded metadata.
       #
       # Returns Hash.

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: '5.1'
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-lib
@@ -354,15 +354,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/.sprockets-manifest-459226ba5fc211b78ba9a3aa6ebde96c.json
+- lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js
+- lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js.gz
 - lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css
 - lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css.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-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.js
+- lib/gollum/public/assets/editor-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.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
@@ -1476,6 +1476,7 @@ files:
 - 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
@@ -1495,6 +1496,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