convert $path global to a gollum_path sinatra setting

This commit is contained in:
rick
2010-08-23 16:16:39 -07:00
parent 8c625419b8
commit 99995f7364
2 changed files with 12 additions and 10 deletions
+3 -2
View File
@@ -38,7 +38,7 @@ end
# Read command line options into `options` hash # Read command line options into `options` hash
opts.parse! opts.parse!
$path = ARGV[0] || Dir.pwd gollum_path = ARGV[0] || Dir.pwd
if options['irb'] if options['irb']
require 'irb' require 'irb'
@@ -67,9 +67,10 @@ if options['irb']
end end
require 'gollum' require 'gollum'
wiki = Gollum::Wiki.new $path wiki = Gollum::Wiki.new gollum_path
IRB.start_session binding IRB.start_session binding
else else
require 'gollum/frontend/app' require 'gollum/frontend/app'
Precious::App.set :gollum_path, gollum_path
Precious::App.run!(options) Precious::App.run!(options)
end end
+9 -8
View File
@@ -12,6 +12,7 @@ module Precious
dir = File.dirname(File.expand_path(__FILE__)) dir = File.dirname(File.expand_path(__FILE__))
# We want to serve public assets for now # We want to serve public assets for now
set :public, "#{dir}/public" set :public, "#{dir}/public"
set :static, true set :static, true
@@ -40,7 +41,7 @@ module Precious
get '/edit/:name' do get '/edit/:name' do
@name = params[:name] @name = params[:name]
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
if page = wiki.page(@name) if page = wiki.page(@name)
@page = page @page = page
@content = page.raw_data @content = page.raw_data
@@ -52,7 +53,7 @@ module Precious
post '/edit/:name' do post '/edit/:name' do
name = params[:name] name = params[:name]
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
page = wiki.page(name) page = wiki.page(name)
format = params[:format].intern format = params[:format].intern
name = params[:rename] if params[:rename] name = params[:rename] if params[:rename]
@@ -64,7 +65,7 @@ module Precious
post '/create/:name' do post '/create/:name' do
name = params[:page] name = params[:page]
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
format = params[:format].intern format = params[:format].intern
@@ -80,13 +81,13 @@ module Precious
post '/preview' do post '/preview' do
format = params['wiki_format'] format = params['wiki_format']
data = params['text'] data = params['text']
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
wiki.preview_page("Preview", data, format).formatted_data wiki.preview_page("Preview", data, format).formatted_data
end end
get '/history/:name' do get '/history/:name' do
@name = params[:name] @name = params[:name]
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
@page = wiki.page(@name) @page = wiki.page(@name)
@page_num = [params[:page].to_i, 1].max @page_num = [params[:page].to_i, 1].max
@versions = @page.versions :page => @page_num @versions = @page.versions :page => @page_num
@@ -108,7 +109,7 @@ module Precious
get '/compare/:name/:version_list' do get '/compare/:name/:version_list' do
@name = params[:name] @name = params[:name]
@versions = params[:version_list].split(/\.{2,3}/) @versions = params[:version_list].split(/\.{2,3}/)
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
@page = wiki.page(@name) @page = wiki.page(@name)
diffs = wiki.repo.diff(@versions.first, @versions.last, @page.path) diffs = wiki.repo.diff(@versions.first, @versions.last, @page.path)
@diff = diffs.first @diff = diffs.first
@@ -117,7 +118,7 @@ module Precious
get %r{/(.+?)/([0-9a-f]{40})} do get %r{/(.+?)/([0-9a-f]{40})} do
name = params[:captures][0] name = params[:captures][0]
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
if page = wiki.page(name, params[:captures][1]) if page = wiki.page(name, params[:captures][1])
@page = page @page = page
@name = name @name = name
@@ -133,7 +134,7 @@ module Precious
end end
def show_page_or_file(name) def show_page_or_file(name)
wiki = Gollum::Wiki.new($path) wiki = Gollum::Wiki.new(settings.gollum_path)
if page = wiki.page(name) if page = wiki.page(name)
@page = page @page = page
@name = name @name = name