@@ -4,61 +4,76 @@ require "giraffe/page"
require "ostruct"
require "pathname"
+
module Giraffe
- Conf = OpenStruct.new
+ class << self
+
+ # Configuration
+ #
+ attr_accessor :wikiroot,
+ :reporoot,
+
+ :to_filename,
+ :to_uri,
+
+ :list_filter,
+ :resource_filter,
+
+ :home,
+
+ :authenticator,
+
+ :itself
+
+ # Wiki object
+ #
+ attr_reader :wiki
- # TODO: Move statics out of method
+ end
+
+ # Default configuration
+ #
def self.reload()
# No authentication by default.
- Conf.authenticator = nil
+ self.authenticator = nil
# Root of wiki pages and root of the repository if needed.
- Conf.wikiroot = File.join ENV["HOME"], "wiki"
- Conf.reporoot = Conf.wikiroot
+ self.wikiroot = File.join ENV["HOME"], "wiki"
+ self.reporoot = wikiroot
# Page name <-> filesystem mapping (none by default).
- Conf.to_filename = lambda {|uri| uri }
- Conf.to_uri = lambda {|file| file }
-
- Conf.list_filter = lambda {|file| true }
-
- Conf.resource_filter = lambda {|uri| false }
+ self.to_filename = lambda {|uri| uri }
+ self.to_uri = lambda {|file| file }
+ self.list_filter = lambda {|file| true }
+ self.resource_filter = lambda {|uri| false }
# Wiki setup.
- Conf.home = "/Home"
+ self.home = "/Home"
# Some type of a link to software version used.
- Conf.itself = (`git remote -v` =~ (/origin\s+git@(.+?)\.git/) && "http://#{$1.sub ":", "/"}/") ||
- "http://github.com/rue/giraffe/"
+ self.itself = (`git remote -v` =~ (/origin\s+git@(.+?)\.git/) && "http://#{$1.sub ":", "/"}/") ||
+ "http://github.com/rue/giraffe/"
+
+# Load user config overrides if any, rest of ARGV goes unchanged.
- # Load user config overrides if any, rest of ARGV goes unchanged.
load(ENV["GIRAFFE_CONF"] || "config.rb")
# Expand all paths just in case.
- Conf.wikiroot = File.expand_path Conf.wikiroot
- Conf.reporoot = File.expand_path Conf.reporoot
-
- # Compute relative path to wiki root if necessary.
- Conf.relative = if Conf.wikiroot != Conf.reporoot
- wiki = Pathname.new Conf.wikiroot
- repo = Pathname.new Conf.reporoot
-
- # TODO: Check that wiki is a child of repo
- wiki.relative_path_from(repo).to_s
- else
- ""
- end
+ self.wikiroot = File.expand_path wikiroot
+ self.reporoot = File.expand_path reporoot
end
+
+ # Load the wiki.
+ #
+ # By default loads HEAD but can be given a commit
+ # to load from instead.
+ #
def self.wiki!(commit = "HEAD")
reload
- @wiki = Git::Repository.open Conf.wikiroot, commit
- end
-
- def self.wiki()
- @wiki
+ @wiki = Git::Repository.open wikiroot, commit
end
end
lib/giraffe.rb
@@ -10,7 +10,7 @@ module Giraffe
attr_reader :object
def self.from_git(object)
- name = Giraffe::Conf.to_uri.call object.name
+ name = Giraffe.to_uri.call object.name
dir = File.dirname(object.path).split "/"
dir = [] if dir == ["."]
@@ -24,7 +24,7 @@ module Giraffe
dir = dir
uri = if dir.empty? then name else File.join(dir, name) end
- filename = Giraffe::Conf.to_filename.call name
+ filename = Giraffe.to_filename.call name
relative = if dir.empty? then filename else File.join(dir, filename) end
object = Giraffe.wiki.object_for relative
@@ -53,7 +53,7 @@ module Giraffe
def create!(content, comments)
# Set up a backend object to fill in.
dir = Giraffe.wiki.object_for @dir.join("/")
- name = Giraffe::Conf.to_filename.call @name
+ name = Giraffe.to_filename.call @name
path = if dir.path.empty? then name else File.join(dir.path, name) end
@@ -82,7 +82,7 @@ module Giraffe
# horribly with more complex name mappings.
#
def directory?()
- File.directory? File.join(Giraffe::Conf.wikiroot, File.join(@dir), @name.downcase)
+ File.directory? File.join(Giraffe.wikiroot, File.join(@dir), @name.downcase)
end
# Escape < and > from the raw page content.
@@ -159,7 +159,7 @@ module Giraffe
filename = name
relative = if dir.empty? then filename else File.join(dir, filename) end
- object = Giraffe::Conf.wiki.object_for relative
+ object = Giraffe.wiki.object_for relative
new name, dir, uri, object, info
end
lib/giraffe/page.rb
@@ -18,7 +18,7 @@ module Giraffe
# TODO: May need further guarding here.
@matches = Giraffe.wiki!.grep(@search).select {|obj, match|
- Giraffe::Conf.list_filter.call obj.name
+ Giraffe.list_filter.call obj.name
}
eruby = Erubis::Eruby.new File.read("views/grep.erb")
resources/grep.rb
@@ -174,16 +174,16 @@ describe "Completely empty path" do
Waves.applications.clear
end
- it "redirects to the page named as Giraffe::Conf.home" do
+ it "redirects to the page named as Giraffe.home" do
response = get("")
response.status.should == 301
- response.location.should == Giraffe::Conf.home
+ response.location.should == Giraffe.home
response = get("/")
response.status.should == 301
- response.location.should == Giraffe::Conf.home
+ response.location.should == Giraffe.home
end
end
spec/page_spec.rb
@@ -9,15 +9,15 @@ $LOAD_PATH.unshift GIRAFFE_ROOT
$LOAD_PATH.unshift GIRAFFE_WAVES
require "waves"
-require "runtime/mocks"
+require "waves/runtime/mocks"
require "rubygems"
require "nokogiri"
-Waves::Runtime.instance = Waves::Runtime.new
-Object.send :include, Waves::Mocks
+Waves::Runtime.new
+include Waves::Mocks
-require "startup"
+require "run_giraffe_run"
require "fileutils"
@@ -62,22 +62,22 @@ def create_good_repo()
config = <<-ENDCONFIG
# Directory in which the wiki pages live
-Giraffe::Conf.wikiroot = "#{File.join @repo, @wiki}"
+Giraffe.wikiroot = "#{File.join @repo, @wiki}"
# Directory in which .git lives
-Giraffe::Conf.reporoot = "#{File.join @repo, @wiki}/.."
+Giraffe.reporoot = "#{File.join @repo, @wiki}/.."
# Append extension to *all* page name candidates
-Giraffe::Conf.to_filename = lambda {|uri| uri + ".txt" }
-Giraffe::Conf.to_uri = lambda {|file| file.chomp ".txt" }
+Giraffe.to_filename = lambda {|uri| uri + ".txt" }
+Giraffe.to_uri = lambda {|file| file.chomp ".txt" }
# No showing stuff other than .txt for now
-Giraffe::Conf.list_filter = lambda {|file| file =~ /\.txt$/ }
+Giraffe.list_filter = lambda {|file| file =~ /\.txt$/ }
# Resource files allowed
RESOURCES = { "png" => {:mime => "image/png"} } unless defined? RESOURCES
-Giraffe::Conf.resource_filter = lambda {|uri|
+Giraffe.resource_filter = lambda {|uri|
uri.match /.+\.(.+)$/
RESOURCES[$1]
}
spec/spec_helper.rb
@@ -30,7 +30,7 @@
<!-- Main navigation -->
<div id="navigation">
<ul>
- <li><a href="<%= Giraffe::Conf.home %>" title="Go to home page" accesskey="i">home</a></li>
+ <li><a href="<%= Giraffe.home %>" title="Go to home page" accesskey="i">home</a></li>
<li><a href="/changes" title="View wiki history" accesskey="y">history</a></li>
<li><a href="/pages" title="List of pages" accesskey="l">pages</a></li>
<li>
@@ -52,7 +52,7 @@
<li><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.1</a></li>
<li><a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS 2.1</a></li>
<li><a href="http://www.section508.info/check_this.cfm?URLtest=http://http://cs.helsinki.fi/u/esaynatk&s508=1&CheckURL=0">508 OK</a></li>
- <li><a href="<%= Giraffe::Conf.itself %>" title="Giraffe website" class="imagelink">
+ <li><a href="<%= Giraffe.itself %>" title="Giraffe website" class="imagelink">
<img src="/giraffe/images/giraffe_logo_small.png" alt="Giraffe" /> power!
</a></li>
</ul>
views/layout.erb
@@ -8,7 +8,7 @@
<div id="page_list">
<% if @objects.empty? %>
- <p><a href="/editable/<%= Giraffe::Conf.home %>" title="Create your home page" accesskey="i">Go to create your first page.</a></p>
+ <p><a href="/editable/<%= Giraffe.home %>" title="Create your home page" accesskey="i">Go to create your first page.</a></p>
<% else %>
<div class="content">
<ul class="page_list">
@@ -23,7 +23,7 @@
</ul>
</li>
<% else %>
- <% next unless Giraffe::Conf.list_filter.call object.path %>
+ <% next unless Giraffe.list_filter.call object.path %>
<% page = Giraffe::Page.from_git object %>
<li class="entry">
<ul class="page">
views/pages.erb
9c6728cba6dbf1259adbdcee94e0b0401b7afbf0
Eero Saynatkari
projects@kittensoft.org
http://github.com/rue/giraffe/commit/b41008e81d7aed77d8c37e6c607d28102fd6b6cf
b41008e81d7aed77d8c37e6c607d28102fd6b6cf
2008-12-15T07:05:10-08:00
2008-12-15T06:19:51-08:00
Moved back to config directly in Giraffe rather than Giraffe::Conf.
5090a872fddcc58ab224d8c5cc3cc445dc67a248
Eero Saynatkari
projects@kittensoft.org