RTFMd 0.10301.11 → 0.10301.12

data/RTFMd.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'RTFMd'
-  s.version           = '0.10301.11'
+  s.version           = '0.10301.12'
   s.date              = '2011-12-16'
 
   s.summary     = "A simple, Markdown documentation helper."

data/config/rtfmd.ru

@@ -2,12 +2,20 @@ require 'sinatra/base'
 require 'gollum'
 require 'gollum/frontend/app'
 
-Precious::App.set(:gollum_path, ENV['RTFMd_WIKI'])
-Precious::App.set(:wiki_options, {
-  :base_path => ENV['RTFMd_BASE_PATH'] == "/" ? "/" : "#{ENV['RTFMd_BASE_PATH']}/"
-})
+Precious::App.set(:roots => {})
 
-map ENV['RTFMd_BASE_PATH'] do
-  run Precious::App
-end 
+ENV['RTFMd_WIKI'].split(/\s*,\s*/).zip(ENV['RTFMd_BASE_PATH'].split(/\s*,\s*/)).each do |wiki_path, base_path|
+  Precious::App.settings.roots[base_path] = {
+    :gollum_path => wiki_path,
+    :wiki_options => {
+      :base_path => base_path == "/" ? "/" : "#{base_path}/"
+    }
+  }
 
+  require 'pp'
+  pp Precious::App.settings.roots[base_path]
+  
+  map base_path do
+    run Precious::App
+  end 
+end

data/lib/gollum/frontend/app.rb

@@ -46,7 +46,7 @@ module Precious
 
     get %r{/(.+?)/([0-9a-f]{40})} do
       name = params[:captures][0]
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+      wiki = Gollum::Wiki.new(settings.roots[request.script_name][:gollum_path], settings.roots[request.script_name][:wiki_options])
       if page = wiki.page(name, params[:captures][1])
         @page = page
         @name = name
@@ -59,7 +59,7 @@ module Precious
     end
 
     get '/pages' do
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+      wiki = Gollum::Wiki.new(settings.roots[request.script_name][:gollum_path], settings.roots[request.script_name][:wiki_options])
       @results = wiki.pages
       @ref = wiki.ref
       @base_path = wiki.base_path
@@ -72,7 +72,7 @@ module Precious
 
     def show_page_or_file(*names)
       ps = names.collect do |name|
-        wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+        wiki = Gollum::Wiki.new(settings.roots[request.script_name][:gollum_path], settings.roots[request.script_name][:wiki_options])
         if page = wiki.page(name)
           @page = page
           @name = name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RTFMd
 version: !ruby/object:Gem::Version 
-  hash: 41213
+  hash: 41203
   prerelease: 
   segments: 
   - 0
   - 10301
-  - 11
-  version: 0.10301.11
+  - 12
+  version: 0.10301.12
 platform: ruby
 authors: 
 - Tom Bombadil