Use cgi/escape instead of cgi/util (#62)

taketo1113 · web-flow · commit 5558fecdf8f8 · 2025-10-15T23:00:20.000+09:00
### Background A warning is currently emitted in CI when running with ruby-head (Ruby 3.5-dev). This warning occurs because `CGI::Util` will be removed in Ruby 3.5. - https://bugs.ruby-lang.org/issues/21258 - ruby/ruby#13275 ``` /home/runner/.rubies/ruby-head/lib/ruby/gems/3.5.0+2/gems/rss-0.3.2/lib/rss/rss.rb:4: warning: CGI::Util is removed from Ruby 3.5. Please use cgi/escape instead for CGI.escape and CGI.unescape features. If you are using CGI.parse, please install and use the cgi gem instead. /home/runner/work/rss/rss/tmp/test/test-dublincore.rb:2: warning: CGI library is removed from Ruby 3.5. Please use cgi/escape instead for CGI.escape and CGI.unescape features. If you need to use the full features of CGI library, Please install cgi gem. ``` https://github.com/ruby/rss/actions/runs/16902042489/job/47883073913#step:6:8 ### Details This Pull Request fixes the warning by replacing the use of `cgi/util` with `cgi/escape`. The `cgi/escape` is available since Ruby 2.3. ### Additional Information Similar fixes have been made in other libraries, such as the rdoc gem. - ruby/rdoc#1366 - ruby/rdoc#1378 - ruby/net-http@d8fd39c
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 require "English"
-require "cgi/util"
+require "cgi/escape"
 require "time"
 
 class Time
diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
-require "cgi/util"
+require "cgi/escape"
 
 module RSS
 
diff --git a/lib/rss/xml.rb b/lib/rss/xml.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
-require "cgi/util"
+require "cgi/escape"
 
 module RSS
   module XML
diff --git a/test/test-content.rb b/test/test-content.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-dublincore.rb b/test/test-dublincore.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-image.rb b/test/test-image.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-itunes.rb b/test/test-itunes.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-slash.rb b/test/test-slash.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-syndication.rb b/test/test-syndication.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-taxonomy.rb b/test/test-taxonomy.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 
 require_relative "rss-testcase"
 
diff --git a/test/test-trackback.rb b/test/test-trackback.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
 require "rexml/document"
 
 require_relative "rss-testcase"
