gollum-lib 5.2.1-java → 5.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8eb75e8cec808b1e8ffe26b5ec999792bdce7a15af24cbdac9117100df5d268
-  data.tar.gz: 4d4f7d6e12db10532a52860404c2466720ea6e9916b6ede7dfa5bc4edad40673
+  metadata.gz: 2cd6be4129fb109662b857e85f0b0a3a9729f78a79e3374315f3404ef7fe5ba0
+  data.tar.gz: 284c5b50a77ae36787c90cf73bf212ff4e3dcea2dd4fa2a0fd91299eae751249
 SHA512:
-  metadata.gz: eb91d755311d03fa94a5062553ae9d8b32672d49632c71699118c9ae5647099e7c7c0b2a30bf3b1912ab99e0a6c42973faf443ee33409105de07a2b613f18edf
-  data.tar.gz: 4d35c9fff4acf001d76377ffadc1fa26a07ec7e31643a47cd12b6c2c5ce59057db5ac148e57025e72a056dc7b7be499d6414faa14d8ba8c655cada43f4c3f737
+  metadata.gz: e4e93ac2deb03a47831678420ba464eca8934ddf01de8db243d5ec9eb6594b1ca16e97d4bb6175f7329fc4329f0276d3eff367bd402ed4772bcdbc82b19e4da2
+  data.tar.gz: f49373c97c8201aec93ebff699e6e5706d203cdda3ba2a5f860a547ad930a3d0672981dace71ccbb25e81e9717ad2b0b858dbf8bf32838983981aa91c270795d

data/HISTORY.md

@@ -1,3 +1,13 @@
+# 5.2.2 / 2023-01-18
+
+* Bugfix release: set Nokogiri default XHTML conversion options more relaibly. See https://github.com/sparklemotion/nokogiri/issues/2761
+
+
+# 5.2.1 / 2022-09-13
+
+* Fixed: 'controls' attribute in audio and video tags should not be sanitized. #430 (@dometto)
+
+
 # 5.2 / 2022-05-28
 
 * Conditionally render "editable" heading classes. Resolves https://github.com/gollum/gollum/issues/1785 (@benjaminwil)

data/LATEST_CHANGES.md

@@ -0,0 +1,4 @@
+# 5.2.3 / 2023-03-13
+
+* Bugfix release: update adapter dependencies for Ruby 3.2 support.
+

data/README.md

@@ -3,7 +3,7 @@ gollum lib -- A wiki built on top of Git
 
 [![Gem Version](https://badge.fury.io/rb/gollum-lib.svg)](http://badge.fury.io/rb/gollum-lib)
 [![Ruby Build](https://github.com/gollum/gollum-lib/actions/workflows/test.yaml/badge.svg)](https://github.com/gollum/gollum-lib/actions/workflows/test.yaml)
-[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum-lib/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum-lib/info)
+[![Cutting Edge Dependency Status](https://cuttingedge.onrender.com/github/gollum/gollum-lib/svg 'Cutting Edge Dependency Status')](https://cuttingedge.onrender.com/github/gollum/gollum-lib/info)
 
 ## DESCRIPTION
 

data/Rakefile

@@ -126,7 +126,7 @@ task :release => :build do
   Rake::Task[:changelog].execute
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git pull --rebase origin master"
-  sh "git tag v#{version}"
+  sh "git tag v#{version} -m 'Release v#{version}'"
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
@@ -189,7 +189,7 @@ end
 desc 'Build changlog'
 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

data/gemspec.rb

@@ -56,6 +56,7 @@ def specification(version, default_adapter, platform = nil)
     Gemfile
     Guardfile
     HISTORY.md
+    LATEST_CHANGES.md
     LICENSE
     README.md
     Rakefile

data/gollum-lib.gemspec

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
 # This file needs to conditionally define the default adapter for MRI and Java, because this is the file that is included from the Gemfile.
 # In addition, the default Java adapter needs to be defined in gollum-lib_java.gemspec beause that file is used to *build* the Java gem.
 if RUBY_PLATFORM == 'java' then
-  default_adapter = ['gollum-rjgit_adapter', '~> 0.6']
+  default_adapter = ['gollum-rjgit_adapter', '~> 1.0']
 else
-  default_adapter = ['gollum-rugged_adapter', '~> 1.0']
+  default_adapter = ['gollum-rugged_adapter', '~> 2.0']
 end
 Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/lib/gollum-lib/macro/audio.rb

@@ -2,7 +2,7 @@ module Gollum
   class Macro
     class Audio < Gollum::Macro
       def render (fname)
-        "<audio width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"\"> HTML5 audio is not supported on this Browser.</audio>"
+        "<audio width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"true\"> HTML5 audio is not supported on this Browser.</audio>"
       end
     end
   end

data/lib/gollum-lib/macro/video.rb

@@ -2,7 +2,7 @@ module Gollum
   class Macro
     class Video < Gollum::Macro
       def render (fname)
-        "<video width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"\"> HTML5 video is not supported on this Browser.</video>"
+        "<video width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"true\"> HTML5 video is not supported on this Browser.</video>"
       end
     end
   end

data/lib/gollum-lib/markup.rb

@@ -23,7 +23,7 @@ module Gollum
     class << self
 
       def to_xml_opts
-        { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
+        { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML & (~Nokogiri::XML::Node::SaveOptions::FORMAT), :indent => 0, :encoding => 'UTF-8' }
       end
 
       # Only use the formats that are specified in config.rb

data/lib/gollum-lib/sanitization.rb

@@ -1,4 +1,5 @@
 ::Loofah::HTML5::SafeList::ACCEPTABLE_PROTOCOLS.add('apt')
+::Loofah::HTML5::SafeList::ALLOWED_ATTRIBUTES.add('controls')
 
 module Gollum
   class Sanitization

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.2.1'
+    VERSION = '5.2.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.3
 platform: java
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-rjgit_adapter
@@ -400,6 +400,7 @@ files:
 - Gemfile
 - Guardfile
 - HISTORY.md
+- LATEST_CHANGES.md
 - LICENSE
 - README.md
 - Rakefile
@@ -469,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A simple, Git-powered wiki.