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

Merge branch 'master' of github.com:github/gollum

Browse Source
This commit is contained in:
eston
2011-01-04 13:49:16 -08:00
parent ea49ef806b 21332010ab
commit a93a2fb53d
7 changed files with 49 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -2,3 +2,4 @@ coverage
pkg
.DS_Store
.bundle
Gemfile.lock
Gemfile.lock
-58
View File
@@ -1,58 +0,0 @@
PATH
remote: .
specs:
gollum (1.1.0)
albino (~> 1.0)
github-markup (>= 0.4.0, < 1.0.0)
grit (~> 2.3)
mustache (>= 0.11.2, < 1.0.0)
nokogiri (~> 1.4)
sanitize (~> 1.1)
sinatra (~> 1.0)
GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.3)
albino (1.0)
diff-lcs (1.1.2)
github-markup (0.5.0)
grit (2.3.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
mime-types (1.16)
mocha (0.9.9)
rake
mustache (0.11.2)
nokogiri (1.4.3.1)
org-ruby (0.5.3)
rubypants (>= 0.2.0)
rack (1.2.1)
rake (0.8.7)
rdiscount (1.6.5)
rubypants (0.2.0)
sanitize (1.2.1)
nokogiri (~> 1.4.1)
shoulda (2.11.3)
sinatra (1.1.0)
rack (~> 1.1)
tilt (~> 1.1)
tilt (1.1)
PLATFORMS
ruby
DEPENDENCIES
RedCloth
albino (~> 1.0)
github-markup (>= 0.4.0, < 1.0.0)
gollum!
grit (~> 2.3)
mocha
mustache (>= 0.11.2, < 1.0.0)
nokogiri (~> 1.4)
org-ruby
rdiscount
sanitize (~> 1.1)
shoulda
sinatra (~> 1.0)
lib/gollum/blob_entry.rb
+5 -3
View File
@@ -32,7 +32,7 @@ module Gollum
#
# Returns an unbaked Grit::Blob instance.
def blob(repo)
@blob ||= Grit::Blob.create(repo,
@blob ||= Grit::Blob.create(repo,
:id => @sha, :name => name, :size => @size)
end
@@ -53,19 +53,21 @@ module Gollum
end
# Normalizes a given directory name for searching through tree paths.
# Ensures that a directory begins with a slash, or
# Ensures that a directory begins with a slash, or
#
# normalize_dir("") # => ""
# normalize_dir(".") # => ""
# normalize_dir("foo") # => "/foo"
# normalize_dir("/foo/") # => "/foo"
# normalize_dir("/") # => ""
# normalize_dir("c:/") # => ""
#
# dir - String directory name.
#
# Returns a normalized String directory name, or nil if no directory
# Returns a normalized String directory name, or nil if no directory
# is given.
def self.normalize_dir(dir)
return '' if dir =~ /^.:\/$/
if dir
dir = ::File.expand_path(dir, '/')
dir = '' if dir == '/'
lib/gollum/page.rb
+27 -23
View File
@@ -4,15 +4,16 @@ module Gollum
Wiki.page_class = self
VALID_PAGE_RE = /^(.+)\.(md|mkdn?|mdown|markdown|textile|rdoc|org|creole|re?st(\.txt)?|asciidoc|pod)$/i
FORMAT_NAMES = { :markdown => "Markdown",
:textile => "Textile",
:rdoc => "RDoc",
:org => "Org-mode",
:creole => "Creole",
:rest => "reStructuredText",
:asciidoc => "AsciiDoc",
:pod => "Pod" }
VALID_PAGE_RE = /^(.+)\.(md|mkdn?|mdown|markdown|textile|rdoc|org|creole|re?st(\.txt)?|asciidoc|pod|(media)?wiki)$/i
FORMAT_NAMES = { :markdown => "Markdown",
:textile => "Textile",
:rdoc => "RDoc",
:org => "Org-mode",
:creole => "Creole",
:rest => "reStructuredText",
:asciidoc => "AsciiDoc",
:mediawiki => "MediaWiki",
:pod => "Pod" }
# Sets a Boolean determing whether this page is a historical version.
#
@@ -65,7 +66,7 @@ module Gollum
@blob && @blob.name
end
# Public: The canonical page name without extension, and dashes converted
# Public: The canonical page name without extension, and dashes converted
# to spaces.
#
# Returns the String name.
@@ -161,6 +162,8 @@ module Gollum
:pod
when /\.(\d)$/i
:roff
when /\.(media)?wiki$/i
:mediawiki
else
nil
end
@@ -176,7 +179,7 @@ module Gollum
# options - The options Hash:
# :page - The Integer page number (default: 1).
# :per_page - The Integer max count of items to return.
# :follow - Follow's a file across renames, but falls back
# :follow - Follow's a file across renames, but falls back
# to a slower Grit native call. (default: false)
#
# Returns an Array of Grit::Commit.
@@ -206,7 +209,7 @@ module Gollum
@sidebar ||= find_sub_page(:sidebar)
end
# Gets a Boolean determining whether this page is a historical version.
# Gets a Boolean determining whether this page is a historical version.
# Historical pages are pulled using exact SHA hashes and format all links
# with rel="nofollow"
#
@@ -244,14 +247,15 @@ module Gollum
# Returns the String extension (no leading period).
def self.format_to_ext(format)
case format
when :markdown then 'md'
when :textile then 'textile'
when :rdoc then 'rdoc'
when :org then 'org'
when :creole then 'creole'
when :rest then 'rest'
when :asciidoc then 'asciidoc'
when :pod then 'pod'
when :markdown then 'md'
when :textile then 'textile'
when :rdoc then 'rdoc'
when :org then 'org'
when :creole then 'creole'
when :rest then 'rest'
when :asciidoc then 'asciidoc'
when :pod then 'pod'
when :mediawiki then 'mediawiki'
end
end
@@ -280,7 +284,7 @@ module Gollum
def find(name, version)
map = @wiki.tree_map_for(version.to_s)
if page = find_page_in_tree(map, name)
page.version = version.is_a?(Grit::Commit) ?
page.version = version.is_a?(Grit::Commit) ?
version : @wiki.commit_for(version)
page.historical = page.version.to_s == version.to_s
page
@@ -293,7 +297,7 @@ module Gollum
# map - The Array tree map from Wiki#tree_map.
# name - The canonical String page name.
# checked_dir - Optional String of the directory a matching page needs
# to be in. The string should
# to be in. The string should
#
# Returns a Gollum::Page or nil if the page could not be found.
def find_page_in_tree(map, name, checked_dir = nil)
@@ -352,7 +356,7 @@ module Gollum
end
end
# Loads a sub page. Sub page nanes (footers) are prefixed with
# Loads a sub page. Sub page nanes (footers) are prefixed with
# an underscore to distinguish them from other Pages.
#
# name - String page name.
test/helper.rb
+6 -5
View File
@@ -22,11 +22,12 @@ def testpath(path)
end
def cloned_testpath(path)
path = testpath(path)
cloned = path.chomp('.git')
FileUtils.rm_rf cloned
Dir.chdir(File.expand_path(File.dirname(path))) do
%x{git clone #{File.basename(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
test/test_page.rb
+9
View File
@@ -134,4 +134,13 @@ context "Page" do
assert_equal '', Gollum::Page.cname(nil)
assert_equal '', Gollum::Page.cname(3)
end
test "normalize_dir" do
assert_equal "", Gollum::BlobEntry.normalize_dir("")
assert_equal "", Gollum::BlobEntry.normalize_dir(".")
assert_equal "", Gollum::BlobEntry.normalize_dir("/")
assert_equal "", Gollum::BlobEntry.normalize_dir("c:/")
assert_equal "/foo", Gollum::BlobEntry.normalize_dir("foo")
assert_equal "/foo", Gollum::BlobEntry.normalize_dir("/foo")
end
end
test/test_page_revert.rb
+1 -1
View File
@@ -8,7 +8,7 @@ context "Page Reverting" do
end
teardown do
FileUtils.rm_rf @path
FileUtils.rm_rf(@path)
end
test "reverts single commit" do