From 2aa7e466edce443205ff9306e4627c9ba36ce8fe Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Wed, 4 Jul 2012 11:04:51 -0600 Subject: [PATCH] File view links use '-' instead of %20. --- lib/gollum/file_view.rb | 14 ++++++++------ test/test_file_view.rb | 5 +++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb index 624b991d..032d6028 100644 --- a/lib/gollum/file_view.rb +++ b/lib/gollum/file_view.rb @@ -15,19 +15,20 @@ module Gollum def new_page page name = page.name - %Q(
  • #{name}
  • \n) + url = page.filename_stripped + %Q(
  • #{name}
  • \n) end def new_folder page - new_sub_folder ::File.dirname(page.path), page.name + new_sub_folder ::File.dirname(page.path), page.name, page.filename_stripped end - def new_sub_folder path, name + def new_sub_folder path, name, url <<-HTML
    1. -
    2. #{name}
    3. +
    4. #{name}
    5. HTML end @@ -65,11 +66,12 @@ module Gollum if (count - folder_start == 1) page = @pages[ folder_start ] name = page.name + url = page.filename_stripped html += <<-HTML
      1. -
      2. #{name}
      3. +
      4. #{name}
    6. HTML @@ -129,7 +131,7 @@ module Gollum end # subfolder - html += new_sub_folder ::File.dirname(page.path).split('/').last, page.name + html += new_sub_folder ::File.dirname(page.path).split('/').last, page.name, page.filename_stripped else # depth+1 because we need an additional end_folder (depth+1).times { html += end_folder; } diff --git a/test/test_file_view.rb b/test/test_file_view.rb index 12e89852..744e479e 100644 --- a/test/test_file_view.rb +++ b/test/test_file_view.rb @@ -7,6 +7,11 @@ class FakePage @filepath = filepath end + # From page.rb + def filename_stripped + ::File.basename(@filepath, ::File.extname(@filepath)) + end + def path return @filepath end