Gollum::Wiki#pages come back sorted by title, not permalink or the default ordering from git ls-tree.

This commit is contained in:
rick
2010-09-16 09:16:42 -07:00
parent 9cc8790d4f
commit e37a8b9da4
6 changed files with 14 additions and 10 deletions
+3 -1
View File
@@ -221,7 +221,9 @@ module Gollum
# #
# Returns an Array of Gollum::Page instances. # Returns an Array of Gollum::Page instances.
def pages(treeish = nil) def pages(treeish = nil)
tree_list(treeish || 'master') tree_list(treeish || 'master').sort! do |x, y|
x.title.downcase <=> y.title.downcase
end
end end
# Public: Returns the number of pages accessible from a commit # Public: Returns the number of pages accessible from a commit
@@ -0,0 +1,2 @@
x∙н[
б0@Q©Ё┼ы─▓╓yDэй$≥╘AшH:БЖМЭ=pА√╬╝MюзИ$┐(Ш≤≤UJ(ег╧tяq╤yv.EvVsUoмфДШ■╢и3Q╛9Ф┌·1!#З░~Дя▄V·p*▐╜┴╤FВeеЖ╨■╬чюьД┌÷ЭdА╛ёжЙпcOХОPa╜╟В!m[@hУrH┐
+1 -1
View File
@@ -1 +1 @@
60f12f4254f58801b9ee7db7bca5fa8aeefaa56b 308fdf72d89351bf53fa6eeb00884273047e07fa
+8 -8
View File
@@ -32,15 +32,15 @@ context "Wiki" do
assert_equal commits, @wiki.log(:page => 2).map { |c| c.id } assert_equal commits, @wiki.log(:page => 2).map { |c| c.id }
end end
test "list pages" do test "list pages, sorted by title" do
pages = @wiki.pages pages = @wiki.pages
assert_equal \ assert_equal \
%w(Bilbo-Baggins.md Eye-Of-Sauron.md Home.textile My-Precious.md), %w(bilbo.md Bilbo-Baggins.md Eye-Of-Sauron.md My-Precious.md Home.textile),
pages.map { |p| p.filename }.sort pages.map { |p| p.filename }
end end
test "counts pages" do test "counts pages" do
assert_equal 4, @wiki.size assert_equal 5, @wiki.size
end end
test "normalizes commit hash" do test "normalizes commit hash" do
@@ -64,9 +64,9 @@ context "Wiki" do
assert @wiki.ref_map.empty? assert @wiki.ref_map.empty?
assert @wiki.tree_map.empty? assert @wiki.tree_map.empty?
@wiki.tree_map_for 'master' @wiki.tree_map_for 'master'
assert_equal({"master"=>"60f12f4254f58801b9ee7db7bca5fa8aeefaa56b"}, @wiki.ref_map) assert_equal({"master"=>"308fdf72d89351bf53fa6eeb00884273047e07fa"}, @wiki.ref_map)
map = @wiki.tree_map['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'] map = @wiki.tree_map['308fdf72d89351bf53fa6eeb00884273047e07fa']
assert_equal 'Bilbo-Baggins.md', map[0].path assert_equal 'Bilbo-Baggins.md', map[0].path
assert_equal '', map[0].dir assert_equal '', map[0].dir
assert_equal map[0].path, map[0].name assert_equal map[0].path, map[0].name
@@ -77,10 +77,10 @@ context "Wiki" do
test "#tree_map_for only caches tree for commit" do test "#tree_map_for only caches tree for commit" do
assert @wiki.tree_map.empty? assert @wiki.tree_map.empty?
@wiki.tree_map_for '60f12f4254f58801b9ee7db7bca5fa8aeefaa56b' @wiki.tree_map_for '308fdf72d89351bf53fa6eeb00884273047e07fa'
assert @wiki.ref_map.empty? assert @wiki.ref_map.empty?
entry = @wiki.tree_map['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'][0] entry = @wiki.tree_map['308fdf72d89351bf53fa6eeb00884273047e07fa'][0]
assert_equal 'Bilbo-Baggins.md', entry.path assert_equal 'Bilbo-Baggins.md', entry.path
end end
end end