gollum 1.3.1 → 1.4.2

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

@@ -1,6 +1,88 @@
 // ua
 $(document).ready(function() {
-  
+  var nodeSelector = {
+    node1: null,
+    node2: null,
+
+    selectNodeRange: function( n1, n2 ) {
+      if ( nodeSelector.node1 && nodeSelector.node2 ) {
+        $('#wiki-history td.selected').removeClass('selected');
+        nodeSelector.node1.addClass('selected');
+        nodeSelector.node2.addClass('selected');
+
+        // swap the nodes around if they went in reverse
+        if ( nodeSelector.nodeComesAfter( nodeSelector.node1,
+                                          nodeSelector.node2 ) ) {
+          var n = nodeSelector.node1;
+          nodeSelector.node1 = nodeSelector.node2;
+          nodeSelector.node2 = n;
+        }
+
+        var s = true;
+        var $nextNode = nodeSelector.node1.next();
+        while ( $nextNode ) {
+          $nextNode.addClass('selected');
+          if ( $nextNode[0] == nodeSelector.node2[0] ) {
+            break;
+          }
+          $nextNode = $nextNode.next();
+        }
+      }
+    },
+
+    nodeComesAfter: function ( n1, n2 ) {
+      var s = false;
+      $(n1).prevAll().each(function() {
+        if ( $(this)[0] == $(n2)[0] ) {
+          s = true;
+        }
+      });
+      return s;
+    },
+
+    checkNode: function( nodeCheckbox ) {
+      var $nodeCheckbox = nodeCheckbox;
+      var $node = $(nodeCheckbox).parent().parent();
+      // if we're unchecking
+      if ( !$nodeCheckbox.is(':checked') ) {
+
+        // remove the range, since we're breaking it
+        $('#wiki-history tr.selected').each(function() {
+          if ( $(this).find('td.checkbox input').is(':checked') ) {
+            return;
+          }
+          $(this).removeClass('selected');
+        });
+
+        // no longer track this
+        if ( $node[0] == nodeSelector.node1[0] ) {
+          nodeSelector.node1 = null;
+          if ( nodeSelector.node2 ) {
+            nodeSelector.node1 = nodeSelector.node2;
+            nodeSelector.node2 = null;
+          }
+        } else if ( $node[0] == nodeSelector.node2[0] ) {
+          nodeSelector.node2 = null;
+        }
+
+      } else {
+        if ( !nodeSelector.node1 ) {
+          nodeSelector.node1 = $node;
+          nodeSelector.node1.addClass('selected');
+        } else if ( !nodeSelector.node2 ) {
+          // okay, we don't have a node 2 but have a node1
+          nodeSelector.node2 = $node;
+          nodeSelector.node2.addClass('selected');
+          nodeSelector.selectNodeRange( nodeSelector.node1,
+                                        nodeSelector.node2 );
+        } else {
+          // we have two selected already
+          $nodeCheckbox[0].checked = false;
+        }
+      }
+    }
+  };
+
   // ua detection
   if ($.browser.mozilla) {
     $('body').addClass('ff');
@@ -14,7 +96,7 @@ $(document).ready(function() {
       $('body').addClass('ie8');
     }
   }
-  
+
   if ($('#minibutton-new-page').length) {
     $('#minibutton-new-page').removeClass('jaws');
     $('#minibutton-new-page').click(function(e) {
@@ -38,10 +120,12 @@ $(document).ready(function() {
                           });
     });
   }
-  
+
   if ($('#wiki-wrapper').hasClass('history')) {
     $('#wiki-history td.checkbox input').each(function() {
-      $(this).click(highlightChecked);
+      $(this).click(function() {
+        nodeSelector.checkNode($(this));
+      });
       if ( $(this).is(':checked') ) {
         nodeSelector.checkNode($(this));
       }
@@ -53,9 +137,7 @@ $(document).ready(function() {
       });
     }
   }
-  
 
-  
   if ($('#searchbar a#search-submit').length) {
     $.GollumPlaceholder.add($('#searchbar #search-query'));
     $('#searchbar a#search-submit').click(function(e) {
@@ -67,8 +149,8 @@ $(document).ready(function() {
       $(this).unbind('submit');
       $(this).submit();
     });
-  }  
-  
+  }
+
   if ($('#gollum-revert-form').length &&
       $('.gollum-revert-button').length ) {
     $('a.gollum-revert-button').click(function(e) {
@@ -76,116 +158,4 @@ $(document).ready(function() {
       $('#gollum-revert-form').submit();
     });
   }
-  
 });
-
-var nodeSelector = {
-  
-  node1: null,
-  node2: null,
-  
-  selectNodeRange: function( n1, n2 ) {
-    if ( nodeSelector.node1 && nodeSelector.node2 ) {
-      $('#wiki-history td.selected').removeClass('selected');
-      nodeSelector.node1.addClass('selected');
-      nodeSelector.node2.addClass('selected');
-      
-      // swap the nodes around if they went in reverse
-      if ( nodeSelector.nodeComesAfter( nodeSelector.node1, 
-                                        nodeSelector.node2 ) ) {
-        var n = nodeSelector.node1;
-        nodeSelector.node1 = nodeSelector.node2;
-        nodeSelector.node2 = n;
-      }
-      
-      var s = true;
-      var $nextNode = nodeSelector.node1.next();
-      while ( $nextNode ) {
-        $nextNode.addClass('selected');
-        if ( $nextNode[0] == nodeSelector.node2[0] ) {
-          break;
-        }
-        $nextNode = $nextNode.next();
-      }
-    }
-  },
-  
-  nodeComesAfter: function ( n1, n2 ) {
-    var s = false;
-    $(n1).prevAll().each(function() {
-      if ( $(this)[0] == $(n2)[0] ) {
-        s = true;
-      }
-    });
-    return s;
-  },
-  
-  checkNode: function( nodeCheckbox ) {
-    var $nodeCheckbox = nodeCheckbox;
-    var $node = $(nodeCheckbox).parent().parent();
-    // if we're unchecking
-     if ( !$nodeCheckbox.is(':checked') ) {
-    
-       // remove the range, since we're breaking it
-       $('#wiki-history tr.selected').each(function() {
-         if ( $(this).find('td.checkbox input').is(':checked') ) {
-           return;
-         }
-         $(this).removeClass('selected');
-       });
-       
-       // no longer track this
-       if ( $node[0] == nodeSelector.node1[0] ) {
-         nodeSelector.node1 = null;
-         if ( nodeSelector.node2 ) {
-           nodeSelector.node1 = nodeSelector.node2;
-           nodeSelector.node2 = null;
-         }
-       } else if ( $node[0] == nodeSelector.node2[0] ) {
-         nodeSelector.node2 = null;
-       }
-       
-     } else {
-       if ( !nodeSelector.node1 ) {
-         nodeSelector.node1 = $node;
-         nodeSelector.node1.addClass('selected');
-       } else if ( !nodeSelector.node2 ) {
-         // okay, we don't have a node 2 but have a node1
-         nodeSelector.node2 = $node;
-         nodeSelector.node2.addClass('selected');
-         nodeSelector.selectNodeRange( nodeSelector.node1, 
-                                       nodeSelector.node2 );
-       } else {
-         // we have two selected already
-         $nodeCheckbox[0].checked = false;
-       }
-     }
-  }
-  
-};
-
-function highlightOn() {
-  $(this).parent().parent().animate({
-                                      backgroundColor: '#ffffea',
-                                      duration: 400
-                                    });
-}
-
-function highlightOff() {
-  var color = '#ebf2f6';
-  if ($(this).parent().parent().hasClass('alt-row')) {
-    color = '#f3f7fa';
-  }
-  $(this).parent().parent().animate({
-                                      backgroundColor: color,
-                                      duration: 400
-                                    });
-}
-
-function highlightChecked() {
- nodeSelector.checkNode($(this));
-}
-
-function initMathJax() {
-  
-}

data/lib/gollum/frontend/templates/create.mustache

@@ -10,6 +10,8 @@
 </div>
 <script type="text/javascript">
 jQuery(document).ready(function() {
-  $.GollumEditor({ NewFile: true });
+  $.GollumEditor({ NewFile: true, MarkupType: '{{default_markup}}' });
 });
-</script>
+</script>
+
+{{something}}

data/lib/gollum/frontend/templates/editor.mustache

@@ -110,7 +110,7 @@
     
     <span class="jaws"><br></span>
     <input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
-    <a href="javascript:void(0)" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
+    <a href="/preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
   </fieldset>
 </form>
 </div>

data/lib/gollum/frontend/templates/history.mustache

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

data/lib/gollum/frontend/templates/page.mustache

@@ -41,5 +41,3 @@
   <p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
 </div>
 </div>
-
-<script type="text/javascript" src="/javascript/MathJax/MathJax.js"></script>

data/lib/gollum/frontend/views/create.rb

@@ -8,15 +8,15 @@ module Precious
       def title
         "Create a new page"
       end
-      
+
       def is_create_page
         true
       end
-      
+
       def is_edit_page
         false
       end
-      
+
       def format
         @format = (@page.format || false) if @format.nil? && @page
         @format.to_s.downcase
@@ -39,6 +39,10 @@ module Precious
       def formats
         super(:markdown)
       end
+
+      def default_markup
+        Precious::App.settings.default_markup
+      end
     end
   end
 end

data/lib/gollum/frontend/views/page.rb

@@ -2,6 +2,8 @@ module Precious
   module Views
     class Page < Layout
       attr_reader :content, :page, :footer
+      DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
+      DEFAULT_AUTHOR = 'you'
 
       def title
         @page.title
@@ -12,13 +14,15 @@ module Precious
       end
 
       def author
+        return DEFAULT_AUTHOR unless @page.version
         @page.version.author.name
       end
 
       def date
-        @page.version.authored_date.strftime("%Y-%m-%d %H:%M:%S")
+        return Time.now.strftime(DATE_FORMAT) unless @page.version
+        @page.version.authored_date.strftime(DATE_FORMAT)
       end
-      
+
       def editable
         @editable
       end

data/lib/gollum/frontend/views/pages.rb

@@ -10,8 +10,8 @@ module Precious
       def has_results
         !@results.empty?
       end
-      
-      def no_results 
+
+      def no_results
         @results.empty?
       end
     end

data/lib/gollum/frontend/views/search.rb

@@ -10,8 +10,8 @@ module Precious
       def has_results
         !@results.empty?
       end
-      
-      def no_results 
+
+      def no_results
         @results.empty?
       end
 

data/lib/gollum/git_access.rb

@@ -158,6 +158,9 @@ module Gollum
     def tree!(sha)
       tree  = @repo.git.native(:ls_tree,
         {:r => true, :l => true, :z => true}, sha)
+      if tree.respond_to?(:force_encoding)
+        tree.force_encoding("UTF-8")
+      end
       items = tree.split("\0").inject([]) do |memo, line|
         memo << parse_tree_line(line)
       end

data/lib/gollum/markup.rb

@@ -1,5 +1,7 @@
 require 'digest/sha1'
 require 'cgi'
+require 'pygments'
+require 'base64'
 
 module Gollum
 
@@ -13,12 +15,13 @@ module Gollum
       @wiki    = page.wiki
       @name    = page.filename
       @data    = page.text_data
-      @version = page.version.id
+      @version = page.version.id if page.version
       @format  = page.format
       @dir     = ::File.dirname(page.path)
       @tagmap  = {}
       @codemap = {}
       @texmap  = {}
+      @wsdmap  = {}
       @premap  = {}
     end
 
@@ -27,15 +30,17 @@ module Gollum
     #
     # no_follow - Boolean that determines if rel="nofollow" is added to all
     #             <a> tags.
+    # encoding  - Encoding Constant or String.
     #
     # Returns the formatted String content.
-    def render(no_follow = false)
+    def render(no_follow = false, encoding = nil)
       sanitize = no_follow ?
         @wiki.history_sanitizer :
         @wiki.sanitizer
 
       data = extract_tex(@data.dup)
       data = extract_code(data)
+      data = extract_wsd(data)
       data = extract_tags(data)
       begin
         data = GitHub::Markup.render(@name, data)
@@ -46,22 +51,19 @@ module Gollum
         data = %{<p class="gollum-error">#{e.message}</p>}
       end
       data = process_tags(data)
-      data = process_code(data)
+      data = process_code(data, encoding)
       if sanitize || block_given?
         doc  = Nokogiri::HTML::DocumentFragment.parse(data)
         doc  = sanitize.clean_node!(doc) if sanitize
         yield doc if block_given?
-        data = doc_to_html(doc)
+        data = doc.to_html
       end
       data = process_tex(data)
+      data = process_wsd(data)
       data.gsub!(/<p><\/p>/, '')
       data
     end
 
-    def doc_to_html(doc)
-      doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML)
-    end
-
     #########################################################################
     #
     # TeX
@@ -96,13 +98,7 @@ module Gollum
     def process_tex(data)
       @texmap.each do |id, spec|
         type, tex = *spec
-        out =
-        case type
-          when :block
-            %{<script type="math/tex; mode=display">#{tex}</script>}
-          when :inline
-            %{<script type="math/tex">#{tex}</script>}
-        end
+        out = %{<img src="#{::File.join(@wiki.base_path, '_tex.png')}?type=#{type}&data=#{Base64.encode64(tex).chomp}" alt="#{CGI.escapeHTML(tex)}">}
         data.gsub!(id, out)
       end
       data
@@ -365,24 +361,37 @@ module Gollum
     #
     # Returns the placeholder'd String data.
     def extract_code(data)
-      data.gsub!(/^``` ?([^\r\n]+)?\r?\n(.+?)\r?\n```\r?$/m) do
-        id     = Digest::SHA1.hexdigest($2)
+      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do
+        id     = Digest::SHA1.hexdigest("#{$2}.#{$3}")
         cached = check_cache(:code, id)
         @codemap[id] = cached   ?
           { :output => cached } :
-          { :lang => $1, :code => $2 }
-        id
+          { :lang => $2, :code => $3, :indent => $1 }
+        "#{$1}#{id}" # print the SHA1 ID with the proper indentation
       end
       data
     end
 
+    # Remove the leading space from a code block. Leading space
+    # is only removed if every single line in the block has leading
+    # whitespace.
+    #
+    # code      - The code block to remove spaces from
+    # regex     - A regex to match whitespace
+    def remove_leading_space(code, regex)
+      if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ regex }
+        code.gsub!(regex, '')
+      end
+    end
+
     # Process all code from the codemap and replace the placeholders with the
     # final HTML.
     #
-    # data - The String data (with placeholders).
+    # data     - The String data (with placeholders).
+    # encoding - Encoding Constant or String.
     #
     # Returns the marked up String data.
-    def process_code(data)
+    def process_code(data, encoding = nil)
       return data if data.nil? || data.size.zero? || @codemap.size.zero?
 
       blocks    = []
@@ -390,17 +399,19 @@ module Gollum
         next if spec[:output] # cached
 
         code = spec[:code]
-        if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
-          code.gsub!(/^(  |\t)/m, '')
-        end
+
+        remove_leading_space(code, /^#{spec[:indent]}/m)
+        remove_leading_space(code, /^(  |\t)/m)
 
         blocks << [spec[:lang], code]
       end
 
       highlighted = begin
-        blocks.size.zero? ? [] : Gollum::Albino.colorize(blocks)
-      rescue ::Albino::ShellArgumentError, ::Albino::TimeoutExceeded,
-               ::Albino::MaximumOutputExceeded
+        encoding ||= 'utf-8'
+        blocks.map { |lang, code|
+          Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s})
+        }
+      rescue ::RubyPython::PythonError
         []
       end
 
@@ -419,6 +430,41 @@ module Gollum
       data
     end
 
+    #########################################################################
+    #
+    # Sequence Diagrams
+    #
+    #########################################################################
+
+    # Extract all sequence diagram blocks into the wsdmap and replace with
+    # placeholders.
+    #
+    # data - The raw String data.
+    #
+    # Returns the placeholder'd String data.
+    def extract_wsd(data)
+      data.gsub(/^\{\{\{ ?(.+?)\r?\n(.+?)\r?\n\}\}\}\r?$/m) do
+        id = Digest::SHA1.hexdigest($2)
+        @wsdmap[id] = { :style => $1, :code => $2 }
+        id
+      end
+    end
+
+    # Process all diagrams from the wsdmap and replace the placeholders with
+    # the final HTML.
+    #
+    # data - The String data (with placeholders).
+    #
+    # Returns the marked up String data.
+    def process_wsd(data)
+      @wsdmap.each do |id, spec|
+        style = spec[:style]
+        code = spec[:code]
+        data.gsub!(id, Gollum::WebSequenceDiagram.new(code, style).to_tag)
+      end
+      data
+    end
+
     # Hook for getting the formatted value of extracted tag data.
     #
     # type - Symbol value identifying what type of data is being extracted.
@@ -439,48 +485,5 @@ module Gollum
     end
   end
 
-  begin
-    require 'redcarpet'
-
-    class MarkupGFM < Markup
-      def render(no_follow = false)
-        sanitize = no_follow ?
-          @wiki.history_sanitizer :
-          @wiki.sanitizer
-
-        data = extract_tex(@data.dup)
-        data = extract_tags(data)
-
-        flags = [
-          :autolink,
-          :fenced_code,
-          :tables,
-          :strikethrough,
-          :lax_htmlblock,
-          :gh_blockcode,
-          :no_intraemphasis
-        ]
-        data = Redcarpet.new(data, *flags).to_html
-        data = process_tags(data)
-
-        doc  = Nokogiri::HTML::DocumentFragment.parse(data)
-
-        doc.search('pre').each do |node|
-          next unless lang = node['lang']
-          text = node.inner_text
-          html = Gollum::Albino.colorize(text, lang)
-          node.replace(html)
-        end
-
-        doc  = sanitize.clean_node!(doc) if sanitize
-        yield doc if block_given?
-
-        data = doc_to_html(doc)
-        data = process_tex(data)
-        data
-      end
-    end
-  rescue LoadError
-    MarkupGFM = Markup
-  end
+  MarkupGFM = Markup
 end