Fixing usages of URI.encode so nicinfo is compatible with ruby 3.0+.

Author: gdubin

lib/nicinfo/constants.rb

@@ -18,7 +18,7 @@
 
 module NicInfo
 
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
   CONFIG_VERSION = 4

lib/nicinfo/nicinfo_main.rb

@@ -319,7 +319,8 @@ def get url, try, expect_rdap = true
       if data == nil
 
         @config.logger.trace("Issuing GET for " + url)
-        uri = URI.parse( URI::encode( url ) )
+        p = URI::Parser.new
+        uri = URI.parse( p.escape( url ) )
         req = Net::HTTP::Get.new(uri.request_uri)
         req["User-Agent"] = NicInfo::VERSION_LABEL
         req["Accept"] = NicInfo::RDAP_CONTENT_TYPE + ", " + NicInfo::JSON_CONTENT_TYPE
@@ -376,7 +377,8 @@ def get url, try, expect_rdap = true
     def get_file_via_http url, file_name, try
 
       @config.logger.trace("Downloading " + url + " to " + file_name )
-      uri = URI.parse( URI::encode( url ) )
+      p = URI::Parser.new
+      uri = URI.parse( p.escape( url ) )
       req = Net::HTTP::Get.new(uri.request_uri)
       req["User-Agent"] = NicInfo::VERSION_LABEL
       req["Accept"] = NicInfo::JSON_CONTENT_TYPE
@@ -937,7 +939,7 @@ def guess_query_value_type(args)
 
     # Creates a query type
     def create_resource_url(args, queryType)
-
+      p = URI::Parser.new
       path = ""
       case queryType
         when QueryType::BY_IP4_ADDR
@@ -959,15 +961,15 @@ def create_resource_url(args, queryType)
           path = tree.find_rest_ref(args[0])
           raise ArgumentError.new("Unable to find result for " + args[0]) unless path
         when QueryType::BY_ENTITY_HANDLE
-          path << "entity/" << URI.escape( args[ 0 ] )
+          path << "entity/" << p.escape( args[ 0 ] )
         when QueryType::SRCH_ENTITY_BY_NAME
           case args.length
             when 1
-              path << "entities?fn=" << URI.escape( args[ 0 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] )
             when 2
-              path << "entities?fn=" << URI.escape( args[ 0 ] + " " + args[ 1 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] + " " + args[ 1 ] )
             when 3
-              path << "entities?fn=" << URI.escape( args[ 0 ] + " " + args[ 1 ] + " " + args[ 2 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] + " " + args[ 1 ] + " " + args[ 2 ] )
           end
         when QueryType::SRCH_DOMAIN_BY_NAME
           path << "domains?name=" << args[ 0 ]

lib/nicinfo/utils.rb

@@ -20,8 +20,9 @@
 module NicInfo
 
   def NicInfo.make_safe( url )
-    safe = URI.escape( url )
-    safe = URI.escape( safe, "!*'();:@&=+$,/?#[]" )
+    p = URI::Parser.new
+    safe = p.escape( url )
+    safe = p.escape( safe, "!*'();:@&=+$,/?#[]" )
     return safe
   end
 

nicinfo.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.date        = Time.now.strftime( "%Y-%m-%d" )
   s.summary     = "RDAP Client"
   s.description = "A command-line RDAP client."
-  s.authors     = ["Andrew Newton"]
-  s.email       = 'andy@arin.net'
+  s.authors     = ["Andrew Newton","Garth Dubin"]
+  s.email       = 'gdubin@arin.net'
   s.files       = Dir["lib/**/*"].entries
   s.homepage    = 'https://github.com/arinlabs/nicinfo'
   s.license      = 'ISC'