Release 4.0.0

Move to Kramdown and support JRuby

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - jruby-19mode
 before_install:
  - sudo apt-get update
  - sudo apt-get install libicu-dev

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum'
-  s.version           = '3.1.3'
+  s.version           = '4.0.0'
-  s.date              = '2015-04-04'
+  s.date              = '2015-04-11'
   s.rubyforge_project = 'gollum'
   s.license           = 'MIT'
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency 'gollum-lib', '~> 4.0', '>= 4.0.1'
-  s.add_dependency 'github-markdown', '~> 0.6.5'
+  s.add_dependency 'kramdown', '~> 1.6.0'
   s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
   s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
   s.add_dependency 'useragent', '~> 0.10.0'

lib/gollum.rb

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

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

@@ -121,7 +121,7 @@
           formData.append('file', file);
 
           $.ajax({
-            url: '/uploadFile',
+            url: baseUrl + '/uploadFile',
             data: formData,
             cache: false,
             contentType: false,

test/test_app.rb

@@ -77,8 +77,7 @@ context "Frontend" do
                      { :name => 'user1', :email => 'user1' });
 
     get page
-
+    expected = "<h2><a class=\"anchor\" (href|id)=\"(#)?#{text}\" (href|id)=\"(#)?#{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
-    expected = "<h2><a class=\"anchor\" id=\"#{text}\" href=\"##{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
     actual   = nfd(last_response.body)
 
     assert_match /#{expected}/, actual
@@ -409,7 +408,6 @@ context "Frontend" do
     @wiki = Gollum::Wiki.new(@path)
     Precious::App.set(:gollum_path, @path)
     Precious::App.set(:wiki_options, {})
-
     post "/preview", :content => 'abc', :format => 'markdown'
     assert last_response.ok?
   end