From 96842d9742d272b9449fc83a393fe1f9ced4ad12 Mon Sep 17 00:00:00 2001
From: bootstraponline <cafe@bootstraponline.com>
Date: Fri, 27 Jul 2012 14:45:40 -0600
Subject: [PATCH] Refactor page url generation. Avoid appending './' to urls.

---
 lib/gollum/file_view.rb                     | 10 ++++++++--
 test/file_view/1_file.txt                   |  2 +-
 test/file_view/1_folder.txt                 |  2 +-
 test/file_view/2_files_2_folders_1_root.txt |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb
index 1e329239..272f1d9a 100644
--- a/lib/gollum/file_view.rb
+++ b/lib/gollum/file_view.rb
@@ -15,7 +15,7 @@ module Gollum
 
     def new_page page
       name = page.name
-      url  = ::File.join(::File.dirname(page.path), page.filename_stripped)
+      url  = url_for_page page
       %Q(  <li class="file"><a href="#{url}">#{name}</a></li>\n)
     end
 
@@ -38,6 +38,12 @@ module Gollum
       HTML
     end
 
+    def url_for_page page
+      url = ::File.join(::File.dirname(page.path), page.filename_stripped)
+      url = url[2..-1] if url[0,2] == './'
+      url
+    end
+
     def render_files
       html = ''
       count = @pages.size
@@ -65,7 +71,7 @@ module Gollum
       if (count - folder_start == 1)
         page = @pages[ folder_start ]
         name = page.name
-        url  = ::File.join(::File.dirname(page.path), page.filename_stripped)
+        url  = url_for_page page
         html += <<-HTML
         <li>
           <label>#{::File.dirname(page.path)}</label> <input type="checkbox" checked />
diff --git a/test/file_view/1_file.txt b/test/file_view/1_file.txt
index d0c72ff9..6f65a3a3 100644
--- a/test/file_view/1_file.txt
+++ b/test/file_view/1_file.txt
@@ -1,3 +1,3 @@
 <ol class="tree">
-  <li class="file"><a href="./0">0</a></li>
+  <li class="file"><a href="0">0</a></li>
 </ol>
\ No newline at end of file
diff --git a/test/file_view/1_folder.txt b/test/file_view/1_folder.txt
index 3893332e..f960bee7 100644
--- a/test/file_view/1_folder.txt
+++ b/test/file_view/1_folder.txt
@@ -2,7 +2,7 @@
         <li>
           <label>.</label> <input type="checkbox" checked />
           <ol>
-            <li class="file"><a href="./folder0">folder0</a></li>
+            <li class="file"><a href="folder0">folder0</a></li>
          </ol>
         </li>
 </ol>
\ No newline at end of file
diff --git a/test/file_view/2_files_2_folders_1_root.txt b/test/file_view/2_files_2_folders_1_root.txt
index d648b641..f6e1e8f3 100644
--- a/test/file_view/2_files_2_folders_1_root.txt
+++ b/test/file_view/2_files_2_folders_1_root.txt
@@ -1,5 +1,5 @@
 <ol class="tree">
-  <li class="file"><a href="./root">root</a></li>
+  <li class="file"><a href="root">root</a></li>
       <li>
         <label>folder0</label> <input type="checkbox" checked />
         <ol>