ASCIIDoc headers can be written in two ways: with differing underlines or with different indentation using = (equals sign). ASCIIDoc supports headings 1-4. The editor will automatically use the = notation. To create a level one header, prefix your line with one =. Level two headers are created with == and so on.
'
+ data: 'AsciiDoc headers can be written in two ways: with differing underlines or with different indentation using = (equals sign). AsciiDoc supports headings 1-4. The editor will automatically use the = notation. To create a level one header, prefix your line with one =. Level two headers are created with == and so on.
'
},
{
menuName: 'Bold / Italic',
- data: 'ASCIIDoc will automatically convert textual representations of commonly-used special characters. For example, (R) becomes ®, (C) becomes © and (TM) becomes ™.
'
+ data: 'AsciiDoc will automatically convert textual representations of commonly-used special characters. For example, (R) becomes ®, (C) becomes © and (TM) becomes ™.
'
}
]
},
@@ -132,7 +147,7 @@ var ASCIIDocHelp = [
content: [
{
menuName: 'Paragraphs',
- data: 'ASCIIDoc allows paragraphs to have optional titles or icons to denote special sections. To make a normal paragraph, simply add a line between blocks and a new paragraph will start. If you want to title your paragraphs, adda line prefixed by . (full stop). An example paragraph with optional title is displayed below:.Optional Title
'
+ data: 'AsciiDoc allows paragraphs to have optional titles or icons to denote special sections. To make a normal paragraph, simply add a line between blocks and a new paragraph will start. If you want to title your paragraphs, adda line prefixed by . (full stop). An example paragraph with optional title is displayed below:.Optional Title
'
},
{
menuName: 'Source Blocks',
@@ -157,12 +172,12 @@ var ASCIIDocHelp = [
},
{
menuName: 'Images',
- data: '
diff --git a/lib/gollum/templates/latest_changes.mustache b/lib/gollum/templates/latest_changes.mustache
new file mode 100644
index 00000000..9044c23a
--- /dev/null
+++ b/lib/gollum/templates/latest_changes.mustache
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+ {{#versions}}
+
+
+ {{>author_template}}
+
+
+ {{date}}:
+ {{message}}
+ [{{id7}}]
+ {{#files}}
+ {{file}}
+ {{/files}}
+
+
+ {{/versions}}
+
+
+
+
+
+
+
diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index 805b6361..0453e897 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -2,6 +2,9 @@
+
+
+
@@ -16,9 +19,9 @@
diff --git a/lib/gollum/templates/page.mustache b/lib/gollum/templates/page.mustache
index d7b7a53a..4b15ed9f 100644
--- a/lib/gollum/templates/page.mustache
+++ b/lib/gollum/templates/page.mustache
@@ -18,22 +18,35 @@ Mousetrap.bind(['e'], function( e ) {
class="action-all-pages">All
Files
-
- New
- {{#allow_uploads}}
-
- Upload
- {{/allow_uploads}}
- {{#editable}}
-
- Rename
-
Edit
- {{/editable}}
+ {{#allow_editing}}
+
+ New
+ {{/allow_editing}}
+ {{#allow_editing}}
+ {{#allow_uploads}}
+
+ Upload
+ {{/allow_uploads}}
+ {{/allow_editing}}
+ {{#allow_editing}}
+ {{#editable}}
+
+ Rename
+ {{/editable}}
+ {{/allow_editing}}
+ {{#allow_editing}}
+ {{#editable}}
+
Edit
+ {{/editable}}
+ {{/allow_editing}}
{{#page_exists}}
History
+
+ Latest Changes
{{/page_exists}}
diff --git a/lib/gollum/views/compare.rb b/lib/gollum/views/compare.rb
index df2e3a3a..a8abca8e 100644
--- a/lib/gollum/views/compare.rb
+++ b/lib/gollum/views/compare.rb
@@ -3,7 +3,7 @@ module Precious
class Compare < Layout
include HasPage
- attr_reader :page, :diff, :versions, :message
+ attr_reader :page, :diff, :versions, :message, :allow_editing
def title
"Comparison of #{@page.title}"
diff --git a/lib/gollum/views/create.rb b/lib/gollum/views/create.rb
index 7d09c7fe..d976df83 100755
--- a/lib/gollum/views/create.rb
+++ b/lib/gollum/views/create.rb
@@ -17,6 +17,14 @@ module Precious
false
end
+ def allow_uploads
+ @allow_uploads
+ end
+
+ def upload_dest
+ @upload_dest
+ end
+
def format
@format = (@page.format || false) if @format.nil? && @page
@format.to_s.downcase
diff --git a/lib/gollum/views/edit.rb b/lib/gollum/views/edit.rb
index 0909e5af..8b0a5e60 100755
--- a/lib/gollum/views/edit.rb
+++ b/lib/gollum/views/edit.rb
@@ -60,6 +60,14 @@ module Precious
true
end
+ def allow_uploads
+ @allow_uploads
+ end
+
+ def upload_dest
+ @upload_dest
+ end
+
def format
@format = (@page.format || false) if @format.nil?
@format.to_s.downcase
diff --git a/lib/gollum/views/history.rb b/lib/gollum/views/history.rb
index ca51254c..a3d19e3b 100644
--- a/lib/gollum/views/history.rb
+++ b/lib/gollum/views/history.rb
@@ -3,7 +3,7 @@ module Precious
class History < Layout
include HasPage
- attr_reader :page, :page_num
+ attr_reader :page, :page_num, :allow_editing
def title
@page.title
diff --git a/lib/gollum/views/latest_changes.rb b/lib/gollum/views/latest_changes.rb
new file mode 100644
index 00000000..8707e489
--- /dev/null
+++ b/lib/gollum/views/latest_changes.rb
@@ -0,0 +1,90 @@
+module Precious
+ module Views
+ class LatestChanges < Layout
+
+ attr_reader :wiki
+
+ def title
+ "Latest Changes (Globally)"
+ end
+
+ def versions
+ i = @versions.size + 1
+ @versions.map do |v|
+ i -= 1
+ { :id => v.id,
+ :id7 => v.id[0..6],
+ :num => i,
+ :author => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
+ :message => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
+ :date => v.authored_date.strftime("%B %d, %Y"),
+ :gravatar => Digest::MD5.hexdigest(v.author.email.strip.downcase),
+ :identicon => self._identicon_code(v.author.email),
+ :date_full => v.authored_date,
+ :files => v.stats.files.map { |f,*rest|
+ page_path = extract_renamed_path_destination(f)
+ page_path = remove_page_extentions(page_path)
+ { :file => f,
+ :link => "#{page_path}/#{v.id}"
+ }
+ }
+ }
+ end
+ end
+
+ def remove_page_extentions(page_path)
+ Gollum::Markup.formats.values.each do |format|
+ page_path = page_path.gsub(/\.#{format[:regexp]}$/, '')
+ end
+ return page_path
+ end
+
+ def extract_renamed_path_destination(file)
+ return file.gsub(/{.* => (.*)}/, '\1').gsub(/.* => (.*)/, '\1')
+ end
+
+ # http://stackoverflow.com/questions/9445760/bit-shifting-in-ruby
+ def left_shift(int, shift)
+ r = ((int & 0xFF) << (shift & 0x1F)) & 0xFFFFFFFF
+ # 1>>31, 2**32
+ (r & 2147483648) == 0 ? r : r - 4294967296
+ end
+
+ def string_to_code(string)
+ # sha bytes
+ b = [Digest::SHA1.hexdigest(string)[0, 20]].pack('H*').bytes.to_a
+ # Thanks donpark's IdenticonUtil.java for this.
+ # Match the following Java code
+ # ((b[0] & 0xFF) << 24) | ((b[1] & 0xFF) << 16) |
+ # ((b[2] & 0xFF) << 8) | (b[3] & 0xFF)
+
+ return left_shift(b[0], 24) |
+ left_shift(b[1], 16) |
+ left_shift(b[2], 8) |
+ b[3] & 0xFF
+ end
+
+ def _identicon_code(blob)
+ string_to_code blob + @request.host
+ end
+
+ def use_identicon
+ @wiki.user_icons == 'identicon'
+ end
+
+ def partial(name)
+ if name == :author_template
+ self.class.partial("history_authors/#{@wiki.user_icons}")
+ else
+ super
+ end
+ end
+
+ def previous_link
+ end
+
+ def next_link
+ end
+ end
+ end
+end
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index c48d4f33..6f635d17 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -14,7 +14,7 @@ module Precious
end
def page_header
- page_header_from_content(@content) || title
+ title
end
def content
@@ -47,6 +47,10 @@ module Precious
@page_exists
end
+ def allow_editing
+ @allow_editing
+ end
+
def allow_uploads
@allow_uploads
end
@@ -56,8 +60,12 @@ module Precious
end
def has_header
- @header = (@page.header || false) if @header.nil?
- !!@header
+ if @header
+ @header.formatted_data.strip.empty? ? false : true
+ else
+ @header = (@page.header || false)
+ !!@header
+ end
end
def header_content
@@ -69,8 +77,12 @@ module Precious
end
def has_footer
- @footer = (@page.footer || false) if @footer.nil?
- !!@footer
+ if @footer
+ @footer.formatted_data.strip.empty? ? false : true
+ else
+ @footer = (@page.footer || false)
+ !!@footer
+ end
end
def footer_content
@@ -86,8 +98,12 @@ module Precious
end
def has_sidebar
- @sidebar = (@page.sidebar || false) if @sidebar.nil?
- !!@sidebar
+ if @sidebar
+ @sidebar.formatted_data.strip.empty? ? false : true
+ else
+ @sidebar = (@page.sidebar || false)
+ !!@sidebar
+ end
end
def sidebar_content
@@ -142,7 +158,7 @@ module Precious
def find_header_node(doc)
case @page.format
when :asciidoc
- doc.css("div#gollum-root > div#header > h1:first-child")
+ doc.css("div#gollum-root > h1:first-child")
when :org
doc.css("div#gollum-root > p.title:first-child")
when :pod
@@ -166,9 +182,11 @@ module Precious
# Returns page content without title if it was extracted.
#
def content_without_page_header(content)
- doc = build_document(content)
- title = find_header_node(doc)
- title.remove unless title.empty?
+ doc = build_document(content)
+ if @h1_title
+ title = find_header_node(doc)
+ title.remove unless title.empty?
+ end
# .inner_html will cause href escaping on UTF-8
doc.css("div#gollum-root").children.to_xml(@@to_xml)
end
diff --git a/lib/gollum/views/pages.rb b/lib/gollum/views/pages.rb
index d2a85f5e..bd020d2a 100644
--- a/lib/gollum/views/pages.rb
+++ b/lib/gollum/views/pages.rb
@@ -3,7 +3,7 @@ require "pathname"
module Precious
module Views
class Pages < Layout
- attr_reader :results, :ref
+ attr_reader :results, :ref, :allow_editing
def title
"All pages in #{@ref}"
@@ -47,7 +47,11 @@ module Precious
folder_link
end
elsif page_path != ".gitkeep"
- %{
#{page.name} }
+ if defined? page.format
+ %{
#{page.name} }
+ else
+ %{
#{page.name} }
+ end
end
}.compact.join("\n")
else
diff --git a/test/helper.rb b/test/helper.rb
index fd4bf782..91f09d06 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -87,3 +87,14 @@ def context(*args, &block)
end
$contexts = []
+
+# Commit file to wiki, overwriting previous versions of that file
+def commit_test_file(wiki, dir, filename, ext, content)
+ committer = Gollum::Committer.new(wiki, :message => "Added testfile", :parent => wiki.repo.head.commit)
+ committer.add_to_index(dir, filename, ext, content, true)
+ committer.after_commit do |committer, sha|
+ wiki.clear_cache
+ committer.update_working_dir(dir, filename, ext)
+ end
+ committer.commit
+end
diff --git a/test/test_allow_editing.rb b/test/test_allow_editing.rb
new file mode 100644
index 00000000..d59b93ba
--- /dev/null
+++ b/test/test_allow_editing.rb
@@ -0,0 +1,80 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+context "Precious::Views::Editing" do
+ include Rack::Test::Methods
+ setup do
+ examples = testpath "examples"
+ @path = File.join(examples, "test.git")
+ Precious::App.set(:gollum_path, @path)
+ FileUtils.cp_r File.join(examples, "revert.git"), @path, :remove_destination => true
+ @wiki = Gollum::Wiki.new(@path)
+ end
+
+ teardown do
+ FileUtils.rm_r(File.join(File.dirname(__FILE__), *%w[examples test.git]))
+ end
+
+ test "creating page is blocked" do
+ Precious::App.set(:wiki_options, { allow_editing: false})
+ post "/create", :content => 'abc', :page => "D",
+ :format => 'markdown', :message => 'def'
+ assert !last_response.ok?
+
+ page = @wiki.page('D')
+ assert page.nil?
+ end
+
+
+ test "frontend links for editing are not blocked" do
+ Precious::App.set(:wiki_options, { allow_editing: true, allow_uploads: true })
+ get '/A'
+
+ assert_match /Delete this Page/, last_response.body, "'Delete this Page' link is blocked in page template"
+ assert_match /New/, last_response.body, "'New' button is blocked in page template"
+ assert_match /Upload/, last_response.body, "'Upload' link is blocked in page template"
+ assert_match /Rename/, last_response.body, "'Rename' link is blocked in page template"
+ assert_match /Edit/, last_response.body, "'Edit' link is blocked in page template"
+
+ get '/pages'
+
+ assert_match /New/, last_response.body, "'New' link is blocked in pages template"
+
+ get '/history/A'
+
+ assert_match /Edit/, last_response.body, "'Edit' link is blocked in history template"
+
+ get '/compare/A/fc66539528eb96f21b2bbdbf557788fe8a1196ac..b26b791cb7917c4f37dd9cb4d1e0efb24ac4d26f'
+
+ assert_match /Edit Page/, last_response.body, "'Edit Page' link is blocked in compare template"
+ assert_match /Revert Changes/, last_response.body, "'Revert Changes' link is blocked in compare template"
+ end
+
+ test "frontend links for editing blocked" do
+ Precious::App.set(:wiki_options, { allow_editing: false })
+ get '/A'
+
+ assert_no_match /Delete this Page/, last_response.body, "'Delete this Page' link not blocked in page template"
+ assert_no_match /New/, last_response.body, "'New' button not blocked in page template"
+ assert_no_match /Upload/, last_response.body, "'Upload' link not blocked in page template"
+ assert_no_match /Rename/, last_response.body, "'Rename' link not blocked in page template"
+ assert_no_match /Edit/, last_response.body, "'Edit' link not blocked in page template"
+
+ get '/pages'
+
+ assert_no_match /New/, last_response.body, "'New' link not blocked in pages template"
+
+ get '/history/A'
+
+ assert_no_match /Edit/, last_response.body, "'Edit' link not blocked in history template"
+
+ get '/compare/A/fc66539528eb96f21b2bbdbf557788fe8a1196ac..b26b791cb7917c4f37dd9cb4d1e0efb24ac4d26f'
+
+ assert_no_match /Edit Page/, last_response.body, "'Edit Page' link not blocked in compare template"
+ assert_no_match /Revert Changes/, last_response.body, "'Revert Changes' link not blocked in compare template"
+ end
+
+ def app
+ Precious::App
+ end
+end
\ No newline at end of file
diff --git a/test/test_app.rb b/test/test_app.rb
index ef0fc318..68c590e9 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -8,7 +8,7 @@ context "Frontend" do
@path = cloned_testpath("examples/revert.git")
@wiki = Gollum::Wiki.new(@path)
Precious::App.set(:gollum_path, @path)
- Precious::App.set(:wiki_options, {})
+ Precious::App.set(:wiki_options, {allow_editing: true})
end
teardown do
@@ -78,12 +78,19 @@ context "Frontend" do
get page
- expected = "
"
+ expected = "
"
actual = nfd(last_response.body)
assert_match /#{expected}/, actual
end
+ test "show sidebar, header, footer when present" do
+ divs = [@wiki.page("_Header").formatted_data, @wiki.page("_Footer").formatted_data, @wiki.page("_Sidebar").formatted_data]
+ @wiki.write_page("HeaderTest", :markdown, "Test", commit_details)
+ get "/HeaderTest"
+ divs.each {|div| assert_match div, last_response.body}
+ end
+
test "retain edit information" do
page1 = 'page1'
user1 = 'user1'
@@ -542,6 +549,19 @@ context "Frontend" do
assert_match /meta name="robots" content="noindex, nofollow"/, last_response.body
end
+ test "show revision of specific file" do
+ shas = {}
+ ["First revision of testfile", "Second revision of testfile"].each do |content|
+ new_commit = commit_test_file(@wiki, "revisions", "testfile", "log", content)
+ shas[new_commit] = content
+ end
+ shas.each do |sha, content|
+ get "revisions/testfile.log/#{sha}"
+ assert last_response.ok?
+ assert_match /#{content}/, last_response.body
+ end
+ end
+
def app
Precious::App
end
diff --git a/test/test_latest_changes_view.rb b/test/test_latest_changes_view.rb
new file mode 100644
index 00000000..4883b223
--- /dev/null
+++ b/test/test_latest_changes_view.rb
@@ -0,0 +1,45 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path '../../lib/gollum/views/latest_changes', __FILE__
+
+context "Precious::Views::LatestChanges" do
+ include Rack::Test::Methods
+
+ def app
+ Precious::App
+ end
+
+ setup do
+ @path = cloned_testpath("examples/lotr.git")
+ @wiki = Gollum::Wiki.new(@path)
+ Precious::App.set(:gollum_path, @path)
+ Precious::App.set(:wiki_options, {:latest_changes_count => 10})
+ end
+
+ test "displays_latest_changes" do
+ get('/latest_changes')
+ body = last_response.body
+ assert body.include?('
Charles Pence '), "/latest_changes should include the Author Charles Pence"
+ assert body.include?('60f12f4'), "/latest_changes should include the :latest_changes_count commit"
+ assert !body.include?('0ed8cbe'), "/latest_changes should not include more than latest_changes_count commits"
+ assert body.include?('
Data-Two.csv '), "/latest_changes include links to modified files in #{body}"
+ assert body.include?('
Hobbit.md '), "/latest_changes should include links to modified pages in #{body}"
+ end
+
+ test "extract destination file name in case of path renaming" do
+ view = Precious::Views::LatestChanges.new
+ assert_equal "newname.md", view.extract_renamed_path_destination("oldname.md => newname.md")
+ assert_equal "newDirectoryName/fileName.md", view.extract_renamed_path_destination("{oldDirectoryName => newDirectoryName}/fileName.md")
+ end
+
+ test "remove page extentions" do
+ view = Precious::Views::LatestChanges.new
+ assert_equal "page", view.remove_page_extentions("page.wiki")
+ assert_equal "page-wiki", view.remove_page_extentions("page-wiki.md")
+ assert_equal "file.any_extention", view.remove_page_extentions("file.any_extention")
+ end
+
+ teardown do
+ FileUtils.rm_rf(@path)
+ end
+end
diff --git a/test/test_pages_view.rb b/test/test_pages_view.rb
index 85a0bbde..868ccacd 100644
--- a/test/test_pages_view.rb
+++ b/test/test_pages_view.rb
@@ -2,14 +2,26 @@
require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
require File.expand_path '../../lib/gollum/views/pages', __FILE__
-FakeResult = Struct.new(:path) do
+FakePageResult = Struct.new(:path) do
def name
File.basename(path, File.extname(path)).gsub("-", " ")
end
-
def escaped_url_path
CGI.escape(path).gsub(/\..+$/, "").gsub("%2F", "/")
end
+ def format
+ true
+ end
+end
+
+FakeFileResult = Struct.new(:path) do
+ def name
+ File.basename(path).gsub("-", " ")
+ end
+ def escaped_url_path
+ result = path.sub(/\/[^\/]+$/, '/')
+ CGI.escape(result).gsub("%2F", "/")
+ end
end
context "Precious::Views::Pages" do
@@ -30,17 +42,17 @@ context "Precious::Views::Pages" do
test "files_folders" do
@page.instance_variable_set("@path", "Mordor")
@page.instance_variable_set("@base_url", "")
- results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
+ results = [FakePageResult.new("Mordor/Eye-Of-Sauron.md"), FakeFileResult.new("Mordor/Aragorn.pdf"), FakePageResult.new("Mordor/Orc/Saruman.md"), FakeFileResult.new("Mordor/.gitkeep")]
@page.instance_variable_set("@results", results)
- assert_equal %{
Eye Of Sauron \n
Orc }, @page.files_folders
+ assert_equal %{
Eye Of Sauron \n
Aragorn.pdf \n
Orc }, @page.files_folders
end
test "base url" do
# based on test "files_folders"
@page.instance_variable_set("@path", "Mordor")
@page.instance_variable_set("@base_url", "/wiki")
- results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
+ results = [FakePageResult.new("Mordor/Eye-Of-Sauron.md"), FakeFileResult.new("Mordor/Aragorn.pdf"), FakePageResult.new("Mordor/Orc/Saruman.md"), FakePageResult.new("Mordor/.gitkeep")]
@page.instance_variable_set("@results", results)
- assert_equal %{
Eye Of Sauron \n
Orc }, @page.files_folders
+ assert_equal %{
Eye Of Sauron \n
Aragorn.pdf \n
Orc }, @page.files_folders
end
end