Release 2.4.8

gollum.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'gollum'
-  s.version           = '2.4.7'
+  s.version           = '2.4.8'
   s.date              = '2012-12-20'
   s.rubyforge_project = 'gollum'
 

lib/gollum.rb

@@ -28,7 +28,7 @@ require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
 $KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
-  VERSION = '2.4.7'
+  VERSION = '2.4.8'
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))

lib/gollum/frontend/app.rb

@@ -88,7 +88,8 @@ module Precious
     end
 
     get '/' do
-      redirect ::File.join(@base_url, 'Home')
+      page_dir = settings.wiki_options[:page_file_dir].to_s
+      redirect clean_url(::File.join(@base_url, page_dir, 'Home'))
     end
 
     # path is set to name if path is nil.
@@ -179,6 +180,12 @@ module Precious
       @name = wikip.name.to_url
       @path = wikip.path
 
+      # --page-file-dir docs
+      # /docs/Home should be created in /Home
+      # not /docs/Home because write_page will append /docs
+      page_dir = settings.wiki_options[:page_file_dir].to_s
+      @path = @path.sub(page_dir, '/') if @path.start_with? page_dir
+
       page = wikip.page
       if page
         page_dir = settings.wiki_options[:page_file_dir].to_s