Release 2.4.11

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'gollum'
-  s.version           = '2.4.7'
+  s.version           = '2.4.11'
-  s.date              = '2012-12-20'
+  s.date              = '2013-01-08'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."

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.11'
 
   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,14 @@ module Precious
       @name = wikip.name.to_url
       @path = wikip.path
 
+      page_dir = settings.wiki_options[:page_file_dir].to_s
+      unless page_dir.empty?
+        # --page-file-dir docs
+        # /docs/Home should be created in /Home
+        # not /docs/Home because write_page will append /docs
+        @path = @path.sub(page_dir, '/') if @path.start_with? page_dir
+      end
+
       page = wikip.page
       if page
         page_dir = settings.wiki_options[:page_file_dir].to_s

lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js

@@ -38,7 +38,9 @@
         $.GollumEditor.Placeholder.add($('#gollum-editor-edit-summary input'));
         $('#gollum-editor form[name="gollum-editor"]').submit(function( e ) {
           e.preventDefault();
-          $.GollumEditor.Placeholder.clearAll();
+          // Do not clear default place holder text
+          // Updated home (markdown)
+          // $.GollumEditor.Placeholder.clearAll();
           debug('submitting');
           $(this).unbind('submit');
           $(this).submit();

lib/gollum/markup.rb

@@ -636,16 +636,8 @@ module Gollum
     #
     # Returns the String of formatted data with metadata removed.
     def extract_metadata(data)
-      @metadata ||= {}
+      @metadata = {}
-      # The markers are `<!-- ---` and `-->`
+      data
-      data.gsub(/\<\!--+\s+---(.*?)--+\>/m) do
-        yaml = @wiki.sanitizer.clean($1)
-        hash = YAML.load(yaml)
-        if Hash === hash
-          @metadata.update(hash)
-        end
-        ''
-      end
     end
 
     # Hook for getting the formatted value of extracted tag data.