From 68754cf94cc2d9b2a400ff19d2e48a7ffa2ec1f2 Mon Sep 17 00:00:00 2001
From: paz <paz@nadir.org>
Date: Tue, 8 Jun 2021 22:31:06 +0200
Subject: [PATCH] Fix escaping values in ruby 3.0
Works in older rubies (checked for v2.5.3), too.
---
CHANGELOG.md | 7 +++++++
lib/schleuder-cli.rb | 1 +
lib/schleuder-cli/helper.rb | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74676b..8dc705d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/).
+## Unreleased
+
+### Fixed
+
+* Fix compatibility with ruby 3.0 by changing how values are escaped.
+
+
## [0.1.0] / 2017-07-21
### Added
diff --git a/lib/schleuder-cli.rb b/lib/schleuder-cli.rb
index 16821ce..c6adf09 100644
--- a/lib/schleuder-cli.rb
+++ b/lib/schleuder-cli.rb
@@ -3,6 +3,7 @@ require 'json'
require 'pathname'
require 'net/https'
require 'uri'
+require 'cgi'
require 'singleton'
require 'yaml'
require 'base64'
diff --git a/lib/schleuder-cli/helper.rb b/lib/schleuder-cli/helper.rb
index 925dfde..6c3e478 100644
--- a/lib/schleuder-cli/helper.rb
+++ b/lib/schleuder-cli/helper.rb
@@ -19,7 +19,7 @@ module SchleuderCli
u = "/#{args.join('/')}.json"
if params
paramstring = params.map do |k,v|
- "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}"
+ "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
end.join('&')
u << "?#{paramstring}"
end
--
GitLab