Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-grit

Inlining this code allows us to remove a dependency on gitlab_grit in
gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby
still depends on this gem, but it moves us a step closer.

1 files changed, 14 insertions, 10 deletions

diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb
index 563712c5d63..7fe56979d5c 100644
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
@@ -11,16 +11,11 @@ module Gitlab
           { user_id: user_id, username: username, name: name, email: email, message: message }
         end
       end
-      PageBlob = Struct.new(:name)
 
       # GollumSlug inlines just enough knowledge from Gollum::Page to generate a
       # slug, which is used when previewing pages that haven't been persisted
       class GollumSlug
         class << self
-          def format_to_ext(format)
-            format == :markdown ? 'md' : format.to_s
-          end
-
           def cname(name, char_white_sub = '-', char_other_sub = '-')
             if name.respond_to?(:gsub)
               name.gsub(/\s/, char_white_sub).gsub(/[<>+]/, char_other_sub)
@@ -29,18 +24,27 @@ module Gitlab
             end
           end
 
+          def format_to_ext(format)
+            format == :markdown ? "md" : format.to_s
+          end
+
+          def canonicalize_filename(filename)
+            ::File.basename(filename, ::File.extname(filename)).tr('-', ' ')
+          end
+
           def generate(title, format)
-            name = cname(title) + '.' + format_to_ext(format)
-            blob = PageBlob.new(name)
+            ext = format_to_ext(format.to_sym)
+            name = cname(title) + '.' + ext
+            canonical_name = canonicalize_filename(name)
 
             path =
-              if blob.name.include?('/')
-                blob.name.sub(%r{/[^/]+$}, '/')
+              if name.include?('/')
+                name.sub(%r{/[^/]+$}, '/')
               else
                 ''
               end
 
-            path + cname(name)
+            path + cname(canonical_name, '-', '-')
           end
         end
       end