gollum 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba1dc19c4f9b1968a0800d5b70a50ca712cd3ef330ceeb7d937af5394169b56
-  data.tar.gz: 714ecd6e8e2511ebb40339230edde002082dd90e17a3b5681753d459ade46898
+  metadata.gz: 777fc637bf9f32da50347a0bf604706d39ce97c24ed4be4892efc5ef9c557856
+  data.tar.gz: f4d551f8183da4d8ed4335a882976dbf6c07dea068fca79ecc59fc44ec28461d
 SHA512:
-  metadata.gz: 969605876f29c7997fc98ddd11c95346d126fa96168425337e00aba7327b557c945a781bb9fabfb97120b81b846f7e444bbcc8a98fc8b3d997be5675517551aa
-  data.tar.gz: cd4192d8eb0857bc92aae1e4ac2cb1ee2d24ea6eee05cbe3cfb064a262616a9995ed464da45188737e0ad22bed82521be913639141c068bbc0bebd0b3a0eaa33
+  metadata.gz: 2f2f435022ea90684574562a14ec4e95db45eb1ea0297aa641326c0a6fa767ec4f1985002ced08575b27d18b6a46119bef92ecea32dac22225bb6a542326b7b7
+  data.tar.gz: 2e9ef9046e7f70cda791e76f251cbab4e60a7f5b6539943b1c1418bdc49a89812c64e5e318511c89e37ad69d66a2064f4d7ebbde64f5364ccfe29aa0722a963d

data/CONTRIBUTING.md

@@ -181,6 +181,8 @@ git push ../lotr.git/ master
 
 Gollum uses [yarn](https://yarnpkg.com/) and [sprockets](https://github.com/rails/sprockets) to manage assets. By default, Gollum uses the precompiled static assets that are packaged with the gem (under `lib/gollum/public/assets`). If you're making changes to Gollum's JavaScript or (S)CSS assets, you might want to develop by calling `gollum` with the `--development-assets` flag. This will cause the application to use the unpackaged assets that you are editing (under `lib/gollum/public/gollum/` and in your local `node_modules` directory), so you can test and tweak. Once you are satisfied with your changes, it's time to [update the static assets](#updating-static-assets)!
 
+You can also enable the use of development assets by setting the `APP_ENV` environment variable to `gollum_development`: for example, with `APP_ENV=gollum_development bundle exec gollum ...`.
+
 For convenience, Gollum also allows developers to set a custom location for `node_modules` (by default expected to be in the root of the project) when using `--development-assets`. Set the `GOLLUM_DEV_ASSETS` environment variable to do this, e.g.: `GOLLUM_DEV_ASSETS=/path/to/my/node_modules gollum --development-assets`
 
 ## Updating static assets

data/HISTORY.md

@@ -1,3 +1,23 @@
+# 6.0.0 / 2024-05-03
+
+# Breaking Changes
+
+* Docker image: removed deprecated automatic activation of --mathjax. Pass '--math mathjax' to continue using mathjax, or '--math' to use KaTeX (see below).
+* RACK_ENV is ignored, please use APP_ENV instead (@svoop).
+
+## New features
+
+* Add support for Mermaid diagrams (@dometto).
+* Add support for downloading page sources with ?raw (@tstein).
+* Add openssh client to docker images for ssh: repo support. (@jagerkin).
+* Add support for mathematical typesetting using KaTeX (@dometto). Users can now choose between MathJax and KaTeX with the --math flag.
+* Add support for more languages (Chinese).
+
+## Fixes & Improvements
+
+* Fix (Docker image): add git configuration for `/wiki` as safe directory. #2006
+* Fix: use `base_path` as set in config file.
+
 # 5.3.0 / 2022-05-25
 
 * Feature: allow for overriding only specific Mustache templates/partials (@beporter)

data/LATEST_CHANGES.md

@@ -1,19 +1,7 @@
-# 6.0.0
-
-# Breaking Changes
-
-* Docker image: removed deprecated automatic activation of --mathjax. Pass '--math mathjax' to continue using mathjax, or '--math' to use KaTeX (see below).
-* RACK_ENV is ignored, please use APP_ENV instead (@svoop).
-
-## New features
-
-* Add support for Mermaid diagrams (@dometto).
-* Add support for downloading page sources with ?raw (@tstein).
-* Add openssh client to docker images for ssh: repo support. (@jagerkin).
-* Add support for mathematical typesetting using KaTeX (@dometto). Users can now choose between MathJax and KaTeX with the --math flag.
-* Add support for more languages (Chinese).
+# 6.0.1
 
 ## Fixes & Improvements
 
-* Fix (Docker image): add git configuration for `/wiki` as safe directory. #2006
-* Fix: use `base_path` as set in config file.
+* Use static assets when `APP_ENV` is `development` (@dometto)
+* Explicitly require Rack 3 or greater (@dometto)
+* Let the `--base-path` wiki option handle prefixed and suffixed slashes in path values. (i.e. `--base-path /my-wiki`) (@dometto)

data/Rakefile

@@ -214,7 +214,7 @@ end
 desc 'Build changelog'
 task :changelog do
   [latest_changes_file, history_file].each do |f|
-    unless File.exists?(f)
+    unless File.exist?(f)
       puts "#{f} does not exist but is required to build a new release."
       exit!
     end
@@ -271,7 +271,7 @@ task :precompile do
       JS_COMPRESSOR = ::Terser.new
     end
   end
-  
+
   require './lib/gollum/app.rb'
 
   # Next, configure the Sprockets asset pipeline and precompile production-

data/bin/gollum

@@ -293,9 +293,9 @@ else
   if base_path.nil?
     Precious::App.run!(options)
   else
-    require 'rack'
+    require 'rackup'
 
-    # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
-    Rack::Server.new(:app => Precious::MapGollum.new(base_path), :Port => options[:port], :Host => options[:bind]).start
+    # Rackup::Handler does not work with Ctrl + C. Use Rackup::Server instead.
+    Rackup::Server.new(:app => Precious::MapGollum.new(base_path), :Port => options[:port], :Host => options[:bind]).start
   end
 end

data/gollum.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.name              = 'gollum'
-  s.version           = '6.0.0'
+  s.version           = '6.0.1'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'gollum-lib', '~> 6.0'
   s.add_dependency 'kramdown', '~> 2.3'
   s.add_dependency 'kramdown-parser-gfm', '~> 1.1.0'
+  s.add_dependency 'rack', '>= 3.0'
   s.add_dependency 'rackup', '~> 2.1'
   s.add_dependency 'sinatra', '~> 4.0'
   s.add_dependency 'sinatra-contrib', '~> 4.0'

data/lib/gollum/app.rb

@@ -55,17 +55,19 @@ module Precious
 
   # For use with the --base-path option.
   class MapGollum
+  include Precious::Helpers
     def initialize(base_path)
+      base_route = "/#{remove_leading_and_trailing_slashes(base_path)}"
       @mg = Rack::Builder.new do
 
-        map "/#{base_path}" do
+        map base_route do
           run Precious::App
         end
         map '/' do
-          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+          run Proc.new { [302, { 'Location' => base_route }, []] }
         end
         map '/*' do
-          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+          run Proc.new { [302, { 'Location' => base_route }, []] }
         end
 
       end
@@ -101,7 +103,7 @@ module Precious
     }
 
     # Sinatra error handling
-    configure :development, :staging do
+    configure :development, :staging, :gollum_development do
       enable :show_exceptions, :dump_errors
       disable :raise_errors, :clean_trace
     end
@@ -136,7 +138,7 @@ module Precious
       @mermaid = settings.wiki_options.fetch(:mermaid, true)
       Gollum::Filter::Code.language_handlers.delete(/mermaid/) unless @mermaid
 
-      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
+      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :gollum_development)
       @static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
       @mathjax_path = ::File.join(File.dirname(__FILE__), 'public/gollum/javascript/MathJax')
 

data/lib/gollum.rb

@@ -13,7 +13,7 @@ require 'rhino' if RUBY_PLATFORM == 'java'
 require ::File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
   KEYBINDINGS = ['default', 'vim', 'emacs']
 
   ::I18n.available_locales = [:en, :cn]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement
@@ -613,7 +627,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A simple, Git-powered wiki.