Minor uri utils refactor (#4553)

* use class << self instead of private_class_method

Author: sethboyles

lib/utils/uri_utils.rb

@@ -11,111 +11,114 @@ module UriUtils
 (#{DOCKER_TAG_REGEX.source}@#{DOCKER_DIGEST_REGEX.source}) | #{DOCKER_DIGEST_REGEX.source})\\Z", Regexp::EXTENDED)
 
   class InvalidDockerURI < StandardError; end
+  class << self
+    def is_uri?(candidate)
+      !!(candidate.is_a?(String) && /\A#{URI::DEFAULT_PARSER.make_regexp}\Z/ =~ candidate && URI(candidate))
+    rescue StandardError
+      false
+    end
 
-  def self.is_uri?(candidate)
-    !!(candidate.is_a?(String) && /\A#{URI::DEFAULT_PARSER.make_regexp}\Z/ =~ candidate && URI(candidate))
-  rescue StandardError
-    false
-  end
+    def is_buildpack_uri?(candidate)
+      return false unless candidate.is_a?(String)
+      return true if is_uri?(candidate)
 
-  def self.is_buildpack_uri?(candidate)
-    return false unless candidate.is_a?(String)
-    return true if is_uri?(candidate)
+      !!(SSH_REGEX.match(candidate) || GIT_REGEX.match(candidate))
+    end
 
-    !!(SSH_REGEX.match(candidate) || GIT_REGEX.match(candidate))
-  end
+    def is_cnb_buildpack_uri?(candidate)
+      return false unless candidate.is_a?(String)
+      return is_uri?(candidate) if candidate.start_with?(%r{\Ahttp(s)?://}x)
+      return !!parse_docker_uri(candidate.split('://').last) if candidate.start_with?('docker://')
 
-  def self.is_cnb_buildpack_uri?(candidate)
-    return false unless candidate.is_a?(String)
-    return is_uri?(candidate) if candidate.start_with?(%r{\Ahttp(s)?://}x)
-    return !!parse_docker_uri(candidate.split('://').last) if candidate.start_with?('docker://')
+      false
+    rescue StandardError
+      false
+    end
 
-    false
-  rescue StandardError
-    false
-  end
+    def is_uri_path?(candidate)
+      !!(candidate.is_a?(String) && candidate =~ %r{^(?:/|/([^\s/]\S*)?)$})
+    end
 
-  def self.is_uri_path?(candidate)
-    !!(candidate.is_a?(String) && candidate =~ %r{^(?:/|/([^\s/]\S*)?)$})
-  end
+    # This escapes only the values in queries.
+    def uri_escape(uri)
+      parts = uri.split('?', 2)
+      return uri if parts.size == 1
+
+      query = parts[1].split('&').map do |subquery|
+        subparts = subquery.split('=', 2)
+        if subparts.size == 1
+          CGI.escape(subparts[0])
+        else
+          [subparts[0], CGI.escape(subparts[1])].join('=')
+        end
+      end.join('&')
+      [parts[0].tr(' ', '+'), query].join('?')
+    end
 
-  # This escapes only the values in queries.
-  def self.uri_escape(uri)
-    parts = uri.split('?', 2)
-    return uri if parts.size == 1
-
-    query = parts[1].split('&').map do |subquery|
-      subparts = subquery.split('=', 2)
-      if subparts.size == 1
-        CGI.escape(subparts[0])
-      else
-        [subparts[0], CGI.escape(subparts[1])].join('=')
-      end
-    end.join('&')
-    [parts[0].tr(' ', '+'), query].join('?')
-  end
+    def parse_docker_uri(docker_uri)
+      name_parts = docker_uri.split('/', 2)
 
-  def self.parse_docker_uri(docker_uri)
-    name_parts = docker_uri.split('/', 2)
+      host = name_parts[0]
+      path = name_parts[1]
 
-    host = name_parts[0]
-    path = name_parts[1]
+      if missing_registry(name_parts)
+        host = ''
+        path = docker_uri
+      end
 
-    if missing_registry(name_parts)
-      host = ''
-      path = docker_uri
-    end
+      path = 'library/' + path if (official_docker_registry(name_parts[0]) || missing_registry(name_parts)) && path.exclude?('/')
+      path, tag_digest = parse_docker_tag_digest_from_path(path)
 
-    path = 'library/' + path if (official_docker_registry(name_parts[0]) || missing_registry(name_parts)) && path.exclude?('/')
-    path, tag_digest = parse_docker_tag_digest_from_path(path)
+      raise InvalidDockerURI.new "Invalid image name [#{path}]" unless DOCKER_PATH_REGEX =~ path
+      raise InvalidDockerURI.new "Invalid image tag [#{tag_digest}]" if tag_digest && DOCKER_TAG_DIGEST_REGEX !~ tag_digest
 
-    raise InvalidDockerURI.new "Invalid image name [#{path}]" unless DOCKER_PATH_REGEX =~ path
-    raise InvalidDockerURI.new "Invalid image tag [#{tag_digest}]" if tag_digest && DOCKER_TAG_DIGEST_REGEX !~ tag_digest
+      # if only sha256 presented, we add hash value as fragment to the uri,
+      # since the ruby uri parser confuses because of second ':' in uri's path part.
+      if tag_digest && tag_digest.start_with?('sha256:')
+        _, hash_value = tag_digest.split(':')
+        path += '@sha256'
+        tag_digest = hash_value
+      end
 
-    # if only sha256 presented, we add hash value as fragment to the uri,
-    # since the ruby uri parser confuses because of second ':' in uri's path part.
-    if tag_digest && tag_digest.start_with?('sha256:')
-      _, hash_value = tag_digest.split(':')
-      path += '@sha256'
-      tag_digest = hash_value
+      [host, path, tag_digest]
     end
 
-    [host, path, tag_digest]
-  end
+    private
 
-  private_class_method def self.official_docker_registry(host)
-    host == DOCKER_INDEX_SERVER
-  end
+    def official_docker_registry(host)
+      host == DOCKER_INDEX_SERVER
+    end
 
-  private_class_method def self.missing_registry(name_parts)
-    host = name_parts[0]
-    name_parts.length == 1 ||
-    (host.exclude?('.') && host.exclude?(':') && host != 'localhost')
-  end
+    def missing_registry(name_parts)
+      host = name_parts[0]
+      name_parts.length == 1 ||
+        (host.exclude?('.') && host.exclude?(':') && host != 'localhost')
+    end
 
-  private_class_method def self.parse_docker_tag_digest_from_path(path)
-    # Split path into base path and digest if digest is present (after '@')
-    base_path, digest = path.split('@', 2)
+    def parse_docker_tag_digest_from_path(path)
+      # Split path into base path and digest if digest is present (after '@')
+      base_path, digest = path.split('@', 2)
 
-    if digest
-      # If digest is present and base_path contains a tag (':'), split it
-      if base_path.include?(':')
-        base_path, tag = base_path.split(':', 2)
-        # Return path and combined tag@digest
-        return [base_path, "#{tag}@#{digest}"]
-      end
+      if digest
+        # If digest is present and base_path contains a tag (':'), split it
+        if base_path.include?(':')
+          base_path, tag = base_path.split(':', 2)
+          # Return path and combined tag@digest
+          return [base_path, "#{tag}@#{digest}"]
+        end
 
-      # Return path and digest if no tag present
-      return [base_path, digest]
-    end
+        # Return path and digest if no tag present
+        return [base_path, digest]
+      end
 
-    # No digest present, check for tag
-    base_path, tag = base_path.split(':', 2)
+      # No digest present, check for tag
+      base_path, tag = base_path.split(':', 2)
 
-    # If tag is present but looks like a path segment (contains '/'), treat as no tag
-    return [base_path, 'latest'] if tag&.include?('/')
+      # If tag is present but looks like a path segment (contains '/'), treat as no tag
+      return [base_path, 'latest'] if tag&.include?('/')
 
-    # Return path and tag (or nil if no tag)
-    [base_path, tag]
+      # Return path and tag (or nil if no tag)
+      [base_path, tag]
+    end
   end
 end