RubyGems - gollum - Versions diffs - 2.0.0 → 2.1.0 - Mend

gollum 2.0.0 → 2.1.0

Potentially problematic release.

This version of gollum might be problematic. Click here for more details.

Files changed (454) hide show

data/lib/gollum/frontend/templates/layout.mustache CHANGED Viewed

@@ -2,22 +2,29 @@
 <html>
 <head>
   <meta http-equiv="Content-type" content="text/html;charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="/css/gollum.css" media="all">
-  <link rel="stylesheet" type="text/css" href="/css/editor.css" media="all">
-  <link rel="stylesheet" type="text/css" href="/css/dialog.css" media="all">
-  <link rel="stylesheet" type="text/css" href="/css/template.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}css/gollum.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}css/editor.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}css/dialog.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
   <!--[if IE 7]>
-  <link rel="stylesheet" type="text/css" href="/css/ie7.css" media="all">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}css/ie7.css" media="all">
   <![endif]-->
-  <script type="text/javascript" src="/javascript/jquery.js"></script>
-  <script type="text/javascript" src="/javascript/gollum.js"></script>
-  <script type="text/javascript" src="/javascript/gollum.dialog.js"></script>
-  <script type="text/javascript" src="/javascript/gollum.placeholder.js"></script>
-  <script type="text/javascript"
-    src="/javascript/editor/gollum.editor.js"></script>
+  <script>var baseUrl = '{{base_url}}'</script>
+  <script type="text/javascript" src="{{base_url}}javascript/jquery-1.7.2.min.js"></script>
+  <script type="text/javascript" src="{{base_url}}javascript/mousetrap.min.js"></script>
+  <script type="text/javascript" src="{{base_url}}javascript/gollum.js"></script>
+  <script type="text/javascript" src="{{base_url}}javascript/gollum.dialog.js"></script>
+  <script type="text/javascript" src="{{base_url}}javascript/gollum.placeholder.js"></script>
+  <script type="text/javascript" src="{{base_url}}javascript/editor/gollum.editor.js"></script>
+  {{#mathjax}}<script>(function(d,j){
+  j = d.createElement('script');
+  j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
+  (d.head || d.getElementsByTagName('head')[0]).appendChild(j);
+  }(document));
+  </script>{{/mathjax}}
   <title>{{title}}</title>
 </head>
 <body>

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

@@ -5,33 +5,53 @@
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="/pages"
-      class="action-all-pages">All Pages</a></li>
+    <li class="minibutton"><a href="{{base_url}}"
+       class="action-edit-page">Home</a></li>
+    <li class="minibutton"><a href="{{base_url}}pages"
+      class="action-all-pages">All</a></li>
+    <li class="minibutton"><a href="{{base_url}}fileview"
+    class="action-all-pages">Files</a></li>
     <li class="minibutton" class="jaws">
-      <a href="#" id="minibutton-new-page">New Page</a></li>
+      <a href="#" id="minibutton-new-page">New</a></li>
+    <li class="minibutton" class="jaws">
+      <a href="#" id="minibutton-rename-page">Rename</a></li>
     {{#editable}}
-    <li class="minibutton"><a href="/edit/{{escaped_name}}"
-       class="action-edit-page">Edit Page</a></li>
+    <li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
+       class="action-edit-page">Edit</a></li>
     {{/editable}}
-    <li class="minibutton"><a href="/history/{{escaped_name}}"
-       class="action-page-history">Page History</a></li>
+    <li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
+       class="action-page-history">History</a></li>
   </ul>
 </div>
 <div id="wiki-content">
-<div class="wrap {{#has_footer}} has-footer {{/has_footer}} {{#has_sidebar}}  has-rightbar{{/has_sidebar}}">
-  <div id="wiki-body" class="gollum-{{format}}-content">
-    <div id="template">
-      {{{content}}}
-    </div>
+<div class="{{#has_header}}has-header{{/has_header}}{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}} has-rightbar{{/has_sidebar}}{{#has_toc}} has-toc{{/has_toc}}">
+  {{#has_toc}}
+  <div id="wiki-toc-main">
+    {{{toc_content}}}
   </div>
+  {{/has_toc}}
   {{#has_sidebar}}
   <div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content">
-    {{{sidebar_content}}}
+    <div id="sidebar-content" class="markdown-body">
+      {{{sidebar_content}}}
+    </div>
   </div>
   {{/has_sidebar}}
+  <div id="wiki-body" class="gollum-{{format}}-content">
+    {{#has_header}}
+    <div id="wiki-header" class="gollum-{{header_format}}-content">
+      <div id="header-content" class="markdown-body">
+        {{{header_content}}}
+      </div>
+    </div>
+    {{/has_header}}
+    <div class="markdown-body">
+      {{{content}}}
+    </div>
+  </div>
   {{#has_footer}}
   <div id="wiki-footer" class="gollum-{{footer_format}}-content">
-    <div id="footer-content">
+    <div id="footer-content" class="markdown-body">
       {{{footer_content}}}
     </div>
   </div>
@@ -41,5 +61,8 @@
 </div>
 <div id="footer">
   <p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
+  <p>
+    <a id="delete-link" href="{{base_url}}{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
+  </p>
 </div>
 </div>

data/lib/gollum/frontend/templates/pages.mustache CHANGED Viewed

@@ -1,24 +1,28 @@
 <div id="wiki-wrapper" class="results">
-<div id="head">
+<div id="head" style="border:none;">
   <h1>{{title}}</h1>
   <ul class="actions">
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="/"
+    <li class="minibutton"><a href="{{base_url}}"
        class="action-edit-page">Home</a></li>
+    <li class="minibutton" class="jaws">
+    <a href="#" id="minibutton-new-page">New</a>
+    </li>
   </ul>
 </div>
-<div id="results">
+<div id="pages">
 {{#has_results}}
-  <ul>
-    {{#results}}
-    <li>
-      <a href="/{{name}}">{{name}}</a>
-    </li>
-    {{/results}}
-  </ul>
+  <div id="file-browser">
+    <div class="breadcrumb">
+      {{{breadcrumb}}}
+    </div>
+    <ul>
+      {{{files_folders}}}
+    </ul>
+  </div>
 {{/has_results}}
 {{#no_results}}

data/lib/gollum/frontend/templates/search.mustache CHANGED Viewed

@@ -5,7 +5,7 @@
     <li class="minibutton">
       {{>searchbar}}
     </li>
-    <li class="minibutton"><a href="/"
+    <li class="minibutton"><a href="{{base_url}}"
        class="action-edit-page">Home</a></li>
   </ul>
 </div>
@@ -15,7 +15,7 @@
   <ul>
     {{#results}}
     <li>
-      <a href="/{{name}}">{{name}}</a>
+      <a href="{{base_url}}{{name}}">{{name}}</a>
       <span class="count">({{count}} matches)</span>
     </li>
     {{/results}}

data/lib/gollum/frontend/templates/searchbar.mustache CHANGED Viewed

@@ -1,5 +1,5 @@
 <div id="searchbar">
-  <form action="/search" method="get" id="search-form">
+  <form action="{{base_url}}search" method="get" id="search-form">
   <div id="searchbar-fauxtext">
     <input type="text" name="q" id="search-query" value="Search&hellip;" autocomplete="off">
     <a href="#" id="search-submit" title="Search this wiki">

data/lib/gollum/frontend/uri_encode_component.rb ADDED Viewed

@@ -0,0 +1,172 @@
+=begin
+  Copyright 2006-2008 the V8 project authors. All rights reserved.
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of Google Inc. nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=end
+# This file provides the following methods:
+#   encodeURIComponent(componentString)
+#   string.charCodeAt(k)
+# component must be String
+def encodeURIComponent(componentString)
+  URI::URIEncodeComponent(componentString)
+end
+# define charCodeAt on String
+class String
+  def charCodeAt(k)
+    return self[k].ord
+  end
+end
+module URI; class << self
+# Does the char code correspond to an alpha-numeric char.
+# isAlphaNumeric('a'.ord) => true
+# isAlphaNumeric(''.ord) => false
+def isAlphaNumeric(cc)
+  # a - z
+  if (97 <= cc && cc <= 122); return true end
+  # A - Z
+  if (65 <= cc && cc <= 90); return true end
+  # 0 - 9
+  if (48 <= cc && cc <= 57); return true end
+  return false
+end
+def unescapePredicate(cc)
+  if (isAlphaNumeric(cc)); return true end
+  # !
+  if (cc == 33); return true end
+  # '()*
+  if (39 <= cc && cc <= 42); return true end
+  # -.
+  if (45 <= cc && cc <= 46); return true end
+  # _
+  if (cc == 95); return true end
+  # ~
+  if (cc == 126); return true end
+  return false
+end
+def URIEncodeSingle(cc, result, index)
+  x = (cc >> 12) & 0xF;
+  y = (cc >> 6) & 63;
+  z = cc & 63;
+  octets = Array.new(3);
+  if (cc <= 0x007F)
+    octets[0] = cc;
+  elsif (cc <= 0x07FF)
+    octets[0] = y + 192;
+    octets[1] = z + 128;
+  else
+    octets[0] = x + 224;
+    octets[1] = y + 128;
+    octets[2] = z + 128;
+  end
+  return URIEncodeOctets(octets, result, index);
+end
+# Lazily initialized.
+@@hexCharCodeArray = 0;
+def URIAddEncodedOctetToBuffer(octet, result, index)
+  result[index] = 37; # Char code of '%'.
+  index += 1
+  result[index] = @@hexCharCodeArray[octet >> 4];
+  index += 1
+  result[index] = @@hexCharCodeArray[octet & 0x0F];
+  index += 1
+  return index;
+end
+def URIEncodeOctets(octets, result, index)
+  if (@@hexCharCodeArray == 0)
+    @@hexCharCodeArray = [48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+                        65, 66, 67, 68, 69, 70];
+  end
+  index = URIAddEncodedOctetToBuffer(octets[0], result, index);
+  if (octets[1]); index = URIAddEncodedOctetToBuffer(octets[1], result, index) end
+  if (octets[2]); index = URIAddEncodedOctetToBuffer(octets[2], result, index) end
+  if (octets[3]); index = URIAddEncodedOctetToBuffer(octets[3], result, index) end
+  return index;
+end
+def URIEncodePair(cc1 , cc2, result, index)
+  u = ((cc1 >> 6) & 0xF) + 1;
+  w = (cc1 >> 2) & 0xF;
+  x = cc1 & 3;
+  y = (cc2 >> 6) & 0xF;
+  z = cc2 & 63;
+  octets = Array.new(4);
+  octets[0] = (u >> 2) + 240;
+  octets[1] = (((u & 3) << 4) | w) + 128;
+  octets[2] = ((x << 4) | y) + 128;
+  octets[3] = z + 128;
+  return URIEncodeOctets(octets, result, index);
+end
+# component must be String
+def URIEncodeComponent(componentString)
+  Encode(componentString, :unescapePredicate);
+end
+# ECMA-262, section 15.1.3
+def Encode(uri, unescape)
+  uriLength = uri.length;
+  # We are going to pass result to %StringFromCharCodeArray
+  # which does not expect any getters/setters installed
+  # on the incoming array.
+  result = Array.new(uriLength);
+  index = 0;
+  k = -1;
+  while ((k+=1) < uriLength) do
+    cc1 = uri.charCodeAt(k);
+    if (self.send(unescape, cc1))
+      result[index] = cc1;
+      index += 1
+    else
+      if (cc1 >= 0xDC00 && cc1 <= 0xDFFF); throw("URI malformed") end
+      if (cc1 < 0xD800 || cc1 > 0xDBFF)
+        index = URIEncodeSingle(cc1, result, index);
+      else
+        k+=1;
+        if (k == uriLength); throw("URI malformed") end
+        cc2 = uri.charCodeAt(k);
+        if (cc2 < 0xDC00 || cc2 > 0xDFFF); throw("URI malformed") end
+        index = URIEncodePair(cc1, cc2, result, index);
+      end
+    end
+  end
+  # return %StringFromCharCodeArray(result);
+  # 'c' = 8 bit signed char
+  # http://www.ruby-doc.org/core-1.9.3/Array.html#method-i-pack
+  return result.pack 'c*'
+end
+end # class << self
+end # module

data/lib/gollum/frontend/views/compare.rb CHANGED Viewed

@@ -1,16 +1,14 @@
 module Precious
   module Views
     class Compare < Layout
+      include HasPage
       attr_reader :page, :diff, :versions, :message
       def title
         "Comparison of #{@page.title}"
       end
-      def path
-        @page.path
-      end
       def before
         @versions[0][0..6]
       end

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

@@ -27,6 +27,11 @@ module Precious
         !!@footer
       end
+      def has_header
+        @header = (@page.header || false) if @header.nil? && @page
+        !!@header
+      end
       def has_sidebar
         @sidebar = (@page.sidebar || false) if @sidebar.nil? && @page
         !!@sidebar

data/lib/gollum/frontend/views/edit.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module Precious
   module Views
     class Edit < Layout
       include Editable
+      include HasPage
       attr_reader :page, :content
@@ -13,6 +14,17 @@ module Precious
         @name.gsub('-', ' ')
       end
+      def header
+        if @header.nil?
+          if page = @page.header
+            @header = page.raw_data
+          else
+            @header = false
+          end
+        end
+        @header
+      end
       def footer
         if @footer.nil?
           if page = @page.footer

data/lib/gollum/frontend/views/file_view.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module Precious
+  module Views
+    class FileView < Layout
+      attr_reader :results, :ref
+      def title
+        "File view of #{@ref}"
+      end
+      def has_results
+        !@results.empty?
+      end
+      def no_results
+        @results.empty?
+      end
+    end
+  end
+end

data/lib/gollum/frontend/views/has_page.rb ADDED Viewed

@@ -0,0 +1,15 @@
+module Precious
+  module HasPage
+    def path
+      @page.path
+    end
+    def escaped_url_path
+      @page.escaped_url_path
+    end
+    def format
+      @page.format.to_s
+    end
+  end
+end