Release 2.4.1

Fixed custom.css to apply to all views

.gitattributes

@@ -0,0 +1,32 @@
+# https://help.github.com/articles/dealing-with-line-endings
+#
+# For Mac & Linux
+# git config --global core.autocrlf input
+#
+# For windows
+# git config --global core.autocrlf true
+#
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.txt text
+*.md text
+*.rb text
+*.js text
+*.html text
+*.yml text
+*.mustache text
+*.css text
+Rakefile text
+Gemfile text
+LICENSE text
+COPYRIGHT text
+gollum text
+.gitattributes text
+.gitignore text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.travis.yml

@@ -6,3 +6,4 @@ notifications:
 before_install:
  - sudo apt-get update
  - sudo apt-get install -y --force-yes asciidoc
+ - ASCIIDOC=1; export ASCIIDOC

Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
-gem 'rake', '~> 0.9'
+gem 'rake', '~> 10.0.2'

README.md

@@ -136,7 +136,13 @@ or JavaScript. These tags will be stripped from the converted HTML. See
 `docs/sanitization.md` for more details on what tags and attributes are
 allowed.
 
+## TITLES
 
+The first defined `h1` will override the default header on a page. There are two ways to set a page title. The metadata syntax:
+
+`<!-- --- title: New Title -->`
+
+The first `h1` tag can be set to always override the page title, without needing to use the metadata syntax. Start gollum with the `--h1-title` flag.
 ## BRACKET TAGS
 
 A variety of Gollum tags use a double bracket syntax. For example:
@@ -532,9 +538,17 @@ Your Rack middleware can pass author details to Gollum in a Hash in the session
 ## 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
+## CONFIG FILE
 
-`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.
+Gollum optionally takes a `--config file`. See [config.rb](https://github.com/github/gollum/blob/master/config.rb) for an example.
+
+## CUSTOM CSS
+
+The `--css` flag will inject `custom.css` from the root of your git repository into each page. `custom.css` must be commited to git or you will get a 302 redirect to the create page. Here's an example of floating the sidebar to the left.
+
+```css
+#wiki-rightbar { float: left !important; }
+```
 
 ## CONTRIBUTE
 

Rakefile

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

bin/gollum

@@ -45,6 +45,10 @@ opts = OptionParser.new do |opts|
     options['irb'] = true
   end
 
+  opts.on("--css", "Inject custom css. Uses custom.css from root repository") do
+    wiki_options[:css] = true
+  end
+
   opts.on("--page-file-dir [PATH]", "Specify the sub directory for all page files (default: repository root).") do |path|
     wiki_options[:page_file_dir] = path
   end
@@ -69,6 +73,10 @@ opts = OptionParser.new do |opts|
     wiki_options[:mathjax] = true
   end
 
+  opts.on("--user-icons [SOURCE]", "Set the history user icons. Valid values: gravatar, identicon, none. Default: none.") do |source|
+    wiki_options[:user_icons] = source
+  end
+
   opts.on("--show-all", "Shows all files in file view. By default only valid pages are shown.") do
     wiki_options[:show_all] = true
   end
@@ -76,6 +84,9 @@ opts = OptionParser.new do |opts|
   opts.on("--collapse-tree", "Collapse file view tree. By default, expanded tree is shown.") do
     wiki_options[:collapse_tree] = true
   end
+  opts.on("--h1-title", "Sets page title to value of first h1") do
+    wiki_options[:h1_title] = true
+  end
 end
 
 # Read command line options into `options` hash
@@ -174,6 +185,6 @@ else
       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
+    Rack::Server.new(:app => MapGollum.new(base_path), :Port => options['port'], :Host => options['bind']).start
   end
 end

config.rb

@@ -0,0 +1,28 @@
+# Example gollum config
+# gollum ../wiki --config config.rb
+#
+# or run from source with
+#
+# bundle exec bin/gollum ../wiki/ --config config.rb
+
+# Remove const to avoid
+# warning: already initialized constant FORMAT_NAMES
+#
+# only remove if it's defined.
+# constant Gollum::Page::FORMAT_NAMES not defined (NameError)
+Gollum::Page.send :remove_const, :FORMAT_NAMES if defined? Gollum::Page::FORMAT_NAMES
+# limit to one format
+Gollum::Page::FORMAT_NAMES = { :markdown  => "Markdown" }
+
+=begin
+Valid formats are:
+{ :markdown  => "Markdown",
+  :textile   => "Textile",
+  :rdoc      => "RDoc",
+  :org       => "Org-mode",
+  :creole    => "Creole",
+  :rest      => "reStructuredText",
+  :asciidoc  => "AsciiDoc",
+  :mediawiki => "MediaWiki",
+  :pod       => "Pod" }
+=end

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'gollum'
-  s.version           = '2.3.7'
-  s.date              = '2012-11-06'
+  s.version           = '2.4.1'
+  s.date              = '2012-11-19'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."
@@ -25,22 +25,22 @@ Gem::Specification.new do |s|
 
   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('github-markdown', '~> 0.5.3')
   s.add_dependency('pygments.rb', '~> 0.3.2')
   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.12')
+  s.add_dependency('useragent', '~> 0.4.13')
   s.add_dependency('stringex', '~> 1.4.0')
 
   s.add_development_dependency('RedCloth', '~> 4.2.9')
-  s.add_development_dependency('mocha', '~> 0.12.7')
+  s.add_development_dependency('mocha', '~> 0.13.0')
   s.add_development_dependency('org-ruby', '~> 0.7.2')
-  s.add_development_dependency('shoulda', '~> 3.3.1')
+  s.add_development_dependency('shoulda', '~> 3.3.2')
   s.add_development_dependency('rack-test', '~> 0.6.2')
   s.add_development_dependency('wikicloth', '~> 0.8.0')
-  s.add_development_dependency('rake', '~> 0.9')
+  s.add_development_dependency('rake', '~> 10.0.2')
   s.add_development_dependency('pry', '~> 0.9.10')
   # required by pry
   s.add_development_dependency('rb-readline', '~> 0.4.2')
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     bin/gollum
+    config.rb
     docs/sanitization.md
     gollum.gemspec
     lib/gollum.rb
@@ -74,6 +75,7 @@ Gem::Specification.new do |s|
     lib/gollum/frontend/public/gollum/images/fileview/toggle-small-expand.png
     lib/gollum/frontend/public/gollum/images/fileview/toggle-small.png
     lib/gollum/frontend/public/gollum/images/icon-sprite.png
+    lib/gollum/frontend/public/gollum/images/man_24.png
     lib/gollum/frontend/public/gollum/images/para.png
     lib/gollum/frontend/public/gollum/images/pin-16.png
     lib/gollum/frontend/public/gollum/images/pin-20.png
@@ -90,6 +92,7 @@ Gem::Specification.new do |s|
     lib/gollum/frontend/public/gollum/javascript/gollum.dialog.js
     lib/gollum/frontend/public/gollum/javascript/gollum.js
     lib/gollum/frontend/public/gollum/javascript/gollum.placeholder.js
+    lib/gollum/frontend/public/gollum/javascript/identicon_canvas.js
     lib/gollum/frontend/public/gollum/javascript/jquery-1.7.2.min.js
     lib/gollum/frontend/public/gollum/javascript/jquery.color.js
     lib/gollum/frontend/public/gollum/javascript/mousetrap.min.js
@@ -437,6 +440,9 @@ Gem::Specification.new do |s|
     lib/gollum/frontend/templates/error.mustache
     lib/gollum/frontend/templates/file_view.mustache
     lib/gollum/frontend/templates/history.mustache
+    lib/gollum/frontend/templates/history_authors/gravatar.mustache
+    lib/gollum/frontend/templates/history_authors/identicon.mustache
+    lib/gollum/frontend/templates/history_authors/none.mustache
     lib/gollum/frontend/templates/layout.mustache
     lib/gollum/frontend/templates/page.mustache
     lib/gollum/frontend/templates/pages.mustache

lib/gollum.rb

@@ -1,6 +1,7 @@
 # ~*~ encoding: utf-8 ~*~
 # stdlib
 require 'digest/md5'
+require 'digest/sha1'
 require 'ostruct'
 
 # external
@@ -23,7 +24,7 @@ require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
 require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '2.3.7'
+  VERSION = '2.4.1'
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))

lib/gollum/file_view.rb

@@ -22,7 +22,7 @@ module Gollum
     def new_page page
       name = page.name
       url  = url_for_page page
-      %Q(  <li class="file"><a href="#{url}">#{name}</a></li>\n)
+      %Q(  <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a></li>)
     end
 
     def new_folder folder_path
@@ -38,10 +38,7 @@ module Gollum
     end
 
     def end_folder
-      <<-HTML
-        </ol>
-      </li>
-      HTML
+      "</ol></li>\n"
     end
 
     def url_for_page page
@@ -85,13 +82,11 @@ module Gollum
       # Handle special case of only one folder.
       if (count - folder_start == 1)
         page = @pages[ folder_start ]
-        name = page.name
-        url  = url_for_page page
         html += <<-HTML
         <li>
           <label>#{::File.dirname(page.path)}</label> <input type="checkbox" #{@checked} />
           <ol>
-            <li class="file"><a href="#{url}">#{name}</a></li>
+          #{new_page page}
          </ol>
         </li>
         HTML

lib/gollum/frontend/app.rb

@@ -85,6 +85,7 @@ module Precious
       @base_url = url('/', false).chomp('/')
       # above will detect base_path when it's used with map in a config.ru
       settings.wiki_options.merge!({ :base_path => @base_url })
+      @css = settings.wiki_options[:css]
     end
 
     get '/' do
@@ -196,12 +197,10 @@ module Precious
       page_dir = settings.wiki_options[:page_file_dir].to_s
       path = clean_url(::File.join(page_dir, path)) unless path.start_with?(page_dir)
 
-      # 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         = Gollum::Wiki.new(settings.gollum_path, wiki_options)
+      wiki = wiki_new
 
       begin
-        wiki.write_page(name, format, params[:content], commit_message)
+        wiki.write_page(name, format, params[:content], commit_message, path)
         redirect to("/#{clean_url(::File.join(path,name))}")
       rescue Gollum::DuplicatePageError => e
         @message = "Duplicate page: #{e.message}"
@@ -238,6 +237,7 @@ module Precious
       @content = @page.formatted_data
       @toc_content = wiki.universal_toc ? @page.toc_data : nil
       @mathjax = wiki.mathjax
+      @h1_title = wiki.h1_title
       @editable = false
       mustache :page
     end
@@ -282,10 +282,6 @@ module Precious
       mustache :compare
     end
 
-    get %r{^/(javascript|css|images)} do
-      halt 404
-    end
-
     get %r{/(.+?)/([0-9a-f]{40})} do
       file_path = params[:captures][0]
       version   = params[:captures][1]
@@ -360,6 +356,7 @@ module Precious
         @content = page.formatted_data
         @toc_content = wiki.universal_toc ? @page.toc_data : nil
         @mathjax = wiki.mathjax
+        @h1_title = wiki.h1_title
         mustache :page
       elsif file = wiki.file(fullpath)
         content_type file.mime_type

lib/gollum/frontend/public/gollum/css/_styles.css

@@ -72,16 +72,23 @@ ol.tree
   }
     li.file a
     {
-      background: url(../images/fileview/document.png) 0 0 no-repeat;
       color: #fff;
-      padding-left: 21px;
       text-decoration: none;
-      display: block;
+      display: inline-block;
     }
-    li.file a[href *= '.pdf']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href *= '.html']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href $= '.css']  { background: url(../images/fileview/document.png) 0 0 no-repeat; }
-    li.file a[href $= '.js']    { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a span.icon
+      {
+        width: 14px;
+        height: 18px;
+        background: url(../images/fileview/document.png) 0 0 no-repeat;
+        display: inline-block;
+        margin-right: 7px;
+        vertical-align: text-top;
+      }
+      li.file a[href *= '.pdf'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href *= '.html'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href $= '.css'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
+      li.file a[href $= '.js']  span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
   li input
   {
     position: absolute;

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

@@ -233,6 +233,7 @@
                 $('#gollum-dialog-dialog').animate({ opacity: 1 }, {
                 duration: 500
                 });
+                $($('#gollum-dialog-dialog input[type="text"]').get(0)).focus();
               }
             });
           }

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

@@ -212,4 +212,37 @@ $(document).ready(function() {
       $('#gollum-revert-form').submit();
     });
   }
+
+  if( $('#wiki-wrapper.edit').length ){
+    $("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
+    $("#gollum-editor-body").one('change', function(){
+      window.onbeforeunload = function(){ return "Leaving will discard all edits!" };
+    });
+    $.GollumEditor();
+  }
+
+  if( $('#wiki-wrapper.create').length ){
+    $("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
+    $("#gollum-editor-body").one('change', function(){
+      window.onbeforeunload = function(){ return "Leaving will not create a new page!" };
+    });
+    $.GollumEditor({ NewFile: true, MarkupType: default_markup });
+  }
+
+  if( $('#wiki-history').length ){
+    var lookup = {};
+    $('img.identicon').each(function(index, element){
+      var $item   = $(element);
+      var code    = parseInt($item.data('identicon'), 10);
+      var img_bin = lookup[code];
+      if( img_bin === undefined ){
+        var size = 16;
+        var canvas = $('<canvas width=16 height=16/>').get(0);
+        render_identicon(canvas, code, 16);
+        img_bin = canvas.toDataURL("image/png");
+        lookup[code] = img_bin;
+      }
+      $item.attr('src', img_bin);
+    });
+  }
 });

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

@@ -0,0 +1,111 @@
+/*
+Client-side Canvas tag based Identicon rendering code
+
+@author  Don Park
+@version 0.2
+@date    January 21th, 2007
+*/
+
+var patch0 = new Array( 0, 4, 24, 20 );
+var patch1 = new Array( 0, 4, 20 );
+var patch2 = new Array( 2, 24, 20 );
+var patch3 = new Array( 0, 2,  20, 22 );
+var patch4 = new Array( 2, 14, 22, 10 );
+var patch5 = new Array( 0, 14, 24, 22 );
+var patch6 = new Array( 2, 24, 22, 13, 11, 22, 20 );
+var patch7 = new Array( 0, 14, 22 );
+var patch8 = new Array( 6, 8, 18, 16 );
+var patch9 = new Array( 4, 20, 10, 12, 2 );
+var patch10 = new Array( 0, 2, 12, 10 );
+var patch11 = new Array( 10, 14, 22 );
+var patch12 = new Array( 20, 12, 24 );
+var patch13 = new Array( 10, 2, 12 );
+var patch14 = new Array( 0, 2, 10 );
+var patchTypes = new Array( patch0, patch1, patch2, patch3, patch4,
+		patch5, patch6, patch7, patch8, patch9, patch10, patch11,
+		patch12, patch13, patch14, patch0 );
+var centerPatchTypes = new Array(0, 4, 8, 15);
+
+function render_identicon_patch(ctx, x, y, size, patch, turn, invert, foreColor, backColor) {
+	patch %= patchTypes.length;
+	turn %= 4;
+	if (patch == 15)
+		invert = !invert;
+
+	var vertices = patchTypes[patch];
+	var offset = size / 2;
+	var scale = size / 4;
+
+	ctx.save();
+
+	// paint background
+	ctx.fillStyle = invert ? foreColor : backColor;
+	ctx.fillRect(x, y, size, size);
+
+	// build patch path
+	ctx.translate(x + offset, y + offset);
+	ctx.rotate(turn * Math.PI / 2);
+	ctx.beginPath();
+	ctx.moveTo((vertices[0] % 5 * scale - offset), (Math.floor(vertices[0] / 5) * scale - offset));
+	for (var i = 1; i < vertices.length; i++)
+		ctx.lineTo((vertices[i] % 5 * scale - offset), (Math.floor(vertices[i] / 5) * scale - offset));
+	ctx.closePath();
+	
+	// offset and rotate coordinate space by patch position (x, y) and
+	// 'turn' before rendering patch shape
+
+	// render rotated patch using fore color (back color if inverted)
+	ctx.fillStyle = invert ? backColor : foreColor;
+	ctx.fill();
+
+	// restore rotation
+	ctx.restore();
+}
+
+function render_identicon(node, code, size) {
+	if (!node || !code || !size) return;
+	
+	var patchSize = size / 3;
+	var middleType = centerPatchTypes[code & 3];
+	var middleInvert = ((code >> 2) & 1) != 0;
+	var cornerType = (code >> 3) & 15;
+	var cornerInvert = ((code >> 7) & 1) != 0;
+	var cornerTurn = (code >> 8) & 3;
+	var sideType = (code >> 10) & 15;
+	var sideInvert = ((code >> 14) & 1) != 0;
+	var sideTurn = (code >> 15) & 3;
+	var blue = (code >> 16) & 31;
+	var green = (code >> 21) & 31;
+	var red = (code >> 27) & 31;
+	var foreColor = "rgb(" + (red << 3) + "," + (green << 3) + "," + (blue << 3) + ")";
+	var backColor = "rgb(255,255,255)";
+	
+	var ctx = node.getContext("2d");
+
+	// middle patch
+	render_identicon_patch(ctx, patchSize, patchSize, patchSize, middleType, 0, middleInvert, foreColor, backColor);
+	// side patchs, starting from top and moving clock-wise
+	render_identicon_patch(ctx, patchSize, 0, patchSize, sideType, sideTurn++, sideInvert, foreColor, backColor);
+	render_identicon_patch(ctx, patchSize * 2, patchSize, patchSize, sideType, sideTurn++, sideInvert, foreColor, backColor);
+	render_identicon_patch(ctx, patchSize, patchSize * 2, patchSize, sideType, sideTurn++, sideInvert, foreColor, backColor);
+	render_identicon_patch(ctx, 0, patchSize, patchSize, sideType, sideTurn++, sideInvert, foreColor, backColor);
+	// corner patchs, starting from top left and moving clock-wise
+	render_identicon_patch(ctx, 0, 0, patchSize, cornerType, cornerTurn++, cornerInvert, foreColor, backColor);
+	render_identicon_patch(ctx, patchSize * 2, 0, patchSize, cornerType, cornerTurn++, cornerInvert, foreColor, backColor);
+	render_identicon_patch(ctx, patchSize * 2, patchSize * 2, patchSize, cornerType, cornerTurn++, cornerInvert, foreColor, backColor);
+	render_identicon_patch(ctx, 0, patchSize * 2, patchSize, cornerType, cornerTurn++, cornerInvert, foreColor, backColor);
+}
+
+function render_identicon_canvases(prefix) {
+	var canvases = document.getElementsByTagName("canvas");
+	var n = canvases.length;
+	for (var i = 0; i < n; i++) {
+		var node = canvases[i];
+		if (node.title && node.title.indexOf(prefix) == 0) {
+			if (node.style.display == 'none') node.style.display = "inline";
+			var code = node.title.substring(prefix.length) * 1;
+			var size = node.width;
+			render_identicon(node, code, size);
+		}
+	}
+}

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

@@ -298,6 +298,8 @@ var makePreviewHtml = function () {
   }
 
   var prevTime = new Date().getTime();
+  // Handle gollum file code insertion syntax.
+  text = text.replace(/^[ \t]*``` ?([^:\n\r]+:[^`\n\r]+)```/gm, '``$1``');
   text = md_to_html( text );
 
   // Calculate the processing time of the HTML creation.

lib/gollum/frontend/templates/create.mustache

@@ -1,4 +1,4 @@
-<div id="wiki-wrapper">
+<div id="wiki-wrapper" class="create">
 <div id="head">
   <h1>Create New Page</h1>
 </div>
@@ -9,12 +9,6 @@
 </div>
 </div>
 <script type="text/javascript">
-window.onbeforeunload = function(){ return "Leaving will not create a new page!" };
-$("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
-
-jQuery(document).ready(function() {
-  $.GollumEditor({ NewFile: true, MarkupType: '{{default_markup}}' });
-});
+var default_markup = '{{default_markup}}';
 </script>
-
 {{something}}

lib/gollum/frontend/templates/edit.mustache

@@ -10,11 +10,3 @@
 </div>
   <div id="wiki-content">{{>editor}}</div>
 </div>
-<script type="text/javascript">
-window.onbeforeunload = function(){ return "Leaving will discard all edits!" };
-$("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
-
-jQuery(document).ready(function() {
-  $.GollumEditor();
-});
-</script>

lib/gollum/frontend/templates/file_view.mustache

@@ -5,6 +5,7 @@
   <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">
+  {{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
   <title>{{title}}</title>
 </head>
 <body>

lib/gollum/frontend/templates/history.mustache

@@ -30,11 +30,7 @@
           <input type="checkbox" name="versions[]" value="{{id}}">
         </td>
         <td class="author">
-          <a href="javascript:void(0)">
-            <img src="https://secure.gravatar.com/avatar/{{gravatar}}?s=16"
-             alt="avatar: {{author}}" class="mini-gravatar">
-            <span class="username">{{author}}</span>
-          </a>
+            {{>author_template}}
         </td>
         <td class="commit-name">
           <span class="time-elapsed">{{date}}:</span>&nbsp;

lib/gollum/frontend/templates/history_authors/gravatar.mustache

@@ -0,0 +1,5 @@
+<a href="javascript:void(0)">
+<img src="https://secure.gravatar.com/avatar/{{gravatar}}?s=16"
+    alt="avatar: {{author}}" class="mini-gravatar"/>
+    <span class="username">{{author}}</span>
+</a>

lib/gollum/frontend/templates/history_authors/identicon.mustache

@@ -0,0 +1,5 @@
+<a href="javascript:void(0)">
+  <img src="{{base_url}}/images/man_24.png" alt="avatar: {{author}}"
+    class="mini-gravatar identicon" data-identicon="{{identicon}}"/>
+  <span class="username">{{author}}</span>
+</a>

lib/gollum/frontend/templates/history_authors/none.mustache

@@ -0,0 +1,3 @@
+<a href="javascript:void(0)">
+    <span class="username">{{author}}</span>
+</a>

lib/gollum/frontend/templates/layout.mustache

@@ -6,6 +6,7 @@
   <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">
+  {{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
 
   <!--[if IE 7]>
   <link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">
@@ -18,6 +19,9 @@
   <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>
+  {{#use_identicon}}
+  <script type="text/javascript" src="{{base_url}}/javascript/identicon_canvas.js"></script>
+  {{/use_identicon}}
   {{#mathjax}}
   <script type="text/x-mathjax-config">
   MathJax.Hub.Config({

lib/gollum/frontend/templates/page.mustache

@@ -7,7 +7,7 @@ Mousetrap.bind(['e'], function( e ) {
 </script>
 <div id="wiki-wrapper" class="page">
 <div id="head">
-  <h1>{{title}}</h1>
+  <h1>{{page_header}}</h1>
   <ul class="actions">
     <li class="minibutton">
       {{>searchbar}}

lib/gollum/frontend/views/history.rb

@@ -19,8 +19,47 @@ module Precious
             :selected => @page.version.id == v.id,
             :author   => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
             :message  => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
-            :date     => v.committed_date.strftime("%B %d, %Y"),
-            :gravatar => Digest::MD5.hexdigest(v.author.email) }
+            :date     => v.authored_date.strftime("%B %d, %Y"),
+            :gravatar => Digest::MD5.hexdigest(v.author.email),
+            :identicon => self._identicon_code(v.author.email),
+          }
+        end
+      end
+
+      # http://stackoverflow.com/questions/9445760/bit-shifting-in-ruby
+      def left_shift int, shift
+        r = ((int & 0xFF) << (shift & 0x1F)) & 0xFFFFFFFF
+        # 1>>31, 2**32
+        (r & 2147483648) == 0 ? r : r - 4294967296
+      end
+
+      def string_to_code string
+        # sha bytes
+        b = [Digest::SHA1.hexdigest(string)[0,20]].pack('H*').bytes.to_a
+        # Thanks donpark's IdenticonUtil.java for this.
+        # Match the following Java code
+        # ((b[0] & 0xFF) << 24) | ((b[1] & 0xFF) << 16) |
+        #	 ((b[2] & 0xFF) << 8) | (b[3] & 0xFF)
+
+        return left_shift(b[0], 24) |
+               left_shift(b[1], 16) |
+               left_shift(b[2], 8)  |
+               b[3] & 0xFF
+      end
+
+      def _identicon_code(blob)
+        string_to_code blob + @request.host
+      end
+
+      def use_identicon
+          @page.wiki.user_icons == 'identicon'
+      end
+
+      def partial(name)
+        if name == :author_template
+          self.class.partial("history_authors/#{@page.wiki.user_icons}")
+        else
+          super
         end
       end
 

lib/gollum/frontend/views/layout.rb

@@ -23,6 +23,11 @@ module Precious
       def base_url
         @base_url
       end
+
+      def css # custom css
+        @css
+      end
+
     end
   end
 end

lib/gollum/frontend/views/page.rb

@@ -8,7 +8,16 @@ module Precious
       DEFAULT_AUTHOR = 'you'
 
       def title
-        @page.url_path.gsub("-", " ")
+        h1 = @h1_title ? page_header_from_content(@content) : false
+        h1 || @page.url_path_title
+      end
+
+      def page_header
+        page_header_from_content(@content) || title
+      end
+
+      def content
+        content_without_page_header(@content)
       end
 
       def author
@@ -80,6 +89,10 @@ module Precious
         @mathjax
       end
 
+      def use_identicon
+        @page.wiki.user_icons == 'identicon'
+      end
+
       # Access to embedded metadata.
       #
       # Examples
@@ -90,6 +103,48 @@ module Precious
       def metadata
         @page.metadata
       end
+
+      private
+
+      # Wraps page formatted data to Nokogiri::HTML document.
+      #
+      def build_document(content)
+        Nokogiri::HTML(%{<div id="gollum-root">} + content + %{</div>})
+      end
+
+      # Finds header node inside Nokogiri::HTML document.
+      #
+      def find_header_node(doc)
+        case self.format
+          when :asciidoc
+            doc.css("div#gollum-root > div#header > h1:first-child")
+          when :org
+            doc.css("div#gollum-root > p.title:first-child")
+          when :pod
+            doc.css("div#gollum-root > a.dummyTopAnchor:first-child + h1")
+          when :rest
+            doc.css("div#gollum-root > div > div > h1:first-child")
+          else
+            doc.css("div#gollum-root > h1:first-child")
+        end
+      end
+
+      # Extracts title from page if present.
+      #
+      def page_header_from_content(content)
+        doc = build_document(content)
+        title = find_header_node(doc)
+        Sanitize.clean(title.to_html).strip unless title.empty?
+      end
+
+      # Returns page content without title if it was extracted.
+      #
+      def content_without_page_header(content)
+        doc = build_document(content)
+        title = find_header_node(doc)
+        title.remove unless title.empty?
+        doc.css("div#gollum-root").inner_html
+      end
     end
   end
 end

lib/gollum/markup.rb

@@ -395,12 +395,12 @@ module Gollum
     # name - The String absolute or relative path of the file.
     #
     # Returns the Gollum::File or nil if none was found.
-    def find_file(name)
+    def find_file(name, version=@version)
       if name =~ /^\//
-        @wiki.file(name[1..-1], @version)
+        @wiki.file(name[1..-1], version)
       else
         path = @dir == '.' ? name : ::File.join(@dir, name)
-        @wiki.file(path, @version)
+        @wiki.file(path, version)
       end
     end
 
@@ -435,6 +435,10 @@ module Gollum
     #
     # Gitcode - fetch code from github search path and replace the contents
     #           to a code-block that gets run the next parse.
+    #           Acceptable formats:
+    #              ```language:local-file.ext```
+    #              ```language:/abs/other-file.ext```
+    #              ```language:github/gollum/master/somefile.txt```
     #
     #########################################################################
 
@@ -445,11 +449,11 @@ module Gollum
         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
+            if file = self.find_file(uri, @wiki.ref)
+              contents = file.raw_data
+            else
+              # How do we communicate a render error?
+              next "File not found: #{Rack::Utils::escape_html(uri)}"
             end
         else
           contents = Gollum::Gitcode.new(uri).contents

lib/gollum/page.rb

@@ -168,6 +168,27 @@ module Gollum
       path
     end
 
+    # Public: Defines title for page.rb
+    #
+    # Returns the String title
+    def url_path_title
+      metadata_title || url_path.gsub("-", " ")
+    end
+
+    # Public: Metadata title
+    #
+    # Set with <!-- --- title: New Title --> in page content
+    #
+    # Returns the String title or nil if not defined
+    def metadata_title
+      if metadata
+        title = metadata['title']
+        return title unless title.nil?
+      end
+
+      nil
+    end
+
     # Public: The url_path, but CGI escaped.
     #
     # Returns the String url_path
@@ -221,7 +242,7 @@ module Gollum
     # Public: Embedded metadata.
     #
     # Returns Hash of metadata.
-    def meta_data()
+    def metadata()
       formatted_data if markup_class.metadata == nil
       markup_class.metadata
     end

lib/gollum/sanitization.rb

@@ -105,7 +105,7 @@ module Gollum
     attr_reader :transformers
 
     # Gets or sets a String prefix which is added to ID attributes.
-    # Default: 'wiki-'
+    # Default: ''
     attr_accessor :id_prefix
 
     # Gets a Hash describing HTML attributes that Sanitize should add.
@@ -128,7 +128,7 @@ module Gollum
       @add_attributes   = {}
       @remove_contents  = REMOVE_CONTENTS.dup
       @allow_comments   = false
-      @id_prefix        = 'wiki-'
+      @id_prefix        = ''
       yield self if block_given?
     end
 

lib/gollum/wiki.rb

@@ -137,6 +137,14 @@ module Gollum
     # Gets the boolean live preview value.
     attr_reader :live_preview
 
+    # Injects custom css from custom.css in root repo.
+    # Defaults to false
+    attr_reader :css
+
+    # Sets page title to value of first h1
+    # Defaults to false
+    attr_reader :h1_title
+
     # Public: Initialize a new Gollum Repo.
     #
     # path    - The String path to the Git repository that holds the Gollum
@@ -155,6 +163,8 @@ module Gollum
     #           :ref - String the repository ref to retrieve pages from
     #           :ws_subs       - Array of chars to sub for ws in filenames.
     #           :mathjax       - Set to false to disable mathjax.
+    #           :user_icons    - Enable user icons on the history page. [gravatar, identicon, none].
+    #                            Default: none
     #           :show_all      - Show all files in file view, not just valid pages.
     #                            Default: false
     #           :collapse_tree - Start with collapsed file view. Default: false
@@ -166,26 +176,36 @@ module Gollum
         options[:access] = path
         path             = path.path
       end
+
+      # Use .fetch instead of ||
+      #
+      # o = { :a => false }
+      # o[:a] || true # => true
+      # o.fetch :a, true # => false
+
       @path                 = path
-      @repo_is_bare  = options[:repo_is_bare]
-      @page_file_dir = options[:page_file_dir]
-      @access        = options[:access]       || GitAccess.new(path, @page_file_dir, @repo_is_bare)
-      @base_path     = options[:base_path]    || "/"
-      @page_class    = options[:page_class]   || self.class.page_class
-      @file_class    = options[:file_class]   || self.class.file_class
-      @markup_classes = options[:markup_classes] || self.class.markup_classes
+      @repo_is_bare         = options.fetch :repo_is_bare, nil
+      @page_file_dir        = options.fetch :page_file_dir, nil
+      @access               = options.fetch :access, GitAccess.new(path, @page_file_dir, @repo_is_bare)
+      @base_path            = options.fetch :base_path, "/"
+      @page_class           = options.fetch :page_class, self.class.page_class
+      @file_class           = options.fetch :file_class, self.class.file_class
+      @markup_classes       = options.fetch :markup_classes, self.class.markup_classes
       @repo                 = @access.repo
-      @ref           = options[:ref] || self.class.default_ref
-      @sanitization  = options[:sanitization] || self.class.sanitization
-      @ws_subs       = options[:ws_subs] ||
-        self.class.default_ws_subs
-      @history_sanitization = options[:history_sanitization] ||
-        self.class.history_sanitization
-      @live_preview  = options.fetch(:live_preview, true)
-      @universal_toc = options.fetch(:universal_toc, false)
-      @mathjax = options[:mathjax] || false
-      @show_all = options[:show_all] || false
-      @collapse_tree = options[:collapse_tree] || false
+      @ref                  = options.fetch :ref, self.class.default_ref
+      @sanitization         = options.fetch :sanitization, self.class.sanitization
+      @ws_subs              = options.fetch :ws_subs, self.class.default_ws_subs
+      @history_sanitization = options.fetch :history_sanitization, self.class.history_sanitization
+      @live_preview         = options.fetch :live_preview, true
+      @universal_toc        = options.fetch :universal_toc, false
+      @mathjax              = options.fetch :mathjax, false
+      @show_all             = options.fetch :show_all, false
+      @collapse_tree        = options.fetch :collapse_tree, false
+      @css                  = options.fetch :css, false
+      @h1_title             = options.fetch :h1_title, false
+
+      @user_icons           = ['gravatar', 'identicon'].include?( options[:user_icons] ) ?
+                              options[:user_icons] : 'none'
     end
 
     # Public: check whether the wiki's git repo exists on the filesystem.
@@ -262,10 +282,11 @@ module Gollum
     #          :committer - Optional Gollum::Committer instance.  If provided,
     #                       assume that this operation is part of batch of
     #                       updates and the commit happens later.
-    #
+    # dir    - The String subdirectory of the Gollum::Page without any
+    #          prefix or suffix slashes (e.g. "foo/bar").
     # Returns the String SHA1 of the newly written version, or the
     # Gollum::Committer instance if this is part of a batch update.
-    def write_page(name, format, data, commit = {})
+    def write_page(name, format, data, commit = {}, dir = '')
       multi_commit = false
 
       committer = if obj = commit[:committer]
@@ -277,7 +298,7 @@ module Gollum
 
       filename = Gollum::Page.cname(name)
 
-      committer.add_to_index('', filename, format, data)
+      committer.add_to_index(dir, filename, format, data)
 
       committer.after_commit do |index, sha|
         @access.refresh
@@ -594,6 +615,9 @@ module Gollum
     # Toggles mathjax.
     attr_reader :mathjax
 
+    # Toggles user icons. Default: 'none'
+    attr_reader :user_icons
+
     # Toggles showing all files in files view. Default is false.
     # When false, only valid pages in the git repo are displayed.
     attr_reader :show_all

licenses/licenses.txt

@@ -1,3 +1,12 @@
+For gollum code, everything should fall under the existing MIT License.
+Alternative permissive licenses (such as BSD) for 3rd party dependencies are
+acceptable. For image assets in Gollum, CC BY or CC BY-SA is fine. Anything
+released under a copyleft license (for example GPL, AGPL, LGPL, MPL, EPL,
+etc.) is not permitted in gollum. Public domain, CC BY or CC BY-SA for code in
+gollum is not permitted.
+
+---
+
 The following PNGs are based on Ubuntu 11.10 SVG files located in /usr/share/icons/unity-icon-theme/places/svg/
 - group-folders.svg
 - group-files.svg
@@ -21,3 +30,23 @@ http://www.thecssninja.com/css/css-tree-menu
 http://www.thecssninja.com/demo/license.txt
 
   lib/gollum/frontend/public/css/_styles.css
+
+---
+
+Default profile image (man_24.png) is used under the CC BY-SA 3.0 Unported license.
+
+CC BY-SA 3.0 Unported
+http://blog.twg.ca/2010/11/retina-display-icon-set/
+http://creativecommons.org/licenses/by-sa/3.0/legalcode.txt
+
+    lib/gollum/frontend/public/images/man_24.png
+
+---
+
+The canvas_identicon code is used under the MIT license.
+
+https://github.com/donpark/identicon/blob/master/identicon-canvas/identicon_canvas.js
+https://github.com/donpark/identicon/blob/master/README
+
+  lib/gollum/frontend/public/gollum/javascript/identicon_canvas.js
+

test/examples/lotr.git/logs/HEAD

@@ -5,3 +5,4 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e
 b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700	push
 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100	push
 cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100	push
+629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey <dekimsey@ufl.edu> 1352501984 -0500	push

test/examples/lotr.git/logs/refs/heads/master

@@ -5,3 +5,4 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e
 b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700	push
 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100	push
 cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100	push
+629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey <dekimsey@ufl.edu> 1352501984 -0500	push

test/examples/lotr.git/objects/45/71349a92aa180e230345e4e44c9be7d9d4f96c

@@ -0,0 +1,2 @@
+x
E�OK1Å=÷S<ëEaºz’EYð ]¼g·™™`¦•´3ê··ã<åù½—4ps}{¶=
!gtä;°ö.„{w��ZNѹSÄ<g‹È=^eáYµCN¼vêȘdëlV¶²6³Æ6 
+ã‰$q„$÷"1*&«c«!µ`?J?¼Á“$š�)øwšµ®°·JV|¿&!æ‰}ç²Áï´)�<Ò—«þ¦cýƒHРs:²Õf£C»dŸõC8ah.Jß³qªˆl²P•Ü¤›·ÿÁ§¶ï”«�s¿³6gú

test/examples/lotr.git/objects/7d/6aeab8b84c895f21f6c66b84a457b0fced9693

@@ -0,0 +1 @@
+x
�Î=j1@áÔ:Åt®ô?cC\ù³šY¼Ú

test/examples/lotr.git/refs/heads/master

@@ -1 +1 @@
-629aa678272b017a4d136d35e77ac94d80b08dc2
+7d6aeab8b84c895f21f6c66b84a457b0fced9693

test/file_view/1_file.txt

@@ -1,3 +1,5 @@
 <ol class="tree">
-  <li class="file"><a href="0">0</a></li>
+  <li class="file">
+    <a href="0"><span class="icon"></span>0</a>
+  </li>
 </ol>

test/file_view/1_file_1_folder.txt

@@ -1,8 +1,11 @@
 <ol class="tree">
   <li>
-          <label>folder0</label> <input type="checkbox" checked />
+    <label>folder0</label>
+    <input type="checkbox" />
     <ol>
-            <li class="file"><a href="folder0/0">0</a></li>
+      <li class="file">
+        <a href="folder0/0"><span class="icon"></span>0</a>
+      </li>
     </ol>
   </li>
 </ol>

test/file_view/1_folder.txt

@@ -1,8 +1,11 @@
 <ol class="tree">
   <li>
-          <label>.</label> <input type="checkbox" checked />
+    <label>.</label>
+    <input type="checkbox" />
     <ol>
-            <li class="file"><a href="folder0">folder0</a></li>
+      <li class="file">
+        <a href="folder0"><span class="icon"></span>folder0</a>
+      </li>
     </ol>
   </li>
 </ol>

test/file_view/2_files_2_folders.txt

@@ -1,12 +1,20 @@
 <ol class="tree">
   <li>
-        <label>folder0</label> <input type="checkbox" checked />
+    <label>folder0</label>
+    <input type="checkbox" />
     <ol>
-  <li class="file"><a href="folder0/0">0</a></li>
+      <li class="file">
+        <a href="folder0/0"><span class="icon"></span>0</a>
+      </li>
     </ol>
   </li>
   <li>
-        <label>folder1</label> <input type="checkbox" checked />
+    <label>folder1</label>
+    <input type="checkbox" />
     <ol>
-  <li class="file"><a href="folder1/1">1</a></li>
+      <li class="file">
+        <a href="folder1/1"><span class="icon"></span>1</a>
+      </li>
+    </ol>
+  </li>
 </ol>

test/file_view/2_files_2_folders_1_root.txt

@@ -1,13 +1,23 @@
 <ol class="tree">
-  <li class="file"><a href="root">root</a></li>
+  <li class="file">
+    <a href="root"><span class="icon"></span>root</a>
+  </li>
   <li>
-        <label>folder0</label> <input type="checkbox" checked />
+    <label>folder0</label>
+    <input type="checkbox" />
     <ol>
-  <li class="file"><a href="folder0/0">0</a></li>
+      <li class="file">
+        <a href="folder0/0"><span class="icon"></span>0</a>
+      </li>
     </ol>
   </li>
   <li>
-        <label>folder1</label> <input type="checkbox" checked />
+    <label>folder1</label>
+    <input type="checkbox" />
     <ol>
-  <li class="file"><a href="folder1/1">1</a></li>
+      <li class="file">
+        <a href="folder1/1"><span class="icon"></span>1</a>
+      </li>
+    </ol>
+  </li>
 </ol>

test/file_view/nested_folders.txt

@@ -1,20 +1,28 @@
 <ol class="tree">
   <li>
-        <label>folder0</label> <input type="checkbox" checked />
+    <label>folder0</label>
+    <input type="checkbox" />
     <ol>
       <li>
-        <label>folder1</label> <input type="checkbox" checked />
+        <label>folder1</label>
+        <input type="checkbox" />
         <ol>
           <li>
-        <label>folder2</label> <input type="checkbox" checked />
+            <label>folder2</label>
+            <input type="checkbox" />
             <ol>
-  <li class="file"><a href="folder0/folder1/folder2/0">0</a></li>
+              <li class="file">
+                <a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a>
+              </li>
             </ol>
           </li>
           <li>
-        <label>folder3</label> <input type="checkbox" checked />
+            <label>folder3</label>
+            <input type="checkbox" />
             <ol>
-  <li class="file"><a href="folder0/folder1/folder3/1">1</a></li>
+              <li class="file">
+                <a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a>
+              </li>
             </ol>
           </li>
         </ol>
@@ -22,7 +30,12 @@
     </ol>
   </li>
   <li>
-        <label>folder4</label> <input type="checkbox" checked />
+    <label>folder4</label>
+    <input type="checkbox" />
     <ol>
-  <li class="file"><a href="folder4/2">2</a></li>
+      <li class="file">
+        <a href="folder4/2"><span class="icon"></span>2</a>
+      </li>
+    </ol>
+  </li>
 </ol>

test/helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rack/test'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'fileutils'
 
 dir = File.dirname(File.expand_path(__FILE__))

test/test_app.rb

@@ -185,8 +185,6 @@ context "Frontend" do
     post "/create", :content => 'abc', :page => name,
       :format => 'markdown', :message => 'def'
 
-    follow_redirect!
-
     assert last_response.ok?
 
     @wiki.clear_cache
@@ -385,16 +383,11 @@ context "Frontend with lotr" do
   end
 
   test "create pages within sub-directories using page file dir" do
-    Precious::App.set(:wiki_options, { :page_file_dir => 'wiki' })
-
     post "/create", :content => 'one two', :page => 'base',
-      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+      :path => 'wiki/Mordor', :format => 'markdown', :message => 'oooh, scary'
     assert_equal 'http://example.org/wiki/Mordor/base', last_response.headers['Location']
     get "/wiki/Mordor/base"
 
-    # Reset page_file_dir after request but before matching.
-    Precious::App.set(:wiki_options, { :page_file_dir => nil })
-
     assert_match /one two/, last_response.body
   end
 

test/test_committer.rb

@@ -50,7 +50,7 @@ context "Wiki" do
   end
 
   test "parents with default master ref" do
-    ref = '629aa678272b017a4d136d35e77ac94d80b08dc2'
+    ref = '7d6aeab8b84c895f21f6c66b84a457b0fced9693'
     committer = Gollum::Committer.new(@wiki)
     assert_equal ref,  committer.parents.first.sha
   end

test/test_file_view.rb

@@ -68,10 +68,24 @@ def write file, content
   end
 end
 
+def to_html html
+  # Remove blank nodes for proper formatting
+  doc = Nokogiri.XML(html) do |cfg|
+    cfg.default_xml.noblanks
+  end
+
+  # Save as XHTML
+  doc.to_xml( { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML, :indent => 2, :encoding => 'UTF-8' } )
+end
+
 def check name, pages_array
   pages = FakePages.new pages_array
   expected = read name
-  actual = view pages
+  actual = to_html view pages
+
+  # Uncomment when updating tests
+  # write name, actual
+
   assert_equal expected, actual
 end
 

test/test_git_access.rb

@@ -18,7 +18,7 @@ context "GitAccess" do
     assert @access.ref_map.empty?
     assert @access.tree_map.empty?
     @access.tree 'master'
-    assert_equal({"master"=>"629aa678272b017a4d136d35e77ac94d80b08dc2"}, @access.ref_map)
+    assert_equal({"master"=>"7d6aeab8b84c895f21f6c66b84a457b0fced9693"}, @access.ref_map)
 
     @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'
     map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3']

test/test_gitcode.rb

@@ -25,15 +25,73 @@ context "gitcode" do
   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\"><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></div>\n\n<p>b</p>}, @rendered
+    assert_equal %Q{<p>a</p>\n\n<div class=\"highlight\"><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;</span>\n    <span class=\"nt\">&lt;a</span> <span class=\"na\">href=</span><span class=\"s\">\"0\"</span><span class=\"nt\">&gt;&lt;span</span> <span class=\"na\">class=</span><span class=\"s\">\"icon\"</span><span class=\"nt\">&gt;&lt;/span&gt;</span>0<span class=\"nt\">&lt;/a&gt;</span>\n  <span class=\"nt\">&lt;/li&gt;</span>\n<span class=\"nt\">&lt;/ol&gt;</span>\n</pre></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>}
+    assert_equal g.contents, %{<ol class=\"tree\">\n  <li class=\"file\">\n    <a href=\"0\"><span class=\"icon\"></span>0</a>\n  </li>\n</ol>\n}
+  end
+
+  test "gitcode relative local file" do
+    @wiki.write_page("Bilbo Baggins", :markdown, "a\n```python:file-exists.py```\nb", commit_details)
+    page = @wiki.page('Bilbo Baggins')
+
+    index = @wiki.repo.index
+    index.add("file-exists.py", "import sys\n\nprint sys.maxint\n")
+    index.commit("Add file-exists.py")
+
+    @wiki.clear_cache
+
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class="highlight"><pre><span class="kn">import</span> <span class="nn">sys</span>\n\n<span class="k">print</span> <span class="n">sys</span><span class="o">.</span><span class="n">maxint</span>\n</pre></div>\n\n<p>b</p>}, output
+  end
+
+  test "gitcode relative local file in subdir" do
+    index = @wiki.repo.index
+    index.add("foo/file-exists.py", "import sys\n\nprint sys.maxint\n")
+    index.commit("Add file-exists.py")
+
+    @wiki.write_page("Pippin", :markdown, "a\n```python:file-exists.py```\nb", commit_details, 'foo')
+
+    page = @wiki.paged('Pippin', 'foo')
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class="highlight"><pre><span class="kn">import</span> <span class="nn">sys</span>\n\n<span class="k">print</span> <span class="n">sys</span><span class="o">.</span><span class="n">maxint</span>\n</pre></div>\n\n<p>b</p>}, output
+  end
+
+  test "gitcode relative no file" do
+    @wiki.write_page("Bilbo Baggins", :markdown, "a\n```python:no-file-exists.py```\nb", commit_details)
+    page = @wiki.page('Bilbo Baggins')
+    output = page.formatted_data
+    assert_equal %Q{<p>a\nFile not found: no-file-exists.py\nb</p>}, output
+  end
+
+  test "gitcode absolute local file" do
+    @wiki.write_page("Bilbo Baggins", :markdown, "a\n```python:/monkey/file-exists.py```\nb", commit_details)
+    page = @wiki.page('Bilbo Baggins')
+
+    index = @wiki.repo.index
+    index.add("monkey/file-exists.py", "import sys\n\nprint sys.platform\n")
+    index.commit("Add monkey/file-exists.py")
+    @wiki.clear_cache
+
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class="highlight"><pre><span class="kn">import</span> <span class="nn">sys</span>\n\n<span class="k">print</span> <span class="n">sys</span><span class="o">.</span><span class="n">platform</span>\n</pre></div>\n\n<p>b</p>}, output
+  end
+
+  test "gitcode absolute no file" do
+    @wiki.write_page("Bilbo Baggins", :markdown, "a\n```python:/monkey/no-file-exists.py```\nb", commit_details)
+    page = @wiki.page('Bilbo Baggins')
+    output = page.formatted_data
+    assert_equal %Q{<p>a\nFile not found: /monkey/no-file-exists.py\nb</p>}, output
+  end
+
+  test "gitcode error generates santized html" do
+    @wiki.write_page("Bilbo Baggins", :markdown, "a\n```python:<script>foo</script>```\nb", commit_details)
+    page = @wiki.page('Bilbo Baggins')
+    output = page.formatted_data
+    assert_equal %Q{<p>a\nFile not found: &lt;script&gt;foo&lt;/script&gt;\nb</p>}, output
   end
 
   teardown do

test/test_history_view.rb

@@ -0,0 +1,25 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path '../../lib/gollum/frontend/views/history', __FILE__
+
+context "Precious::Views::History" do
+  setup do
+    @history = Precious::Views::History.new
+  end
+
+  test "string_to_code" do
+    # Result must match the following Java code.
+=begin
+	    public static void main(String[] args) throws Exception {
+		    final String s = "code@example.com";
+		    final byte[] b = MessageDigest.getInstance("SHA1").digest(s.toString().getBytes("UTF-8"));
+		    final int c = ((b[0] & 0xFF) << 24) | ((b[1] & 0xFF) << 16)
+				    | ((b[2] & 0xFF) << 8) | (b[3] & 0xFF);
+		    // 143327882
+		    System.out.println(c);
+	    }
+=end
+    actual = @history.string_to_code 'code@example.com'
+    assert_equal 143327882, actual
+  end
+end

test/test_markup.rb

@@ -582,24 +582,13 @@ 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\"><pre><span class=\"nt\">&lt;p&gt;</span>a  b<span class=\"nt\">&lt;/p&gt;</span>\n</pre></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\"><pre><span class=\"nt\">&lt;p&gt;</span>a\n!base<span class=\"nt\">&lt;/p&gt;</span>\n</pre></div>\n}, output
+    assert_equal %Q{<p>a\nFile not found: /base</p>}, output
   end
 
   test "embed code page relative link" do
@@ -608,7 +597,7 @@ np.array([[2,2],[1,3]],np.float)
 
     page = @wiki.page("a")
     output = page.formatted_data
-    assert_equal %Q{<p>a\n</p><div class=\"highlight\"><pre><span class=\"nt\">&lt;p&gt;</span>a\n!rel<span class=\"nt\">&lt;/p&gt;</span>\n</pre></div>\n}, output
+    assert_equal %Q{<p>a\nFile not found: base</p>}, output
   end
 
   test "code block in unsupported language" do
@@ -656,7 +645,7 @@ np.array([[2,2],[1,3]],np.float)
     page = @wiki.page("Bilbo Baggins")
     rendered = Gollum::Markup.new(page).render
     assert_equal output, rendered 
-    assert_equal result, page.meta_data
+    assert_equal result, page.metadata
   end
 
   test "metadata blocks with newline" do
@@ -671,7 +660,7 @@ np.array([[2,2],[1,3]],np.float)
     page = @wiki.page("Bilbo Baggins")
     rendered = Gollum::Markup.new(page).render
     assert_equal output, rendered 
-    assert_equal result, page.meta_data
+    assert_equal result, page.metadata
   end
 
   test "metadata sanitation" do
@@ -686,7 +675,7 @@ np.array([[2,2],[1,3]],np.float)
     page = @wiki.page("Bilbo Baggins")
     rendered = Gollum::Markup.new(page).render
     assert_equal output, rendered 
-    assert_equal result, page.meta_data
+    assert_equal result, page.metadata
   end
 
   #########################################################################
@@ -783,6 +772,7 @@ end
     ]
   end
 
+if ENV['ASCIIDOC']
   #########################################################################
   # Asciidoc
   #########################################################################
@@ -794,6 +784,7 @@ end
   test "internal links with asciidoc" do 
     compare("= Book Title\n\n[[anid]]\n== Heading", '<div class="sect1"><h2 id="wiki-anid">Heading<a class="anchor" id="Heading" href="#Heading"></a></h2><div class="sectionbody"></div></div>', 'asciidoc')
   end
+end
 
   #########################################################################
   #

test/test_page.rb

@@ -227,5 +227,12 @@ context "within a sub-directory" do
     assert page.header.raw_data =~ /^Hobbits/
     assert page.footer.raw_data =~ /^Lord of the Rings/
   end
+
+  test "get metadata on page" do
+    page = @wiki.page('Elrond')
+    assert_equal Gollum::Page, page.class
+    assert_equal 'elf', page.metadata['race']
+  end
+
 end
 

test/test_wiki.rb

@@ -198,6 +198,14 @@ context "Wiki page writing" do
     assert_equal cd[:email], @wiki.repo.commits.first.author.email
   end
 
+  test "page title override with metadata" do
+    @wiki.write_page("Gollum", :markdown, "<!-- --- title: Over -->", commit_details)
+
+    page = @wiki.page("Gollum")
+
+    assert_equal 'Over', page.url_path_title
+  end
+
   test "update page with format change" do
     @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details)
 

test/wiki_factory.rb

@@ -1,10 +1,12 @@
 class WikiFactory
-  def self.create p
+  def self.create p, opt={}
     path = testpath "examples/test.git"
     Grit::Repo.init_bare(path)
-    Gollum::Wiki.default_options = {:universal_toc => false}
+    Gollum::Wiki.default_options = {:universal_toc => false}.merge(opt)
     cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
     wiki = Gollum::Wiki.new(path)
+    # set 'wiki-' prefix on ids for tests
+    wiki.sanitization.id_prefix = 'wiki-'
     return wiki, path, cleanup
   end
 end