summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/rubygems/printable_uri.rb12
-rw-r--r--test/rubygems/test_gem_printable_uri.rb18
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/rubygems/printable_uri.rb b/lib/rubygems/printable_uri.rb
index ecf0b239f2..53d9fb7685 100644
--- a/lib/rubygems/printable_uri.rb
+++ b/lib/rubygems/printable_uri.rb
@@ -21,7 +21,7 @@ class Gem::PrintableUri
self
end
- def parsed_uri?
+ def valid_uri?
@uri.is_a? URI::Generic
end
@@ -30,7 +30,7 @@ class Gem::PrintableUri
end
def original_password
- return unless parsed_uri?
+ return unless valid_uri?
@original_uri.password
end
@@ -56,25 +56,25 @@ class Gem::PrintableUri
end
def redactable_credential?
- return false unless parsed_uri?
+ return false unless valid_uri?
password? || oauth_basic? || token?
end
def password?
- return false unless parsed_uri?
+ return false unless valid_uri?
!!@uri.password
end
def oauth_basic?
- return false unless parsed_uri?
+ return false unless valid_uri?
@uri.password == 'x-oauth-basic'
end
def token?
- return false unless parsed_uri?
+ return false unless valid_uri?
!@uri.user.nil? && @uri.password.nil?
end
diff --git a/test/rubygems/test_gem_printable_uri.rb b/test/rubygems/test_gem_printable_uri.rb
index 59394547b9..c227fe683a 100644
--- a/test/rubygems/test_gem_printable_uri.rb
+++ b/test/rubygems/test_gem_printable_uri.rb
@@ -4,23 +4,23 @@ require 'rubygems/printable_uri'
class TestPrintableUri < Gem::TestCase
def test_parsed_uri
- assert_equal true, Gem::PrintableUri.parse_uri("https://www.example.com").parsed_uri?
+ assert_equal true, Gem::PrintableUri.parse_uri("https://www.example.com").valid_uri?
end
- def test_parsed_uri_with_empty_uri_object
- assert_equal true, Gem::PrintableUri.parse_uri(URI("")).parsed_uri?
+ def test_valid_uri_with_empty_uri_object
+ assert_equal true, Gem::PrintableUri.parse_uri(URI("")).valid_uri?
end
- def test_parsed_uri_with_valid_uri_object
- assert_equal true, Gem::PrintableUri.parse_uri(URI("https://www.example.com")).parsed_uri?
+ def test_valid_uri_with_valid_uri_object
+ assert_equal true, Gem::PrintableUri.parse_uri(URI("https://www.example.com")).valid_uri?
end
- def test_parsed_uri_with_other_objects
- assert_equal false, Gem::PrintableUri.parse_uri(Object.new).parsed_uri?
+ def test_valid_uri_with_other_objects
+ assert_equal false, Gem::PrintableUri.parse_uri(Object.new).valid_uri?
end
- def test_parsed_uri_with_invalid_uri
- assert_equal false, Gem::PrintableUri.parse_uri("https://www.example.com:80index").parsed_uri?
+ def test_valid_uri_with_invalid_uri
+ assert_equal false, Gem::PrintableUri.parse_uri("https://www.example.com:80index").valid_uri?
end
def test_credential_redacted_with_user_pass