gollum 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6498c3f4201b606f4fc3919ce8c900b708e95f4599e8d768eb449f7265b422
-  data.tar.gz: c777311336b3da982568b1d6200bed36fef5f1d4cacdebb94fd3dbdd507faa8e
+  metadata.gz: 1e6ee218ec3038d40b887356c370ba15c3447367aae654f3b4e9866b0e710455
+  data.tar.gz: 6872a6036fcf1eb464eea8a613ae319feb680c5a5bb2d9ff34b2371d22d620a4
 SHA512:
-  metadata.gz: 24f98884dcef45d1522c94c74da652c72b4ec350b78eb7f073f38144eb30aae41451dd3daefdf751902b17ff20da3a03ba327b82f97859b253428dba97fac868
-  data.tar.gz: 7ec0150d4a1d0f9246924cde38ce0e951059838f9df2a915320f7af83d85b445d7959cdefddc8aaf067fa40a8e486c3be33db2cbbd8699ecde897b3825759d03
+  metadata.gz: f4bfe69e3cd37fc8d789496a953e2f7ed875ecc8798ec7f1a68328dece6901823a4d0dae2fa12585f1f2a8cac8f42af8c29e4eafb08b32adb9cfec9dccad42e2
+  data.tar.gz: '0160962fa0410dad56f90be9a3ffa10c2d16e2f5ca504aed55968ecb1b500d6e3cc077a8f16028fc8102db397202119b08513b7aef5f09d545d8ff9d0c5ab452'

data/HISTORY.md

@@ -1,3 +1,20 @@
+# 5.3.0 / 2023-20-03
+
+* Backport fixes from the `master` branch for Ruby 3.2 compatibility.
+
+# 5.3.0 / 2022-05-25
+
+* Feature: allow for overriding only specific Mustache templates/partials (@beporter)
+* Feature: Add option to show browser's local time (@NikitaIvanovV)
+* Improvement: presentation on mobile devises (@benjaminwil)
+* Improvement: Add page context to template filter. #1603 (@tevino)
+* Fix: restore normalize check on file upload (@manofstick)
+* Fix mathjax on edit and create pages. #1772 (@fhchl)
+* Fix utf-8 issues: #1721 #1758 #1801 (@basking2, @dometto)
+* Fix an IME rendering issue. #1735 (@yy0931)
+* Fix broken history button when viewing historical deleted file. (@NikitaIvanovV)
+* Fix: non-ascii characters in page names are not rendered correctly in the preview tab of the "Edit" page. #1739 (@yy0931)
+* Fix: anchors and header display on JRuby. #1779
 # 5.2.3 / 2021-04-18
 
 * Fix bug preventing page titles from being displayed

data/gollum.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.name              = 'gollum'
-  s.version           = '5.3.0'
+  s.version           = '5.3.1'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency 'rdoc', '~> 6'
-  s.add_dependency 'gollum-lib', '~> 5.1'
+  s.add_dependency 'gollum-lib', '>= 5.2.3', '< 6.0'
   s.add_dependency 'kramdown', '~> 2.3'
   s.add_dependency 'kramdown-parser-gfm', '~> 1.1.0'
   s.add_dependency 'sinatra', '~> 2.0'
   s.add_dependency 'sinatra-contrib', '~> 2.0'
-  s.add_dependency 'mustache-sinatra', '>= 1.0.1', '< 2'
+  s.add_dependency 'mustache-sinatra', '~> 2.0' 
   s.add_dependency 'useragent', '~> 0.16.2'
   s.add_dependency 'gemojione', '~> 4.1'
   s.add_dependency 'octicons', '~> 12.0'

data/lib/gollum/app.rb

@@ -16,6 +16,7 @@ require 'gollum'
 require 'gollum/assets'
 require 'gollum/views/helpers'
 require 'gollum/views/helpers/locale_helpers'
+require 'gollum/views/template_cascade'
 require 'gollum/views/layout'
 require 'gollum/views/editable'
 require 'gollum/views/has_page'
@@ -23,7 +24,6 @@ require 'gollum/views/has_user_icons'
 require 'gollum/views/has_math'
 require 'gollum/views/pagination'
 require 'gollum/views/rss.rb'
-require 'gollum/views/template_cascade'
 
 require File.expand_path '../helpers', __FILE__
 
@@ -112,7 +112,6 @@ module Precious
       @wiki_title = settings.wiki_options.fetch(:title, 'Gollum Wiki')
 
       if settings.wiki_options[:template_dir]
-        Precious::Views::Layout.extend Precious::Views::TemplateCascade
         Precious::Views::Layout.template_priority_path = settings.wiki_options[:template_dir]
       end
 

data/lib/gollum/views/layout.rb

@@ -3,7 +3,6 @@ require 'cgi'
 module Precious
   module Views
     class Layout < Mustache
-      include Rack::Utils
       include Sprockets::Helpers
       include Precious::Views::AppHelpers
       include Precious::Views::LocaleHelpers
@@ -11,10 +10,21 @@ module Precious
       include Precious::Views::RouteHelpers
       include Precious::Views::OcticonHelpers
 
-      alias_method :h, :escape_html
-
       attr_reader :name, :path
 
+      self.extend Precious::Views::TemplateCascade
+
+      # Method should track lib/mustache.rb from Mustache project.
+      def partial(name)
+        path = self.class.first_path_available(name)
+        begin
+          File.read(path)
+        rescue
+          raise if raise_on_context_miss?
+          ""
+        end
+      end
+      
       def escaped_name
         CGI.escape(@name)
       end

data/lib/gollum/views/page.rb

@@ -15,7 +15,6 @@ module Precious
 
       DATE_FORMAT    = "%Y-%m-%d %H:%M:%S"
       DEFAULT_AUTHOR = 'you'
-      @@to_xml       = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
 
       def title
         h1 = @h1_title ? page_header_from_content(@content) : false
@@ -252,7 +251,7 @@ module Precious
             title.remove unless title.empty?
           end
         # .inner_html will cause href escaping on UTF-8
-        doc.css("div#gollum-root").children.to_xml(@@to_xml)
+        doc.css("div#gollum-root").children.to_xml(Gollum::Markup.to_xml_opts)
       end
 
       def table(data)

data/lib/gollum/views/template_cascade.rb

@@ -2,7 +2,7 @@ module Precious
   module Views
     module TemplateCascade
       def template_priority_path
-        @@template_priority_path
+        @@template_priority_path ||= nil
       end
 
       def template_priority_path=(path)
@@ -24,17 +24,6 @@ module Precious
       def template_file
         @template_file || first_path_available(template_name)
       end
-
-      # Method should track lib/mustache.rb from Mustache project.
-      def partial(name)
-        path = first_path_available(name)
-        begin
-          File.read(path)
-        rescue
-          raise if raise_on_context_miss?
-          ""
-        end
-      end
     end
   end
 end

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 = '5.3.0'
+  VERSION = '5.3.1'
 
   ::I18n.available_locales = [:en]
   ::I18n.load_path = Dir[::File.expand_path("lib/gollum/locales") + "/*.yml"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -29,16 +29,22 @@ dependencies:
   name: gollum-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -99,22 +105,16 @@ dependencies:
   name: mustache-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: useragent
   requirement: !ruby/object:Gem::Requirement
@@ -1557,7 +1557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A simple, Git-powered wiki.