wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Format code

Browse Source
This commit is contained in:
bootstraponline
2014-04-05 12:48:31 -04:00
parent 452d825e66
commit 2ae75978dd
12 changed files with 307 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/views/compare.rb
+16 -14
View File
@@ -47,43 +47,45 @@ module Precious
end
@left_diff_line_number = nil
def left_diff_line_number(id, line)
if line =~ /^@@/
m, li = *line.match(/\-(\d+)/)
m, li = *line.match(/\-(\d+)/)
@left_diff_line_number = li.to_i
@current_line_number = @left_diff_line_number
ret = '...'
@current_line_number = @left_diff_line_number
ret = '...'
elsif line[0] == ?-
ret = @left_diff_line_number.to_s
ret = @left_diff_line_number.to_s
@left_diff_line_number += 1
@current_line_number = @left_diff_line_number - 1
@current_line_number = @left_diff_line_number - 1
elsif line[0] == ?+
ret = ' '
else
ret = @left_diff_line_number.to_s
ret = @left_diff_line_number.to_s
@left_diff_line_number += 1
@current_line_number = @left_diff_line_number - 1
@current_line_number = @left_diff_line_number - 1
end
ret
end
@right_diff_line_number = nil
def right_diff_line_number(id, line)
if line =~ /^@@/
m, ri = *line.match(/\+(\d+)/)
m, ri = *line.match(/\+(\d+)/)
@right_diff_line_number = ri.to_i
@current_line_number = @right_diff_line_number
ret = '...'
@current_line_number = @right_diff_line_number
ret = '...'
elsif line[0] == ?-
ret = ' '
elsif line[0] == ?+
ret = @right_diff_line_number.to_s
ret = @right_diff_line_number.to_s
@right_diff_line_number += 1
@current_line_number = @right_diff_line_number - 1
@current_line_number = @right_diff_line_number - 1
else
ret = @right_diff_line_number.to_s
ret = @right_diff_line_number.to_s
@right_diff_line_number += 1
@current_line_number = @right_diff_line_number - 1
@current_line_number = @right_diff_line_number - 1
end
ret
end
lib/gollum/views/edit.rb
+4 -4
View File
@@ -6,10 +6,10 @@ module Precious
attr_reader :page, :content
# return path set in app.rb not @page.path
def path
@path
end
# return path set in app.rb not @page.path
def path
@path
end
def title
"#{@page.title}"
lib/gollum/views/editable.rb
+1 -1
View File
@@ -4,7 +4,7 @@ module Precious
Gollum::Markup.formats.map do |key, val|
{ :name => val[:name],
:id => key.to_s,
:selected => selected == key}
:selected => selected == key }
end.sort do |a, b|
a[:name].downcase <=> b[:name].downcase
end
lib/gollum/views/file_view.rb
+2 -2
View File
@@ -10,8 +10,8 @@ module Precious
def has_results
!@results.empty?
end
def no_results
def no_results
@results.empty?
end
end
lib/gollum/views/history.rb
+14 -14
View File
@@ -13,16 +13,16 @@ module Precious
i = @versions.size + 1
@versions.map do |v|
i -= 1
{ :id => v.id,
:id7 => v.id[0..6],
:num => i,
:selected => @page.version.id == v.id,
: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),
{ :id => v.id,
:id7 => v.id[0..6],
:num => i,
:selected => @page.version.id == v.id,
: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,
:date_full => v.authored_date,
}
end
end
@@ -36,16 +36,16 @@ module Precious
def string_to_code string
# sha bytes
b = [Digest::SHA1.hexdigest(string)[0,20]].pack('H*').bytes.to_a
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
left_shift(b[1], 16) |
left_shift(b[2], 8) |
b[3] & 0xFF
end
def _identicon_code(blob)
@@ -53,7 +53,7 @@ module Precious
end
def use_identicon
@page.wiki.user_icons == 'identicon'
@page.wiki.user_icons == 'identicon'
end
def partial(name)
lib/gollum/views/page.rb
+9 -9
View File
@@ -4,9 +4,9 @@ module Precious
include HasPage
attr_reader :content, :page, :header, :footer
DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
DEFAULT_AUTHOR = 'you'
@@to_xml = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
@@to_xml = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
def title
h1 = @h1_title ? page_header_from_content(@content) : false
@@ -23,14 +23,14 @@ module Precious
def author
page_versions = @page.versions
first = page_versions ? page_versions.first : false
first = page_versions ? page_versions.first : false
return DEFAULT_AUTHOR unless first
first.author.name.respond_to?(:force_encoding) ? first.author.name.force_encoding('UTF-8') : first.author.name
end
def date
page_versions = @page.versions
first = page_versions ? page_versions.first : false
first = page_versions ? page_versions.first : false
return Time.now.strftime(DATE_FORMAT) unless first
first.authored_date.strftime(DATE_FORMAT)
end
@@ -50,7 +50,7 @@ module Precious
def allow_uploads
@allow_uploads
end
def upload_dest
@upload_dest
end
@@ -80,7 +80,7 @@ module Precious
def footer_format
has_footer && @footer.format.to_s
end
def bar_side
@bar_side.to_s
end
@@ -153,7 +153,7 @@ module Precious
# Extracts title from page if present.
#
def page_header_from_content(content)
doc = build_document(content)
doc = build_document(content)
title = find_header_node(doc).inner_text.strip
title = nil if title.empty?
title
@@ -162,11 +162,11 @@ module Precious
# Returns page content without title if it was extracted.
#
def content_without_page_header(content)
doc = build_document(content)
doc = build_document(content)
title = find_header_node(doc)
title.remove unless title.empty?
# .inner_html will cause href escaping on UTF-8
doc.css("div#gollum-root").children.to_xml( @@to_xml )
doc.css("div#gollum-root").children.to_xml(@@to_xml)
end
end
end
lib/gollum/views/pages.rb
+2 -2
View File
@@ -11,7 +11,7 @@ module Precious
def breadcrumb
if @path
path = Pathname.new(@path)
path = Pathname.new(@path)
breadcrumb = [%{<a href="#{@base_url}/pages/">Home</a>}]
path.descend do |crumb|
title = crumb.basename
@@ -34,7 +34,7 @@ module Precious
folder_links = []
@results.map { |page|
page_path = page.path.sub(/^#{@path}\//,'')
page_path = page.path.sub(/^#{@path}\//, '')
if page_path.include?('/')
folder = page_path.split('/').first