gollum 2.4.11 → 2.4.12

data/lib/gollum.rb

@@ -10,28 +10,17 @@ require 'github/markup'
 require 'sanitize'
 
 # internal
-require File.expand_path('../gollum/git_access', __FILE__)
-require File.expand_path('../gollum/committer', __FILE__)
-require File.expand_path('../gollum/pagination', __FILE__)
-require File.expand_path('../gollum/blob_entry', __FILE__)
-require File.expand_path('../gollum/wiki', __FILE__)
-require File.expand_path('../gollum/page', __FILE__)
-require File.expand_path('../gollum/file', __FILE__)
-require File.expand_path('../gollum/file_view', __FILE__)
-require File.expand_path('../gollum/markup', __FILE__)
-require File.expand_path('../gollum/sanitization', __FILE__)
-require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
-require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
+require File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 # Set ruby to UTF-8 mode
 # This is required for Ruby 1.8.7 which gollum still supports.
 $KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
-  VERSION = '2.4.11'
+  VERSION = '2.4.12'
 
   def self.assets_path
-    ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
+    ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
   end
 
   class Error < StandardError; end

data/lib/gollum/{frontend/app.rb → app.rb}

@@ -1,14 +1,15 @@
 # ~*~ encoding: utf-8 ~*~
 require 'cgi'
 require 'sinatra'
-require 'gollum'
+require 'gollum-lib'
 require 'mustache/sinatra'
 require 'useragent'
 require 'stringex'
 
-require 'gollum/frontend/views/layout'
-require 'gollum/frontend/views/editable'
-require 'gollum/frontend/views/has_page'
+require 'gollum'
+require 'gollum/views/layout'
+require 'gollum/views/editable'
+require 'gollum/views/has_page'
 
 require File.expand_path '../helpers', __FILE__
 
@@ -27,7 +28,7 @@ end
 # There are a number of wiki options that can be set for the frontend
 #
 # Example
-# require 'gollum/frontend/app'
+# require 'gollum/app'
 # Precious::App.set(:wiki_options, {
 #     :universal_toc => false,
 # }
@@ -85,11 +86,12 @@ module Precious
       # 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]
+      @js = settings.wiki_options[:js]
     end
 
     get '/' do
       page_dir = settings.wiki_options[:page_file_dir].to_s
-      redirect clean_url(::File.join(@base_url, page_dir, 'Home'))
+      redirect clean_url(::File.join(@base_url, page_dir, wiki_new.index_page))
     end
 
     # path is set to name if path is nil.
@@ -98,13 +100,13 @@ module Precious
     #   extract_path will trim path to 'a'
     # name, path, version
     def wiki_page(name, path = nil, version = nil, exact = true)
+      wiki = wiki_new
+      
       path = name if path.nil?
-      name = extract_name(name)
+      name = extract_name(name) || wiki.index_page
       path = extract_path(path)
       path = '/' if exact && path.nil?
 
-      wiki = wiki_new
-
       OpenStruct.new(:wiki => wiki, :page => wiki.paged(name, path, exact, version),
                      :name => name, :path => path)
     end
@@ -123,6 +125,7 @@ module Precious
       wikip = wiki_page(params[:splat].first)
       @name = wikip.name
       @path = wikip.path
+      
       wiki = wikip.wiki
       if page = wikip.page
         if wiki.live_preview && page.format.to_s.include?('markdown') && supported_useragent?(request.user_agent)
@@ -143,25 +146,57 @@ module Precious
       end
     end
 
+    post '/rename/*' do
+      wikip     = wiki_page(params[:splat].first)
+      halt 500 if wikip.nil?
+      wiki      = wikip.wiki
+      page      = wiki.paged(wikip.name, wikip.path, exact = true)
+      rename    = params[:rename]
+      halt 500 if page.nil?
+      halt 500 if rename.nil? or rename.empty?
+
+      # Fixup the rename if it is a relative path
+      # In 1.8.7 rename[0] != rename[0..0]
+      if rename[0..0] != '/'
+        source_dir = ::File.dirname(page.path)
+        source_dir = '' if source_dir == '.'
+        (target_dir, target_name) = ::File.split(rename)
+        target_dir = target_dir == '' ? source_dir : "#{source_dir}/#{target_dir}"
+        rename = "#{target_dir}/#{target_name}"
+      end
+
+      committer = Gollum::Committer.new(wiki, commit_message)
+      commit    = {:committer => committer}
+
+      success = wiki.rename_page(page, rename, commit)
+      if !success
+          # This occurs on NOOPs, for example renaming A => A
+          redirect to("/#{page.escaped_url_path}")
+          return
+      end
+      committer.commit
+
+      wikip = wiki_page(rename)
+      page = wiki.paged(wikip.name, wikip.path, exact = true)
+      return if page.nil?
+      redirect to("/#{page.escaped_url_path}")
+    end
+
     post '/edit/*' do
       path      = '/' + clean_url(sanitize_empty_params(params[:path])).to_s
       page_name = CGI.unescape(params[:page])
       wiki      = wiki_new
       page      = wiki.paged(page_name, path, exact = true)
       return if page.nil?
-      rename    = params[:rename].to_url if params[:rename]
-      name      = rename || page.name
       committer = Gollum::Committer.new(wiki, commit_message)
       commit    = {:committer => committer}
 
-      update_wiki_page(wiki, page, params[:content], commit, name, params[:format])
+      update_wiki_page(wiki, page, params[:content], commit, page.name, params[:format])
       update_wiki_page(wiki, page.header,  params[:header],  commit) if params[:header]
       update_wiki_page(wiki, page.footer,  params[:footer],  commit) if params[:footer]
       update_wiki_page(wiki, page.sidebar, params[:sidebar], commit) if params[:sidebar]
       committer.commit
 
-      page = wiki.page(rename) if rename
-
       redirect to("/#{page.escaped_url_path}") unless page.nil?
     end
 
@@ -224,7 +259,9 @@ module Precious
       sha1         = shas.shift
       sha2         = shas.shift
 
-      if wiki.revert_page(@page, sha1, sha2, commit_message)
+      commit = commit_message
+      commit[:message] = "Revert commit #{sha1.chars.take(7).join}"
+      if wiki.revert_page(@page, sha1, sha2, commit)
         redirect to("/#{@page.escaped_url_path}")
       else
         sha2, sha1 = sha1, "#{sha1}^" if !sha2
@@ -298,7 +335,6 @@ module Precious
         @page = page
         @name = name
         @content = page.formatted_data
-        @editable = true
         mustache :page
       else
         halt 404
@@ -348,18 +384,23 @@ module Precious
     end
 
     def show_page_or_file(fullpath)
-      name         = extract_name(fullpath)
-      path         = extract_path(fullpath) || '/'
-      wiki         = wiki_new
+      wiki = wiki_new
+
+      name = extract_name(fullpath) || wiki.index_page
+      path = extract_path(fullpath) || '/'
 
       if page = wiki.paged(name, path, exact = true)
         @page = page
         @name = name
+        @content  = page.formatted_data
+  
+        # Extensions and layout data
         @editable = true
-        @content = page.formatted_data
         @toc_content = wiki.universal_toc ? @page.toc_data : nil
-        @mathjax = wiki.mathjax
+        @mathjax  = wiki.mathjax
         @h1_title = wiki.h1_title
+        @bar_side  = wiki.bar_side
+        
         mustache :page
       elsif file = wiki.file(fullpath)
         content_type file.mime_type
@@ -388,7 +429,8 @@ module Precious
     # message is sourced from the incoming request parameters
     # author details are sourced from the session, to be populated by rack middleware ahead of us
     def commit_message
-      commit_message = { :message => params[:message] }
+      msg = (params[:message].nil? or params[:message].empty?) ? "[no message]" : params[:message]
+      commit_message = { :message => msg }
       author_parameters = session['gollum.author']
       commit_message.merge! author_parameters unless author_parameters.nil?
       commit_message

data/lib/gollum/{frontend/helpers.rb → helpers.rb}

@@ -12,6 +12,12 @@ module Precious
 
     # Extract the 'page' name from the file_path
     def extract_name(file_path)
+      if file_path[-1, 1] == "/"
+        return nil
+      end
+      
+      # File.basename is too eager to please and will return the last 
+      # component of the path even if it ends with a directory separator.
       ::File.basename(file_path)
     end
 
@@ -26,11 +32,5 @@ module Precious
       url.gsub('%2F','/').gsub(/^\/+/,'').gsub('//','/')
     end
 
-    def trim_leading_slash url
-      return url if url.nil?
-      url.gsub!('%2F','/')
-      return '/' + url.gsub(/^\/+/,'') if url[0,1] == '/'
-      url
-    end
   end
 end

data/lib/gollum/{frontend/public → public}/gollum/css/dialog.css

@@ -80,13 +80,23 @@
     line-height: 1.6em;
     margin: 0.3em 0 0 0;
     padding: 0.3em 0.5em;
-    width: 96.5%;
+    width: 94%;
   }
 
   #gollum-dialog-dialog-body fieldset .field input.code {
     font-family: 'Monaco', 'Courier New', Courier, monospace;
   }
 
+  #gollum-dialog-dialog-body fieldset .field span.context {
+    font-size: .9em;
+    color: #666;
+  }
+    #gollum-dialog-dialog-body fieldset .field span.context span.path {
+      font-family: 'Monaco', 'Courier New', Courier, monospace;
+      font-weight: bold;
+    }
+
+
 #gollum-dialog-dialog-body fieldset .field:last-child {
   margin: 0 0 1em 0;
 }
@@ -138,4 +148,4 @@
   filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
   background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
   background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
+}

data/lib/gollum/{frontend/public → public}/gollum/css/editor.css

@@ -243,7 +243,7 @@ a#function-help:hover span { background-position: -405px -28px; }
   background: #fff;
   border: 1px solid #ddd;
   font-size: 1em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-family: Consolas, "Liberation Mono", Courier, monospace;
   line-height: 1.4em;
   margin: 1em 0 0.4em;
   padding: 0.5em;

data/lib/gollum/{frontend/public → public}/gollum/css/gollum.css

@@ -74,6 +74,12 @@ a:hover, a:visited {
 }
 
 /* @section body */
+
+.has-leftbar #wiki-body {
+  float: right;
+  clear: right;
+}
+
 #wiki-body {
   display: block;
   float: left;
@@ -83,7 +89,7 @@ a:hover, a:visited {
   width: 100%;
 }
 
-.has-rightbar #wiki-body {
+.has-sidebar #wiki-body {
   width: 68%;
 }
 
@@ -93,7 +99,7 @@ a:hover, a:visited {
   border: 1px solid #DDD;
   font-size: 13px;
   padding: 0px 5px;
-  float:left;
+  float: left;
   margin-bottom: 20px;
   min-width: 33%;
 
@@ -105,12 +111,19 @@ a:hover, a:visited {
   border: none;
 }
 
-/* @section rightbar */
-#wiki-rightbar {
+/* @section sidebar */
+.has-leftbar #wiki-sidebar {
+  float: left;
+}
+
+.has-rightbar #wiki-sidebar {
+  float: right;
+}
+
+#wiki-sidebar {
   background-color: #f7f7f7;
   border: 1px solid #ddd;
   font-size: 13px;
-  float: right;
   padding: 7px;
   width: 25%;
   color: #555;
@@ -120,15 +133,15 @@ a:hover, a:visited {
   -webkit-border-radius: 0.5em;
 }
 
-#wiki-rightbar p {
+#wiki-sidebar p {
   margin: 13px 0 0;
 }
 
-#wiki-rightbar > p:first-child {
+#wiki-sidebar > p:first-child {
   margin-top: 10px;
 }
 
-#wiki-rightbar p.parent {
+#wiki-sidebar p.parent {
   border-bottom: 1px solid #bbb;
   font-weight: bold;
   margin: 0 0 0.5em 0;
@@ -137,7 +150,7 @@ a:hover, a:visited {
 }
 
 /* Back arrow */
-#wiki-rightbar p.parent:before {
+#wiki-sidebar p.parent:before {
   color: #666;
   content: "← ";
 }
@@ -149,7 +162,7 @@ a:hover, a:visited {
   margin: 2em 0 5em;
 }
 
-.has-rightbar #wiki-footer {
+.has-sidebar #wiki-footer {
   width: 70%;
 }
 
@@ -716,3 +729,6 @@ ul.actions {
   padding: 0.25em;
 }
 
+.clearfloats {
+  clear: both;
+}

data/lib/gollum/{frontend/public → public}/gollum/javascript/gollum.dialog.js

@@ -79,6 +79,10 @@
           fieldAttributes.id + '">';
       }
 
+      if( fieldAttributes.context ){
+        html += '<span class="context">' + fieldAttributes.context + '</span>';
+      }
+
       return html;
     },