gollum 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3746893fd4bb885fa53c453b7224916685babb8c129a65d56ccd8c31b73e0d43
-  data.tar.gz: 1a83709ed4921c25ea91743b36b27dc788409866a4705b71eb285920696b9853
+  metadata.gz: 8d4d24ffaa889dd2ccaea1b04803e084020f923f3efb3e1512609676f9fc8647
+  data.tar.gz: ade42ad7156ebde9985813a051b2f327bc5c597604dc3d1fa20141fc307a197a
 SHA512:
-  metadata.gz: f43522071d711ee1fa8446636fc621db6be4c3721184018a8a050f11fb6485ef06642f0b09f056a9ec4cf3ac5da58f6b75f06315cc78823d0ce8ed35990e9c82
-  data.tar.gz: 447f15b9174f3375825739f35f54baea66e5f583337aeb1e7ccbb87d439cd04cd1f21216e074c6dae01514261c6f6a1937558b8969621237cc543418f19f4536
+  metadata.gz: 33521b0483e80acdb63acbceb27dda772684dda4e5bf619e4a1cbf6fa0eb9b60c49c70ff15d0def8f34dce5d8690625e173f35137e3ff51a58e3c18926398ecb
+  data.tar.gz: 6f9c3b0b3a97ce1789c2f91184d6aebebab966b883be753b30562f41bca42782f1d2c2abb5b1dfd0bf55977521d2f49e77969f1211073b658860222ed772786b

data/README.md

@@ -17,7 +17,7 @@ Gollum is a simple wiki system built on top of Git. A Gollum Wiki is simply a gi
 	* May be written in a variety of [markups](#markups).
 	* Can be edited with your favourite system editor or IDE (changes will be visible after committing) or with the built-in web interface.
 	* Can be displayed in all versions, reverted, etc.
-* Gollum strives to be compatible with GitHub wikis (see `--hyphened-tag-lookup`)
+* Gollum strives to be compatible with GitHub wikis (see `--lenient-tag-lookup`)
 * Gollum supports advanced functionality like:
   * [UML diagrams](https://github.com/gollum/gollum/wiki#plantuml-diagrams)
   * [BibTeX and Citation support](https://github.com/gollum/gollum/wiki/BibTeX-and-Citations)

data/bin/gollum

@@ -172,6 +172,7 @@ MSG
   end
   opts.on('--version', 'Display the current version of Gollum.') do
     puts 'Gollum ' + Gollum::VERSION
+    exit 0
   end
   opts.on('--versions', 'Display the current version of Gollum and auxiliary gems.') do
     require 'gollum-lib'
@@ -286,29 +287,7 @@ else
   else
     require 'rack'
 
-    class MapGollum
-      def initialize(base_path)
-        @mg = Rack::Builder.new do
-
-          map "/#{base_path}" do
-            run Precious::App
-          end
-          map '/' do
-            run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
-          end
-          map '/*' do
-            run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
-          end
-
-        end
-      end
-
-      def call(env)
-        @mg.call(env)
-      end
-    end
-
     # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
-    Rack::Server.new(:app => MapGollum.new(base_path), :Port => options[:port], :Host => options[:bind]).start
+    Rack::Server.new(:app => Precious::MapGollum.new(base_path), :Port => options[:port], :Host => options[:bind]).start
   end
 end

data/bin/gollum-migrate-tags

@@ -4,8 +4,6 @@ require 'optparse'
 require 'pathname'
 require 'rubygems'
 
-REPO = ARGV[0] || Dir.pwd
-
 wiki_options = {}
 options = {}
 
@@ -83,12 +81,15 @@ begin
     const = setting.to_s.upcase
     Object.const_set(const, value) unless Object.const_defined?(const)
   end
+  wiki_options[:page_file_dir] = setting(:page_file_dir) ? setting(:page_file_dir) : wiki_options[:page_file_dir] # Allow settings :page_file_dir through PAGE_FILE_DIR constant.
 rescue OptionParser::InvalidOption
   puts "gollum-migrate-tags: #{$!.message}"
   puts "gollum-migrate-tags: try 'gollum-migrate-tags --help' for more information"
   exit
 end
 
+REPO = ARGV[0] || Dir.pwd
+
 require 'gollum-lib'
 
 if cfg = options[:config]
@@ -261,7 +262,7 @@ wiki.pages.each do |page|
   log(:info,"Page #{page.path}")
   new_data = page.formatted_data
   if setting(:no_dry_run)
-    path = ::File.join([wiki.path, wiki.page_file_dir, page.path].compact)
+    path = ::File.join(wiki.path, page.path)
     f = File.new(path, 'w')
     f.write(new_data)
     f.close

data/gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum'
-  s.version           = '5.0.0'
-  s.date              = '2020-03-30'
+  s.version           = '5.0.1'
+  s.date              = '2020-04-04'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'

data/lib/gollum.rb

@@ -12,7 +12,7 @@ require 'rhino' if RUBY_PLATFORM == 'java'
 require File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))

data/lib/gollum/app.rb

@@ -40,6 +40,30 @@ Gollum::set_git_max_filesize(190 * 10**6)
 # See the wiki.rb file for more details on wiki options
 
 module Precious
+  
+  # For use with the --base-path option.
+  class MapGollum
+    def initialize(base_path)
+      @mg = Rack::Builder.new do
+
+        map "/#{base_path}" do
+          run Precious::App
+        end
+        map '/' do
+          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+        end
+        map '/*' do
+          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+        end
+
+      end
+    end
+
+    def call(env)
+      @mg.call(env)
+    end
+  end
+  
   class App < Sinatra::Base
     register Mustache::Sinatra
     register Sinatra::Namespace
@@ -188,7 +212,8 @@ module Precious
               @etag         = page.sha
               mustache :edit
           else
-            redirect_to("/create/#{encodeURIComponent(@name)}")
+            path = ::File.join('gollum/create', @path, @name)
+            redirect to(clean_url(encodeURIComponent(path)))
           end
         end
 
@@ -413,8 +438,8 @@ module Precious
         @page      = wikip.page
         @page_num  = [params[:page_num].to_i, 1].max
         @max_count = settings.wiki_options.fetch(:pagination_count, 10)
-        @wiki      = @page.wiki
         unless @page.nil?
+          @wiki      = @page.wiki
           @versions = @page.versions(
             per_page: @max_count,
             page_num: @page_num,
@@ -435,12 +460,12 @@ module Precious
       end
 
       post '/compare/*' do
-        @file     = encodeURIComponent(params[:splat].first)
+        @file     = clean_url(encodeURIComponent(params[:splat].first))
         @versions = params[:versions] || []
         if @versions.size < 2
-          redirect_to("/history/#{@file}")
+          redirect to("gollum/history/#{@file}")
         else
-          redirect_to("/compare/%s/%s...%s" % [
+          redirect to("gollum/compare/%s/%s...%s" % [
               @file,
               @versions.last,
               @versions.first]

data/lib/gollum/templates/layout.mustache

@@ -51,7 +51,7 @@
   {{#mathjax_config}}
   <script type="text/javascript" src="{{base_url}}/{{mathjax_config}}"></script>
   {{/mathjax_config}}
-  <script defer src="{{base_path}}/gollum/assets/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+  <script defer src="{{base_url}}/gollum/assets/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
   {{/mathjax}}
   {{#js}}<script type="text/javascript" src="{{custom_path}}/custom.js"></script>{{/js}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-lib