Skip to content

Commit

Permalink
Rename Gem::PrintableUri#parsed_uri? to Gem::PrintableUri#valid_uri?
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-niknam authored and deivid-rodriguez committed Aug 24, 2021
1 parent 5b6b649 commit a517770
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions lib/rubygems/printable_uri.rb
Expand Up @@ -21,7 +21,7 @@ def parse_uri
self
end

def parsed_uri?
def valid_uri?
@uri.is_a? URI::Generic
end

Expand All @@ -30,7 +30,7 @@ def credential_redacted?
end

def original_password
return unless parsed_uri?
return unless valid_uri?

@original_uri.password
end
Expand All @@ -56,25 +56,25 @@ def redact_credential
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
Expand Down
18 changes: 9 additions & 9 deletions test/rubygems/test_gem_printable_uri.rb
Expand Up @@ -4,23 +4,23 @@

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
Expand Down

0 comments on commit a517770

Please sign in to comment.