gollum 2.0.0 → 2.1.0

data/test/examples/lotr.git/refs/heads/master

@@ -1 +1 @@
-1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3
+629aa678272b017a4d136d35e77ac94d80b08dc2

data/test/examples/revert.git/COMMIT_EDITMSG

@@ -1 +1 @@
-add footer and sidebar
+Add header.

data/test/examples/revert.git/logs/HEAD

@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick <technoweenie@gmail.com> 1291942707 -0800	clone: from /Users/rick/p/gollum/test/examples/revert.git
 7c45b5f16ff3bae2a0063191ef832701214d4df5 f403b791119f8232b7cb0ba455c624ac6435f433 rick <technoweenie@gmail.com> 1291942743 -0800	commit: add footer and sidebar
+f403b791119f8232b7cb0ba455c624ac6435f433 ed6c9f63b98acf73c25b5ffbb38da557d3682023 bootstraponline <cafe@bootstraponline.com> 1336421777 -0600	commit: Add header.

data/test/examples/revert.git/logs/refs/heads/master

@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick <technoweenie@gmail.com> 1291942707 -0800	clone: from /Users/rick/p/gollum/test/examples/revert.git
 7c45b5f16ff3bae2a0063191ef832701214d4df5 f403b791119f8232b7cb0ba455c624ac6435f433 rick <technoweenie@gmail.com> 1291942743 -0800	commit: add footer and sidebar
+f403b791119f8232b7cb0ba455c624ac6435f433 ed6c9f63b98acf73c25b5ffbb38da557d3682023 bootstraponline <cafe@bootstraponline.com> 1336421777 -0600	commit: Add header.

data/test/examples/revert.git/objects/ed/6c9f63b98acf73c25b5ffbb38da557d3682023

@@ -0,0 +1,3 @@
+x
��K� @]s
+.`3ç�1z�
���-
+�$X��J,�9����CW�Œ�s�ƚr���\��8{�����?ci]���{t>��Zwѷ�U?v�m�k�֓����P�=_��WQ�R�"\�O�ziN�

data/test/examples/revert.git/refs/heads/master

@@ -1 +1 @@
-f403b791119f8232b7cb0ba455c624ac6435f433
+ed6c9f63b98acf73c25b5ffbb38da557d3682023

data/test/file_view/1_file.txt

@@ -0,0 +1,3 @@
+<ol class="tree">
+  <li class="file"><a href="0">0</a></li>
+</ol>

data/test/file_view/1_file_1_folder.txt

@@ -0,0 +1,8 @@
+<ol class="tree">
+        <li>
+          <label>folder0</label> <input type="checkbox" checked />
+          <ol>
+            <li class="file"><a href="folder0/0">0</a></li>
+         </ol>
+        </li>
+</ol>

data/test/file_view/1_folder.txt

@@ -0,0 +1,8 @@
+<ol class="tree">
+        <li>
+          <label>.</label> <input type="checkbox" checked />
+          <ol>
+            <li class="file"><a href="folder0">folder0</a></li>
+         </ol>
+        </li>
+</ol>

data/test/file_view/2_files_2_folders.txt

@@ -0,0 +1,12 @@
+<ol class="tree">
+      <li>
+        <label>folder0</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder0/0">0</a></li>
+        </ol>
+      </li>
+      <li>
+        <label>folder1</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder1/1">1</a></li>
+</ol>

data/test/file_view/2_files_2_folders_1_root.txt

@@ -0,0 +1,13 @@
+<ol class="tree">
+  <li class="file"><a href="root">root</a></li>
+      <li>
+        <label>folder0</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder0/0">0</a></li>
+        </ol>
+      </li>
+      <li>
+        <label>folder1</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder1/1">1</a></li>
+</ol>

data/test/file_view/nested_folders.txt

@@ -0,0 +1,28 @@
+<ol class="tree">
+      <li>
+        <label>folder0</label> <input type="checkbox" checked />
+        <ol>
+      <li>
+        <label>folder1</label> <input type="checkbox" checked />
+        <ol>
+      <li>
+        <label>folder2</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder0/folder1/folder2/0">0</a></li>
+        </ol>
+      </li>
+      <li>
+        <label>folder3</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder0/folder1/folder3/1">1</a></li>
+        </ol>
+      </li>
+        </ol>
+      </li>
+        </ol>
+      </li>
+      <li>
+        <label>folder4</label> <input type="checkbox" checked />
+        <ol>
+  <li class="file"><a href="folder4/2">2</a></li>
+</ol>

data/test/test_app.rb

@@ -15,9 +15,30 @@ context "Frontend" do
     FileUtils.rm_rf(@path)
   end
 
+  test "retain edit information" do
+    page1 = 'page1'
+    user1 = 'user1'
+    @wiki.write_page(page1, :markdown, '',
+                     { :name => user1, :email => user1 });
+
+    get page1
+    assert_match /Last edited by <b>user1/, last_response.body
+
+    page2 = 'page2'
+    user2 = 'user2'
+    @wiki.write_page(page2, :markdown, '',
+                     { :name => user2, :email => user2 });
+
+    get page2
+    assert_match /Last edited by <b>user2/, last_response.body
+
+    get page1
+    assert_match /Last edited by <b>user1/, last_response.body
+  end
+
   test "edits page" do
     page_1 = @wiki.page('A')
-    post "/edit/A", :content => 'abc',
+    post "/edit/A", :content => 'abc', :page => 'A',
       :format => page_1.format, :message => 'def'
     follow_redirect!
     assert last_response.ok?
@@ -29,13 +50,14 @@ context "Frontend" do
     assert_not_equal page_1.version.sha, page_2.version.sha
   end
 
-  test "edits page footer and sidebar" do
+  test "edits page header footer and sidebar" do
     commits = @wiki.repo.commits('master').size
     page_1  = @wiki.page('A')
+    header_1 = page_1.header
     foot_1  = page_1.footer
     side_1  = page_1.sidebar
 
-    post "/edit/A",
+    post "/edit/A", :header => 'header',
       :footer => 'footer', :page => "A", :sidebar => 'sidebar', :message => 'def'
     follow_redirect!
     assert_equal "/A", last_request.fullpath
@@ -43,13 +65,16 @@ context "Frontend" do
 
     @wiki.clear_cache
     page_2 = @wiki.page(page_1.name)
+    header_2 = page_2.header
     foot_2 = page_2.footer
     side_2 = page_2.sidebar
     assert_equal page_1.raw_data, page_2.raw_data
 
+    assert_equal 'header', header_2.raw_data
     assert_equal 'footer', foot_2.raw_data
     assert_equal 'def',    foot_2.version.message
     assert_not_equal foot_1.version.sha, foot_2.version.sha
+    assert_not_equal header_1.version.sha, header_2.version.sha
 
     assert_equal 'sidebar', side_2.raw_data
     assert_equal 'def',     side_2.version.message
@@ -60,10 +85,10 @@ context "Frontend" do
   test "renames page" do
     page_1 = @wiki.page('B')
     post "/edit/B", :content => 'abc',
-      :rename => "C",
+      :rename => "C", :page => 'B',
       :format => page_1.format, :message => 'def'
     follow_redirect!
-    assert_equal "/C", last_request.fullpath
+    assert_equal '/c', last_request.fullpath
     assert last_response.ok?
 
     @wiki.clear_cache
@@ -88,15 +113,33 @@ context "Frontend" do
   test "creates pages with escaped characters in title" do
     post "/create", :content => 'abc', :page => 'Title with spaces',
       :format => 'markdown', :message => 'foo'
-    assert_equal 'http://example.org/Title-with-spaces', last_response.headers['Location']
+    assert_equal 'http://example.org/title-with-spaces', last_response.headers['Location']
     get "/Title-with-spaces"
     assert_match /abc/, last_response.body
+  end
+
+  test "redirects to create on non-existant page" do
+    name = "E"
+    get "/#{name}"
+    follow_redirect!
+    assert_equal "/create/#{name}", last_request.fullpath
+    assert last_response.ok?
+  end
 
-    post "/create", :content => 'ghi', :page => 'Title/with/slashes',
-      :format => 'markdown', :message => 'bar'
-    assert_equal 'http://example.org/Title-with-slashes', last_response.headers['Location']
-    get "/Title-with-slashes"
-    assert_match /ghi/, last_response.body
+  test "edit redirects to create on non-existant page" do
+    name = "E"
+    get "/edit/#{name}"
+    follow_redirect!
+    assert_equal "/create/#{name}", last_request.fullpath
+    assert last_response.ok?
+  end
+
+  test "create redirects to page if already exists" do
+    name = "A"
+    get "/create/#{name}"
+    follow_redirect!
+    assert_equal "/#{name}", last_request.fullpath
+    assert last_response.ok?
   end
 
   test "guards against creation of existing page" do
@@ -110,6 +153,20 @@ context "Frontend" do
     assert_not_equal 'abc', page.raw_data
   end
 
+  test "delete a page" do
+    name = "deleteme"
+    post "/create", :content => 'abc', :page => name,
+      :format => 'markdown', :message => 'foo'
+    page = @wiki.page(name)
+    assert_equal 'abc', page.raw_data
+
+    get '/delete/' + name
+
+    @wiki.clear_cache
+    page = @wiki.page(name)
+    assert_equal nil, page
+  end
+
   test "previews content" do
     post "/preview", :content => 'abc', :format => 'markdown'
     assert last_response.ok?
@@ -125,7 +182,6 @@ context "Frontend" do
     assert last_response.ok?
   end
 
-
   test "reverts single commit" do
     page1 = @wiki.page('B')
 
@@ -167,3 +223,97 @@ context "Frontend" do
     Precious::App
   end
 end
+
+context "Frontend with lotr" do
+  include Rack::Test::Methods
+
+  setup do
+    @path = cloned_testpath("examples/lotr.git")
+    @wiki = Gollum::Wiki.new(@path)
+    Precious::App.set(:gollum_path, @path)
+    Precious::App.set(:wiki_options, {})
+  end
+
+  teardown do
+    FileUtils.rm_rf(@path)
+  end
+
+  # Here's the dir structure of lotr.git
+  #
+  # .
+  # ├── Bilbo-Baggins.md
+  # ├── Data.csv
+  # ├── Gondor
+  # │   ├── Boromir.md
+  # │   ├── _Footer.md
+  # │   ├── _Header.md
+  # │   └── _Sidebar.md
+  # ├── Home.textile
+  # ├── Mordor
+  # │   ├── Eye-Of-Sauron.md
+  # │   ├── _Footer.md
+  # │   ├── _Header.md
+  # │   ├── _Sidebar.md
+  # │   ├── eye.jpg
+  # │   └── todo.txt
+  # ├── My-Precious.md
+  # ├── Samwise\ Gamgee.mediawiki
+  # ├── _Footer.md
+  # ├── _Header.md
+  # └── _Sidebar.md
+  #
+
+  test "/pages" do
+    get "/pages"
+    assert last_response.ok?
+
+    body = last_response.body
+
+    assert body.include?("Bilbo Baggins"), "/pages should include the page 'Bilbo Baggins'"
+    assert body.include?("Gondor"), "/pages should include the folder 'Gondor'"
+    assert !body.include?("Boromir"), "/pages should NOT include the page 'Boromir'"
+    assert body.include?("Mordor"), "/pages should include the folder 'Mordor'"
+    assert !body.include?("Eye Of Sauron"), "/pages should NOT include the page 'Eye Of Sauron'"
+  end
+
+  test "/pages/Mordor/" do
+    get "/pages/Mordor/"
+    assert last_response.ok?, "/pages/Mordor/ did not respond ok"
+
+    body = last_response.body
+
+    assert !body.include?("Bilbo Baggins"), "/pages/Mordor/ should NOT include the page 'Bilbo Baggins'"
+    assert body.include?("Eye Of Sauron"), "/pages/Mordor/ should include the page 'Eye Of Sauron'"
+  end
+
+  test "create pages within sub-directories" do
+    post "/create", :content => 'big smelly creatures', :page => 'Orc',
+      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+    assert_equal 'http://example.org/Mordor/orc', last_response.headers['Location']
+    get "/Mordor/Orc"
+    assert_match /big smelly creatures/, last_response.body
+
+    post "/create", :content => 'really big smelly creatures', :page => 'Uruk Hai',
+      :path => 'Mordor', :format => 'markdown', :message => 'oooh, very scary'
+    assert_equal 'http://example.org/Mordor/uruk-hai', last_response.headers['Location']
+    get "/Mordor/Uruk-Hai"
+    assert_match /really big smelly creatures/, last_response.body
+  end
+
+  test "edit pages within sub-directories" do
+    post "/create", :content => 'big smelly creatures', :page => 'Orc',
+      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+    assert_equal 'http://example.org/Mordor/orc', last_response.headers['Location']
+
+    post "/edit/Mordor/Orc", :content => 'not so big smelly creatures',
+      :page => 'Orc', :path => 'Mordor', :message => 'minor edit'
+    assert_equal 'http://example.org/Mordor/orc', last_response.headers['Location']
+
+    get "/Mordor/Orc"
+    assert_match /not so big smelly creatures/, last_response.body
+  end
+
+  def app
+    Precious::App
+  end
+end

data/test/test_app_helpers.rb

@@ -0,0 +1,13 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+
+context "Precious::Helpers" do
+  include Precious::Helpers
+
+  test "extracting paths from URLs" do
+    assert_nil extract_path('Eye-Of-Sauron')
+    assert_equal 'Mordor', extract_path('Mordor/Sauron')
+    assert_equal 'Mordor/Sauron', extract_path('Mordor/Sauron/Evil')
+  end
+end
+

data/test/test_committer.rb

@@ -50,7 +50,7 @@ context "Wiki" do
   end
 
   test "parents with default master ref" do
-    ref = '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'
+    ref = '629aa678272b017a4d136d35e77ac94d80b08dc2'
     committer = Gollum::Committer.new(@wiki)
     assert_equal ref,  committer.parents.first.sha
   end

data/test/test_file_view.rb

@@ -0,0 +1,102 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path '../../lib/gollum/file_view', __FILE__
+
+class FakePage
+  def initialize filepath
+    @filepath = filepath  
+  end
+  
+  # From page.rb
+  def filename_stripped
+    ::File.basename(@filepath, ::File.extname(@filepath))
+  end
+
+  def path
+    return @filepath
+  end
+
+  # From page.rb
+  def name
+    self.class.canonicalize_filename @filepath
+  end
+
+  # From page.rb
+  def self.strip_filename filename
+    ::File.basename( filename, ::File.extname( filename ))
+  end
+
+  # From page.rb
+  def self.canonicalize_filename filename
+    strip_filename(filename).gsub('-', ' ')
+  end
+end
+
+class FakePages
+  def initialize filepath_array
+    @array = filepath_array.map { | filepath | FakePage.new filepath }
+  end
+
+  def size
+    @array.size
+  end
+  
+  def [] index
+    @array[ index ]
+  end
+end
+
+def view pages
+  Gollum::FileView.new( pages ).render_files
+end
+
+@@test_path = File.expand_path( '../file_view/' , __FILE__ ) + '/'
+
+def read file
+  File.read @@test_path + file + '.txt'
+end
+
+# For creating expected files.
+# write name, actual
+def write file, content
+  File.open(@@test_path + file + '.txt', 'w') do | f |
+    f.write content
+  end
+end
+
+def check name, pages_array
+  pages = FakePages.new pages_array
+  expected = read name
+  actual = view pages
+  assert_equal expected, actual
+end
+
+# Test Notes
+# root files must be before any folders.
+# Home.md => file at root folder
+# docs/sanitization.md => file within folder
+context 'file_view' do
+  test 'one file' do
+    check '1_file', [ '0.md' ]
+  end
+
+  test 'one folder' do
+    check '1_folder', [ 'folder0/' ]
+  end
+
+  test 'one file with one folder' do
+    check '1_file_1_folder', [ 'folder0/0.md' ]
+  end
+
+  test 'two files with two folders' do
+    check '2_files_2_folders', [ 'folder0/0.md', 'folder1/1.md' ]
+  end
+
+  test 'two files with two folders and one root file' do
+    check '2_files_2_folders_1_root', [ 'root.md', 'folder0/0.md', 'folder1/1.md' ]
+  end
+
+  test 'nested folders' do
+    check 'nested_folders', [ 'folder0/folder1/folder2/0.md', 'folder0/folder1/folder3/1.md', 'folder4/2.md' ]
+  end
+end # context