gollum 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e671e9e3556522997ba960c4ab1e5d1ae7b29e
-  data.tar.gz: a1184728ef1ebdf0afd72259b6e226226f17e60e
+  metadata.gz: 4f1fd022c60a1f76f6089b8abf1ce266c614c0c5
+  data.tar.gz: acd811fd1f8208bbce1c0478d76fbadf01384c70
 SHA512:
-  metadata.gz: 3af45d3ac496d93ff54f4c967c284e9d41718aa0ef23d81fdc0095c64564ba786870b0cb7cbf60893a62763f08332ef29c6ef276da194b02cf78721359ef0e15
-  data.tar.gz: 8406d6b1001336d90c71b5ec0861ec38f0c5c1c0cc4236f1377bff6269ba05a0483fdcf081fe19e922c1c69944dd3f383133ca0369c46cefde6feb771daca02f
+  metadata.gz: dab40d9d3d84550c9d3ee33189645d95d63cd60b4b98e5dc4ee4e9a00d24e11ccf0fccac1eb9a0efe3df22a29e3f382b640cacc4f85ce3a9045c6b1cc906f898
+  data.tar.gz: 840edf30f8f864272f7a241d642d7553589b4d5f4527a00724ae8eb27e62381fda76f8a3b0391dc43568544ff76711e9a73f31e334693f13f16fcad805a33839

data/bin/gollum

@@ -56,6 +56,10 @@ opts = OptionParser.new do |opts|
     wiki_options[:js] = true
   end
 
+  opts.on("--template-dir [PATH]", "Specify custom template directory") do |path|
+    wiki_options[:template_dir] = path
+  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
@@ -168,6 +172,7 @@ else
   require 'gollum/app'
   Precious::App.set(:gollum_path, gollum_path)
   Precious::App.set(:wiki_options, wiki_options)
+  Precious::App.settings.mustache[:templates] = wiki_options[:template_dir] if wiki_options[:template_dir]
 
   if cfg = options['config']
     # If the path begins with a '/' it will be considered an absolute path,

data/gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.name              = 'gollum'
-  s.version           = '2.5.2'
-  s.date              = '2013-11-02'
+  s.version           = '2.6.0'
+  s.date              = '2014-01-02'
   s.rubyforge_project = 'gollum'
   s.license           = 'MIT'
 
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'gollum-lib', '~> 1.0.9'
+  s.add_dependency 'gollum-lib', '~> 1.0', '>= 1.0.9'
   s.add_dependency 'github-markdown', '~> 0.5.5'
-  s.add_dependency 'sinatra', '~> 1.4.3'
+  s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.3'
   s.add_dependency 'mustache', ['>= 0.99.4', '< 1.0.0']
   s.add_dependency 'useragent', '~> 0.8.2'
 
   s.add_development_dependency 'rack-test', '~> 0.6.2'
-  s.add_development_dependency 'shoulda', ['>= 3.4.0', '< 3.5.0']
+  s.add_development_dependency 'shoulda', '~> 3.4.0'
   s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
 
   # = MANIFEST =

data/lib/gollum/app.rb

@@ -289,6 +289,8 @@ module Precious
       format       = params[:format].intern
       wiki = wiki_new
 
+      path.gsub!(/^\//, '')
+
       begin
         wiki.write_page(name, format, params[:content], commit_message, path)
 
@@ -300,15 +302,14 @@ module Precious
       end
     end
 
-    post '/revert/:page/*' do
-      wikip        = wiki_page(params[:page])
+    post '/revert/*/:sha1/:sha2' do
+      wikip        = wiki_page(params[:splat].first)
       @path        = wikip.path
       @name        = wikip.name
       wiki         = wikip.wiki
       @page        = wiki.paged(@name,@path)
-      shas         = params[:splat].first.split("/")
-      sha1         = shas.shift
-      sha2         = shas.shift
+      sha1         = params[:sha1]
+      sha2         = params[:sha2]
 
       commit = commit_message
       commit[:message] = "Revert commit #{sha1.chars.take(7).join}"
@@ -387,6 +388,7 @@ module Precious
         @page = page
         @name = name
         @content = page.formatted_data
+        @version = version
         mustache :page
       else
         halt 404

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

@@ -179,6 +179,7 @@
             duration: 200,
             complete: function() {
               $('#gollum-dialog-dialog').removeClass('active');
+              $('#gollum-dialog-dialog').css('display', 'none');
             }
           });
         }

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

@@ -155,7 +155,8 @@ $(document).ready(function() {
         fields: [
           {
             type:   'file',
-            context: 'Your uploaded file will be accessible at /uploads/[filename]'
+            context: 'Your uploaded file will be accessible at /uploads/[filename]',
+            action: baseUrl + '/uploadFile'
           }
         ],
         OK: function( res ) {

data/lib/gollum/templates/layout.mustache

@@ -7,6 +7,7 @@
   <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}}
+  {{#noindex}}<meta name="robots" content="noindex, nofollow" />{{/noindex}}
 
   <!--[if IE 7]>
   <link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">

data/lib/gollum/views/page.rb

@@ -35,6 +35,10 @@ module Precious
         first.authored_date.strftime(DATE_FORMAT)
       end
 
+      def noindex
+        @version ? true : false
+      end
+
       def editable
         @editable
       end

data/lib/gollum.rb

@@ -16,7 +16,7 @@ require File.expand_path('../gollum/uri_encode_component', __FILE__)
 $KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
-  VERSION = '2.5.2'
+  VERSION = '2.6.0'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,13 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
@@ -23,6 +26,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.9
 - !ruby/object:Gem::Dependency
@@ -44,6 +50,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
@@ -51,6 +60,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
@@ -105,22 +117,16 @@ dependencies:
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -663,8 +669,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []
+has_rdoc: