olelo 0.9.6 → 0.9.7

data/bin/olelo

@@ -28,7 +28,7 @@ opts = OptionParser.new do |opts|
     options[:host] = host
   end
 
-  opts.on('-s', '--server SERVER', 'serve using SERVER (webrick/mongrel)') do |server|
+  opts.on('-s', '--server SERVER', 'serve using SERVER (webrick/mongrel/thin)') do |server|
     options[:server] = server
   end
 

data/config.ru

@@ -99,6 +99,7 @@ use Rack::MethodOverride
 use Rack::CommonLogger, LoggerOutput.new(logger)
 use Rack::RelativeRedirect
 use Olelo::Middleware::ForceEncoding
+use Rack::Head
 run Olelo::Application.new
 
 logger.info "Olelo started in #{Olelo::Config['production'] ? 'production' : 'development'} mode"

data/config/config.yml.default

@@ -21,6 +21,7 @@ production:      true
 sidebar_page:    'Sidebar'
 
 # Use a different base directory as root to support installation in user homes
+# e.g. /wiki
 base_path:      '/'
 
 # Main cache store. Uncomment this!

data/lib/olelo/application.rb

@@ -13,7 +13,7 @@ module Olelo
 
     has_around_hooks :request, :routing, :action, :title, :footer, :login_buttons,
                      :edit_buttons, :attributes_buttons, :upload_buttons
-    has_hooks :auto_login, :render, :menu, :head, :script
+    has_hooks :auto_login, :render, :menu, :head
 
     def self.reserved_path?(path)
       path = '/' + path.cleanpath
@@ -32,7 +32,7 @@ module Olelo
     # Executed before each request
     before :routing do
       User.current = User.find(session[:olelo_user])
-      if !User.current
+      unless User.current
         invoke_hook(:auto_login)
         User.current ||= User.anonymous(request)
       end
@@ -148,7 +148,7 @@ module Olelo
         raise NotFound
       end
       @version = @diff.to
-      cache_control version: @version
+      cache_control etag: @version.to_s
       render :changes
     end
 
@@ -158,8 +158,7 @@ module Olelo
       @page_nr = [params[:page].to_i, 1].max
       @history = page.history((@page_nr - 1) * per_page, per_page)
       @page_count = @page_nr + @history.length / per_page
-      @history = @history[0...per_page]
-      cache_control version: page.version
+      cache_control etag: page.etag
       render :history
     end
 
@@ -269,7 +268,7 @@ module Olelo
     get '/(:path)', tail: true do
       begin
         @page = Page.find!(params[:path])
-        cache_control version: page.version
+        cache_control etag: page.etag
         show_page
       rescue NotFound
         redirect build_path(params[:path], action: :new)
@@ -278,7 +277,7 @@ module Olelo
 
     get '/version/:version(/:path)' do
       @page = Page.find!(params[:path], params[:version])
-      cache_control version: page.version
+      cache_control etag: page.etag
       show_page
     end
 

data/lib/olelo/helper.rb

@@ -17,14 +17,6 @@ module Olelo
     def render_block(name)
       with_hooks(name) { yield }.join.html_safe
     end
-
-    def include_or_define_block(name, content = nil, &block)
-      if block_given? || content
-        define_block(name, content, &block)
-      else
-        include_block(name)
-      end
-    end
   end
 
   module FlashHelper
@@ -242,11 +234,6 @@ module Olelo
       last_modified = last_modified.try(:to_time) || last_modified
       last_modified = last_modified.try(:httpdate) || last_modified
 
-      if options[:version]
-        options[:etag] = options[:version].cache_id
-        options[:last_modified] = options[:version].date
-      end
-
       if User.logged_in?
         # Always private mode if user is logged in
         options[:private] = true
@@ -309,31 +296,38 @@ module Olelo
     end
 
     def footer(content = nil, &block)
-      include_or_define_block(:footer, content, &block)
+      if block_given? || content
+        define_block(:footer, content, &block)
+      else
+        include_block(:footer)
+      end
     end
 
     def title(content = nil, &block)
-      include_or_define_block(:title,  content, &block)
+      if block_given? || content
+        define_block(:title, content, &block)
+      else
+        include_block(:title)
+      end
     end
 
     def head
-      @@theme_link ||=
+      @@js_css_links ||=
         begin
           file = File.join(Config['themes_path'], Config['theme'], 'style.css')
-          path = build_path "static/themes/#{Config['theme']}/style.css?#{File.mtime(file).to_i}"
-          %{<link rel="stylesheet" href="#{escape_html path}" type="text/css"/>}
-        end
-      @@script_link ||=
-        begin
-          path = build_path "static/script.js?#{File.mtime(File.join(Config['app_path'], 'static', 'script.js')).to_i}"
-          %{<script src="#{escape_html path}" type="text/javascript"></script>}
+          css_path = build_path "static/themes/#{Config['theme']}/style.css?#{File.mtime(file).to_i}"
+          js_path = build_path "static/script.js?#{File.mtime(File.join(Config['app_path'], 'static', 'script.js')).to_i}"
+          %{<link rel="stylesheet" href="#{escape_html css_path}" type="text/css"/>
+<script src="#{escape_html js_path}" type="text/javascript"></script>}
         end
+      # Add base path to root page to fix links in history browsing and for wikis with base_path
       base_path = if page && page.root?
         url = request.base_url
+        url << Config['base_path'] if Config['base_path'] != '/'
         url << '/' << 'version'/page.tree_version if !page.head?
         %{<base href="#{escape_html url}/"/>}.html_safe
       end
-      [base_path, @@theme_link, @@script_link, *invoke_hook(:head)].join.html_safe
+      [base_path, @@js_css_links, *invoke_hook(:head)].join.html_safe
     end
 
     def session

data/lib/olelo/middleware/ua_header.rb

@@ -1,3 +1,4 @@
+# From ActionPack
 module Olelo
   module Middleware
     class UAHeader

data/lib/olelo/page.rb

@@ -39,8 +39,8 @@ module Olelo
 
     attr_reader :path, :tree_version
 
-    def initialize(path, tree_version = nil, parent = nil)
-      @path, @tree_version, @parent = path.to_s.cleanpath.freeze, tree_version, parent
+    def initialize(path, tree_version = nil, etag = nil, parent = nil)
+      @path, @etag, @tree_version, @parent = path.to_s.cleanpath.freeze, etag, tree_version, parent
       Page.check_path(@path)
     end
 
@@ -67,7 +67,10 @@ module Olelo
       path = path.to_s.cleanpath
       check_path(path)
       tree_version = repository.get_version(tree_version) unless Version === tree_version
-      Page.new(path, tree_version) if tree_version && repository.path_exists?(path, tree_version)
+      if tree_version
+        etag = repository.path_etag(path, tree_version)
+        Page.new(path, tree_version, etag) if etag
+      end
     end
 
     # Throws if not found
@@ -88,6 +91,13 @@ module Olelo
       mime.text? || mime == EMPTY_MIME || mime == DIRECTORY_MIME
     end
 
+    def etag
+      unless new?
+        @etag ||= repository.path_etag(path, tree_version)
+        "#{head? ? 1 : 0}-#{@etag}"
+      end
+    end
+
     def next_version
       init_versions
       @next_version
@@ -208,7 +218,7 @@ module Olelo
           []
         else
           repository.get_children(path, tree_version).sort.map do |name|
-            Page.new(path/name, tree_version, self)
+            Page.new(path/name, tree_version, nil, self)
           end
         end
     end

data/lib/olelo/repository.rb

@@ -41,10 +41,6 @@ module Olelo
     def ==(other)
       other.to_s == id
     end
-
-    def cache_id
-      "#{@id}-#{@head}"
-    end
   end
 
   # Difference between versions
@@ -131,13 +127,13 @@ module Olelo
       raise NotImplementedError
     end
 
-    # Check if path exists
+    # Check if path exists and return etag
     #
     # @param [String] path
     # @param [String, Version] version
-    # @return [Boolean]
+    # @return [String]
     # @api public
-    def path_exists?(path, version)
+    def path_etag(path, version)
       raise NotImplementedError
     end
 

data/lib/olelo/routing.rb

@@ -32,8 +32,7 @@ module Olelo
 
       catch(:forward) do
         with_hooks(:request) { perform! }
-        status, header, body = response.finish
-        return [status, header, request.head? ? [] : body]
+        return response.finish
       end
 
       @app ? @app.call(env) : error!(NotFound.new(@request.path_info))
@@ -195,7 +194,6 @@ module Olelo
 
       def get(path, patterns = {}, &block)
         add_route('GET',  path, patterns, &block)
-        add_route('HEAD', path, patterns, &block)
       end
 
       def put(path, patterns = {}, &block)

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/plugins/aspects/main.rb

@@ -146,7 +146,7 @@ end
 # Plug-in the aspect subsystem
 module ::Olelo::PageHelper
   def render_page(page)
-    Cache.cache("include-#{page.path}-#{page.version.cache_id}", update: no_cache?, defer: true) do |context|
+    Cache.cache("include-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do |context|
       begin
         context = Context.new(page: page, params: {included: true})
         Aspect.find!(page, layout: true).call(context, page)
@@ -162,7 +162,7 @@ class ::Olelo::Application
   def show_page
     params[:aspect] ||= 'subpages' if params[:path].to_s.ends_with? '/'
     @selected_aspect, layout, header, content =
-    Cache.cache("aspect-#{page.path}-#{page.version.cache_id}-#{build_query(params)}",
+    Cache.cache("aspect-#{page.path}-#{page.etag}-#{build_query(params)}",
                 update: no_cache?, defer: true) do |cache|
       aspect = Aspect.find!(page, name: params[:aspect])
       cache.disable! if !aspect.cacheable?
@@ -172,6 +172,7 @@ class ::Olelo::Application
       context.header['Content-Type'] ||= page.mime.to_s if !aspect.layout?
       [aspect.name, aspect.layout?, context.header.to_hash, result]
     end
+
     self.response.header.merge!(header)
 
     @menu_versions = true
@@ -186,18 +187,15 @@ class ::Olelo::Application
 
   hook :menu do |menu|
     if menu.name == :actions && view_menu = menu[:view]
-      Cache.cache("aspect-menu-#{page.path}-#{page.version.cache_id}-#{@selected_aspect}",
-                              update: no_cache?, defer: true) do
-        aspects = Aspect.find_all(page).select {|a| !a.hidden? || a.name == @selected_aspect || a.name == page.attributes['aspect'] }.map do |a|
-          [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
-        end.sort_by(&:first)
-        aspects.select {|label, a| a.layout? }.map do |label, a|
-          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: a.name == @selected_aspect ? 'selected' : nil)
-        end +
-        aspects.reject {|label, a| a.layout? }.map do |label, a|
-          MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: 'download')
-        end
-      end.each {|item| view_menu << item }
+      aspects = Aspect.find_all(page).select {|a| !a.hidden? || a.name == @selected_aspect || a.name == page.attributes['aspect'] }.map do |a|
+        [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
+      end.sort_by(&:first)
+      aspects.select {|label, a| a.layout? }.each do |label, a|
+        view_menu << MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: a.name == @selected_aspect ? 'selected' : nil)
+      end
+      aspects.reject {|label, a| a.layout? }.each do |label, a|
+        view_menu << MenuItem.new(a.name, label: label, href: build_path(page, aspect: a.name), class: 'download')
+      end
     end
   end
 end

data/plugins/blog/main.rb

@@ -10,7 +10,7 @@ end
 Tags::Tag.define 'menu', optional: 'path', description: 'Show blog menu', dynamic: true do |context, attrs, content|
   page = Page.find(attrs[:path]) rescue nil
   if page
-    Cache.cache("blog-#{page.path}-#{page.version.cache_id}", update: no_cache?(context.request.env), defer: true) do
+    Cache.cache("blog-#{page.path}-#{page.etag}", update: no_cache?(context.request.env), defer: true) do
       years = {}
       page.children.each do |child|
         (years[child.version.date.year] ||= [])[child.version.date.month] = true

data/plugins/editor/ace/init.js

@@ -1,4 +1,6 @@
 $(function() {
+    "use strict";
+
     var textarea = $('#edit-content');
     if (textarea.length == 1) {
 	textarea.hide().before('<div id="ace-editor" style="position:relative; width:100%; height: 40em"/>');

data/plugins/editor/markup/script.js

@@ -1,10 +1,10 @@
 (function(){var e=function(){var g=typeof document.selection!=="undefined"&&typeof document.selection.createRange!=="undefined";return{getSelectionRange:function(a){var b,c,d;a.focus();if(typeof a.selectionStart!=="undefined"){b=a.selectionStart;c=a.selectionEnd}else if(g){b=document.selection.createRange();c=b.text.length;if(b.parentElement()!==a)throw"Unable to get selection range.";if(a.type==="textarea"){d=b.duplicate();d.moveToElementText(a);d.setEndPoint("EndToEnd",b);b=d.text.length-c}else{a=
 a.createTextRange();a.setEndPoint("EndToStart",b);b=a.text.length}c=b+c}else throw"Unable to get selection range.";return{start:b,end:c}},getSelectionStart:function(a){return this.getSelectionRange(a).start},getSelectionEnd:function(a){return this.getSelectionRange(a).end},setSelectionRange:function(a,b,c){var d;a.focus();if(typeof c==="undefined")c=b;if(typeof a.selectionStart!=="undefined")a.setSelectionRange(b,c);else if(g){d=a.value;a=a.createTextRange();c-=b+d.slice(b+1,c).split("\n").length-
-1;b-=d.slice(0,b).split("\n").length-1;a.move("character",b);a.moveEnd("character",c);a.select()}else throw"Unable to set selection range.";},getSelectedText:function(a){var b=this.getSelectionRange(a);return a.value.substring(b.start,b.end)},insertText:function(a,b,c,d,h){d=d||c;var i=c+b.length,l=a.value.substring(0,c);d=a.value.substr(d);a.value=l+b+d;h===true?this.setSelectionRange(a,c,i):this.setSelectionRange(a,i)},replaceSelectedText:function(a,b,c){var d=this.getSelectionRange(a);this.insertText(a,
+1;b-=d.slice(0,b).split("\n").length-1;a.move("character",b);a.moveEnd("character",c);a.select()}else throw"Unable to set selection range.";},getSelectedText:function(a){var b=this.getSelectionRange(a);return a.value.substring(b.start,b.end)},insertText:function(a,b,c,d,h){d=d||c;var i=c+b.length,k=a.value.substring(0,c);d=a.value.substr(d);a.value=k+b+d;h===true?this.setSelectionRange(a,c,i):this.setSelectionRange(a,i)},replaceSelectedText:function(a,b,c){var d=this.getSelectionRange(a);this.insertText(a,
 b,d.start,d.end,c)},wrapSelectedText:function(a,b,c,d){b=b+this.getSelectedText(a)+c;this.replaceSelectedText(a,b,d)}}}();window.Selection=e})();
 (function(e){e.fn.extend({getSelectionRange:function(){return Selection.getSelectionRange(this[0])},getSelectionStart:function(){return Selection.getSelectionStart(this[0])},getSelectionEnd:function(){return Selection.getSelectionEnd(this[0])},getSelectedText:function(){return Selection.getSelectedText(this[0])},setSelectionRange:function(g,a){return this.each(function(){Selection.setSelectionRange(this,g,a)})},insertText:function(g,a,b,c){return this.each(function(){Selection.insertText(this,g,a,
 b,c)})},replaceSelectedText:function(g,a){return this.each(function(){Selection.replaceSelectedText(this,g,a)})},wrapSelectedText:function(g,a,b){return this.each(function(){Selection.wrapSelectedText(this,g,a,b)})}})})(jQuery);(function(e){var g={creole:{link:["[[","link text","]]"],bold:["**","bold text","**"],italic:["//","italic text","//"],ul:["* ","list item","",true],ol:["# ","list item","",true],h1:["= ","headline","",true],h2:["== ","headline","",true],h3:["=== ","headline","",true],sub:["~~","subscript","~~"],sup:["^^","superscript","^^"],del:["--","deleted text","--"],ins:["++","inserted text","++"],image:["{{","image","}}"],preformatted:["{{{","preformatted","}}}"]},markdown:{link:function(a){return(a=prompt("link target:",
 a))?["[","link text","]("+a+")"]:null},bold:["**","bold text","**"],italic:["*","italic text","*"],ul:["* ","list item","",true],ol:["1. ","list item","",true],h1:["","headline","\n========",true],h2:["","headline","\n--------",true],image:function(a){return(a=prompt("image path:",a))?["![","image alt text","]("+a+")"]:null},preformatted:["    ","preformatted","",true]},orgmode:{bold:["*","bold text","*"],italic:["/","italic text","/"],ul:["- ","list item",""],ol:["1. ","list item",""],h1:["* ","headline",
 ""],h2:["** ","headline",""],h3:["*** ","headline",""]},textile:{link:function(a){return(a=prompt("link target:",a))?['"',"link text",'":'+a]:null},bold:["*","bold text","*"],italic:["_","italic text","_"],ul:["* ","list item","",true],ol:["# ","list item","",true],h1:["h1. ","headline","",true],h2:["h2. ","headline","",true],h3:["h3. ","headline","",true],em:["_","emphasized text","_"],sub:["~","subscript","~"],sup:["^","superscript","^"],del:["-","deleted text","-"],ins:["+","inserted text","+"],
-image:["!","image","!"]}};e.fn.markupEditor=function(a){if(a=g[a]){var b=e('<ul class="button-bar" id="markup-editor"/>'),c=[];for(k in a)c.push(k);c.sort();for(var d=0;d<c.length;++d)b.append('<li><a href="#" id="markup-editor-'+c[d]+'">'+c[d]+"</a></li>");this.before(b);var h=this;e("a",b).click(function(){var i=a[this.id.substr(14)],l=h.getSelectedText();if(typeof i=="function")i=i(l);if(i){var f=h.getSelectionRange(),j=i[0],n=i[1],m=i[2];if(i[3]){h.setSelectionRange(f.start-1,f.start);if(f.start!==
-0&&h.getSelectedText()!="\n")j="\n"+j;h.setSelectionRange(f.end,f.end+1);if(h.getSelectedText()!="\n")m+="\n"}if(f.start==f.end){h.insertText(j+n+m,f.start,f.start,false);h.setSelectionRange(f.start+j.length,f.start+j.length+n.length)}else h.insertText(j+l+m,f.start,f.end,false)}return false})}}})(jQuery);$(function(){var e=Olelo.page_mime;if(e=="application/x-empty"||e=="inode/directory")e=Olelo.default_mime;(e=/text\/x-(\w+)/.exec(e))&&$("#edit-content").markupEditor(e[1])});
+image:["!","image","!"]}};e.fn.markupEditor=function(a){if(a=g[a]){var b=e('<ul class="button-bar" id="markup-editor"/>'),c=[];for(var d in a)c.push(d);c.sort();for(d=0;d<c.length;++d)b.append('<li><a href="#" id="markup-editor-'+c[d]+'">'+c[d]+"</a></li>");this.before(b);var h=this;e("a",b).click(function(){var i=a[this.id.substr(14)],k=h.getSelectedText();if(typeof i=="function")i=i(k);if(i){var f=h.getSelectionRange(),j=i[0],m=i[1],l=i[2];if(i[3]){h.setSelectionRange(f.start-1,f.start);if(f.start!==
+0&&h.getSelectedText()!="\n")j="\n"+j;h.setSelectionRange(f.end,f.end+1);if(h.getSelectedText()!="\n")l+="\n"}if(f.start==f.end){h.insertText(j+m+l,f.start,f.start,false);h.setSelectionRange(f.start+j.length,f.start+j.length+m.length)}else h.insertText(j+k+l,f.start,f.end,false)}return false})}}})(jQuery);$(function(){var e=Olelo.page_mime;if(e=="application/x-empty"||e=="inode/directory")e=Olelo.default_mime;(e=/text\/x-(\w+)/.exec(e))&&$("#edit-content").markupEditor(e[1])});

data/plugins/editor/markup/script/01-olelo.markupeditor.js

@@ -1,4 +1,6 @@
 (function($) {
+    "use strict";
+
     var markups = {
         creole: {
             link:   ['[[', 'link text', ']]'],
@@ -97,7 +99,7 @@
             var list = $('<ul class="button-bar" id="markup-editor"/>');
 
             var buttons = [];
-            for (k in markup) {
+            for (var k in markup) {
                  buttons.push(k);
             }
             buttons.sort();

data/plugins/editor/markup/script/init.js

@@ -1,4 +1,6 @@
 $(function() {
+    "use strict";
+
     var mime = Olelo.page_mime;
     if (mime == 'application/x-empty' || mime == 'inode/directory') {
 	mime = Olelo.default_mime;

data/plugins/filters/markdown_nowiki.rb

@@ -1,15 +1,34 @@
 description 'Markdown nowiki filter'
 
+# Embeds indented markdown text blocks in <notags> tags
+# and adds <notags> around ``texts``
 Filter.create :markdown_nowiki do |context, content|
   output = ''
-  until content.blank?
-    case content
-    when /(\A( {4}|\t).*)|(\A``.*?``)|(\A`[^`]*`)/
-      output << "<notags>#{$&}</notags>"
-    when /(\A[^`\n]+)|(\A\n+)/
-      output << $&
+  block, state = nil, nil
+  content.each_line do |line|
+    if block
+      if line =~ /\A( {4}|\t)/
+        block << line
+        state = :in
+      elsif line =~ /\A\s*\Z/
+        block << line
+        state = :after if state == :in
+      elsif state == :after
+        output << "<notags>#{block}</notags>"
+        block = nil
+      else
+        block << line
+        line = block
+        block = nil
+      end
+    elsif line =~ /\A\s*\Z/
+      block, state = line, :before
+    end
+
+    unless block
+      output << line.gsub(/``.*?``|`[^`]*`/, '<notags>\0</notags>')
     end
-    content = $'
   end
+  output << (state == :before ? block : "<notags>#{block}</notags>") if block
   output
 end

data/plugins/misc/fancybox/script/init.js

@@ -1,4 +1,6 @@
 $(function() {
+    "use strict";
+
     function initFancybox() {
         $('a.fancybox').each(function() {
             var href = this.href.replace(/aspect=\w+/g, '');

data/plugins/misc/fragment_cache.rb

@@ -0,0 +1,30 @@
+description 'Cache page fragments'
+dependencies 'utils/cache'
+
+class ::Olelo::Application
+  def cache_id
+    @cache_id ||= page ? "#{page.path}-#{page.etag}-#{build_query(params)}" : "#{request.path_info}-#{build_query(params)}"
+  end
+
+  redefine_method :menu do |name|
+    Cache.cache("menu-#{name}-#{cache_id}", update: no_cache?) do |cache|
+      super(name)
+    end
+  end
+
+  redefine_method :head do
+    Cache.cache("head-#{cache_id}", update: no_cache?) do |cache|
+      super()
+    end
+  end
+
+  redefine_method :footer do |content = nil, &block|
+    if block_given? || content
+      super(content, &block)
+    else
+      Cache.cache("footer-#{cache_id}", update: no_cache?) do |cache|
+        super()
+      end
+    end
+  end
+end

data/plugins/repositories/gitrb_repository.rb

@@ -24,9 +24,13 @@ class GitrbRepository < Repository
   end
 
   # @override
-  def path_exists?(path, version)
+  def path_etag(path, version)
     check_path(path)
-    !get_object(path, version).nil? rescue false
+    if id = get_object(path, version).id rescue nil
+      [id,
+       (get_object(path + CONTENT_EXT, version).id rescue nil),
+       (get_object(path + ATTRIBUTE_EXT, version).id rescue nil)].join('-')
+    end
   end
 
   # @override
@@ -73,7 +77,7 @@ class GitrbRepository < Repository
     if object
       content = object.data
       # Try to force utf-8 encoding and revert to old encoding if this doesn't work
-      content.try_encoding(Encoding.default_encoding)
+      content.try_encoding(Encoding.default_external)
     else
       ''
     end

data/plugins/repositories/rugged_repository.rb

@@ -238,10 +238,14 @@ class RuggedRepository < Repository
     commit_to_version(@git.last_commit)
   end
 
-  def path_exists?(path, version)
+  def path_etag(path, version)
     commit = @git.lookup(version.to_s)
     raise 'Not a commit' unless Rugged::Commit === commit
-    path.blank? || commit.tree.path(path) != nil rescue nil
+    if oid = oid_by_path(commit, path)
+      [oid,
+       oid_by_path(commit, path + CONTENT_EXT),
+       oid_by_path(commit, path + ATTRIBUTE_EXT)].join('-')
+    end
   end
 
   def get_version(version = nil)
@@ -311,15 +315,17 @@ class RuggedRepository < Repository
   def get_children(path, version)
     commit = @git.lookup(version.to_s)
     raise 'Not a commit' unless Rugged::Commit === commit
-    object = object_by_path(commit.tree, path)
-    Rugged::Tree === object ? object.map {|e| e[:name].force_encoding(Encoding.default_external) }.reject {|name| reserved_name?(name) } : []
+    object = object_by_path(commit, path)
+    Rugged::Tree === object ? object.map do |e|
+      e[:name].force_encoding(Encoding.default_external)
+    end.reject {|name| reserved_name?(name) } : []
   end
 
   def get_content(path, version)
     commit = @git.lookup(version.to_s)
     raise 'Not a commit' unless Rugged::Commit === commit
-    object = object_by_path(commit.tree, path)
-    object = object_by_path(commit.tree, path + CONTENT_EXT) if Rugged::Tree === object
+    object = object_by_path(commit, path)
+    object = object_by_path(commit, path + CONTENT_EXT) if Rugged::Tree === object
     Rugged::Blob === object ? object.content.try_encoding(Encoding.default_external) : ''
   end
 
@@ -327,7 +333,7 @@ class RuggedRepository < Repository
     commit = @git.lookup(version.to_s)
     raise 'Not a commit' unless Rugged::Commit === commit
     path += ATTRIBUTE_EXT
-    object = object_by_path(commit.tree, path)
+    object = object_by_path(commit, path)
     object ? YAML.load(object.content) : {}
   end
 
@@ -393,17 +399,23 @@ class RuggedRepository < Repository
   def path_changed?(c, path)
     return true if path.blank?
     ref1, ref2, ref3 = nil, nil, nil
-    (c.parents.empty? && (ref1 ||= c.tree.path(path) rescue {})) || c.parents.any? do |parent|
-      (ref1 ||= c.tree.path(path) rescue {}) != (parent.tree.path(path) rescue {}) ||
-        (ref2 ||= c.tree.path(path + ATTRIBUTE_EXT) rescue {}) != (parent.tree.path(path + ATTRIBUTE_EXT) rescue {}) ||
-        (ref3 ||= c.tree.path(path + CONTENT_EXT) rescue {}) != (parent.tree.path(path + CONTENT_EXT) rescue {})
+    (c.parents.empty? && (ref1 ||= oid_by_path(c, path))) || c.parents.any? do |parent|
+      (ref1 ||= oid_by_path(c, path)) != (oid_by_path(parent, path)) ||
+        (ref2 ||= oid_by_path(c, path + ATTRIBUTE_EXT)) != (oid_by_path(parent, path + ATTRIBUTE_EXT)) ||
+        (ref3 ||= oid_by_path(c, path + CONTENT_EXT)) != (oid_by_path(parent, path + CONTENT_EXT))
     end
   end
 
-  def object_by_path(tree, path)
-    return tree if path.blank?
-    ref = tree.path(path)
-    @git.lookup(ref[:oid])
+  def oid_by_path(commit, path)
+    return commit.tree_oid if path.blank?
+    commit.tree.path(path)[:oid]
+  rescue Rugged::IndexerError
+    nil
+  end
+
+  def object_by_path(commit, path)
+    return commit.tree if path.blank?
+    @git.lookup(commit.tree.path(path)[:oid])
   rescue Rugged::IndexerError
     nil
   end

data/plugins/treeview/script/00-jquery.treeview.js

@@ -1,6 +1,8 @@
 // Ajax Tree View
 // Written by Daniel Mendler, 2009
 (function($) {
+    "use strict";
+
     // Create treeview
     // $('div#id').treeView(...);
     $.fn.treeView = function(options) {

data/plugins/treeview/script/init.js

@@ -1,4 +1,6 @@
 $(function() {
+    "use strict";
+
     // Add treeview translations
     $.translations({
 	en: {

data/static/script/09-olelo.storage.js

@@ -1,6 +1,8 @@
 // Simple storage plugin
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     var storage = {}, data = {};
     try {
 	if (window.localStorage) {

data/static/script/10-olelo.i18n.js

@@ -1,6 +1,8 @@
 // Very simple i18n plugin
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     var locale = null, translations = {};
     $.translations = function(t) {
         for (var lang in t) {

data/static/script/11-olelo.unsaved.js

@@ -1,4 +1,6 @@
 (function($) {
+    "use strict";
+
     // Add treeview translations
     $.translations({
 	en: {

data/static/script/12-olelo.historytable.js

@@ -1,4 +1,6 @@
 (function($) {
+    "use strict";
+
     $.fn.historyTable = function() {
 	$('thead tr', this).prepend('<th class="compare"><button>&#177;</button></th>');
 	$('tbody tr', this).each(function() {

data/static/script/13-olelo.pagination.js

@@ -3,6 +3,8 @@
 // $('#page_element').bind('pageLoaded', function() {});
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     $.fn.pagination = function(links) {
 	var page = this;
 

data/static/script/14-olelo.tabwidget.js

@@ -1,6 +1,8 @@
 // Simple, unobtrusive tab widget
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     $.fn.tabWidget = function(options) {
         var store = options && options.store;
 	var selected = null;

data/static/script/15-olelo.timeago.js

@@ -1,6 +1,8 @@
 // Replace timestamps with relative time
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     $.translations({
          en: {
               less_than_a_minute_ago: 'less than a minute ago',

data/static/script/16-olelo.underliner.js

@@ -1,6 +1,8 @@
 // Underline text in elements. Especially useful for accesskeys.
 // Written by Daniel Mendler
 (function($) {
+    "use strict";
+
     $.extend($.fn, {
 	// Underline text
 	underlineText: function(str) {

data/static/script/17-olelo.ui.combobox.js

@@ -1,4 +1,6 @@
 (function($) {
+    "use strict";
+
     $.widget('ui.combobox', {
 	_create: function() {
 	    var input = this.element;

data/static/script/init.js

@@ -1,6 +1,8 @@
 // Olelo bootstrap
 // Written by Daniel Mendler
 $(function() {
+    "use strict";
+
     $('html').removeClass('no-js').addClass('js');
     function pageLoaded() {
         $('#upload-path', this).each(function() {

data/test/request_test.rb

@@ -1,8 +1,8 @@
 require 'helper'
 require 'olelo/middleware/force_encoding'
 require 'olelo/middleware/degrade_mime_type'
+require 'olelo/middleware/ua_header'
 require 'rack/relative_redirect'
-require 'rack/session/pool'
 
 class Bacon::Context
   include Rack::Test::Methods
@@ -74,7 +74,9 @@ describe 'requests' do
       use Rack::MethodOverride
       use Olelo::Middleware::ForceEncoding
       use Olelo::Middleware::DegradeMimeType
+      use Olelo::Middleware::UAHeader
       #use Rack::RelativeRedirect
+      use Rack::Head
       run Olelo::Application.new
     end
   end

data/views/show.slim

@@ -1,7 +1,7 @@
 - title page.title
-= define_block :version_link do
-  a.version href=build_path(page, version: page.version, force_version: true) title=page.version = page.version.short
 = footer do
+  = define_block :version_link do
+    a.version href=build_path(page, version: page.version, force_version: true) title=page.version = page.version.short
   == :version_by.t(version: blocks[:version_link], author: escape_html(page.version.author.name), date: date(page.version.date))
 - if !page.attributes['no_title']
   h1= title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9838140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+  version_requirements: *9838140
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9836960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *9836960
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9835660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+  version_requirements: *9835660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9833880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
+  version_requirements: *9833880
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9832440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *9832440
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9829740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.1
+  version_requirements: *9829740
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9829040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  version_requirements: *9829040
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9828020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: 0.17.0.b7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.17.0.b7
+  version_requirements: *9828020
 - !ruby/object:Gem::Dependency
   name: evaluator
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9826260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +109,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.6
+  version_requirements: *9826260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9824340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *9824340
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9822920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *9822920
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9822060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +142,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+  version_requirements: *9822060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9812980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,12 +153,7 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+  version_requirements: *9812980
 description: Olelo is a git-based wiki which supports many markup languages, tags,
   embedded TeX and much more. It can be extended through plugins.
 email:
@@ -355,6 +290,7 @@ files:
 - plugins/misc/fancybox/script/01-jquery.easing.js
 - plugins/misc/fancybox/script/02-jquery.fancybox.js
 - plugins/misc/fancybox/script/init.js
+- plugins/misc/fragment_cache.rb
 - plugins/misc/system.rb
 - plugins/misc/variables.rb
 - plugins/misc/webdav.rb
@@ -533,8 +469,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Olelo is a git-based wiki.
 test_files: []
+has_rdoc: