From e310f760303ea99ff561b3129d0496245f31c6ec Mon Sep 17 00:00:00 2001
From: "Watal M. Iwasaki" <heavywatal@users.noreply.github.com>
Date: Sun, 14 Jun 2020 22:49:26 +0900
Subject: [PATCH] Enhance RouteHelpers

- page_route() accepts nil and return base_url
- clean_url() accepts multiple args and join them
---
 lib/gollum/views/helpers.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index ba02aa5f..a2cc8991 100644
--- a/lib/gollum/views/helpers.rb
+++ b/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 url if url.nil?
+
+        ::File.join(*url).gsub(%r{/{2,}}, '/')
       end
     end