Release 2.2.9

Escape " in headers
Improve base path note
2012-10-14 22:26:17 -06:00 · 2012-10-14 22:21:00 -06:00 · 2012-10-14 21:42:25 -06:00 · 2012-10-14 21:28:43 -06:00 · 2012-10-14 20:57:27 -06:00 · 2012-10-14 17:24:33 -06:00
48 changed files with 1078 additions and 777 deletions
@@ -4,3 +4,4 @@ pkg
 .bundle
 Gemfile.lock
 *.gem
+*.swp
@@ -4,5 +4,5 @@ rvm:
 notifications:
  disabled: true
 before_install:
- - gem uninstall ffi -a
- - sudo apt-get install -y asciidoc
+ - sudo apt-get update
+ - sudo apt-get install -y --force-yes asciidoc
@@ -1,4 +1,4 @@
 source "http://rubygems.org"

 gemspec
-gem "rake", "~> 0.9.2"
+gem "rake", "~> 0.9.2.2"
@@ -295,7 +295,7 @@ This is useful for writing about the link syntax in your wiki pages.

 Gollum has a special tag to insert a table of contents (new in v2.1)

-    '[[_TOC_]]
+    [[_TOC_]]

 This tag is case sensitive, use all upper case.  The TOC tag can be inserted
 into the `_Header`, `_Footer` or `_Sidebar` files too.
@@ -334,6 +334,27 @@ then that whitespace will be ignored (this makes the blocks easier to read in pl
 The block must end with three backticks indented at the same level than the opening
 backticks.

+### GITHUB SYNTAX HIGHLIGHTING
+
+As an extra feature, you can syntax highlight a file from your repository, allowing
+you keep some of your sample code in the main repository. The code-snippet is
+updated when the wiki is rebuilt. You include github code like this:
+
+    ```html:github/gollum/master/test/file_view/1_file.txt```
+
+This will make the builder look at the **github user**, in the **gollum project**,
+in the **master branch**, at path **test/file_view/1_file.txt**. It will be
+rewritten to:
+
+    ```html
+    <ol class="tree">
+      <li class="file"><a href="0">0</a></li>
+    </ol>
+    ```
+
+Which will be parsed as HTML code during the Pygments run, and thereby coloured 
+appropriately.
+
 ## MATHEMATICAL EQUATIONS


@@ -392,6 +413,17 @@ By default, internal wiki links are all absolute from the root. To specify a dif

    wiki = Gollum::Wiki.new("my-gollum-repo.git", :base_path => "/wiki")

+Note that base_path just modifies the links. To map gollum to a non-root location:
+
+- Use the gollum binary: `gollum path/to/wiki --base-path mywiki`
+- Define config.ru with `map`. See [#532](https://github.com/github/gollum/issues/532) for an example.
+
+> :base_path     - String base path for all Wiki links.
+>
+> The String base path to prefix to internal links. For example, when set
+> to "/wiki", the page "Hobbit" will be linked as "/wiki/Hobbit". Defaults
+> to "/".
+
 Get the latest version of the given human or canonical page name:

    page = wiki.page('page-name')
@@ -497,9 +529,15 @@ like Rack::Auth, OmniAuth, etc.
    Precious::App.set(:wiki_options, {:universal_toc => false})
    run Precious::App

-## Windows Filename Validation
+Your Rack middleware can pass author details to Gollum in a Hash in the session under the 'gollum.author' key.
+
+## WINDOWS FILENAME VALIDATION
 Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details.

+## LIB.SO ERROR
+
+`Could not open library 'lib.so'` may be solved by installing `python-devel` on Fedora or `python-dev` on Ubuntu. Gentoo requires a rubypython [patch](https://gist.github.com/2802480) to use python2.7.
+
 ## CONTRIBUTE

 If you'd like to hack on Gollum, start by forking my repo on GitHub:
@@ -520,14 +558,18 @@ your changes merged back into core is as follows:
 1. Send a pull request to the github/gollum project.

 ## RELEASING
+    For z releases:
+    $ rake bump
+    $ rake release

+    For x.y releases:
+    Update VERSION in lib/gollum.rb
    $ rake gemspec
-    $ gem build gollum.gemspec
-    $ gem push gollum-X.Y.Z.gem
+    $ rake release
    
 ## BUILDING THE GEM FROM MASTER
-    $ gem uninstall -aix gollum
+    $ gem uninstall -aIx gollum
    $ git clone https://github.com/github/gollum.git
    $ cd gollum
    gollum$ rake build
-    gollum$ gem install pkg/gollum*.gem
+    gollum$ gem install --no-ri --no-rdoc pkg/gollum*.gem
@@ -17,6 +17,27 @@ def version
  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end

+# assumes x.y.z all digit version
+def next_version
+  # x.y.z
+  v = version.split '.'
+  # bump z
+  v[-1] = v[-1].to_i + 1
+  v.join '.'
+end
+
+def bump_version
+  old_file = File.read("lib/#{name}.rb")
+  old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
+  new_version = next_version
+  # replace first match of old vesion with new version
+  old_file.sub!(old_version_line, "  VERSION = '#{new_version}'")
+
+  File.write("lib/#{name}.rb", old_file)
+
+  new_version
+end
+
 def date
  Date.today.to_s
 end
@@ -71,7 +92,14 @@ end
 #
 #############################################################################

-
+desc "Update version number and gemspec"
+task :bump do
+  puts "Updated version to #{bump_version}"
+  # Execute does not invoke dependencies.
+  # Manually invoke gemspec then validate.
+  Rake::Task[:gemspec].execute
+  Rake::Task[:validate].execute
+end

 #############################################################################
 #
@@ -117,7 +145,7 @@ task :gemspec => :validate do
    split("\n").
    sort.
    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    reject { |file| file =~ /^(rdoc|pkg|test|Home\.md)/ }.
    map { |file| "    #{file}" }.
    join("\n")

@@ -139,4 +167,4 @@ task :validate do
    puts "A `VERSION` file at root level violates Gem best practices."
    exit!
  end
-end
+end
@@ -65,8 +65,8 @@ opts = OptionParser.new do |opts|
    wiki_options[:live_preview] = false
  end

-  opts.on("--no-mathjax", "Disables mathjax.") do
-    options['mathjax'] = false
+  opts.on("--mathjax", "Enables mathjax.") do
+    wiki_options[:mathjax] = true
  end
 end

@@ -141,5 +141,31 @@ else
    require cfg
  end

-  Precious::App.run!(options)
+  base_path = wiki_options[:base_path]
+
+  if wiki_options[:base_path].nil?
+    Precious::App.run!(options)
+  else
+    require 'rack'
+
+    class MapGollum
+      def initialize base_path
+        @mg = Rack::Builder.new do
+          map '/' do
+            run Proc.new { [ 302, {'Location'=> "/#{base_path}" }, [] ] }
+          end
+
+          map "/#{base_path}" do
+            run Precious::App
+          end
+        end
+      end
+
+      def call(env)
+        @mg.call(env)
+      end
+    end
+    # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
+    Rack::Server.new(:app => MapGollum.new(base_path), :Port => options['port']).start
+  end
 end
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
  s.required_ruby_version = ">= 1.8.7"

  s.name              = 'gollum'
-  s.version           = '2.1.0'
-  s.date              = '2012-08-01'
+  s.version           = '2.2.9'
+  s.date              = '2012-10-14'
  s.rubyforge_project = 'gollum'

  s.summary     = "A simple, Git-powered wiki."
@@ -23,31 +23,30 @@ Gem::Specification.new do |s|
  s.rdoc_options = ["--charset=UTF-8"]
  s.extra_rdoc_files = %w[README.md LICENSE]

-  s.add_dependency('grit', "~> 2.5.0")
-  s.add_dependency('github-markup', [">= 0.7.0", "< 1.0.0"])
-  s.add_dependency('github-markdown')
-  s.add_dependency('pygments.rb', "~> 0.2.0")
-  s.add_dependency('posix-spawn', "~> 0.3.0")
-  s.add_dependency('sinatra', "~> 1.0")
-  s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
-  s.add_dependency('sanitize', "~> 2.0.0")
-  s.add_dependency('nokogiri', "~> 1.4")
-  s.add_dependency('useragent', "~> 0.4.9")
-  s.add_dependency('stringex', "~> 1.4.0")
+  s.add_dependency('grit', '~> 2.5.0')
+  s.add_dependency('github-markup', ['>= 0.7.4', '< 1.0.0'])
+  s.add_dependency('github-markdown', '~> 0.5.1')
+  s.add_dependency('pygments.rb', '~> 0.3.1')
+  s.add_dependency('escape_utils', '0.2.4')
+  s.add_dependency('sinatra', '~> 1.3.3')
+  s.add_dependency('mustache', ['>= 0.99.4', '< 1.0.0'])
+  s.add_dependency('sanitize', '~> 2.0.3')
+  s.add_dependency('nokogiri', '~> 1.5.5')
+  s.add_dependency('useragent', '~> 0.4.10')
+  s.add_dependency('stringex', '~> 1.4.0')

-  s.add_development_dependency('RedCloth')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('org-ruby', '~>0.6.3')
-  s.add_development_dependency('shoulda')
-  s.add_development_dependency('rack-test')
-  s.add_development_dependency('wikicloth', '~>0.8.0')
-  s.add_development_dependency('rake', '~> 0.9.2')
+  s.add_development_dependency('RedCloth', '~> 4.2.9')
+  s.add_development_dependency('mocha', '~> 0.12.6')
+  s.add_development_dependency('org-ruby', '~> 0.7.1')
+  s.add_development_dependency('shoulda', '~> 3.1.1')
+  s.add_development_dependency('rack-test', '~> 0.6.2')
+  s.add_development_dependency('wikicloth', '~> 0.8.0')
+  s.add_development_dependency('rake', '~> 0.9.2.2')

  # = MANIFEST =
  s.files = %w[
    Gemfile
    HISTORY.md
-    Home.md
    LICENSE
    README.md
    Rakefile
@@ -426,6 +425,7 @@ Gem::Specification.new do |s|
    lib/gollum/frontend/public/gollum/livepreview/licenses/retina_display_icon_set/by_sa_3.0_unported_legalcode.txt
    lib/gollum/frontend/public/gollum/livepreview/licenses/sizzle/LICENSE.txt
    lib/gollum/frontend/public/gollum/livepreview/licenses/sundown/sundown.txt
+    lib/gollum/frontend/public/gollum/livepreview/licenses/templarian_windowsicons/license.txt
    lib/gollum/frontend/public/gollum/livepreview/readme.md
    lib/gollum/frontend/templates/compare.mustache
    lib/gollum/frontend/templates/create.mustache
@@ -453,6 +453,7 @@ Gem::Specification.new do |s|
    lib/gollum/frontend/views/pages.rb
    lib/gollum/frontend/views/search.rb
    lib/gollum/git_access.rb
+    lib/gollum/gitcode.rb
    lib/gollum/markup.rb
    lib/gollum/page.rb
    lib/gollum/pagination.rb
@@ -464,156 +465,9 @@ Gem::Specification.new do |s|
    licenses/licenses.txt
    licenses/unity_asset_pool/COPYRIGHT
    templates/formatting.html
-    test/examples/empty.git/HEAD
-    test/examples/empty.git/config
-    test/examples/empty.git/description
-    test/examples/empty.git/hooks/applypatch-msg.sample
-    test/examples/empty.git/hooks/commit-msg.sample
-    test/examples/empty.git/hooks/post-commit.sample
-    test/examples/empty.git/hooks/post-receive.sample
-    test/examples/empty.git/hooks/post-update.sample
-    test/examples/empty.git/hooks/pre-applypatch.sample
-    test/examples/empty.git/hooks/pre-commit.sample
-    test/examples/empty.git/hooks/pre-rebase.sample
-    test/examples/empty.git/hooks/prepare-commit-msg.sample
-    test/examples/empty.git/hooks/update.sample
-    test/examples/empty.git/info/exclude
-    test/examples/empty.git/objects/info/.gitkeep
-    test/examples/empty.git/objects/pack/.gitkeep
-    test/examples/empty.git/refs/heads/.gitkeep
-    test/examples/lotr.git/COMMIT_EDITMSG
-    test/examples/lotr.git/HEAD
-    test/examples/lotr.git/ORIG_HEAD
-    test/examples/lotr.git/config
-    test/examples/lotr.git/description
-    test/examples/lotr.git/index
-    test/examples/lotr.git/info/exclude
-    test/examples/lotr.git/logs/HEAD
-    test/examples/lotr.git/logs/refs/heads/master
-    test/examples/lotr.git/objects/06/131480411710c92a82fe2d1e76932c70feb2e5
-    test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44
-    test/examples/lotr.git/objects/0d/c9016ca928c78d5421a99a53b379b53929221e
-    test/examples/lotr.git/objects/0e/d8cbe0a25235bd867e65193c7d837c66b328ef
-    test/examples/lotr.git/objects/12/629d666c5e3178f82f533f543d61b53dc78c0b
-    test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0
-    test/examples/lotr.git/objects/1d/b89ebba7e2c14d93b94ff98cfa3708a4f0d4e3
-    test/examples/lotr.git/objects/24/49c2681badfd3c189e8ed658dacffe8ba48fe5
-    test/examples/lotr.git/objects/25/4bdc1ba27d8b8a794538a8522d9a2b56ec2dd9
-    test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6
-    test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad
-    test/examples/lotr.git/objects/45/3b250f979c7bd6dfb62640c944c982ae6721ee
-    test/examples/lotr.git/objects/45/f319ee12f2b551b901b22e72602963c366fff1
-    test/examples/lotr.git/objects/46/a697caf435815bb07bbce947fc2d58be15f087
-    test/examples/lotr.git/objects/4c/45c2b4e297a726c3d3f66886f35373e48fe1c5
-    test/examples/lotr.git/objects/4e/023f460ce466e154ca09d8774c79ad5a53fc15
-    test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa
-    test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b
-    test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2
-    test/examples/lotr.git/objects/6e/48abfc56565574859e081ee58eae655d48cf71
-    test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f
-    test/examples/lotr.git/objects/7b/60c5a20a501a70f2317fa0ef763e1e2ce22d6b
-    test/examples/lotr.git/objects/7d/981cd984ad589e3cf00d8122170c6f7d685979
-    test/examples/lotr.git/objects/84/0ec5b1ba1320e8ec443f28f99566f615d5af10
-    test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675
-    test/examples/lotr.git/objects/94/523d7ae48aeba575099dd12926420d8fd0425d
-    test/examples/lotr.git/objects/94/9a9cc3119b9c98817f375e976d2bb5e2a42809
-    test/examples/lotr.git/objects/96/97dc65e095658bbd1b8e8678e08881e86d32f1
-    test/examples/lotr.git/objects/9b/e95b960ac388d4e7db55f610f828e9c31344e6
-    test/examples/lotr.git/objects/a3/1ca2a7c352c92531a8b99815d15843b259e814
-    test/examples/lotr.git/objects/a6/59b3763b822dd97544621fd0beef162ea37b14
-    test/examples/lotr.git/objects/a8/ad3c09dd842a3517085bfadd37718856dee813
-    test/examples/lotr.git/objects/aa/b61fe89d56f8614c0a8151da34f939dcedfa68
-    test/examples/lotr.git/objects/b0/de6e794dfdc7ef3400e894225bfe23308aae5c
-    test/examples/lotr.git/objects/b1/6b3d9fad9d78e5a669e7f33d94c96da374eccd
-    test/examples/lotr.git/objects/bc/4b5fc0ce2c2ba3acef6647e4f67256ee45ab60
-    test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05
-    test/examples/lotr.git/objects/c9/6a7645db5d4c76389e77cd103ef3ed77d81e4c
-    test/examples/lotr.git/objects/ca/7355dc497e9729fbaf0c0e3f424b86afef5614
-    test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd
-    test/examples/lotr.git/objects/d5/29304506d37f544675244c335d85cab5d29966
-    test/examples/lotr.git/objects/dc/596d6b2dd89ab05c66f4abd7d5eb706bc17f19
-    test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83
-    test/examples/lotr.git/objects/f4/84ebb1f40f8eb20d1bcd8d1d71934d2b8ae961
-    test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465
-    test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df
-    test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634
-    test/examples/lotr.git/objects/ff/6f7de62644369380ba73b4e4297c1a2d6f0b66
-    test/examples/lotr.git/objects/info/packs
-    test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.idx
-    test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.pack
-    test/examples/lotr.git/packed-refs
-    test/examples/lotr.git/refs/heads/master
-    test/examples/lotr.git/refs/remotes/origin/HEAD
-    test/examples/page_file_dir.git/COMMIT_EDITMSG
-    test/examples/page_file_dir.git/HEAD
-    test/examples/page_file_dir.git/config
-    test/examples/page_file_dir.git/description
-    test/examples/page_file_dir.git/index
-    test/examples/page_file_dir.git/info/exclude
-    test/examples/page_file_dir.git/logs/HEAD
-    test/examples/page_file_dir.git/logs/refs/heads/master
-    test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf
-    test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e
-    test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
-    test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
-    test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2
-    test/examples/page_file_dir.git/refs/heads/master
-    test/examples/revert.git/COMMIT_EDITMSG
-    test/examples/revert.git/HEAD
-    test/examples/revert.git/config
-    test/examples/revert.git/description
-    test/examples/revert.git/index
-    test/examples/revert.git/info/exclude
-    test/examples/revert.git/logs/HEAD
-    test/examples/revert.git/logs/refs/heads/master
-    test/examples/revert.git/objects/10/2685c42018f802557f05db171f44443e8dacab
-    test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d
-    test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9
-    test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708
-    test/examples/revert.git/objects/8e/83f898e5e16ae400db59dda1017acad540f3aa
-    test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc
-    test/examples/revert.git/objects/ed/6c9f63b98acf73c25b5ffbb38da557d3682023
-    test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433
-    test/examples/revert.git/objects/info/packs
-    test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.idx
-    test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack
-    test/examples/revert.git/packed-refs
-    test/examples/revert.git/refs/heads/master
-    test/examples/revert.git/refs/remotes/origin/HEAD
-    test/examples/yubiwa.git/HEAD
-    test/examples/yubiwa.git/config
-    test/examples/yubiwa.git/description
-    test/examples/yubiwa.git/info/exclude
-    test/examples/yubiwa.git/objects/10/fa2ddc4e3b4009d8a453aace10bd6148c1ad00
-    test/examples/yubiwa.git/objects/52/4b82874327ea7cbf730389964ba7cb3de966de
-    test/examples/yubiwa.git/objects/58/3fc201cb457fb3f1480f3e1e5999b119633835
-    test/examples/yubiwa.git/objects/87/bc1dd46ab3d3874d4e898d45dd512cc20a7cc8
-    test/examples/yubiwa.git/objects/89/64ed1b4e21aa90e831763bbce9034bfda81b70
-    test/examples/yubiwa.git/objects/9f/f6dd0660da5fba2d3374adb2b84fa653bb538b
-    test/examples/yubiwa.git/objects/ac/e97abf2b177815a1972d7db22f229f58c83309
-    test/examples/yubiwa.git/objects/b1/f443863a4816628807fbf86141ebef055dda34
-    test/examples/yubiwa.git/refs/heads/master
-    test/file_view/1_file.txt
-    test/file_view/1_file_1_folder.txt
-    test/file_view/1_folder.txt
-    test/file_view/2_files_2_folders.txt
-    test/file_view/2_files_2_folders_1_root.txt
-    test/file_view/nested_folders.txt
-    test/helper.rb
-    test/test_app.rb
-    test/test_app_helpers.rb
-    test/test_committer.rb
-    test/test_file.rb
-    test/test_file_view.rb
-    test/test_git_access.rb
-    test/test_markup.rb
-    test/test_page.rb
-    test/test_page_revert.rb
-    test/test_pages_view.rb
-    test/test_unicode.rb
-    test/test_wiki.rb
+    templates/helper_wiki.rb
  ]
  # = MANIFEST =

  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
+end
@@ -20,9 +20,10 @@ require File.expand_path('../gollum/markup', __FILE__)
 require File.expand_path('../gollum/sanitization', __FILE__)
 require File.expand_path('../gollum/tex', __FILE__)
 require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
+require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)

 module Gollum
-  VERSION = '2.1.0'
+  VERSION = '2.2.9'

  def self.assets_path
    ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
@@ -100,9 +100,13 @@ module Gollum

        tree.blobs.each do |blob|
          next if page_path_scheduled_for_deletion?(index.tree, fullpath)
-          file = blob.name.downcase.sub(/\.\w+$/, '')
-          file_ext = ::File.extname(blob.name).sub(/^\./, '')
-          if downpath == file && !(allow_same_ext && file_ext == ext)
+          
+          existing_file = blob.name.downcase.sub(/\.\w+$/, '')
+          existing_file_ext = ::File.extname(blob.name).sub(/^\./, '')
+
+          new_file_ext = ::File.extname(path).sub(/^\./, '')
+
+          if downpath == existing_file && !(allow_same_ext && new_file_ext == existing_file_ext)
            raise DuplicatePageError.new(dir, blob.name, path)
          end
        end
@@ -9,7 +9,6 @@ require 'gollum/frontend/views/layout'
 require 'gollum/frontend/views/editable'
 require 'gollum/frontend/views/has_page'

-require File.expand_path '../uri_encode_component', __FILE__
 require File.expand_path '../helpers', __FILE__

 # Fix to_url
@@ -82,23 +81,28 @@ module Precious
    end

    before do
-      @base_url = settings.wiki_options.has_key?(:base_url) ? settings.wiki_options[:base_url] : url('/')
+      @base_url = url('/', false).chomp('/')
      settings.wiki_options.merge!({ :base_path => @base_url }) unless settings.wiki_options.has_key? :base_path
    end

    get '/' do
-      show_page_or_file('Home')
+      redirect File.join(settings.wiki_options[:page_file_dir].to_s,settings.wiki_options[:base_path].to_s, 'Home')
    end

+    # path is set to name if path is nil.
+    #   if path is 'a/b' and a and b are dirs, then
+    #   path must have a trailing slash 'a/b/' or
+    #   extract_path will trim path to 'a'
    # name, path, version
-    def wiki_page( name, path = nil, version = nil)
+    def wiki_page(name, path = nil, version = nil, exact = true)
      path = name if path.nil?
-
      name = extract_name(name)
      path = extract_path(path)
+      path = '/' if exact && path.nil?
+
      wiki = wiki_new

-      OpenStruct.new(:wiki => wiki, :page => wiki.paged(name, path, version),
+      OpenStruct.new(:wiki => wiki, :page => wiki.paged(name, path, exact, version),
                     :name => name, :path => path)
    end

@@ -132,19 +136,20 @@ module Precious
          mustache :edit
        end
      else
-        redirect to("/create/#{CGI.escape(@name)}")
+        redirect to("/create/#{encodeURIComponent(@name)}")
      end
    end

    post '/edit/*' do
-      wikip = wiki_page(CGI.unescape(params[:page]), sanitize_empty_params(params[:path]))
-      path         = wikip.path
-      wiki         = wikip.wiki
-      page         = wikip.page
-      rename       = params[:rename].to_url if params[:rename]
-      name         = rename || page.name
-      committer    = Gollum::Committer.new(wiki, commit_message)
-      commit       = {:committer => committer}
+      path      = '/' + clean_url(sanitize_empty_params(params[:path])).to_s
+      page_name = CGI.unescape(params[:page])
+      wiki      = wiki_new
+      page      = wiki.paged(page_name, path, exact = true)
+      return if page.nil?
+      rename    = params[:rename].to_url if params[:rename]
+      name      = rename || page.name
+      committer = Gollum::Committer.new(wiki, commit_message)
+      commit    = {:committer => committer}

      update_wiki_page(wiki, page, params[:content], commit, name, params[:format])
      update_wiki_page(wiki, page.header,  params[:header],  commit) if params[:header]
@@ -168,9 +173,8 @@ module Precious
    end

    get '/create/*' do
-      splat = params[:splat].first
-      wikip = wiki_page(extract_name(splat).to_url, splat)
-      @name = wikip.name
+      wikip = wiki_page(params[:splat].first.gsub('+', '-'))
+      @name = wikip.name.to_url
      @path = wikip.path

      page = wikip.page
@@ -184,16 +188,23 @@ module Precious
    post '/create' do
      name         = params[:page].to_url
      path         = sanitize_empty_params(params[:path])
+      path = '' if path.nil?
      format       = params[:format].intern

+      page_dir = File.join(settings.wiki_options[:page_file_dir].to_s,
+                           settings.wiki_options[:base_path].to_s)
+      # Home is a special case.
+      path = '' if name.downcase == 'home'
+
+      page_dir = File.join(page_dir, path)
+
      # write_page is not directory aware so use wiki_options to emulate dir support.
-      wiki_options = settings.wiki_options.merge({ :page_file_dir => path })
+      wiki_options = settings.wiki_options.merge({ :page_file_dir => page_dir })
      wiki         = Gollum::Wiki.new(settings.gollum_path, wiki_options)

      begin
        wiki.write_page(name, format, params[:content], commit_message)
-        page = wiki.page(name)
-        redirect to("/#{page.escaped_url_path}")
+        redirect to("/#{clean_url(CGI.escape(::File.join(page_dir,name)))}")
      rescue Gollum::DuplicatePageError => e
        @message = "Duplicate page: #{e.message}"
        mustache :error
@@ -273,22 +284,17 @@ module Precious
      mustache :compare
    end

-    get '/_tex.png' do
-      content_type 'image/png'
-      formula = Base64.decode64(params[:data])
-      Gollum::Tex.render_formula(formula)
-    end
-
    get %r{^/(javascript|css|images)} do
      halt 404
    end

    get %r{/(.+?)/([0-9a-f]{40})} do
      file_path = params[:captures][0]
-      name      = extract_name(file_path)
-      path      = extract_path(file_path)
      version   = params[:captures][1]
-      if page = wiki_page(name, path, version).page
+      wikip     = wiki_page(file_path, file_path, version)
+      name      = wikip.name
+      path      = wikip.path
+      if page = wikip.page
        @page = page
        @name = name
        @content = page.formatted_data
@@ -337,7 +343,9 @@ module Precious
      path         = extract_path(fullpath)
      wiki         = wiki_new

-      if page = wiki.paged(name, path)
+      path = '/' if path.nil?
+
+      if page = wiki.paged(name, path, exact = true)
        @page = page
        @name = name
        @editable = true
@@ -350,7 +358,7 @@ module Precious
        file.raw_data
      else
        page_path = [path, name].compact.join('/')
-        redirect to("/create/#{CGI.escape(page_path).gsub('%2F','/')}")
+        redirect to("/create/#{clean_url(encodeURIComponent(page_path))}")
      end
    end

@@ -363,8 +371,19 @@ module Precious
      wiki.update_page(page, name, format, content.to_s, commit)
    end

+    private
+
+    # Options parameter to Gollum::Committer#initialize
+    #     :message   - The String commit message.
+    #     :name      - The String author full name.
+    #     :email     - The String email address.
+    # message is sourced from the incoming request parameters
+    # author details are sourced from the session, to be populated by rack middleware ahead of us
    def commit_message
-      { :message => params[:message] }
+      commit_message = { :message => params[:message] }
+      author_parameters = session['gollum.author']
+      commit_message.merge! author_parameters unless author_parameters.nil?
+      commit_message
    end
  end
 end
@@ -17,5 +17,18 @@ module Precious
    def sanitize_empty_params(param)
      [nil,''].include?(param) ? nil : CGI.unescape(param)
    end
+
+    # Remove all slashes from the start of string.
+    def clean_url url
+      return url if url.nil?
+      url.gsub('%2F','/').gsub(/^\/+/,'')
+    end
+
+    def trim_leading_slash url
+      return url if url.nil?
+      url.gsub!('%2F','/')
+      return '/' + url.gsub(/^\/+/,'') if url[0,1] == '/'
+      url
+    end
  end
 end
@@ -167,7 +167,7 @@

    setActiveLanguage: function( name ) {
      // On first load _ACTIVE_LANG.length is 0 and evtChangeFormat isn't called.
-      if ( LanguageDefinition._ACTIVE_LANG.length <= 0 ) {
+      if ( LanguageDefinition._ACTIVE_LANG != null && LanguageDefinition._ACTIVE_LANG.length <= 0 ) {
        FormatSelector.updateCommitMessage( name );
      }

@@ -196,7 +196,9 @@
            LanguageDefinition.getHookFunctionFor("activate")();
          }

-          function hotkey( cmd ) {
+          function hotkey( e, cmd ) {
+            e.preventDefault();
+
            var def = LanguageDefinition.getDefinitionFor( cmd );
            if ( typeof def == 'object' ) {
              FunctionBar.executeAction( def );
@@ -205,8 +207,17 @@
            return false;
          }

-          Mousetrap.bind(['command+b', 'ctrl+b'], function(){ hotkey('function-bold'); });
-          Mousetrap.bind(['command+i', 'ctrl+i'], function(){ hotkey('function-italic'); });
+          Mousetrap.bind(['command+1', 'ctrl+1'], function( e ){ hotkey( e, 'function-h1' ); });
+          Mousetrap.bind(['command+2', 'ctrl+2'], function( e ){ hotkey( e, 'function-h2' ); });
+          Mousetrap.bind(['command+3', 'ctrl+3'], function( e ){ hotkey( e, 'function-h3' ); });
+          Mousetrap.bind(['command+b', 'ctrl+b'], function( e ){ hotkey( e, 'function-bold' ); });
+          Mousetrap.bind(['command+i', 'ctrl+i'], function( e ){ hotkey( e, 'function-italic' ); });
+          Mousetrap.bind(['command+s', 'ctrl+s'], function( e ){
+            e.preventDefault();
+            $("#gollum-editor-submit").trigger("click");
+            return false;
+          });
+
        } );
      } else {
        LanguageDefinition._ACTIVE_LANG = name;
@@ -4,7 +4,7 @@ $(document).ready(function() {
    var ok = confirm($(this).data('confirm'));
    if ( ok ) {
      var loc = window.location;
-      loc = baseUrl + 'delete' + loc.pathname
+      loc = baseUrl + '/delete' + loc.pathname.replace(baseUrl,'');
      window.location = loc;
    }
    // Don't navigate on cancel.
@@ -138,10 +138,10 @@ $(document).ready(function() {
          var msg = 'Renamed ' + oldName + ' to ' + newName;
          jQuery.ajax( {
            type: 'POST',
-            url: baseUrl + 'edit/' + oldName,
+            url: baseUrl + '/edit/' + oldName,
            data:  { path: path, rename: newName, page: oldName, message: msg },
            success: function() {
-                window.location = baseUrl + encodeURIComponent(newName);
+                window.location = baseUrl + '/' + encodeURIComponent(newName);
            }
          });
        }
@@ -154,14 +154,6 @@ $(document).ready(function() {
    $('#minibutton-new-page').click(function(e) {
      e.preventDefault();

-      var path = location.pathname;
-      // ensure there's more than one slash in pathname.
-      if (path.split('/').length > 2) {
-        path = path.substr(path.lastIndexOf('/')+1) + '/';
-      } else {
-        path = '';
-      }
-
      $.GollumDialog.init({
        title: 'Create New Page',
        fields: [
@@ -169,7 +161,7 @@ $(document).ready(function() {
            id:   'name',
            name: 'Page Name',
            type: 'text',
-            defaultValue: path || ''
+            defaultValue: ''
          }
        ],
        OK: function( res ) {
@@ -177,7 +169,7 @@ $(document).ready(function() {
          if ( res['name'] ) {
            name = res['name'];
          }
-          window.location = baseUrl + encodeURIComponent(name);
+          window.location = baseUrl + '/' + encodeURIComponent(name);
        }
      });
    });
@@ -2,6 +2,10 @@ body {
  overflow: hidden;
 }

+#editor .ace_sb {
+  overflow-y: auto !important;
+}
+
 #darkness {
  visibility: hidden;
  position: absolute;
@@ -49,7 +53,7 @@ so editor doesn't display in the background. */
 #contentframe {
  margin: 0 auto;
  overflow: visible;
-  width: 80%;
+  width: 90%;
 }

 #previewframe {
@@ -63,14 +67,35 @@ so editor doesn't display in the background. */
  right: 0;
 }

+.editor_bg {
+  position: fixed;
+  top: 0;
+  margin: 0;
+  padding: 0;
+  background: black;
+  width: 50%;
+  height: 100%;
+  z-index: -2;
+}
+
+.toolpanel_bg {
+  position: fixed;
+  background: #666;
+  top: 0;
+  height: 30px;
+  width: 100%;
+  padding: 5px 0;
+  margin: 0;
+  z-index: -1;
+}
+
 /* -- Start from notepag.es -- */
 .toolpanel {
  position: fixed;
  background: #666;
  top: 0;
  height: 30px;
-  right: 20px;
-  width: 80px;
+  width: 50%;
  vertical-align: middle;
  padding: 5px 0;
  margin: 0;
@@ -16,6 +16,9 @@
  <a id='toggle' class='edit' href='javascript:void(0)' onclick='jsm.toggleLeftRight();'><img src='images/lr_24.png' alt='Toggle left to right' title='Toggle left to right'></a>
 </div>

+<div id='editor_bg' class='editor_bg'></div>
+<div class='toolpanel_bg'></div>
+
 <div id='commenttoolpanel' class='toolpanel edit' style='width: 500px; right: 0px; '>
  <a id='savecommentconfirm' class='edit'><img src='images/savecomment_24.png' alt='Confirm save with comment' title='Confirm save with comment'></a>
  <a id='commentcancel' class='edit'><img src='images/cancel_24.png' alt='Cancel save with comment' title='Cancel save with comment'></a>
@@ -36,11 +39,5 @@ var require = {
 <script src='js/sundown.js'></script>
 <script src='js/md_sundown.js'></script>
 <script src='js/livepreview.js'></script>
-<script>(function(d,j){
-j = d.createElement('script');
-j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
-(d.head || d.getElementsByTagName('head')[0]).appendChild(j);
-}(document));
-</script>
 </body>
 </html>
@@ -62,9 +62,10 @@ initAce( commentEditor, commentEditorSession );
 var baseUrl = location.pathname.split('/').slice(0,-2).join('/');

 // RegExp from http://stackoverflow.com/questions/901115/get-query-string-values-in-javascript
+// Returns value on success and undefined on failure.
 $.key = function( key ) {
    var value = new RegExp( '[\\?&]' + key + '=([^&#]*)' ).exec( location.href );
-    return  ( !value ) ? 0 : value[ 1 ] || 0;
+    return  ( !value ) ? undefined : value[ 1 ] || undefined;
 }

 // True if &create=true
@@ -73,10 +74,6 @@ var create = $.key( 'create' );
 var pageName = $.key( 'page' );
 var pathName = $.key( 'path' );

-if ( pathName === 0 ) {
-  pathName = undefined;
-}
-
 defaultCommitMessage = function() {
  var msg = pageName + ' (markdown)';

@@ -97,13 +94,23 @@ $.save = function( commitMessage ) {
  var markdown = 'markdown';
  var txt = editorSession.getValue();
  var msg = defaultCommitMessage();
-  var newLocation = location.protocol + '//' + location.host + baseUrl;
+  var newLocation = baseUrl;

-  if (pathName) {
+  function clean( str ) {
+    return str.replace(/^\/+/, '/');
+  }
+
+  // 'a%2Fb' => a/b
+  if ( pathName ) {
+    pathName = unescape( pathName );
    newLocation += '/' + pathName;
+    pathName = pathName + '/'; // pathName must end with /
+
+    pathName = clean( pathName );
  }

  newLocation += '/' + pageName;
+  newLocation = clean( newLocation );

  // if &create=true then handle create instead of edit.
  if ( create ) {
@@ -187,13 +194,14 @@ var previewSet = function( text ) {
  }
 };

-// 'c', 'c++', 'cpp' are github specific and transformed to c_cpp for Ace.
-var languages = [ 'c', 'c++', 'cpp', 'clojure', 'coffee', 'coldfusion',
- 'csharp', 'css', 'diff', 'golang', 'groovy', 'haxe', 'html',
- 'java', 'javascript', 'json', 'latex', 'less', 'liquid',
- 'lua', 'markdown', 'ocaml', 'perl', 'pgsql', 'php', 'powershell',
- 'python', 'ruby', 'scad', 'scala', 'scss', 'sh', 'sql', 'svg',
- 'textile', 'text', 'xml', 'xquery', 'yaml' ];
+// See pygmentsLanguageToAceMode for pygment to ace mode translations.
+// TODO: Update languages and translation once Ace is upgraded to v1.0.
+var languages = [ 'c', 'c++', 'cpp', 'clojure', 'coffee',
+  'coffeescript', 'coldfusion', 'csharp', 'css', 'diff', 'golang',
+  'groovy', 'haxe', 'html', 'java', 'javascript', 'json', 'latex',
+  'less', 'liquid', 'lua', 'markdown', 'ocaml', 'perl', 'pgsql', 'php',
+  'powershell', 'python', 'ruby', 'scad', 'scala', 'scss', 'sh', 'sql',
+  'svg', 'textile', 'text', 'xml', 'xquery', 'yaml' ];

 var staticHighlight = require( 'ace/ext/static_highlight' );
 var githubTheme = require( 'ace/theme/github' );
@@ -236,6 +244,31 @@ function highlight( element, language ) {
  element.parentNode.parentNode.replaceChild( newDiv, element.parentNode );
 }

+// Pygments and Ace have different names for languages.
+function pygmentsLanguageToAceMode( declaredLanguage ) {
+  declaredLanguage = declaredLanguage.toLowerCase();
+
+  switch ( declaredLanguage ) {
+    case 'bash':
+      return 'sh';
+    case 'c':
+    case 'c++':
+    case 'cpp':
+    case 'objective-c':
+      return 'c_cpp';
+    case 'c#':
+      return 'csharp';
+    case 'coffeescript':
+      return 'coffee';
+    case 'html+erb':
+      return 'html'
+  }
+
+  // Assume language name is the same
+  // if it's not handled above.
+  return declaredLanguage;
+}
+
 var makePreviewHtml = function () {
  var text = editorSession.getValue();

@@ -262,8 +295,6 @@ var makePreviewHtml = function () {
  // Update the text using feature detection to support IE.
  // preview.innerHTML = text; // this doesn't work on IE.
  previewSet( text );
-  // MathJax is loaded asynchronously.
-  if (typeof MathJax != 'undefined') { MathJax.Hub.Typeset( content ); }

  // highlight code blocks.
  var codeElements = preview.getElementsByTagName( 'pre' );
@@ -288,15 +319,7 @@ var makePreviewHtml = function () {
      // the syntax for code highlighting means all code, even one line, contains newlines.
      if ( txt.length > 1 && codeHTML.match( /\n/ ) ) {
        var declaredLanguage = element.className.toLowerCase();
-        var aceMode = declaredLanguage;
-
-        // GitHub supports 'c', 'c++', 'cpp'
-        // which must trigger the 'c_cpp' mode in Ace.
-        if ( declaredLanguage === 'c'   ||
-             declaredLanguage === 'c++' ||
-             declaredLanguage === 'cpp' ) {
-          aceMode = 'c_cpp';
-        }
+        var aceMode = pygmentsLanguageToAceMode( declaredLanguage );

        if ( $.inArray( declaredLanguage, languages ) === -1 ) {
          // Unsupported language.
@@ -331,10 +354,23 @@ var applyTimeout = function () {
  /* Load markdown from /data/page into the ace editor.
     ~-1 == false; !~-1 == true;
   */
-  if ( !~location.host.indexOf('github.com') ) {
+  if ( !~ location.host.indexOf( 'github.com' ) ) {
+    
+    // returns unescaped key with leading slashes removed
+    function key_no_leading_slash( key ) {
+      return unescape( $.key( key ) || '' ).replace( /^\/+/, '' );
+    }
+    
+    // ensure leading / is removed from path and that it ends with /
+    var path = key_no_leading_slash( 'path' );
+    // don't append '/' if path is empty from removing leading slash
+    if ( path !== '' && path.charAt( path.length - 1 ) !== '/' ) {
+      path += '/';  
+    }
+    
    jQuery.ajax( {
      type: 'GET',
-      url: baseUrl + '/data/' + $.key( 'page' ),
+      url: baseUrl + '/data/' + path + key_no_leading_slash( 'page' ),
      success: function( data ) {
         editorSession.setValue( data );
      }
@@ -395,7 +431,8 @@ var applyTimeout = function () {
    var heightHalf = height / 2;

    // height minus 50 so the end of document text doesn't flow off the page.
-    var editorContainerStyle = 'width:' + widthHalf + 'px;' +
+    // + 15 for scroll bar
+    var editorContainerStyle = 'width:' + (widthHalf + 15) + 'px;' +
      'height:' + (height - 50) + 'px;' +
      'left:' + (leftRight === false ? widthHalf + 'px;' : '0px;') +
      'top:' + '40px;'; // use 40px for tool menu
@@ -406,12 +443,12 @@ var applyTimeout = function () {
    var previewStyle = 'width:' + (widthHalf - 2 - 10) + 'px;' +
      'height:' + height + 'px;' +
      'left:' + (leftRight === false ? '10px;' : widthHalf + 'px;') +
-      'top:' + '0px;';
+       // preview panel top is equal to height of comment tool panel (40px) + 1
+      'top:41px;';
    cssSet( preview, previewStyle );

     // Resize tool panel
-    var toolPanelStyle = 'width:' + widthHalf + 'px;' +
-      'left:' + (leftRight === false ? widthHalf + 'px;' : '0px;');
+    var toolPanelStyle = 'width:50%;';
    cssSet( toolPanel, toolPanelStyle );

    // Resize comment related elements.
@@ -426,10 +463,12 @@ var applyTimeout = function () {
    cssSet( commentEditorContainer, commentEditorContainerStyle );
    commentEditor.resize();

+    var commentToolPanelHeight = height / 4 - 40;
+
    // In top subtract height (40px) of comment tool panel.
    var commentToolPanelStyle = 'width:' + widthHalf + 'px;' +
      'left:' + widthFourth + 'px;' +
-      'top:' + (height / 4 - 40) + 'px;' +
+      'top:' + commentToolPanelHeight + 'px;' +
      commentHidden;
    cssSet( commentToolPanel, commentToolPanelStyle );

@@ -442,6 +481,11 @@ var applyTimeout = function () {

  win.jsm.resize = resize;

+  // remove editor_bg after loading because
+  // it'll cause problems if toggle left right is used
+  var ebg = doc.getElementById('editor_bg');
+  ebg.parentNode.removeChild(ebg);
+
  /*
     Resize can be called an absurd amount of times
     and will crash the page without debouncing.
@@ -57,3 +57,10 @@ http://www.thecssninja.com/css/css-tree-menu
 http://www.thecssninja.com/demo/license.txt

  lib/gollum/frontend/public/css/_styles.css
+
+---
+
+`lr_24.png` is a modified version of http://templarian.com/files/wp_icons/icons/light/appbar.arrow.right.left.png
+
+https://github.com/Templarian/WindowsIcons/blob/21189bffeb17237d444419ef43ed1b49e9f4e9f8/WindowsPhone/license.txt
+
@@ -0,0 +1,40 @@
+Read the license:
+http://creativecommons.org/licenses/by/3.0/ **
+
+Basicaly, use it anyway you want but include this license file in the source if your project is open source. Nothing is needed in the front facing project. Commercial use is not only allowed but encouraged. This pack was made to promote consistency in applications.
+
+Creator
+- Austin Andrews (@templarian)
+
+Contributor*
+- Oren Nachman
+  - appbar.chevron.down
+  - appbar.chevron.up
+  - appbar.chevron.left
+  - appbar.chevron.right
+- Kris Vandermotten (@kvandermotten)
+  - appbar.medical.pulse
+- Constantin Kichinsky (@kichinsky)
+  - appbar.currency.rubles
+  - appbar.currency.grivna
+- Massimo Savazzi (@msavazzi)
+  - List of missing exported icons
+- Proletkult Graphik, from The Noun Project
+  - appbar.draw.pen (inspired)
+- Olivier Guin, from The Noun Project
+  - appbar.draw.marker
+- Gibran Bisio, from The Noun Project
+  - appbar.draw.bucket
+
+* Developers and designers that emailed Templarian the source .design icons to be added into the package. PNGs also accepted, but may take longer to be added.
+
+
+Contact
+- http://templarian.com/
+- admin[@]templarian[.]com
+
+** Does not apply to copyrighted logos
+- Skype
+- Facebook
+- Twitter
+- etc...
@@ -6,11 +6,11 @@
    <li class="minibutton">
      {{>searchbar}}
    </li>
-    <li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
       class="action-view-page">View Page</a></li>
-    <li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
       class="action-edit-page">Edit Page</a></li>
-    <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
       class="action-page-history">Page History</a></li>
  </ul>
 </div>
@@ -23,10 +23,10 @@

  {{#show_revert}}
  <ul class="actions">
-    <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
       class="action-page-history">Back to Page History</a></li>
    <li class="minibutton">
-      <form name="gollum-revert" action="{{base_url}}revert/{{escaped_url_path}}/{{before}}/{{after}}" method="post" id="gollum-revert-form">
+      <form name="gollum-revert" action="{{base_url}}/revert/{{escaped_url_path}}/{{before}}/{{after}}" method="post" id="gollum-revert-form">
      <a href="#" class="gollum-revert-button">Revert Changes</a>
      </form>
    </li>
@@ -49,7 +49,7 @@
 </div>
 <div id="footer">
  <ul class="actions">
-    <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
       class="action-page-history">Back to Page History</a></li>
    {{#show_revert}}
    <li class="minibutton">
@@ -2,9 +2,9 @@
 <div id="head">
  <h1>Editing <strong>{{title}}</strong></h1>
  <ul class="actions">
-    <li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
       class="action-view-page">View Page</a></li>
-     <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+     <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
       class="action-page-history">Page History</a></li>
  </ul>
 </div>
@@ -1,9 +1,9 @@
 <div id="gollum-editor" data-escaped-name="{{escaped_name}}" class="{{#is_create_page}}create{{/is_create_page}}{{#is_edit_page}}edit{{/is_edit_page}}">
 {{#is_create_page}}
-<form name="gollum-editor" action="{{base_url}}create" method="post">
+<form name="gollum-editor" action="{{base_url}}/create" method="post">
 {{/is_create_page}}
 {{#is_edit_page}}
-<form name="gollum-editor" action="{{base_url}}edit/{{escaped_name}}" method="post">
+<form name="gollum-editor" action="{{base_url}}/edit/{{escaped_name}}" method="post">
 {{/is_edit_page}}
  <fieldset id="gollum-editor-fields">
  {{#is_create_page}}
@@ -126,7 +126,7 @@

    <span class="jaws"><br></span>
    <input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
-    <a href="{{base_url}}preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
+    <a href="{{base_url}}/preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
  </fieldset>
 </form>
 </div>
@@ -2,9 +2,9 @@
 <html>
 <head>
  <meta http-equiv="Content-type" content="text/html;charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/gollum.css" media="all">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/_styles.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/_styles.css" media="all">
  <title>{{title}}</title>
 </head>
 <body>
@@ -12,7 +12,7 @@
 <div id="home_button">
  <ul class="actions">
    <li class="minibutton">
-      <a href="{{base_url}}" class="action-edit-page">Home</a>
+      <a href="{{base_url}}/" class="action-edit-page">Home</a>
    </li>
  </ul>
 </div>
@@ -5,9 +5,9 @@
    <li class="minibutton">
      {{>searchbar}}
    </li>
-    <li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
       class="action-view-page">View Page</a></li>
-    <li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
       class="action-edit-page">Edit Page</a></li>
  </ul>
 </div>
@@ -19,7 +19,7 @@
  </ul>

  <form name="compare-versions" id="version-form" method="post"
-   action="{{base_url}}compare/{{escaped_url_path}}">
+   action="{{base_url}}/compare/{{escaped_url_path}}">
  <fieldset>
  <table>
    <tbody>
@@ -39,7 +39,7 @@
        <td class="commit-name">
          <span class="time-elapsed">{{date}}:</span>&nbsp;
          {{message}}
-          [<a href="{{base_url}}{{escaped_url_path}}/{{id}}" title="View commit">{{id7}}</a>]
+          [<a href="{{base_url}}/{{escaped_url_path}}/{{id}}" title="View commit">{{id7}}</a>]
        </td>
      </tr>
      {{/versions}}
@@ -2,22 +2,22 @@
 <html>
 <head>
  <meta http-equiv="Content-type" content="text/html;charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/gollum.css" media="all">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/editor.css" media="all">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/dialog.css" media="all">
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/editor.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">

  <!--[if IE 7]>
-  <link rel="stylesheet" type="text/css" href="{{base_url}}css/ie7.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">
  <![endif]-->

  <script>var baseUrl = '{{base_url}}'</script>
-  <script type="text/javascript" src="{{base_url}}javascript/jquery-1.7.2.min.js"></script>
-  <script type="text/javascript" src="{{base_url}}javascript/mousetrap.min.js"></script>
-  <script type="text/javascript" src="{{base_url}}javascript/gollum.js"></script>
-  <script type="text/javascript" src="{{base_url}}javascript/gollum.dialog.js"></script>
-  <script type="text/javascript" src="{{base_url}}javascript/gollum.placeholder.js"></script>
-  <script type="text/javascript" src="{{base_url}}javascript/editor/gollum.editor.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/jquery-1.7.2.min.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/mousetrap.min.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/gollum.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/gollum.dialog.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/gollum.placeholder.js"></script>
+  <script type="text/javascript" src="{{base_url}}/javascript/editor/gollum.editor.js"></script>
  {{#mathjax}}<script>(function(d,j){
  j = d.createElement('script');
  j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
@@ -1,3 +1,10 @@
+<script>
+Mousetrap.bind(['e'], function( e ) {
+  e.preventDefault();
+  window.location = "/edit" + window.location.pathname;
+  return false;
+});
+</script>
 <div id="wiki-wrapper" class="page">
 <div id="head">
  <h1>{{title}}</h1>
@@ -5,21 +12,21 @@
    <li class="minibutton">
      {{>searchbar}}
    </li>
-    <li class="minibutton"><a href="{{base_url}}"
+    <li class="minibutton"><a href="{{base_url}}/"
       class="action-edit-page">Home</a></li>
-    <li class="minibutton"><a href="{{base_url}}pages"
+    <li class="minibutton"><a href="{{base_url}}/pages"
      class="action-all-pages">All</a></li>
-    <li class="minibutton"><a href="{{base_url}}fileview"
+    <li class="minibutton"><a href="{{base_url}}/fileview"
    class="action-all-pages">Files</a></li>
    <li class="minibutton" class="jaws">
      <a href="#" id="minibutton-new-page">New</a></li>
    <li class="minibutton" class="jaws">
      <a href="#" id="minibutton-rename-page">Rename</a></li>
    {{#editable}}
-    <li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
       class="action-edit-page">Edit</a></li>
    {{/editable}}
-    <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
       class="action-page-history">History</a></li>
  </ul>
 </div>
@@ -62,7 +69,7 @@
 <div id="footer">
  <p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
  <p>
-    <a id="delete-link" href="{{base_url}}{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
+    <a id="delete-link" href="{{base_url}}/{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
  </p>
 </div>
 </div>
@@ -5,7 +5,7 @@
    <li class="minibutton">
      {{>searchbar}}
    </li>
-    <li class="minibutton"><a href="{{base_url}}"
+    <li class="minibutton"><a href="{{base_url}}/"
       class="action-edit-page">Home</a></li>
    <li class="minibutton" class="jaws">
    <a href="#" id="minibutton-new-page">New</a>
@@ -5,7 +5,7 @@
    <li class="minibutton">
      {{>searchbar}}
    </li>
-    <li class="minibutton"><a href="{{base_url}}"
+    <li class="minibutton"><a href="{{base_url}}/"
       class="action-edit-page">Home</a></li>
  </ul>
 </div>
@@ -15,7 +15,7 @@
  <ul>
    {{#results}}
    <li>
-      <a href="{{base_url}}{{name}}">{{name}}</a>
+      <a href="{{base_url}}/{{name}}">{{name}}</a>
      <span class="count">({{count}} matches)</span>
    </li>
    {{/results}}
@@ -1,5 +1,5 @@
 <div id="searchbar">
-  <form action="{{base_url}}search" method="get" id="search-form">
+  <form action="{{base_url}}/search" method="get" id="search-form">
  <div id="searchbar-fauxtext">
    <input type="text" name="q" id="search-query" value="Search&hellip;" autocomplete="off">
    <a href="#" id="search-submit" title="Search this wiki">
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 =begin
  Copyright 2006-2008 the V8 project authors. All rights reserved.
  Redistribution and use in source and binary forms, with or without
@@ -39,7 +40,12 @@ end
 # define charCodeAt on String
 class String
  def charCodeAt(k)
-    return self[k].ord
+    # use scan, nil check, and unpack instead of ord for 1.8
+    # 1.9 can simply use self[k].ord
+    # http://stackoverflow.com/questions/7793177/split-utf8-string-regardless-of-ruby-version
+    c = self.scan(/./mu)[k]
+    return nil if c.nil?
+    c.unpack('U')[0]
  end
 end

@@ -147,6 +153,7 @@ def Encode(uri, unescape)
  k = -1;
  while ((k+=1) < uriLength) do
    cc1 = uri.charCodeAt(k);
+    next if cc1.nil?
    if (self.send(unescape, cc1))
      result[index] = cc1;
      index += 1
@@ -163,10 +170,11 @@ def Encode(uri, unescape)
      end
    end
  end
+  # use .compact to get rid of nils from charCodeAt
  # return %StringFromCharCodeArray(result);
  # 'c' = 8 bit signed char
  # http://www.ruby-doc.org/core-1.9.3/Array.html#method-i-pack
-  return result.pack 'c*'
+  return result.compact.pack 'c*'
 end
 end # class << self
 end # module
@@ -6,6 +6,11 @@ module Precious

      attr_reader :page, :content

+       # return path set in app.rb not @page.path
+       def path
+         @path
+       end
+
      def title
        "#{@page.title}"
      end
@@ -79,6 +79,17 @@ module Precious
      def mathjax
        @mathjax
      end
+
+      # Access to embedded metadata.
+      #
+      # Examples
+      #
+      #   {{#metadata}}{{name}}{{/metadata}}
+      #
+      # Returns Hash.
+      def metadata
+        @page.metadata
+      end
    end
  end
 end
@@ -12,14 +12,14 @@ module Precious
      def breadcrumb
        if @path
          path = Pathname.new(@path)
-          breadcrumb = [%{<a href="#{@base_url}pages/">Home</a>}]
+          breadcrumb = [%{<a href="#{@base_url}/pages/">Home</a>}]
          path.descend do |crumb|
            title = crumb.basename

            if title == path.basename
              breadcrumb << title
            else
-              breadcrumb << %{<a href="#{@base_url}pages/#{crumb}/">#{title}</a>}
+              breadcrumb << %{<a href="#{@base_url}/pages/#{crumb}/">#{title}</a>}
            end
          end

@@ -39,7 +39,7 @@ module Precious
            if page_path.include?('/')
              folder      = page_path.split('/').first
              folder_path = @path ? "#{@path}/#{folder}" : folder
-              folder_link = %{<li><a href="#{@base_url}pages/#{folder_path}/" class="folder">#{folder}</a></li>}
+              folder_link = %{<li><a href="#{@base_url}/pages/#{folder_path}/" class="folder">#{folder}</a></li>}

              unless folder_links.include?(folder_link)
                folder_links << folder_link
@@ -47,7 +47,7 @@ module Precious
                folder_link
              end
            elsif page_path != ".gitkeep"
-              %{<li><a href="#{@base_url}#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
+              %{<li><a href="#{@base_url}/#{page.escaped_url_path}" class="file">#{page.name}</a></li>}
            end
          }.compact.join("\n")
        else
@@ -0,0 +1,47 @@
+require 'net/http'
+require 'net/https' # ruby 1.8.7 fix, remove at upgrade
+require 'uri'
+require 'open-uri'
+
+module Gollum
+  class Gitcode
+    def initialize path
+      raise(ArgumentError, 'path is nil or empty') if path.nil? or path.empty?
+
+      @uri = URI::HTTP.build({ 
+        :path   => self.unchomp(path), 
+        :host   => 'raw.github.com', 
+        :scheme => 'https',
+        :port   => 443 })
+    end
+
+    def contents
+      @contents ||= self.req @uri
+    end
+
+    def unchomp p
+      return p if p.nil?
+      p[0] == '/' ? p : ('/' + p)
+    end
+
+    def req uri, cut = 1
+      return "Too many redirects or retries" if cut >= 10
+      http = Net::HTTP.new uri.host, uri.port
+      http.use_ssl = true
+      resp = http.get uri.path, {
+        'Accept'        => 'text/plain',
+        'Cache-Control' => 'no-cache',
+        'Connection'    => 'keep-alive',
+        'Host'          => uri.host,
+        'User-Agent'    => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0'
+      }
+      code = resp.code.to_i
+      return resp.body if code == 200
+      return "Not Found" if code == 404
+      return "Unhandled Response Code #{code}" unless code == 304 or not resp.header['location'].nil?
+      loc = URI.parse resp.header['location']
+      uri2 = loc.relative?() ? (uri + loc) : loc # overloads (+)
+      return req uri2, (cut + 1)
+    end
+  end
+end
@@ -3,10 +3,20 @@ require 'cgi'
 require 'pygments'
 require 'base64'

+require File.expand_path '../frontend/helpers', __FILE__
+require File.expand_path '../gitcode', __FILE__
+
+# initialize Pygments
+Pygments.start
+
 module Gollum

  class Markup
+    include Precious::Helpers
+
    attr_accessor :toc
+    attr_reader   :metadata
+
    # Initialize a new Markup object.
    #
    # page - The Gollum::Page.
@@ -27,6 +37,7 @@ module Gollum
      @wsdmap  = {}
      @premap  = {}
      @toc = nil
+      @metadata = nil
    end

    # Render the content with Gollum wiki syntax on top of the file's own
@@ -43,6 +54,8 @@ module Gollum
        @wiki.sanitizer

      data = @data.dup
+      data = extract_metadata(data)
+      data = extract_gitcode(data)
      data = extract_code(data)
      data = extract_tex(data)
      data = extract_wsd(data)
@@ -63,12 +76,14 @@ module Gollum
      doc,toc = process_headers(doc)
      @toc = @sub_page ? ( @parent_page ? @parent_page.toc_data : "[[_TOC_]]" ) : toc
      yield doc if block_given?
-      data = doc.to_html
+      data = doc.to_xhtml

      data = process_toc_tags(data)
      data = process_tex(data)
      data = process_wsd(data)
-      data.gsub!(/<p><\/p>/, '')
+      data.gsub!(/<p><\/p>/) do
+        ''
+      end
      data
    end

@@ -80,15 +95,13 @@ module Gollum
    def process_headers(doc)
      toc = nil
      doc.css('h1,h2,h3,h4,h5,h6').each do |h|
-        id = CGI::escape(h.content.gsub(' ','-'))
+        # must escape "
+        h_name = h.content.gsub(' ','-').gsub('"','%22')
+
        level = h.name.gsub(/[hH]/,'').to_i

        # Add anchors
-        anchor = Nokogiri::XML::Node.new('a', doc)
-        anchor['class'] = 'anchor'
-        anchor['id'] = id
-        anchor['href'] = '#' + id
-        h.add_child(anchor)
+        h.add_child(%Q{<a class="anchor" id="#{h_name}" href="##{h_name}"></a>})

        # Build TOC
        toc ||= Nokogiri::XML::DocumentFragment.parse('<div class="toc"><div class="toc-title">Table of Contents</div></div>')
@@ -105,7 +118,8 @@ module Gollum
          tail_level -= 1
        end
        node = Nokogiri::XML::Node.new('li', doc)
-        node.add_child("<a href='##{id}'>#{h.content}</a>")
+        # % -> %25 so anchors work on Firefox. See issue #475
+        node.add_child(%Q{<a href="##{h_name}">#{h.content}</a>})
        tail.add_child(node)
      end
      toc = toc.to_xhtml if toc != nil
@@ -146,23 +160,9 @@ module Gollum
    def process_tex(data)
      @texmap.each do |id, spec|
        type, tex = *spec
-
-        # Obtain the formula with parameters
-        out = nil
-        begin 
-          width, height, align, base64 = Gollum::Tex.render_formula(tex, true)
-
-          # TODO: Should we load the binary inside the html?
-          #out = %{<img width="#{width}" height="#{height}" style="vertical-align: #{align}px;" src="data:image/png;base64,\n#{base64}" alt="#{CGI.escapeHTML(tex)}" />}
-
-          # Use the alignment values from the formula rendering but still use the call to '_tex.png'. Although it will call render_formula()
-          # again, it will use the already cached formula and it might have some advantages from the point of view of browser caching (really not sure here).
-          out = %{<img width="#{width}" height="#{height}" style="vertical-align: #{align}px;" src="#{::File.join(@wiki.base_path, '_tex.png')}?type=#{type}&data=#{Base64.encode64(tex).chomp}" alt="#{CGI.escapeHTML(tex)}" />}
-        rescue # In case of error
-          out = CGI.escapeHTML(tex)
+        data.gsub!(id) do
+          Gollum::Tex.to_html(tex, type)
        end
-        
-        data.gsub!(id, out)
      end
      data
    end
@@ -217,9 +217,13 @@ module Gollum
      @tagmap.each do |id, tag|
        # If it's preformatted, just put the tag back
        if is_preformatted?(data, id)
-          data.gsub!(id, "[[#{tag}]]")
+          data.gsub!(id) do
+            "[[#{tag}]]"
+          end
        else
-          data.gsub!(id, process_tag(tag))
+          data.gsub!(id) do
+            process_tag(tag).gsub('%2F', '/')
+          end
        end
      end
      data
@@ -399,7 +403,13 @@ module Gollum
          link_name = @wiki.page_class.cname(page.name)
          presence  = "present"
        end
-        link = ::File.join(@wiki.base_path, CGI.escape(link_name))
+        link = ::File.join(@wiki.base_path, page ? page.escaped_url_path : CGI.escape(link_name))
+
+        # //page is invalid
+        # strip all duplicate forward slashes using helpers.rb trim_leading_slash
+        # //page => /page
+        link = trim_leading_slash link
+
        %{<a class="internal #{presence}" href="#{link}#{extra}">#{name}</a>}
      end
    end
@@ -411,7 +421,9 @@ module Gollum
    #
    # Returns the marked up String data.
    def process_toc_tags(data)
-      data.gsub!("[[_TOC_]]", @toc.nil? ? '' : @toc)
+      data.gsub!("[[_TOC_]]") do
+        @toc.nil? ? '' : @toc
+      end
      data
    end

@@ -432,13 +444,23 @@ module Gollum
    # Find a page from a given cname.  If the page has an anchor (#) and has
    # no match, strip the anchor and try again.
    #
-    # cname - The String canonical page name.
+    # cname - The String canonical page name including path.
    #
    # Returns a Gollum::Page instance if a page is found, or an Array of
    # [Gollum::Page, String extra] if a page without the extra anchor data
    # is found.
    def find_page_from_name(cname)
-      if page = @wiki.page(cname)
+      slash = cname.rindex('/')
+
+      unless slash.nil?
+        name = cname[slash+1..-1]
+        path = cname[0..slash]
+        page = @wiki.paged(name, path)
+      else
+        page = @wiki.paged(cname, '/')
+      end
+
+      if page
        return page
      end
      if pos = cname.index('#')
@@ -446,6 +468,34 @@ module Gollum
      end
    end

+    #########################################################################
+    #
+    # Gitcode - fetch code from github search path and replace the contents
+    #           to a code-block that gets run the next parse.
+    #
+    #########################################################################
+
+    def extract_gitcode data
+      data.gsub /^[ \t]*``` ?([^:\n\r]+):([^`\n\r]+)```/ do
+        contents = ''
+        # Use empty string if $2 is nil.
+        uri = $2 || ''
+        # Detect local file.
+        if uri[0..6] != 'github/'
+          if uri[0..0] != '/' # relative file
+            contents = @wiki.page(uri).formatted_data
+          else # use full path
+            contents = @wiki.paged( extract_name( clean_url( uri ) ),
+             '/' + clean_url( extract_path( uri ) ) ).formatted_data
+          end
+        else
+          contents = Gollum::Gitcode.new(uri).contents
+        end
+
+        "```#{$1}\n#{contents}\n```\n"
+      end
+    end
+
    #########################################################################
    #
    # Code
@@ -458,6 +508,33 @@ module Gollum
    #
    # Returns the placeholder'd String data.
    def extract_code(data)
+      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)\r?$/m) do
+        m_indent = $1
+        m_start  = $2 # ~~~
+        m_lang   = $3
+        m_code   = $4
+        m_end    = $5 # ~~~
+
+        # start and finish tilde fence must be the same length
+        return '' if m_start.length != m_end.length
+
+        lang   = m_lang ? m_lang.strip : nil
+        id     = Digest::SHA1.hexdigest("#{lang}.#{m_code}")
+        cached = check_cache(:code, id)
+
+        # 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?
+
+        @codemap[id] = cached   ?
+          { :output => cached } :
+          { :lang => lang, :code => m_code, :indent => m_indent }
+
+        "#{m_indent}#{id}" # print the SHA1 ID with the proper indentation
+      end
+
      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do
        lang   = $2 ? $2.strip : nil
        id     = Digest::SHA1.hexdigest("#{lang}.#{$3}")
@@ -478,7 +555,9 @@ module Gollum
    # regex     - A regex to match whitespace
    def remove_leading_space(code, regex)
      if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ regex }
-        code.gsub!(regex, '')
+        code.gsub!(regex) do
+          ''
+        end
      end
    end

@@ -509,12 +588,12 @@ module Gollum
        encoding ||= 'utf-8'
        begin
          hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s})
-        rescue ::RubyPython::PythonError
+        rescue
          hl_code = code
        end
        highlighted << hl_code
      end
-      
+
      @codemap.each do |id, spec|
        body = spec[:output] || begin
          if (body = highlighted.shift.to_s).size > 0
@@ -524,7 +603,9 @@ module Gollum
            "<pre><code>#{CGI.escapeHTML(spec[:code])}</code></pre>"
          end
        end
-        data.gsub!(id, body)
+        data.gsub!(id) do
+          body
+        end
      end

      data
@@ -560,11 +641,42 @@ module Gollum
      @wsdmap.each do |id, spec|
        style = spec[:style]
        code = spec[:code]
-        data.gsub!(id, Gollum::WebSequenceDiagram.new(code, style).to_tag)
+        data.gsub!(id) do
+          Gollum::WebSequenceDiagram.new(code, style).to_tag
+        end
      end
      data
    end

+    #########################################################################
+    #
+    # Metadata
+    #
+    #########################################################################
+
+    # Extract metadata for data and build metadata table. Metadata
+    # is content found between markers, and must
+    # be a valid YAML mapping.
+    #
+    # Because ri and ruby 1.8.7 are awesome, the markers can't
+    # be included in this documentation without triggering
+    # `Unhandled special: Special: type=17`
+    # Please read the source code for the exact markers
+    #
+    # Returns the String of formatted data with metadata removed.
+    def extract_metadata(data)
+      @metadata ||= {}
+      # The markers are `<!-- ---` and `-->`
+      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.
    #
    # type - Symbol value identifying what type of data is being extracted.
@@ -217,6 +217,14 @@ module Gollum
      markup_class.toc
    end

+    # Public: Embedded metadata.
+    #
+    # Returns Hash of metadata.
+    def meta_data()
+      formatted_data if markup_class.metadata == nil
+      markup_class.metadata
+    end
+
    # Public: The format of the page.
    #
    # Returns the Symbol format of the page. One of:
@@ -319,7 +327,7 @@ module Gollum
    # Returns the String canonical name.
    def self.cname(name, char_white_sub = '-', char_other_sub = '-')
      name.respond_to?(:gsub) ?
-        name.gsub(%r{\s},char_white_sub).gsub(%r{[/<>+]}, char_other_sub) :
+        name.gsub(%r{\s},char_white_sub).gsub(%r{[<>+]}, char_other_sub) :
        ''
    end

@@ -364,9 +372,9 @@ module Gollum
    # version - The String version ID to find.
    #
    # Returns a Gollum::Page or nil if the page could not be found.
-    def find(name, version, dir = nil)
+    def find(name, version, dir = nil, exact = false)
      map = @wiki.tree_map_for(version.to_s)
-      if page = find_page_in_tree(map, name, dir)
+      if page = find_page_in_tree(map, name, dir, exact)
        page.version    = version.is_a?(Grit::Commit) ?
          version : @wiki.commit_for(version)
        page.historical = page.version.to_s == version.to_s
@@ -383,12 +391,14 @@ module Gollum
    #               to be in.  The string should
    #
    # Returns a Gollum::Page or nil if the page could not be found.
-    def find_page_in_tree(map, name, checked_dir = nil)
+    def find_page_in_tree(map, name, checked_dir = nil, exact = false)
      return nil if !map || name.to_s.empty?
      if checked_dir = BlobEntry.normalize_dir(checked_dir)
        checked_dir.downcase!
      end

+      checked_dir = '' if exact && checked_dir.nil?
+
      map.each do |entry|
        next if entry.name.to_s.empty?
        next unless checked_dir.nil? || entry.dir.downcase == checked_dir
@@ -1,366 +1,14 @@
-require 'fileutils'
-require 'shellwords'
-require 'tmpdir'
-require 'posix/spawn'
-require 'base64'
+require 'escape_utils'

 module Gollum
  module Tex
-    class Error < StandardError; end
+    TEX_URL = "http://www.mathtran.org/cgi-bin/toy/"
+    TEX_SIZES = { :inline => 2, :block => 4 }

-    extend POSIX::Spawn
-
-    Template = <<-EOS
-\\documentclass[11pt]{article}
-\\pagestyle{empty}
-\\setlength{\\topskip}{0pt}
-\\setlength{\\parindent}{0pt}
-\\setlength{\\abovedisplayskip}{0pt}
-\\setlength{\\belowdisplayskip}{0pt}
-
-\\usepackage{geometry}
-
-\\usepackage{amsfonts}
-\\usepackage{amsmath}
-
-\\newsavebox{\\snippetbox}
-\\newlength{\\snippetwidth}
-\\newlength{\\snippetheight}
-\\newlength{\\snippetdepth}
-\\newlength{\\pagewidth}
-\\newlength{\\pageheight}
-\\newlength{\\pagemargin}
-
-\\begin{lrbox}{\\snippetbox}%
-\$%s\$
-\\end{lrbox}
-
-\\settowidth{\\snippetwidth}{\\usebox{\\snippetbox}}
-\\settoheight{\\snippetheight}{\\usebox{\\snippetbox}}
-\\settodepth{\\snippetdepth}{\\usebox{\\snippetbox}}
-
-\\setlength\\pagemargin{4pt}
-
-\\setlength\\pagewidth\\snippetwidth
-\\addtolength\\pagewidth\\pagemargin
-\\addtolength\\pagewidth\\pagemargin
-
-\\setlength\\pageheight\\snippetheight
-\\addtolength{\\pageheight}{\\snippetdepth}
-\\addtolength\\pageheight\\pagemargin
-\\addtolength\\pageheight\\pagemargin
-
-\\newwrite\\foo
-\\immediate\\openout\\foo=\\jobname.dimensions
-  \\immediate\\write\\foo{snippetdepth = \\the\\snippetdepth}
-  \\immediate\\write\\foo{snippetheight = \\the\\snippetheight}
-  \\immediate\\write\\foo{snippetwidth = \\the\\snippetwidth}
-  \\immediate\\write\\foo{pagewidth = \\the\\pagewidth}
-  \\immediate\\write\\foo{pageheight = \\the\\pageheight}
-  \\immediate\\write\\foo{pagemargin = \\the\\pagemargin}
-\\closeout\\foo
-
-\\geometry{paperwidth=\\pagewidth,paperheight=\\pageheight,margin=\\pagemargin}
-
-\\begin{document}%
-\\usebox{\\snippetbox}%
-\\end{document}
-    EOS
-
-    class << self
-      attr_accessor :latex_path
+    def self.to_html(tex, type = :inline)
+      tex_uri = EscapeUtils.escape_uri(tex)
+      tex_alt = EscapeUtils.escape_html(tex)
+      %{<img src="#{TEX_URL}?D=#{TEX_SIZES[type]};tex=#{tex_uri}" alt="#{tex_alt}">}
    end
-
-    self.latex_path   = 'pdflatex'
-
-    def self.check_dependencies!
-      return if @dependencies_available
-
-      if `which pdflatex` == ""
-        raise Error, "`pdflatex` command not found"
-      end
-
-      if `which gs` == ""
-        raise Error, "`gs` command not found"
-      end
-      
-      if `which pnmcrop` == ""
-        raise Error, "`pnmcrop` command not found"
-      end
-
-      if `which pnmpad` == ""
-        raise Error, "`pnmpad` command not found"
-      end
-
-      if `which pnmscale` == ""
-        raise Error, "`pnmscale` command not found"
-      end
-      
-      if `which ppmtopgm` == ""
-        raise Error, "`ppmtopgm` command not found"
-      end
-      
-      if `which pnmgamma` == ""
-        raise Error, "`pnmgamma` command not found"
-      end
-      
-      if `which pnmtopng` == ""
-        raise Error, "`pnmtopng` command not found"
-      end
-
-      @dependencies_available = true
-    end
-
-    # Render the formula and calculate the correct alignment
-    # for the image in the html. 
-    #
-    # This is a ruby implementation of the Perl version described 
-    # at http://tex.stackexchange.com/questions/44486/pixel-perfect-vertical-alignment-of-image-rendered-tex-snippets
-    #
-    # The main caveat is that rendering takes quite a bit of processing power,
-    # which can make the page load slowly if it has to render each time. 
-    # For this reason, the method caches the rendered formula in `/tmp` for reduced
-    # loading time in subsequent loads.
-    #   
-    # @param formula the tex formula to render
-    # @param with_properties, if true it returns an array with a base64
-    #   string with the image, and the alignment values for the image. 
-    #   Otherwise it returns the binary image.
-    def self.render_formula(formula, with_properties=false)
-      check_dependencies!
-
-      render_antialias_bits = 4
-        render_oversample = 4
-        display_oversample = 4
-        gamma = 0.3
-        if !with_properties
-            display_oversample = 1
-            gamma = 0.5
-        end
-
-        oversample = render_oversample * display_oversample
-        render_dpi = 96*1.2 * 72.27/72 * oversample # This is 1850.112 dpi.
-
-
-        # Cache rendered formula and returned cached version if it exists
-
-        # First look for the .cache directory in the home folder
-        cache_dir = ::File.expand_path("~/.cache") 
-        if not ::File.exists?(cache_dir) or not ::File.directory?(cache_dir)
-            ::Dir.mkdir(cache_dir)
-        end
-
-        # Check that the gollum directory exists inside the cache dir
-        cache_dir = ::File.join(cache_dir, "gollum")
-        if not ::File.exists?(cache_dir) or not ::File.directory?(cache_dir)
-            ::Dir.mkdir(cache_dir)
-        end
-
-        # Check for the formula in the cache dir
-        hash = Digest::SHA1.hexdigest(formula)
-        cache_file = ::File.join(cache_dir, "tex-#{hash}")
-
-        if ::File.exists?(cache_file)
-            width, height, align, base64 = ::File.open(cache_file, 'rb') { |io| io.read }.split(",")
-
-            if with_properties
-                return width, height, align, base64
-            else
-                return Base64.decode64(base64)
-            end
-        end
-        
-        Dir.mktmpdir('tex') do |path|
-            file = ::File.join(path, "formula")
-
-            # --- Write TeX source and compile to PDF.Write snippet into template
-            ::File.open(file + ".tex", 'w') { |f| f.write(Template % formula) }
-
-            result = sh_chdir path, "pdflatex",
-                "-halt-on-error",
-                "-output-directory=#{path}",
-                "-output-format=pdf",
-                "#{file}.tex",
-                ">#{file}.err 2>&1"
-
-
-
-            # --- Convert PDF to PNM using Ghostscript.
-            sh "gs",
-                "-q -dNOPAUSE -dBATCH",
-                "-dTextAlphaBits=#{render_antialias_bits}",
-                "-dGraphicsAlphaBits=#{render_antialias_bits}",
-                "-r#{render_dpi}",
-                "-sDEVICE=pnmraw",
-                "-sOutputFile=#{file}.pnm",
-                "#{file}.pdf"
-
-
-            img_width, img_height = pnm_width_height(file + ".pnm")
-
-
-            # --- Read dimensions file written by TeX during processing.
-            #
-            #     Example of file contents:
-            #       snippetdepth = 6.50009pt
-            #       snippetheight = 13.53899pt
-            #       snippetwidth = 145.4777pt
-            #       pagewidth = 153.4777pt
-            #       pageheight = 28.03908pt
-            #       pagemargin = 4.0pt
-            dimensions = {}
-            ::File.open(file + ".dimensions").readlines.each_with_index do |line, i|
-                if line =~ /^(\S+)\s+=\s+(-?[0-9\.]+)pt$/
-                    dimensions[$1] = Float($2) / 72.27 * render_dpi
-                else 
-                    raise Error, "#{file}.dimensions: invalid line: #{i}" 
-                end
-            end
-
-            # --- Crop bottom, then measure how much was cropped.
-            sh "pnmcrop -white -bottom #{file}.pnm >#{file}.bottomcrop.pnm"
-            #raise Error, "`pnmcrop` command failed: #{result}" unless ::File.exist?(file + ".bottomcrop.pnm")
-
-            img_width_bottomcrop, img_height_bottomcrop = pnm_width_height("#{file}.bottomcrop.pnm")
-            bottomcrop = img_height - img_height_bottomcrop
-            
-            # --- Crop top and sides, then measure how much was cropped from the top.
-            sh "pnmcrop -white #{file}.bottomcrop.pnm > #{file}.crop.pnm"
-            #raise Error, "`pnmcrop` command failed: #{result}" unless ::File.exist?(file + ".crop.pnm")
-
-            cropped_img_width, cropped_img_height = pnm_width_height("#{file}.crop.pnm")
-            topcrop = img_height_bottomcrop - cropped_img_height
-
-            # --- Pad image with specific values on all four sides, in preparation for
-            #     downsampling.
-
-            # Calculate bottom padding.
-            snippet_depth = Integer(dimensions["snippetdepth"] + dimensions["pagemargin"] + 0.5) - bottomcrop
-            padded_snippet_depth = round_up(snippet_depth, oversample)
-            increase_snippet_depth = padded_snippet_depth - snippet_depth
-            bottom_padding = increase_snippet_depth
-            
-            # --- Next calculate top padding, which depends on bottom padding.
-
-            padded_img_height = round_up(cropped_img_height + bottom_padding,
-                oversample)
-            top_padding = padded_img_height - (cropped_img_height + bottom_padding)
-
-
-            # --- Calculate left and right side padding.  Distribute padding evenly.
-
-            padded_img_width = round_up(cropped_img_width, oversample)
-            left_padding = Integer((padded_img_width - cropped_img_width) / 2.0)
-            right_padding = (padded_img_width - cropped_img_width) - left_padding
-
-
-            # --- Pad the final image.
-            result = sh "pnmpad",
-                "-white",
-                "-bottom=#{bottom_padding}",
-                "-top=#{top_padding}",
-                "-left=#{left_padding}",
-                "-right=#{right_padding}",
-                "#{file}.crop.pnm",
-                ">#{file}.pad.pnm"
-
-            # --- Sanity check of final size.
-            final_pnm_width, final_pnm_height = pnm_width_height(file + ".pad.pnm")
-            raise Error, "#{final_pnm_width} is not a multiple of #{oversample}" unless final_pnm_width % oversample == 0
-            
-            raise "#{final_pnm_height} is not a multiple of #{oversample}" unless final_pnm_height % oversample == 0
-
-            # --- Convert PNM to PNG.
-
-            final_png_width  = final_pnm_width  / render_oversample
-            final_png_height = final_pnm_height / render_oversample
-
-            result = sh "cat #{file}.pad.pnm",
-                "| ppmtopgm",
-                "| pnmscale -reduce #{render_oversample}",
-                "| pnmgamma #{gamma}",
-                "| pnmtopng -compression 9",
-                "> #{file}.png"
-
-            raise Error, "Conversion to png failed: #{result}" unless ::File.exist?(file + ".png")
-
-            # Calculate html properties
-            html_img_width  = final_png_width  / display_oversample
-            html_img_height = final_png_height / display_oversample
-            html_img_vertical_align = sprintf("%.0f", -padded_snippet_depth / oversample) 
-            png_data_base64 = Base64.encode64(::File.open("#{file}.png") { |io| io.read }).chomp
-
-            ::File.open(cache_file, 'w') { |f| f.write(%{#{html_img_width},#{html_img_height},#{html_img_vertical_align},#{png_data_base64}}) }
-            if with_properties
-                return html_img_width, html_img_height, html_img_vertical_align, png_data_base64
-            else
-                ::File.read(file + ".png")
-            end
-        end
-    end
-
-    private
-      def self.sh_chdir(path, *args)  
-        origcommand = args * " "
-        return if origcommand == ""
-
-        command = origcommand
-        command.gsub! /(["\\])/, "\\$1"
-        command = %{/bin/sh -c "(#{command}) 2>&1"}
-
-        pid = spawn command, :chdir => path
-
-        result = Process::waitpid(pid)
-        exit_value = Integer($? >> 8), signal_num = Integer($? & 127), dumped_core = Integer($? & 128)
-        raise Error, "Failed #{result}: #{origcommand}. Exit value = #{exit_value}. Signal Num = #{signal_num}. Dumped core = #{dumped_core}" unless $?.success?
-
-        return result
-      end
-
-      def self.sh(*args)
-        origcommand = args * " "
-        return if origcommand == ""
-
-        command = origcommand
-        command.gsub! /(["\\])/, "\\$1"
-        command = %{/bin/sh -c "(#{command}) 2>&1"}
-
-        pid = spawn command
-        #pid = spawn *args
-        result = Process::waitpid(pid)
-        exit_value = $? >> 8, signal_num = $? & 127, dumped_core = $? & 128
-        raise Error, "Failed #{result}: #{origcommand}. Exit value = #{exit_value}. Signal Num = #{signal_num}. Dumped core = #{dumped_core}" unless $?.success?
-
-        return result
-      end
-
-      def self.round_up(num, mod)
-        num + (num % mod == 0 ? 0 : (mod - (num % mod)))
-      end
-
-      def self.pnm_width_height(filename) 
-        raise Error, "#{filename} is not a .pnm file" if filename !~ /\.pnm$/ 
-
-        width = nil, height = nil
-        ::File.open(filename) do |file|
-          # Read first line
-          line = file.gets
-          begin 
-            line = file.gets # Read next line, skipping comments
-          end while line && line =~ /^#/
-
-          if line =~ /^(\d+)\s+(\d+)$/
-            width  = Integer($1)
-            height = Integer($2)
-          else 
-            raise Error, "#{filename}: couldn't read image size"
-          end
-        end
-
-        raise Error, "#{filename}: couldn't read image size" unless width && height
-
-        return width, height
-      end      
-
  end
 end
@@ -179,7 +179,7 @@ module Gollum
        self.class.history_sanitization
      @live_preview  = options.fetch(:live_preview, true)
      @universal_toc = options.fetch(:universal_toc, false)
-      @mathjax = options[:mathjax] || true
+      @mathjax = options[:mathjax] || false
    end

    # Public: check whether the wiki's git repo exists on the filesystem.
@@ -196,9 +196,9 @@ module Gollum
    # dir     - The directory String relative to the repo.
    #
    # Returns a Gollum::Page or nil if no matching page was found.
-    def page(name, version = @ref, dir = nil)
+    def page(name, version = @ref, dir = nil, exact = false)
      version = @ref if version.nil?
-      @page_class.new(self).find(name, version, dir)
+      @page_class.new(self).find(name, version, dir, exact)
    end

    # Public: Convenience method instead of calling page(name, nil, dir).
@@ -208,8 +208,8 @@ module Gollum
    # dir     - The directory String relative to the repo.
    #
    # Returns a Gollum::Page or nil if no matching page was found.
-    def paged(name, dir = nil, version = @ref)
-      page(name, version, dir)
+    def paged(name, dir = nil, exact = false, version = @ref)
+      page(name, version, dir, exact)
    end

    # Public: Get the static file for a given name.
@@ -495,14 +495,19 @@ module Gollum
      @repo.git.grep(*args).split("\n").each do |line|
        result = line.split(':')
        result_1 = result[1]
-        file_name = result_1.chomp(::File.extname(result_1))
+        # Remove ext only from known extensions.
+        # test.pdf => test.pdf, test.md => test
+        file_name = Page::valid_page_name?(result_1) ? result_1.chomp(::File.extname(result_1)) :
+                    result_1
        results[file_name] = result[2].to_i
      end

      # Use git ls-files '*query*' to search for file names. Grep only searches file content.
      # Spaces are converted to dashes when saving pages to disk.
      @repo.git.ls_files({}, "*#{ query.gsub(' ', '-') }*").split("\n").each do |line|
-        file_name = line.chomp(::File.extname(line))
+        # Remove ext only from known extensions.
+        file_name = Page::valid_page_name?(line) ? line.chomp(::File.extname(line)) :
+                    line
        # If there's not already a result for file_name then
        # the value is nil and nil.to_i is 0.
        results[file_name] = results[file_name].to_i + 1;
@@ -0,0 +1,9 @@
+class WikiFactory
+  def self.create p
+    path = testpath "examples/test.git"
+    Grit::Repo.init_bare(@path)
+    Gollum::Wiki.default_options = {:universal_toc => false}
+    cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
+    Gollum::Wiki.new(@path), @path, cleanup
+  end
+end
@@ -50,6 +50,14 @@ context "Frontend" do
    assert_not_equal page_1.version.sha, page_2.version.sha
  end

+  test "edit page with slash" do
+    page_1 = @wiki.page('A')
+    post "/edit/A", :content => 'abc', :page => 'A', :path => '/////',
+      :format => page_1.format, :message => 'def'
+    follow_redirect!
+    assert last_response.ok?
+  end
+
  test "edits page header footer and sidebar" do
    commits = @wiki.repo.commits('master').size
    page_1  = @wiki.page('A')
@@ -142,10 +150,41 @@ context "Frontend" do
    assert last_response.ok?
  end

+  test "page create and edit with dash & page rev" do
+    page = 'c-d-e'
+    path = 'a/b/' # path must end with /
+
+    post '/create', :content => 'create_msg', :page => page,
+      :path => path, :format => 'markdown', :message => ''
+    page_c = @wiki.paged(page, path)
+    assert_equal 'create_msg', page_c.raw_data
+
+    # must clear or create_msg will be returned
+    @wiki.clear_cache
+
+    # post '/edit' fails. post '/edit/' works.
+    post '/edit/', :content => 'edit_msg',
+      :page => page, :path => path, :message => ''
+    page_e = @wiki.paged(page, path)
+    assert_equal 'edit_msg', page_e.raw_data
+
+    @wiki.clear_cache
+
+    # test `get %r{/(.+?)/([0-9a-f]{40})} do` in app.rb
+    get '/' + page_c.escaped_url_path + '/' + page_c.version.to_s
+    assert last_response.ok?
+    assert_match /create_msg/, last_response.body
+
+    get '/' + page_e.escaped_url_path + '/' + page_e.version.to_s
+    assert last_response.ok?
+    assert_match /edit_msg/, last_response.body
+  end
+
  test "guards against creation of existing page" do
    name = "A"
    post "/create", :content => 'abc', :page => name,
      :format => 'markdown', :message => 'def'
+
    assert last_response.ok?

    @wiki.clear_cache
@@ -182,6 +221,8 @@ context "Frontend" do
    assert last_response.ok?
  end

+=begin
+  # Grit is broken.
  test "reverts single commit" do
    page1 = @wiki.page('B')

@@ -207,6 +248,7 @@ context "Frontend" do
    assert_not_equal page1.version.sha, page2.version.sha
    assert_equal "INITIAL", page2.raw_data.strip
  end
+=end

  test "cannot revert conflicting commit" do
    page1 = @wiki.page('A')
@@ -219,6 +261,41 @@ context "Frontend" do
    assert_equal page1.version.sha, page2.version.sha
  end

+  test "redirects from 'base_path' or 'base_path/' to 'base_path/Home'" do
+    Precious::App.set(:wiki_options, {})
+    get "/"
+    assert_match "http://example.org/Home", last_response.headers['Location']
+
+    Precious::App.set(:wiki_options, { :base_path => '/wiki' })
+    get "/"
+    assert_match "http://example.org/wiki/Home", last_response.headers['Location']
+
+    Precious::App.set(:wiki_options, { :base_path => '/wiki/' })
+    get "/"
+    assert_match "http://example.org/wiki/Home", last_response.headers['Location']
+
+    # Reset base path
+    Precious::App.set(:wiki_options, { :base_path => nil })
+  end
+  
+  test "author details in session are used" do
+    page1 = @wiki.page('A')
+    
+    gollum_author = { :name => 'ghi', :email => 'jkl' }
+    session = { 'gollum.author' => gollum_author }
+    
+    post "/edit/A", { :content => 'abc', :page => 'A', :format => page1.format, :message => 'def' }, { 'rack.session' => session }
+    follow_redirect!
+    assert last_response.ok?
+    
+    @wiki.clear_cache
+    page2 = @wiki.page(page1.name)
+    
+    author = page2.version.author
+    assert_equal 'ghi', author.name
+    assert_equal 'jkl', author.email
+  end
+
  def app
    Precious::App
  end
@@ -303,6 +380,7 @@ context "Frontend with lotr" do
  test "edit pages within sub-directories" do
    post "/create", :content => 'big smelly creatures', :page => 'Orc',
      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+
    assert_equal 'http://example.org/Mordor/orc', last_response.headers['Location']

    post "/edit/Mordor/Orc", :content => 'not so big smelly creatures',
@@ -0,0 +1,42 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path( '../helper', __FILE__ )
+require File.expand_path( '../wiki_factory', __FILE__ )
+
+context "gitcode" do
+
+  def page_with_content c
+    index = @wiki.repo.index
+    index.add 'Sample-Html.md', c 
+    index.commit 'adding file html sample'
+
+    page = @wiki.page 'Sample Html'
+    page
+  end
+
+  setup do
+    # context
+    @wiki, @path, @cleanup = WikiFactory.create 'examples/test.git'
+
+    # given
+    p = page_with_content "a\n\n```html:github/gollum/master/test/file_view/1_file.txt```\n\nb"
+
+    # when rendering the page
+    @rendered = Gollum::Markup.new(p).render
+  end
+
+  test 'that the rendered output is correctly fetched and rendered as html code' do
+    assert_equal %Q{<p>a</p>\n\n<div class=\"highlight\">\n  <pre><span class=\"nt\">&lt;ol</span> <span class=\"na\">class=</span><span class=\"s\">\"tree\"</span><span class=\"nt\">&gt;</span>\n  <span class=\"nt\">&lt;li</span> <span class=\"na\">class=</span><span class=\"s\">\"file\"</span><span class=\"nt\">&gt;&lt;a</span> <span class=\"na\">href=</span><span class=\"s\">\"0\"</span><span class=\"nt\">&gt;</span>0<span class=\"nt\">&lt;/a&gt;&lt;/li&gt;</span>\n<span class=\"nt\">&lt;/ol&gt;</span>\n</pre>\n</div>\n\n<p>b</p>}, @rendered
+  end
+
+  test 'contents' do
+    g = Gollum::Gitcode.new 'github/gollum/master/test/file_view/1_file.txt'
+
+    assert_equal g.contents, %{<ol class="tree">
+  <li class="file"><a href="0">0</a></li>
+</ol>}
+  end
+
+  teardown do
+    @cleanup.call
+  end
+end
@@ -1,17 +1,14 @@
 # ~*~ encoding: utf-8 ~*~
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require File.expand_path( "../helper", __FILE__ )
+require File.expand_path( "../wiki_factory", __FILE__ )

 context "Markup" do
  setup do
-    @path = testpath("examples/test.git")
-    FileUtils.rm_rf(@path)
-    Grit::Repo.init_bare(@path)
-    Gollum::Wiki.default_options = {:universal_toc => false}
-    @wiki = Gollum::Wiki.new(@path)
+    @wiki, @path, @teardown = WikiFactory.create 'examples/test.git'
  end

  teardown do
-    FileUtils.rm_r(File.join(File.dirname(__FILE__), *%w[examples test.git]))
+    @teardown.call
  end

  test "formats page from Wiki#pages" do
@@ -58,6 +55,21 @@ context "Markup" do
  #
  #########################################################################

+  test "absolute link to non-existent page" do
+    @wiki.write_page("linktest", :markdown, "[[/Page]]", commit_details)
+
+    page    = @wiki.page("linktest")
+    doc     = Nokogiri::HTML page.formatted_data
+    paras   = doc / :p
+    para    = paras.first
+    anchors = para / :a
+    assert_equal 1, paras.size
+    assert_equal 1, anchors.size
+    assert_equal 'internal absent', anchors[0]['class']
+    assert_equal '/Page',           anchors[0]['href']
+    assert_equal '/Page',           anchors[0].text
+  end
+
  test "double page links no space" do
    @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", commit_details)

@@ -181,19 +193,72 @@ context "Markup" do
  test "wiki link within inline code block" do
    @wiki.write_page("Potato", :markdown, "`sed -i '' 's/[[:space:]]*$//'`", commit_details)
    page = @wiki.page("Potato")
-    assert_equal "<p><code>sed -i '' 's/[[:space:]]*$//'</code></p>", page.formatted_data
+    assert_equal "<p>\n  <code>sed -i '' 's/[[:space:]]*$//'</code>\n</p>", page.formatted_data
+  end
+
+  test "regexp gsub! backref (#383)" do
+    # bug only triggers on "```" syntax
+    # not `code`
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      (<<-'DATA'
+          ```
+          rot13='tr '\''A-Za-z'\'' '\''N-ZA-Mn-za-m'\'
+          ```
+          DATA
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<pre>\n  <code>      <div class=\"highlight\"><pre><span class=\"n\">rot13</span><span class=\"p\">=</span><span class=\"s\">'tr '</span><span class=\"o\">\\</span><span class=\"s\">''</span><span class=\"n\">A</span><span class=\"o\">-</span><span class=\"n\">Za</span><span class=\"o\">-</span><span class=\"n\">z</span><span class=\"o\">'\\</span><span class=\"s\">''</span> <span class=\"s\">'\\''N-ZA-Mn-za-m'</span><span class=\"o\">\\</span><span class=\"s\">'</span>\n</pre></div>\n</code>\n</pre>}
+    assert_equal expected, output
+  end
+
+  test "~~~ code blocks #537" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~ {.ruby}
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\">\n  <pre><span class=\"s1\">'hi'</span>\n</pre>\n</div>}
+    assert_equal expected, output
+  end
+
+  test "~~~ code blocks #537 with more than one class" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~ {#hi .ruby .sauce}
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\">\n  <pre><span class=\"s1\">'hi'</span>\n</pre>\n</div>}
+    assert_equal expected, output
+  end
+
+  test "~~~ code blocks #537 with lots of tildes" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~~~~ {#hi .ruby .sauce}
+~~
+'hi'~
+~~~~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\">\n  <pre><span class=\"o\">~~</span>\n<span class=\"s1\">'hi'</span><span class=\"o\">~</span>\n</pre>\n</div>}
+    assert_equal expected, output
  end

  test "wiki link within code block" do
    @wiki.write_page("Potato", :markdown, "    sed -i '' 's/[[:space:]]*$//'", commit_details)
    page = @wiki.page("Potato")
-    assert_equal "<pre><code>sed -i '' 's/[[:space:]]*$//'\n</code></pre>", page.formatted_data
+    assert_equal "<pre>\n  <code>sed -i '' 's/[[:space:]]*$//'\n</code>\n</pre>", page.formatted_data
  end

  test "piped wiki link within code block" do
    @wiki.write_page("Potato", :markdown, "`make a link [[home|sweet home]]`", commit_details)
    page = @wiki.page("Potato")
-    assert_equal "<p><code>make a link [[home|sweet home]]</code></p>", page.formatted_data
+    assert_equal "<p>\n  <code>make a link [[home|sweet home]]</code>\n</p>", page.formatted_data
  end

  #########################################################################
@@ -209,7 +274,7 @@ context "Markup" do

      page = @wiki.page(name)
      output = page.formatted_data
-      assert_equal %{<p>a <img src="#{scheme}://example.com/bilbo.jpg"> b</p>}, output
+      assert_equal %{<p>a <img src=\"#{scheme}://example.com/bilbo.jpg\" /> b</p>}, output
    end
  end

@@ -220,7 +285,7 @@ context "Markup" do

      page = @wiki.page(name)
      output = page.formatted_data
-      assert_equal %{<p>a <img src="#{scheme}://example.com/bilbo.JPG"> b</p>}, output
+      assert_equal %{<p>a <img src=\"#{scheme}://example.com/bilbo.JPG\" /> b</p>}, output
    end
  end

@@ -232,7 +297,7 @@ context "Markup" do
    @wiki.write_page("Bilbo Baggins", :markdown, "a [[/alpha.jpg]] [[a | /alpha.jpg]] b", commit_details)

    page = @wiki.page("Bilbo Baggins")
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><a href="/wiki/alpha.jpg">a</a> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /><a href=\"/wiki/alpha.jpg\">a</a> b</p>}, page.formatted_data
  end

  test "image with relative path on root" do
@@ -243,7 +308,7 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.page("Bilbo Baggins")
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><a href="/wiki/alpha.jpg">a</a> b</p>}, page.formatted_data
+    assert_equal %Q{<p>a <img src=\"/wiki/alpha.jpg\" /><a href=\"/wiki/alpha.jpg\">a</a> b</p>}, page.formatted_data
  end

  test "image with relative path" do
@@ -255,7 +320,7 @@ context "Markup" do

    page = @wiki.page("Bilbo Baggins")
    output = page.formatted_data
-    assert_equal %{<p>a <img src="/wiki/greek/alpha.jpg"><a href="/wiki/greek/alpha.jpg">a</a> b</p>}, output
+    assert_equal %{<p>a <img src=\"/wiki/greek/alpha.jpg\" /><a href=\"/wiki/greek/alpha.jpg\">a</a> b</p>}, output
  end

  test "image with absolute path on a preview" do
@@ -265,7 +330,7 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.preview_page("Test", "a [[/alpha.jpg]] b", :markdown)
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /> b</p>}, page.formatted_data
  end

  test "image with relative path on a preview" do
@@ -276,12 +341,12 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.preview_page("Test", "a [[alpha.jpg]] [[greek/alpha.jpg]] b", :markdown)
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><img src="/wiki/greek/alpha.jpg"> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /><img src=\"/wiki/greek/alpha.jpg\" /> b</p>}, page.formatted_data
  end

  test "image with alt" do
    content = "a [[alpha.jpg|alt=Alpha Dog]] b"
-    output = %{<p>a <img src="/greek/alpha.jpg" alt="Alpha Dog"> b</p>}
+    output = %{<p>a<imgsrc=\"/greek/alpha.jpg\"alt=\"AlphaDog\"/>b</p>}
    relative_image(content, output)
  end

@@ -289,7 +354,7 @@ context "Markup" do
    %w{em px}.each do |unit|
      %w{width height}.each do |dim|
        content = "a [[alpha.jpg|#{dim}=100#{unit}]] b"
-        output = "<p>a <img src=\"/greek/alpha.jpg\" #{dim}=\"100#{unit}\"> b</p>"
+        output = "<p>a<imgsrc=\"/greek/alpha.jpg\"#{dim}=\"100#{unit}\"/>b</p>"
        relative_image(content, output)
      end
    end
@@ -298,7 +363,7 @@ context "Markup" do
  test "image with bogus dimension" do
    %w{width height}.each do |dim|
      content = "a [[alpha.jpg|#{dim}=100]] b"
-      output = "<p>a <img src=\"/greek/alpha.jpg\"> b</p>"
+      output = "<p>a<imgsrc=\"/greek/alpha.jpg\"/>b</p>"
      relative_image(content, output)
    end
  end
@@ -306,7 +371,7 @@ context "Markup" do
  test "image with vertical align" do
    %w{top texttop middle absmiddle bottom absbottom baseline}.each do |align|
      content = "a [[alpha.jpg|align=#{align}]] b"
-      output = "<p>a <img src=\"/greek/alpha.jpg\" align=\"#{align}\"> b</p>"
+      output = %Q{<p>a<imgsrc=\"/greek/alpha.jpg\"align=\"#{align}\"/>b</p>}
      relative_image(content, output)
    end
  end
@@ -314,40 +379,40 @@ context "Markup" do
  test "image with horizontal align" do
    %w{left center right}.each do |align|
      content = "a [[alpha.jpg|align=#{align}]] b"
-      output = "<p>a <span class=\"align-#{align}\"><span><img src=\"/greek/alpha.jpg\"></span></span> b</p>"
+      output = "<p>a<spanclass=\"align-#{align}\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span>b</p>"
      relative_image(content, output)
    end
  end

  test "image with float" do
    content = "a\n\n[[alpha.jpg|float]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"float-left\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"float-left\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "image with float and align" do
    %w{left right}.each do |align|
      content = "a\n\n[[alpha.jpg|float|align=#{align}]]\n\nb"
-      output = "<p>a</p>\n\n<p><span class=\"float-#{align}\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+      output = "<p>a</p><p><spanclass=\"float-#{align}\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
      relative_image(content, output)
    end
  end

  test "image with frame" do
    content = "a\n\n[[alpha.jpg|frame]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "absolute image with frame" do
    content = "a\n\n[[http://example.com/bilbo.jpg|frame]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"http://example.com/bilbo.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"http://example.com/bilbo.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "image with frame and alt" do
    content = "a\n\n[[alpha.jpg|frame|alt=Alpha]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\" alt=\"Alpha\"><span>Alpha</span></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"/greek/alpha.jpg\"alt=\"Alpha\"/><span>Alpha</span></span></span></p><p>b</p>"
    relative_image(content, output)
  end

@@ -396,9 +461,7 @@ context "Markup" do

  test "code blocks" do
    content = "a\n\n```ruby\nx = 1\n```\n\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
-             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
-             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\">\n  <pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre>\n</div>\n\n<p>b</p>}

    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
@@ -411,9 +474,7 @@ context "Markup" do

  test "code blocks with carriage returns" do
    content = "a\r\n\r\n```ruby\r\nx = 1\r\n```\r\n\r\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
-             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
-             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\">\n  <pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre>\n</div>\n\n<p>b</p>}

    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
@@ -444,9 +505,7 @@ context "Markup" do

  test "code blocks with multibyte caracters indent" do
    content = "a\n\n```ruby\ns = 'やくしまるえつこ'\n```\n\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre><span class=\"n\">" +
-             "s</span> <span class=\"o\">=</span> <span class=\"s1\">'やくしまるえつこ'" +
-             "</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\">\n  <pre><span class=\"n\">s</span> <span class=\"o\">=</span> <span class=\"s1\">'やくしまるえつこ'</span>\n</pre>\n</div>\n\n<p>b</p>}
    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
    index.commit("Add alpha.jpg")
@@ -498,6 +557,43 @@ np.array([[2,2],[1,3]],np.float)
    assert_match /\(\[\[/, rendered, "#{markup_class} parses out wiki links\n#{rendered}"
  end

+  test "embed code is escaped" do
+    @wiki.write_page("script", :markdown, "a <script></script> b", commit_details)
+    @wiki.write_page("page", :markdown, "```html:script```", commit_details)
+
+    output_script = @wiki.page("script").formatted_data
+    output_page = @wiki.page("page").formatted_data
+
+    assert_equal %Q{<p>a  b</p>}, output_script
+    assert_equal %Q{<div class=\"highlight\">\n  <pre><span class=\"nt\">&lt;p&gt;</span>a  b<span class=\"nt\">&lt;/p&gt;</span>\n</pre>\n</div>}, output_page
+  end
+
+  test "embed code page absolute link" do
+    @wiki.write_page("base", :markdown, "a\n!base\b", commit_details)
+    @wiki.write_page("a", :markdown, "a\n```html:/base```\b", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class=\"highlight\">\n  <pre><span class=\"nt\">&lt;p&gt;</span>a\n!base<span class=\"nt\">&lt;/p&gt;</span>\n</pre>\n</div>\n}, output
+  end
+
+  test "embed code page relative link" do
+    @wiki.write_page("base", :markdown, "a\n!rel\b", commit_details)
+    @wiki.write_page("a", :markdown, "a\n```html:base```\b", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class=\"highlight\">\n  <pre><span class=\"nt\">&lt;p&gt;</span>a\n!rel<span class=\"nt\">&lt;/p&gt;</span>\n</pre>\n</div>\n}, output
+  end
+
+  test "code block in unsupported language" do
+    @wiki.write_page("a", :markdown, "a\n```nonexistent\ncode\n```\nb", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\ncode\nb</p>}, output
+  end
+
  #########################################################################
  #
  # Web Sequence Diagrams
@@ -517,6 +613,57 @@ np.array([[2,2],[1,3]],np.float)
    assert_not_nil rendered.match(output)
  end

+  #########################################################################
+  #
+  # Metadata Blocks
+  #
+  #########################################################################
+
+  test "metadata blocks" do
+    content = "a\n\n<!-- ---\ntags: [foo, bar]\n-->\n\nb"
+    output = "<p>a</p>\n\n<p>b</p>"
+    result = {'tags'=>['foo','bar']}
+
+    index = @wiki.repo.index
+    index.add("Bilbo-Baggins.md", content)
+    index.commit("Add metadata")
+
+    page = @wiki.page("Bilbo Baggins")
+    rendered = Gollum::Markup.new(page).render
+    assert_equal output, rendered 
+    assert_equal result, page.meta_data
+  end
+
+  test "metadata blocks with newline" do
+    content = "a\n\n<!--\n---\ntags: [foo, bar]\n-->\n\nb"
+    output = "<p>a</p>\n\n<p>b</p>"
+    result = {'tags'=>['foo','bar']}
+
+    index = @wiki.repo.index
+    index.add("Bilbo-Baggins.md", content)
+    index.commit("Add metadata")
+
+    page = @wiki.page("Bilbo Baggins")
+    rendered = Gollum::Markup.new(page).render
+    assert_equal output, rendered 
+    assert_equal result, page.meta_data
+  end
+
+  test "metadata sanitation" do
+    content = "a\n\n<!-- ---\nfoo: <script>alert('');</script>\n-->\n\nb"
+    output = "<p>a</p>\n\n<p>b</p>"
+    result = {'foo'=>nil}
+
+    index = @wiki.repo.index
+    index.add("Bilbo-Baggins.md", content)
+    index.commit("Add metadata")
+
+    page = @wiki.page("Bilbo Baggins")
+    rendered = Gollum::Markup.new(page).render
+    assert_equal output, rendered 
+    assert_equal result, page.meta_data
+  end
+
  #########################################################################
  #
  # Various
@@ -619,13 +766,13 @@ end

  test "TeX block syntax" do
    content = 'a \[ a^2 \] b'
-    output = "<p>a<imgwidth=\"15\"height=\"16\"style=\"vertical-align:-1px;\"src=\"/_tex.png?type=block&data=YV4y\"alt=\"a^2\"/>b</p>"
+    output = "<p>a<imgsrc=\"http://www.mathtran.org/cgi-bin/toy/?D=4;tex=a%5E2\"alt=\"a^2\">b</p>"
    compare(content, output, 'md')
  end

  test "TeX inline syntax" do
    content = 'a \( a^2 \) b'
-    output = "<p>a<imgwidth=\"15\"height=\"16\"style=\"vertical-align:-1px;\"src=\"/_tex.png?type=inline&data=YV4y\"alt=\"a^2\"/>b</p>"
+    output = "<p>a<imgsrc=\"http://www.mathtran.org/cgi-bin/toy/?D=2;tex=a%5E2\"alt=\"a^2\">b</p>"
    compare(content, output, 'md')
  end

@@ -16,7 +16,7 @@ context "Page" do
    page = @wiki.page('Bilbo Baggins')
    assert_equal Gollum::Page, page.class
    assert page.raw_data =~ /^# Bilbo Baggins\n\nBilbo Baggins/
-    assert page.formatted_data =~ %r{<h1>Bilbo Baggins<a class="anchor" id="Bilbo-Baggins" href="#Bilbo-Baggins"></a>\n</h1>\n\n<p>Bilbo Baggins}
+    assert page.formatted_data =~ %r{<h1>Bilbo Baggins<a class="anchor" id="Bilbo-Baggins" href="#Bilbo-Baggins"></a></h1>\n\n<p>Bilbo Baggins}
    assert_equal 'Bilbo-Baggins.md', page.path
    assert_equal :markdown, page.format
    assert_equal @wiki.repo.commits.first.id, page.version.id
@@ -99,7 +99,8 @@ context "Page" do
  test "cname" do
    assert_equal "Foo", Gollum::Page.cname("Foo")
    assert_equal "Foo-Bar", Gollum::Page.cname("Foo Bar")
-    assert_equal "Foo---Bar", Gollum::Page.cname("Foo / Bar")
+    # / is now a directory delimiter so it must be preserved
+    assert_equal "Foo-/-Bar", Gollum::Page.cname("Foo / Bar")
    assert_equal "José", Gollum::Page.cname("José")
    assert_equal "モルドール", Gollum::Page.cname("モルドール")
  end
@@ -39,7 +39,6 @@ context "Page Reverting" do
    assert_equal "INITIAL", body=page2.raw_data.strip
    assert_equal body, File.read(File.join(@path, "B.md")).strip
  end
-=end

  test "reverts multiple commits for a page" do
    page1 = @wiki.page('A')
@@ -49,6 +48,7 @@ context "Page Reverting" do
    assert_equal "INITIAL", body=page2.raw_data.strip
    assert_equal body, File.read(File.join(@path, "A.md")).strip
  end
+=end

  test "cannot revert conflicting commit" do
    page1 = @wiki.page('A')
@@ -19,7 +19,7 @@ context "Precious::Views::Pages" do

  test "breadcrumb" do
    @page.instance_variable_set("@path", "Mordor/Eye-Of-Sauron/Saruman")
-    @page.instance_variable_set("@base_url", "/")
+    @page.instance_variable_set("@base_url", "")
    assert_equal '<a href="/pages/">Home</a> / <a href="/pages/Mordor/">Mordor</a> / <a href="/pages/Mordor/Eye-Of-Sauron/">Eye-Of-Sauron</a> / Saruman', @page.breadcrumb
  end

@@ -29,9 +29,18 @@ context "Precious::Views::Pages" do

  test "files_folders" do
    @page.instance_variable_set("@path", "Mordor")
-    @page.instance_variable_set("@base_url", "/")
+    @page.instance_variable_set("@base_url", "")
    results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
    @page.instance_variable_set("@results", results)
    assert_equal %{<li><a href="/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
  end
+
+  test "base url" do
+    # based on test "files_folders"
+    @page.instance_variable_set("@path", "Mordor")
+    @page.instance_variable_set("@base_url", "/wiki")
+    results = [FakeResult.new("Mordor/Eye-Of-Sauron.md"), FakeResult.new("Mordor/Orc/Saruman.md"), FakeResult.new("Mordor/.gitkeep")]
+    @page.instance_variable_set("@results", results)
+    assert_equal %{<li><a href="/wiki/Mordor/Eye-Of-Sauron" class="file">Eye Of Sauron</a></li>\n<li><a href="/wiki/pages/Mordor/Orc/" class="folder">Orc</a></li>}, @page.files_folders
+  end
 end
@@ -15,12 +15,50 @@ context "Unicode Support" do
    FileUtils.rm_rf(@path)
  end

-  test "create and read non-latin page" do
+  test "uri encode" do
+    c = '한글'
+    assert_equal '%ED%95%9C%EA%B8%80', encodeURIComponent(c)
+    assert_equal '%ED%95%9C%EA%B8%80', CGI::escape(c)
+  end
+
+  test "create and read non-latin page with anchor" do
    @wiki.write_page("test", :markdown, "# 한글")

    page = @wiki.page("test")
    assert_equal Gollum::Page, page.class
    assert_equal "# 한글", utf8(page.raw_data)
+
+    # markup.rb
+    doc     = Nokogiri::HTML page.formatted_data
+    h1s     = doc / :h1
+    h1      = h1s.first
+    anchors = h1 / :a
+    assert_equal 1, h1s.size
+    assert_equal 1, anchors.size
+    assert_equal '#한글',  anchors[0]['href']
+    assert_equal  '한글',  anchors[0]['id']
+    assert_equal 'anchor', anchors[0]['class']
+    assert_equal '',       anchors[0].text
+  end
+
+  test "create and read non-latin page with anchor 2" do
+    @wiki.write_page("test", :markdown, "# \"La\" faune d'Édiacara")
+
+    page = @wiki.page("test")
+    assert_equal Gollum::Page, page.class
+    assert_equal "# \"La\" faune d'Édiacara", utf8(page.raw_data)
+
+    # markup.rb test: ', ", É
+    doc     = Nokogiri::HTML page.formatted_data
+    h1s     = doc / :h1
+    h1      = h1s.first
+    anchors = h1 / :a
+    assert_equal 1, h1s.size
+    assert_equal 1, anchors.size
+    assert_equal %q(#%22La%22-faune-d'Édiacara), anchors[0]['href']
+    assert_equal %q(%22La%22-faune-d'Édiacara),  anchors[0]['id']
+    assert_equal 'anchor',                 anchors[0]['class']
+    assert_equal '',                       anchors[0].text
  end

  test "unicode with existing format rules" do
@@ -123,7 +123,7 @@ context "Wiki page previewing" do
  test "preview_page" do
    page = @wiki.preview_page("Test", "# Bilbo", :markdown)
    assert_equal "# Bilbo", page.raw_data
-    assert_equal %Q{<h1>Bilbo<a class="anchor" id="Bilbo" href="#Bilbo"></a>\n</h1>}, page.formatted_data
+    assert_equal %Q{<h1>Bilbo<a class=\"anchor\" id=\"Bilbo\" href=\"#Bilbo\"></a></h1>}, page.formatted_data
    assert_equal "Test.md", page.filename
    assert_equal "Test", page.name
  end
@@ -142,6 +142,16 @@ context "Wiki TOC" do
    assert_equal '<h1>Bilbo<a class="anchor" id="Bilbo" href="#Bilbo"></a></h1>', page.formatted_data.gsub(/\n/,"")
    assert_equal %{<div class="toc"><div class="toc-title">Table of Contents</div><ul><li><a href="#Bilbo">Bilbo</a></li></ul></div>}, page.toc_data.gsub(/\n */,"")
  end
+
+  # Ensure ' creates valid links in TOC
+  # Incorrect: <a href=\"#a\" b=\"\">
+  #   Correct: <a href=\"#a'b\">
+  test "' in link" do
+    page = @wiki.preview_page("Test", "# a'b", :markdown)
+    assert_equal "# a'b", page.raw_data
+    assert_equal %q{<h1>a'b<a class="anchor" id="a'b" href="#a'b"></a></h1>}, page.formatted_data.gsub(/\n/,"")
+    assert_equal %{<div class=\"toc\"><div class=\"toc-title\">Table of Contents</div><ul><li><a href=\"#a'b\">a'b</a></li></ul></div>}, page.toc_data.gsub(/\n */,"")
+  end
 end

 context "Wiki page writing" do
@@ -0,0 +1,10 @@
+class WikiFactory
+  def self.create p
+    path = testpath "examples/test.git"
+    Grit::Repo.init_bare(path)
+    Gollum::Wiki.default_options = {:universal_toc => false}
+    cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
+    wiki = Gollum::Wiki.new(path)
+    return wiki, path, cleanup
+  end
+end
Author	SHA1	Message	Date
bootstraponline	f1c523aa30	Release 2.2.9	2012-10-14 22:26:17 -06:00
bootstraponline	87c08f5613	Escape " in headers	2012-10-14 22:21:00 -06:00
bootstraponline	82913cea20	Improve base path note	2012-10-14 21:42:25 -06:00
bootstraponline	2ad743e4bd	Release 2.2.8	2012-10-14 21:28:43 -06:00
bootstraponline	fa97b57a96	Define default map as suggested on #460 Base path now sets a default map without having to use an external config.ru.	2012-10-14 20:57:27 -06:00
bootstraponline	1b952b6d56	Release 2.2.7	2012-10-14 17:24:33 -06:00
bootstraponline	90cc512bd1	Fix home loop with page-file-dir #491	2012-10-14 15:45:26 -06:00
bootstraponline	b82556c9c0	Fix #460	2012-10-14 15:42:06 -06:00
bootstraponline	fbe3b4bb3b	Fix #460	2012-10-14 15:23:52 -06:00
bootstraponline	5ffd98ad31	Fix #491	2012-10-14 15:15:55 -06:00
bootstraponline	cb9dd4d228	Fix formatting	2012-10-14 14:31:40 -06:00
bootstraponline	cd823bf10c	Add doc from wiki.rb	2012-10-14 14:31:00 -06:00
bootstraponline	5560ec52c2	Add base_path doc	2012-10-14 14:27:08 -06:00
bootstraponline	065151a77f	Add base_path disclaimer	2012-10-14 14:25:27 -06:00
bootstraponline	23454f556c	Release 2.2.6	2012-10-14 13:14:08 -06:00
bootstraponline	a2b3ddf931	Update tests to XHTML	2012-10-14 13:07:18 -06:00
bootstraponline	44b0d2fcfc	Remove old comment	2012-10-14 12:26:23 -06:00
bootstraponline	aed4cc590a	Fix unicode characters Fix #547 Update test	2012-10-14 12:21:31 -06:00
bootstraponline	72ee08b5ab	Release 2.2.5	2012-10-14 11:21:56 -06:00
bootstraponline	45547624e4	Improve tilde fence support More than 3 tildes can be used. The code block must end with the same amount of tildes used to open the code block. Fix #537 http://johnmacfarlane.net/pandoc/README.html#delimited-code-blocks	2012-10-14 11:02:45 -06:00
bootstraponline	f928cfa8be	Don't ship Lorem ipsum in gem	2012-10-13 20:21:08 -06:00
bootstraponline	988984846a	Release 2.2.4	2012-10-13 20:01:57 -06:00
bootstraponline	1149618653	Fix #537	2012-10-13 19:53:41 -06:00
bootstraponline	168a033903	Remove old comment	2012-10-13 14:59:42 -06:00
bootstraponline	6a765c9791	Fix #537	2012-10-13 14:52:28 -06:00
bootstraponline	e16ae7b511	Travis is having a bad day E: There are problems and -y was used without --force-yes before_install: 'sudo apt-get install -y asciidoc' returned false. Done. Build script exited with: 1	2012-10-13 14:07:15 -06:00
bootstraponline	174334ea44	Remove comment	2012-10-13 13:58:56 -06:00
bootstraponline	dbdf06930d	Fix	2012-10-13 13:55:20 -06:00
bootstraponline	c93e65ddc3	Merge branch 'master' of github.com:github/gollum	2012-10-13 13:32:19 -06:00
bootstraponline	56101ed264	Fix #535 and add test	2012-10-13 13:32:08 -06:00
bootstraponline	8269c8e574	TOC doesn't require '	2012-10-13 13:11:31 -06:00
bootstraponline	2246419d1e	Fix spacing	2012-10-13 13:09:20 -06:00
bootstraponline	118a0c318b	Update comment	2012-10-13 13:06:15 -06:00
bootstraponline	5401cf2910	Fix #542	2012-10-13 13:04:51 -06:00
bootstraponline	432f9b8d2f	Add test for #542	2012-10-13 12:57:58 -06:00
bootstraponline	66fc8a2d31	Revert "Fix #542 " This reverts commit `2f3dd3d227`.	2012-10-13 12:55:43 -06:00
bootstraponline	2f3dd3d227	Fix #542 Page link may contain duplicate starting forward slashes. //page points to http://page/ when what we want is /page pointing to http://localhost:1234/page	2012-10-13 09:53:25 -06:00
bootstraponline	c43fd9fa6c	Update language comment	2012-10-12 21:19:24 -06:00
bootstraponline	868518e0f5	Bash is Ace mode sh	2012-10-12 20:58:05 -06:00
bootstraponline	039b5cce98	Try to fix Travis FFI is no longer used in the new pygments.rb. apt-get update may resolve the asciidoc install failure.	2012-10-12 20:24:31 -06:00
bootstraponline	4a421842d5	https://github.com/travis-ci/travis-ci/issues/725 Modified README to trigger a Travis CI build. It's currently broken.	2012-10-12 20:22:10 -06:00
bootstraponline	cfbb124f81	Update README.md	2012-10-12 20:16:43 -06:00
bootstraponline	dcb147cde2	Ensure declaredLanguage is lower case	2012-10-10 20:20:33 -06:00
bootstraponline	8d06b5e67e	Fix pygments language to Ace mode translation	2012-10-10 20:16:04 -06:00
bootstraponline	4776d0b422	Use rake release in readme	2012-10-10 19:45:42 -06:00
bootstraponline	58bb340c33	Release 2.2.3	2012-10-10 19:43:30 -06:00
bootstraponline	ee790a9b7c	Add rake bump to readme	2012-10-10 19:38:53 -06:00
bootstraponline	ac432aad78	Add bump task to Rakefile	2012-10-10 19:35:04 -06:00
bootstraponline	30207e0a39	Merge pull request #533 from wrs/wrs_syntaxfixes Two little syntax highlighting fixes	2012-10-10 16:56:37 -07:00
Walter Smith	d98547a33c	Fix lack of CoffeeScript livepreview Pygments calls it coffeescript, but Ace calls it coffee.	2012-10-10 14:20:50 -07:00
Walter Smith	b7cdeabbf6	Catch all Pygments errors An unrecognized language was generating a MentosError rather than a PythonError. Just catch anything that goes wrong in Pygments.	2012-10-10 14:20:50 -07:00
bootstraponline	be9907a0cc	v2.2.2	2012-10-04 18:17:24 -06:00
bootstraponline	30f42c50a9	Fix #528	2012-10-04 17:18:47 -06:00
bootstraponline	7cba65b138	Gemnasium is not including all deps. pygments.rb is missing for example. Will restore once Gemnasium has fixed the issue.	2012-10-01 23:50:35 -06:00
bootstraponline	f34a78b336	Proc.new instead of lambda.	2012-10-01 23:45:04 -06:00
bootstraponline	e1942dda03	Merge pull request #513 from bootstraponline/embed_code Embed code. #508.	2012-10-01 22:36:25 -07:00
bootstraponline	7142e284fa	.call instead of .() for 1.8.7	2012-10-01 23:29:15 -06:00
bootstraponline	3c1c588953	Restore wiki_factory.	2012-10-01 23:23:40 -06:00
bootstraponline	52cc6bae34	Update dependencies.	2012-09-29 13:50:11 -06:00
bootstraponline	955c608115	Update rake.	2012-09-29 13:40:02 -06:00
bootstraponline	2e00cf312c	Merge pull request #524 from osener/patch-1 Update org-ruby	2012-09-29 12:17:59 -07:00
Ozan Sener	09bbc144d1	Update org-ruby Fixes #81	2012-09-29 11:19:09 +03:00
bootstraponline	d02b63a434	Fix test.	2012-09-26 00:08:11 -06:00
bootstraponline	9b63c67d8c	Try to fix tests.	2012-09-25 23:57:35 -06:00
bootstraponline	05c4bf3374	Add local file support. Example of absolute path to local file. ```html:/home``` Example of relative path to local file. ```html:home``` 1.8.7 string fix. 's'[0..0] instead of 's'[0] Fix regex. Add absolute and relative tests.	2012-09-25 23:31:58 -06:00
bootstraponline	424b4d3f4e	Remove debug statements.	2012-09-25 23:31:25 -06:00
bootstraponline	f9a6187fab	Fix undefined method `[]' for nil:NilClass	2012-09-25 23:31:08 -06:00
Henrik	d406472882	1.8.7 fixes	2012-09-25 23:29:11 -06:00
Henrik	749b5a5ff8	Adding functionality for fetching code from github hack for 1.8.7 Don't miss test_markup's relative require need some food now	2012-09-25 23:29:08 -06:00
bootstraponline	091d5fe750	Update multibyte caracters.	2012-09-25 22:58:07 -06:00
bootstraponline	c8894fb465	New pygments.rb works correctly. The expected output from the tests differs only in newlines. git diff makes it seem like everything changed. bzr qdiff has a better default diff. git doesn't do per char diffs. Revert "New pygments has issues." This reverts commit `2dd41cbfac`.	2012-09-25 22:45:57 -06:00
bootstraponline	2dd41cbfac	New pygments has issues. Revert "Update pygments. Solves #225 #490 #517" This reverts commit `c0c77c5ba7`. Revert "Fix pygments.rb tests." This reverts commit `1f2165e68b`.	2012-09-25 21:54:49 -06:00
bootstraponline	1f2165e68b	Fix pygments.rb tests.	2012-09-25 21:47:24 -06:00
bootstraponline	e9b6bdbdd7	Add dependency status.	2012-09-25 21:38:09 -06:00
bootstraponline	c0c77c5ba7	Update pygments. Solves #225 #490 #517	2012-09-25 21:36:37 -06:00
Corey Donohoe	12403172ac	Merge pull request #521 from Vanuan/update_nokogiri Update nokogiri	2012-09-25 12:16:50 -07:00
John Yani	3b41ab8d75	Update nokogiri	2012-09-25 22:04:43 +03:00
bootstraponline	7bcf35f5b1	Fix #517 . Thanks @roa	2012-09-23 16:26:48 -06:00
bootstraponline	9a7e1c94c7	Merge pull request #515 from realmacsoftware/master Populate author details using the session.	2012-09-16 10:32:33 -07:00
Keith Duncan	30c2e675da	Test that author details from the session are committed into the repository	2012-09-16 16:49:17 +01:00
Keith Duncan	ac405803e8	Add notes on providing author details to the Rack documentation section	2012-09-16 16:25:09 +01:00
Keith Duncan	7dee787a92	Add documentation for where the commit_message parameters are passed and where they're source from	2012-09-16 15:59:49 +01:00
Keith Duncan	ae4b1cdeca	Add support for author parameters coming in from the session, to be set by rack middleware further up the stack	2012-09-15 21:06:08 +01:00
bootstraponline	572982cbf9	Use a professional right left button.	2012-09-09 21:11:16 -06:00
bootstraponline	74290874f9	Fix #383 test.	2012-09-09 14:05:10 -06:00
bootstraponline	847f08d952	Use block form of gsub to avoid regexp backref interpolation The content of this commit message is from @kislyuk's comments on the below two issues. Fix #383 Fix #511 `gsub!(pattern, replacement) interpolates` regexp backreferences `gsub!(pattern) do block` doesn't http://stackoverflow.com/questions/2082457/ruby-gsub-problem-when-using-backreference-and-hashes	2012-09-09 12:22:56 -06:00
Neal Pisenti	0bcd616668	fix mathjax option, fixes #509	2012-09-09 11:50:48 -06:00
bootstraponline	9dd701ccc4	Grit is broken. #508 #356	2012-09-04 17:52:56 -06:00
bootstraponline	56a5a7d92b	Fix #507	2012-09-04 16:24:16 -06:00
bootstraponline	0cf0fad50e	Finish removing MathJax from Live Preview.	2012-09-02 15:27:32 -06:00
bootstraponline	5f9e91656e	Fix LaTeX tests.	2012-09-02 15:03:56 -06:00
Vicent Marti	a7a2479f85	Release 2.2.1	2012-09-02 22:43:50 +02:00
Vicent Marti	a8b230a490	Properly escape TeX data.	2012-09-02 22:27:04 +02:00
bootstraponline	041b01f171	Fix #490	2012-09-01 12:33:08 -06:00
Vicent Marti	1c475f3215	Release 2.2.0	2012-09-01 12:24:17 +02:00
Vicent Marti	ab699d94b0	Do not render LaTeX locally Offload the rendering service to MathTran.org, the free and open-source LaTeX rendering engine.	2012-09-01 12:23:02 +02:00
bootstraponline	942d32c9b6	Fix uninstall command	2012-08-30 21:36:11 -06:00
bootstraponline	97f15f0b18	Add edit hotkey. #496	2012-08-30 21:07:57 -06:00
bootstraponline	ed49358c50	Add h1-3 shortcuts. #496	2012-08-30 20:54:20 -06:00
bootstraponline	85eeecd140	Add save hotkey.	2012-08-30 20:48:44 -06:00
bootstraponline	30fd40fbe5	Fix #498 Ruby 1.8.7 and ri can't deal with <!-- appearing in documentation. Please upgrade to the latest Ruby if you're able to.	2012-08-30 20:29:53 -06:00
bootstraponline	2ed262cacd	v2.1.9	2012-08-30 20:12:28 -06:00
bootstraponline	29a1ef8f8a	Skip doc on install	2012-08-30 20:04:20 -06:00
bootstraponline	772d18ee62	Fix uninstall command	2012-08-30 20:00:54 -06:00
bootstraponline	dd604d9942	Fix #498	2012-08-30 19:57:20 -06:00
bootstraponline	85abc83427	v2.1.8	2012-08-30 19:41:54 -06:00
bootstraponline	6d8220629c	Fix #500	2012-08-30 19:37:57 -06:00
bootstraponline	6ff7ada096	Fix #495	2012-08-30 18:31:35 -03:00
bootstraponline	8575049de5	Update get /data Remove leading slash from page Fix edge case with path set to '/'	2012-08-30 11:40:07 -03:00
bootstraponline	bb6fb0c253	pathName is undefined when not found instead of 0	2012-08-30 11:18:02 -03:00
bootstraponline	eb2ad9f840	Fix path .key now returns undefined on failure so path can be 0. If path is undefined then use an empty string.	2012-08-30 11:14:24 -03:00
bootstraponline	d0dd23fc11	Fix path	2012-08-30 11:09:44 -03:00
bootstraponline	7ae4acbdb0	Fix #497 #492 Data url now includes path.	2012-08-30 11:03:11 -03:00
bootstraponline	881590ab37	Merge pull request #494 from releu/fix-requiring-uri-encoding-components Move require "uri_encode_component"	2012-08-28 18:33:18 -07:00
Jan Bernacki	5e479dc5d9	move require	2012-08-28 22:44:09 +04:00
bootstraponline	7db9c2e762	Merge pull request #487 from jm/master Fix bug with missing variable 'ext'	2012-08-27 11:08:19 -07:00
bootstraponline	ce6b0ac095	v2.1.7	2012-08-25 19:21:13 -06:00
bootstraponline	420bb06988	Fix create test.	2012-08-25 18:58:20 -06:00
bootstraponline	20566f8acf	Fix #484	2012-08-25 18:54:07 -06:00
bootstraponline	1d5f69704a	Clean paths so they start with one slash.	2012-08-25 18:41:13 -06:00
bootstraponline	0da664299e	Fix edit.	2012-08-24 13:47:17 -06:00
bootstraponline	6e8fb2b457	Disable exact on edit for now.	2012-08-24 13:38:34 -06:00
bootstraponline	d1c72a4ff3	Fix #483 and #481 Exact matching of requested pages - /page is no longer the same as /a/page - Deleting /page only deletes /page (before it would delete /a/page instead of /page) - Edit currently breaks the unit tests if exact matching is enabled - Fix redirect on create - Add @giga's checked_dir = '' fix https://github.com/giga/gollum/commit/936958b47324a09c683cb90a2560484b47e09529 - Fix create unit test	2012-08-24 13:35:37 -06:00
bootstraponline	0bf05392e4	Redirect to correct path. #481	2012-08-24 12:26:59 -06:00
bootstraponline	7ecef0c045	Fix #479	2012-08-23 14:11:28 -06:00
bootstraponline	33ca329253	Handle nil slash.	2012-08-23 12:30:08 -06:00
bootstraponline	01fa4770cb	Fix page lookup. #473	2012-08-23 12:16:40 -06:00
bootstraponline	b76257c49c	Restore foward slash.	2012-08-23 11:59:56 -06:00
bootstraponline	e2fbf22f38	Fix #473 .	2012-08-23 11:51:20 -06:00
bootstraponline	134432d029	v2.1.6	2012-08-23 11:33:00 -06:00
bootstraponline	8d4d6e80b8	Fix #475 .	2012-08-23 11:27:40 -06:00
bootstraponline	85e6ef3dca	v2.1.5	2012-08-22 19:57:22 -06:00
bootstraponline	60f1467229	Fix encoding for 1.8.	2012-08-22 18:51:41 -06:00
bootstraponline	1757242382	Don't unpack Fixnum.	2012-08-22 17:40:53 -06:00
bootstraponline	55df7bb9c4	Use encodeURIComponent instead of CGI::escape when output is sent to browser.	2012-08-22 17:30:46 -06:00
bootstraponline	686b8acd38	Fix encodeURIComponent on Ruby 1.8. Replace .ord with .unpack('U')[0]	2012-08-22 17:23:08 -06:00
bootstraponline	a5f9df6170	Restore CGI::escape.	2012-08-22 16:57:24 -06:00
bootstraponline	27f61a870a	Merge pull request #477 from LuminosoInsight/master Fix titles created with the "New" button.	2012-08-22 15:54:23 -07:00
bootstraponline	a48e8d1c5c	New editor style. Disable MathJax in live preview. Parser isn't MathJax aware. Performance of MathJax in live preview is not great. Auto hide editor overflow.	2012-08-22 16:50:57 -06:00
bootstraponline	b80f74bccd	Remove protocol and host.	2012-08-22 13:32:18 -06:00
bootstraponline	1e768734ef	Disable MathJax by default. GitHub.com doesn't support MathJax. The parser is not MathJax aware which causes problems. --mathjax enables MathJax.	2012-08-22 13:31:21 -06:00
bootstraponline	11c9cabeb3	Fix edit baseUrl.	2012-08-22 13:21:01 -06:00
bootstraponline	3a14ab92f0	Fix new page when using map '/wiki' in config.ru.	2012-08-22 13:15:18 -06:00
bootstraponline	62d5f52398	Fix anchor for Firefox.	2012-08-22 13:10:11 -06:00
Rob Speer	2b4848566c	Fix names created with the 'New' button. Previously, a page created with the 'New' button would get all of its spaces turned into the + symbol when submitted, which Gollum would then convert into "-plus-" in the title. So, for example, a request to create a page called "Test page" would instead get "test plus page". This change changes + to - in the parameter received by /create/.	2012-08-22 14:15:20 -04:00
bootstraponline	7c825e877c	Remove protocol + host.	2012-08-20 15:51:07 -06:00
bootstraponline	8417c277e6	Fix delete link when using baseUrl.	2012-08-20 15:23:07 -06:00
bootstraponline	9cef423908	Remove default value in new page.	2012-08-19 14:25:02 -06:00
bootstraponline	e73c84490e	Remove prefix. #470 .	2012-08-16 12:01:03 -06:00
bootstraponline	6cfc807db0	Revert still broken in Grit.	2012-08-15 12:22:03 -06:00
bootstraponline	be366f8103	v2.1.4	2012-08-15 12:06:12 -06:00
bootstraponline	2d13bd796f	Improve #470 fix.	2012-08-15 12:03:48 -06:00
bootstraponline	523f8f80ca	Fix #470 .	2012-08-15 11:48:17 -06:00
bootstraponline	b76fef9143	Update version to 2.1.3	2012-08-13 11:37:56 -06:00
bootstraponline	e935af83d5	Update gemspec.	2012-08-13 11:35:15 -06:00
bootstraponline	d4e019ef42	Merge pull request #331 from tjh/home-page-link-issue Redirect from root to /Home, fixes #250	2012-08-09 10:41:31 -07:00
bootstraponline	2e738828c6	Merge pull request #467 from jamesduncombe/pygments_initialize Added Pygments.start to initialize Pygments on startup, fixes #465	2012-08-09 10:21:59 -07:00
James Duncombe	fd7dc93778	Added Pygments.start to initialize Pygments on startup	2012-08-09 09:14:55 +01:00
bootstraponline	3df407d9ee	Merge pull request #464 from giga/master Fix editor when base url is '/'	2012-08-08 10:53:45 -07:00
Jean-Philippe Garcia Ballester	6fbba84725	Revert "Base path is relative." This reverts commit `69e453ea0b`.	2012-08-08 13:49:11 +02:00
Jean-Philippe Garcia Ballester	37d20fa9cc	Base url without trailing '/' This will allow cleaner url in templates and javascripts.	2012-08-08 13:49:09 +02:00
bootstraponline	410cd912ac	Fix releasing.	2012-08-06 18:31:36 -06:00
bootstraponline	d234bbd861	Test `get %r{/(.+?)/([0-9a-f]{40})} do`	2012-08-06 18:27:12 -06:00
Corey Donohoe	3f68d96815	setup proper gem version numbers	2012-08-06 16:32:16 -07:00
bootstraponline	015cd895d2	Don't ignore version.	2012-08-06 17:18:30 -06:00
bootstraponline	5fa4b48d85	Fix new page default dir.	2012-08-06 15:57:46 -06:00
bootstraponline	88a3783bbc	Remove wpage.	2012-08-06 15:55:05 -06:00
bootstraponline	ea2254b9bd	Fix #462 . Add test for 462.	2012-08-06 15:52:19 -06:00
bootstraponline	9a0c1f2605	Fix path.	2012-08-06 15:18:15 -06:00
bootstraponline	008f26bb7d	Fix app.	2012-08-06 14:49:56 -06:00
bootstraponline	69e453ea0b	Base path is relative.	2012-08-06 14:28:24 -06:00
bootstraponline	88b0b608f4	Add null guard.	2012-08-06 13:49:48 -06:00
bootstraponline	19e3987ae3	Fix path escaping.	2012-08-06 13:36:28 -06:00
bootstraponline	c72e91ddaf	Fix #462 .	2012-08-06 13:16:31 -06:00
bootstraponline	c789dd5067	Update org-ruby.	2012-08-02 19:45:06 -06:00
bootstraponline	551949de29	Fix #459 .	2012-08-02 16:55:24 -06:00
bootstraponline	80730ee87a	Merge pull request #419 from trans/metadata Add support for embedded page metadata.	2012-08-01 16:05:10 -07:00
trans	71028adc9e	Add support for embedded page metadata.	2012-08-01 18:35:53 -04:00
bootstraponline	a2efebc06c	Fix #453 .	2012-08-01 13:04:04 -06:00
Jeremy McAnally	3767a11d21	Rename variables to be more clear and fix reference to non-existent 'ext' variable	2012-07-04 12:33:09 -04:00
Tim Harvey	43d2143506	Redirect from root to /Home, fixes #250	2012-05-10 08:55:56 -04:00