Skip to content

Commit a54d97a

Browse files
committed
Get rid of some miscellaneous cruft
1 parent 09da7a8 commit a54d97a

File tree

1 file changed

+7
-39
lines changed

1 file changed

+7
-39
lines changed

git-wiki.rb

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ class << self
1616

1717
class Page
1818
def self.find_all
19-
return [] if repository.tree.contents.empty?
20-
GitWiki.repository.tree.contents.collect { |blob| new(blob) }
19+
GitWiki.repository.tree.contents.collect {|blob| new(blob) }
2120
end
2221

2322
def self.find_or_create(name)
@@ -26,18 +25,6 @@ def self.find_or_create(name)
2625
new(blob || Grit::Blob.create(GitWiki.repository, :name => path))
2726
end
2827

29-
def self.css_class_for(name)
30-
find_blob(name) ? "exists" : "unknown"
31-
end
32-
33-
def self.repository
34-
GitWiki.repository || raise
35-
end
36-
37-
def self.extension
38-
GitWiki.extension || raise
39-
end
40-
4128
def initialize(blob)
4229
@blob = blob
4330
end
@@ -50,8 +37,8 @@ def to_s
5037
name
5138
end
5239

53-
def new?
54-
@blob.id.nil?
40+
def css_class
41+
@blob.id ? 'existing' : 'new'
5542
end
5643

5744
def name
@@ -70,18 +57,14 @@ def update_content(new_content)
7057

7158
private
7259
def add_to_index_and_commit!
73-
Dir.chdir(self.class.repository.working_dir) {
74-
self.class.repository.add(@blob.name)
60+
Dir.chdir(GitWiki.repository.working_dir) {
61+
GitWiki.repository.add(@blob.name)
7562
}
76-
self.class.repository.commit_index(commit_message)
63+
GitWiki.repository.commit_index("web commit: #{self}")
7764
end
7865

7966
def file_name
80-
File.join(self.class.repository.working_dir, name + self.class.extension)
81-
end
82-
83-
def commit_message
84-
new? ? "Created #{name}" : "Updated #{name}"
67+
File.join(GitWiki.repository.working_dir, name + GitWiki.extension)
8568
end
8669

8770
def wiki_link(str)
@@ -95,21 +78,6 @@ def wiki_link(str)
9578
set :haml, :format => :html5, :attr_wrapper => '"'
9679
enable :inline_templates
9780

98-
before do
99-
content_type "text/html", :charset => "utf-8"
100-
end
101-
102-
helpers do
103-
def title(title=nil)
104-
@title = title.to_s unless title.nil?
105-
@title
106-
end
107-
108-
def list_item(page)
109-
%Q{<a class="page_name" href="/#{page}">#{page.name}</a>}
110-
end
111-
end
112-
11381
get "/" do
11482
redirect "/" + GitWiki.homepage
11583
end

0 commit comments

Comments
 (0)