Use cgi/escape instead of cgi/util

taketo1113 · taketo1113 · commit 08a818b82fbe · 2025-10-15T21:33:16.000+09:00
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: false
 
 require "English"
-require "cgi/util"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "time"
 
 class Time
diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 
-require "cgi/util"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 module RSS
 
diff --git a/lib/rss/xml.rb b/lib/rss/xml.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 
-require "cgi/util"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 module RSS
   module XML
diff --git a/test/test-content.rb b/test/test-content.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-dublincore.rb b/test/test-dublincore.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-image.rb b/test/test-image.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
+
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-itunes.rb b/test/test-itunes.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-slash.rb b/test/test-slash.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-syndication.rb b/test/test-syndication.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
diff --git a/test/test-taxonomy.rb b/test/test-taxonomy.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 require_relative "rss-testcase"
 
diff --git a/test/test-trackback.rb b/test/test-trackback.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 require "rexml/document"
 
 require_relative "rss-testcase"
