jugyo-gollum 1.3.1

data/templates/formatting.html

@@ -0,0 +1,92 @@
+<style>
+  div.frame {
+    margin: 1em 0;
+  }
+
+  div.frame div {
+    display: inline-block;
+    border: 1px solid #aaa;
+    padding: 4px;
+  }
+
+  div div p {
+    font-size: 9px;
+    margin: 0;
+    padding: 4px 0 0 0;
+    text-align: center;
+  }
+
+  .float-left {
+    float: left;
+    padding-right: 1em;
+  }
+
+  .float-right {
+    float: right;
+    padding-left: 1em;
+  }
+
+  .align-left {
+    text-align: left;
+  }
+
+  .align-center {
+    text-align: center;
+  }
+
+  .align-right {
+    text-align: right;
+  }
+</style>
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. <img src="http://www.google.com/images/nav_logo8.png" style="max-width: 16px;" /> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante.
+
+<div class="frame float-left">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" style="max-width: 100px;" />
+    <p>Google</p>
+  </div>
+</div>
+
+Fusce ullamcorper orci enim. Duis lectus elit, convallis ac convallis sit amet, euismod imperdiet dolor. Nunc egestas nisi quis magna feugiat vitae fringilla elit fermentum.
+
+<div class="frame float-right">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" style="max-width: 100px;" />
+    <p>Google</p>
+  </div>
+</div>
+
+Vivamus sollicitudin dolor sit amet elit mollis ultricies. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante.<p>
+
+<div class="frame align-left">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" />
+    <p>Google</p>
+  </div>
+</div>
+
+<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>
+
+<div class="frame align-center">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" />
+    <p>Google</p>
+  </div>
+</div>
+
+<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>
+
+<p>
+<div class="frame align-right">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" />
+  </div>
+</div>
+</p>
+
+<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies. <div class="frame align-right">
+  <div>
+    <img src="http://www.google.com/images/nav_logo8.png" />
+  </div>
+</div> Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>

data/test/examples/lotr.git/COMMIT_EDITMSG

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

data/test/examples/lotr.git/HEAD

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

data/test/examples/lotr.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/lotr.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

data/test/examples/lotr.git/description

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

data/test/examples/lotr.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/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/objects/0e/d8cbe0a25235bd867e65193c7d837c66b328ef

@@ -0,0 +1,3 @@
+x
��Aj1E��)t�	���Bs�@��=#
+�	)-�Lݠ����{����ݚ���l��?
+MK 

data/test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad

@@ -0,0 +1,4 @@
+x���A��0�9�WX�À4ۑ8�� ���0�CU���m��q�d����ق���K��{/����������G�{ѹWG�i �U�8&��V*�/Rל�
+0��>
+L8R����L��pXG���y<+�8�qi��2��/���d	�\�_8�ϝŏL��v:	��e�U=&��Fwc3L���f'�:�$��Ne2ܖ���B��4��$~���>8'�U�Džn
|R�E���
+[,�pFO�p����h�5�*�z�X��Yx�ů+6Y�;���{�.Y���)Y�u�Œ޴��e%ϳ��.��_&�8�Qd��߆=�6����!�%

data/test/examples/lotr.git/objects/94/523d7ae48aeba575099dd12926420d8fd0425d

@@ -0,0 +1,2 @@
+x
��KNC1Eg�@�|���1$�I�'JI��t��yk`zu��m��uAL���*Hˌ�5���T��v*UH�V�X[�-��)S��В(f�T33��0q���I����P
+�<֧Mx�oS����C��	����ۗ�j�f�B$>'d�p������������1n��]�F�zt�ML

data/test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465

@@ -0,0 +1,3 @@
+x���
+�0=�+�r�^�&4 Rz�ȦY�YH���O30�zX{<Dk�"�<�n�apQ*��褝����
+�R+�{�[�?~*A

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

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

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

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

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

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

@@ -0,0 +1,60 @@
+require 'rubygems'
+require 'rack/test'
+require 'test/unit'
+require 'shoulda'
+require 'mocha'
+require 'fileutils'
+
+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.
+TEST_DIR = File.join(File.dirname(__FILE__), *%w[.])
+
+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" }
+end
+
+# test/spec/mini 3
+# http://gist.github.com/25455
+# chris@ozmm.org
+# file:lib/test/spec/mini.rb
+def context(*args, &block)
+  return super unless (name = args.first) && block
+  require 'test/unit'
+  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
+    def self.test(name, &block)
+      define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
+    end
+    def self.xtest(*args) end
+    def self.setup(&block) define_method(:setup, &block) end
+    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
+$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