gollum 1.1.1 → 1.2.0

data/test/examples/lotr.git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+add sidebars

data/test/examples/lotr.git/config

@@ -1,5 +1,12 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
-	bare = true
+	bare = false
+	logallrefupdates = true
 	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rick/p/gollum/test/examples/lotr.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

data/test/examples/lotr.git/info/exclude

@@ -1,4 +1,4 @@
-# git-ls-files --others --exclude-from=.git/info/exclude
+# git ls-files --others --exclude-from=.git/info/exclude
 # Lines that start with '#' are comments.
 # For a project mostly in C, the following would be a good set of
 # exclude patterns (uncomment them if you want to use them):

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

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 60f12f4254f58801b9ee7db7bca5fa8aeefaa56b rick <technoweenie@gmail.com> 1291341857 -0800	clone: from /Users/rick/p/gollum/test/examples/lotr.git
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b a8ad3c09dd842a3517085bfadd37718856dee813 rick <technoweenie@gmail.com> 1291341922 -0800	commit: add sidebars

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

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 60f12f4254f58801b9ee7db7bca5fa8aeefaa56b rick <technoweenie@gmail.com> 1291341857 -0800	clone: from /Users/rick/p/gollum/test/examples/lotr.git
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b a8ad3c09dd842a3517085bfadd37718856dee813 rick <technoweenie@gmail.com> 1291341922 -0800	commit: add sidebars

data/test/examples/lotr.git/packed-refs

@@ -1,2 +1,2 @@
 # pack-refs with: peeled 
-d61c3de65957b5997c236393b3ad4d70b5cd8931 refs/heads/master
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b refs/remotes/origin/master

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

@@ -1 +1 @@
-60f12f4254f58801b9ee7db7bca5fa8aeefaa56b
+a8ad3c09dd842a3517085bfadd37718856dee813

data/test/examples/lotr.git/refs/remotes/origin/HEAD

@@ -0,0 +1 @@
+ref: refs/remotes/origin/master

data/test/examples/page_file_dir.git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+initial commit

data/test/examples/page_file_dir.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/test/examples/page_file_dir.git/config

@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true

data/test/examples/page_file_dir.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/test/examples/page_file_dir.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

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

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 22b404803c966dd92865614d86ff22ca12e50c1e rick <technoweenie@gmail.com> 1295287591 -0800	commit (initial): initial commit

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

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 22b404803c966dd92865614d86ff22ca12e50c1e rick <technoweenie@gmail.com> 1295287591 -0800	commit (initial): initial commit

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

@@ -0,0 +1 @@
+22b404803c966dd92865614d86ff22ca12e50c1e

data/test/examples/revert.git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+add footer and sidebar

data/test/examples/revert.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/test/examples/revert.git/config

@@ -0,0 +1,12 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rick/p/gollum/test/examples/revert.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

data/test/examples/revert.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/test/examples/revert.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

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

@@ -0,0 +1,2 @@
+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

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

@@ -0,0 +1,2 @@
+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

data/test/examples/revert.git/objects/info/packs

@@ -0,0 +1,2 @@
+P pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack
+

data/test/examples/revert.git/packed-refs

@@ -0,0 +1,2 @@
+# pack-refs with: peeled 
+7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/remotes/origin/master

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

@@ -0,0 +1 @@
+f403b791119f8232b7cb0ba455c624ac6435f433

data/test/examples/revert.git/refs/remotes/origin/HEAD

@@ -0,0 +1 @@
+ref: refs/remotes/origin/master

data/test/examples/yubiwa.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/test/examples/yubiwa.git/config

@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true

data/test/examples/yubiwa.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/test/examples/yubiwa.git/info/exclude

@@ -0,0 +1,6 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/test/examples/yubiwa.git/objects/87/bc1dd46ab3d3874d4e898d45dd512cc20a7cc8

@@ -0,0 +1 @@
+x
��Aj�0E��)���Ȓ��PJC�4�i${ �Y��A��-ދ�m�`��jJ�s���{�4�@��;���i��G����O[��S���J�����7��Fr{��������̌g3�=�c�ҿ݉91wZ����FRv-8]ϗ�ሸR�ش﯏ÄT������[N�

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

@@ -0,0 +1 @@
+8964ed1b4e21aa90e831763bbce9034bfda81b70

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rack/test'
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
@@ -8,7 +9,9 @@ dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift(File.join(dir, '..', 'lib'))
 $LOAD_PATH.unshift(dir)
 
+ENV['RACK_ENV'] = 'test'
 require 'gollum'
+require 'gollum/frontend/app'
 
 # Make sure we're in the test dir, the tests expect that to be the current
 # directory.
@@ -18,10 +21,21 @@ def testpath(path)
   File.join(TEST_DIR, path)
 end
 
+def cloned_testpath(path)
+  repo   = File.expand_path(testpath(path))
+  path   = File.dirname(repo)
+  cloned = File.join(path, self.class.name)
+  FileUtils.rm_rf(cloned)
+  Dir.chdir(path) do
+    %x{git clone #{File.basename(repo)} #{self.class.name}}
+  end
+  cloned
+end
+
 def commit_details
   { :message => "Did something at #{Time.now}",
-    :name => "Tom Preston-Werner",
-    :email => "tom@github.com" }
+    :name    => "Tom Preston-Werner",
+    :email   => "tom@github.com" }
 end
 
 # test/spec/mini 3
@@ -40,5 +54,7 @@ def context(*args, &block)
     def self.teardown(&block) define_method(:teardown, &block) end
   end
   (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
+  $contexts << klass
   klass.class_eval &block
-end
+end
+$contexts = []

data/test/test_app.rb

@@ -0,0 +1,144 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+
+context "Frontend" do
+  include Rack::Test::Methods
+
+  setup do
+    @path = cloned_testpath("examples/revert.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
+
+  test "edits page" do
+    page_1 = @wiki.page('A')
+    post "/edit/A", :content => 'abc',
+      :format => page_1.format, :message => 'def'
+    follow_redirect!
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page_2 = @wiki.page(page_1.name)
+    assert_equal 'abc', page_2.raw_data
+    assert_equal 'def', page_2.version.message
+    assert_not_equal page_1.version.sha, page_2.version.sha
+  end
+
+  test "edits page footer and sidebar" do
+    commits = @wiki.repo.commits('master').size
+    page_1  = @wiki.page('A')
+    foot_1  = page_1.footer
+    side_1  = page_1.sidebar
+
+    post "/edit/A",
+      :footer => 'footer', :page => "A", :sidebar => 'sidebar', :message => 'def'
+    follow_redirect!
+    assert_equal "/A", last_request.fullpath
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page_2 = @wiki.page(page_1.name)
+    foot_2 = page_2.footer
+    side_2 = page_2.sidebar
+    assert_equal page_1.raw_data, page_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_equal 'sidebar', side_2.raw_data
+    assert_equal 'def',     side_2.version.message
+    assert_not_equal side_1.version.sha, side_2.version.sha
+    assert_equal commits+1, @wiki.repo.commits('master').size
+  end
+
+  test "renames page" do
+    page_1 = @wiki.page('B')
+    post "/edit/B", :content => 'abc',
+      :rename => "C",
+      :format => page_1.format, :message => 'def'
+    follow_redirect!
+    assert_equal "/C", last_request.fullpath
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    assert_nil @wiki.page("B")
+    page_2 = @wiki.page('C')
+    assert_equal 'abc', page_2.raw_data
+    assert_equal 'def', page_2.version.message
+    assert_not_equal page_1.version.sha, page_2.version.sha
+  end
+
+  test "creates page" do
+    post "/create", :content => 'abc', :page => "D",
+      :format => 'markdown', :message => 'def'
+    follow_redirect!
+    assert last_response.ok?
+
+    page = @wiki.page('D')
+    assert_equal 'abc', page.raw_data
+    assert_equal 'def', page.version.message
+  end
+
+  test "guards against creation of existing page" do
+    name = "A"
+    post "/create", :content => 'abc', :page => name,
+      :format => 'markdown', :message => 'def'
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page = @wiki.page(name)
+    assert_not_equal 'abc', page.raw_data
+  end
+
+  test "previews content" do
+    post "/preview", :content => 'abc', :format => 'markdown'
+    assert last_response.ok?
+  end
+
+  test "reverts single commit" do
+    page1 = @wiki.page('B')
+
+    post "/revert/B/7c45b5f16ff3bae2a0063191ef832701214d4df5"
+    follow_redirect!
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page2 = @wiki.page('B')
+    assert_not_equal page1.version.sha, page2.version.sha
+    assert_equal "INITIAL", page2.raw_data.strip
+  end
+
+  test "reverts multiple commits" do
+    page1 = @wiki.page('A')
+
+    post "/revert/A/fc66539528eb96f21b2bbdbf557788fe8a1196ac/b26b791cb7917c4f37dd9cb4d1e0efb24ac4d26f"
+    follow_redirect!
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page2 = @wiki.page('A')
+    assert_not_equal page1.version.sha, page2.version.sha
+    assert_equal "INITIAL", page2.raw_data.strip
+  end
+
+  test "cannot revert conflicting commit" do
+    page1 = @wiki.page('A')
+
+    post "/revert/A/302a5491a9a5ba12c7652ac831a44961afa312d2"
+    assert last_response.ok?
+
+    @wiki.clear_cache
+    page2 = @wiki.page('A')
+    assert_equal page1.version.sha, page2.version.sha
+  end
+
+  def app
+    Precious::App
+  end
+end

data/test/test_committer.rb

@@ -0,0 +1,51 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+
+context "Wiki" do
+  setup do
+    @wiki = Gollum::Wiki.new(testpath("examples/lotr.git"))
+  end
+
+  test "normalizes commit hash" do
+    commit = {:message => 'abc'}
+    name  = @wiki.repo.config['user.name']
+    email = @wiki.repo.config['user.email']
+    committer = Gollum::Committer.new(@wiki, commit)
+    assert_equal name,  committer.actor.name
+    assert_equal email, committer.actor.email
+
+    commit[:name]  = 'bob'
+    commit[:email] = ''
+    committer = Gollum::Committer.new(@wiki, commit)
+    assert_equal 'bob',  committer.actor.name
+    assert_equal email, committer.actor.email
+
+    commit[:email] = 'foo@bar.com'
+    committer = Gollum::Committer.new(@wiki, commit)
+    assert_equal 'bob',  committer.actor.name
+    assert_equal 'foo@bar.com', committer.actor.email
+  end
+
+  test "yield after_commit callback" do
+    @path = cloned_testpath('examples/lotr.git')
+    yielded = nil
+    begin
+      wiki = Gollum::Wiki.new(@path)
+      committer = Gollum::Committer.new(wiki)
+      committer.after_commit do |index, sha1|
+        yielded = sha1
+        assert_equal committer, index
+      end
+
+      res = wiki.write_page("Gollum", :markdown, "# Gollum", 
+        :committer => committer)
+
+      assert_equal committer, res
+
+      sha1 = committer.commit
+      assert_equal sha1, yielded
+    ensure
+      FileUtils.rm_rf(@path)
+    end
+  end
+end