[前][次][番号順一覧][スレッド一覧]

ruby-changes:67473

From: Daniel <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:53 +0900 (JST)
Subject: [ruby-changes:67473] fafd9d280a (master): [rubygems/rubygems] Rename `Gem::PrintableUri#parsed_uri?` to `Gem::PrintableUri#valid_uri?`

https://git.ruby-lang.org/ruby.git/commit/?id=fafd9d280a

From fafd9d280a4ce57c2868a866ae06ba006671bf5a Mon Sep 17 00:00:00 2001
From: Daniel Niknam <mhmd.niknam@g...>
Date: Sun, 22 Aug 2021 11:39:06 +1000
Subject: [rubygems/rubygems] Rename `Gem::PrintableUri#parsed_uri?` to
 `Gem::PrintableUri#valid_uri?`

https://github.com/rubygems/rubygems/commit/a5177709c9
---
 lib/rubygems/printable_uri.rb           | 12 ++++++------
 test/rubygems/test_gem_printable_uri.rb | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/rubygems/printable_uri.rb b/lib/rubygems/printable_uri.rb
index ecf0b23..53d9fb7 100644
--- a/lib/rubygems/printable_uri.rb
+++ b/lib/rubygems/printable_uri.rb
@@ -21,7 +21,7 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L21
     self
   end
 
-  def parsed_uri?
+  def valid_uri?
     @uri.is_a? URI::Generic
   end
 
@@ -30,7 +30,7 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L30
   end
 
   def original_password
-    return unless parsed_uri?
+    return unless valid_uri?
 
     @original_uri.password
   end
@@ -56,25 +56,25 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L56
   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 5939454..c227fe6 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' https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_printable_uri.rb#L4
 
 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
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]