Release 2.3.7

Fixed #568, triple tilde without language causes Gollum to crash

README.md

@@ -381,10 +381,10 @@ You may imbed sequence diagrams into your wiki page (rendered by
 [WebSequenceDiagrams](http://www.websequencediagrams.com) by using the
 following syntax:
 
-    {{{ blue-modern
+    {{{{{{ blue-modern
       alice->bob: Test
       bob->alice: Test response
-    }}}
+    }}}}}}
 
 You can replace the string "blue-modern" with any supported style.
 
@@ -556,6 +556,8 @@ your changes merged back into core is as follows:
 1. Send a pull request to the github/gollum project.
 
 ## RELEASING
+    x.y.z
+
     For z releases:
     $ rake bump
     $ rake release

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'gollum'
-  s.version           = '2.3.4'
-  s.date              = '2012-10-28'
+  s.version           = '2.3.7'
+  s.date              = '2012-11-06'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."

lib/gollum.rb

@@ -23,7 +23,7 @@ require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
 require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '2.3.4'
+  VERSION = '2.3.7'
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))

lib/gollum/frontend/app.rb

@@ -306,7 +306,8 @@ module Precious
     get '/search' do
       @query = params[:q]
       wiki = wiki_new
-      @results = wiki.search @query
+      # Sort wiki search results by count (desc) and then by name (asc)
+      @results = wiki.search(@query).sort{ |a, b| (a[:count] <=> b[:count]).nonzero? || b[:name] <=> a[:name] }.reverse
       @name = @query
       mustache :search
     end

lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js

@@ -108,8 +108,9 @@ $.save = function( commitMessage ) {
   var msg = defaultCommitMessage();
   var newLocation = baseUrl;
 
+  // Remove all duplicate slashes
   function clean( str ) {
-    return str.replace(/^\/+/, '/');
+    return str.replace(/\/+/g, '/');
   }
 
   // 'a%2Fb' => a/b

lib/gollum/markup.rb

@@ -488,8 +488,10 @@ module Gollum
         # extract lang from { .ruby } or { #stuff .ruby .indent }
         # see http://johnmacfarlane.net/pandoc/README.html#delimited-code-blocks
 
-        lang = lang.match(/\.([^}\s]+)/)
-        lang = lang[1] unless lang.nil?
+        if lang
+            lang = lang.match(/\.([^}\s]+)/)
+            lang = lang[1] unless lang.nil?
+        end
 
         @codemap[id] = cached   ?
           { :output => cached } :

test/test_markup.rb

@@ -212,7 +212,20 @@ context "Markup" do
     assert_equal expected, output
   end
 
-  test "tilda code blocks #537" do
+  # Issue #568
+  test "tilde code blocks without a language" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\"><pre><span class=\"s\">'hi'</span>\n</pre></div>}
+    assert_equal expected, output
+  end
+
+  test "tilde code blocks #537" do
     page = 'test_rgx'
     @wiki.write_page(page, :markdown,
       %Q(~~~ {.ruby}
@@ -225,7 +238,7 @@ context "Markup" do
   end
 
   # Issue #537
-  test "tilda code blocks with more than one class" do
+  test "tilde code blocks with more than one class" do
     page = 'test_rgx'
     @wiki.write_page(page, :markdown,
       %Q(~~~ {#hi .ruby .sauce}
@@ -238,7 +251,7 @@ context "Markup" do
   end
 
   # Issue #537
-  test "tilda code blocks with lots of tildes" do
+  test "tilde code blocks with lots of tildes" do
     page = 'test_rgx'
     @wiki.write_page(page, :markdown,
       %Q(~~~~~~ {#hi .ruby .sauce}