Skip to content

Commit fc91874

Browse files
committed
Rename gravatarImageUrlToGravatarImageUri to rewriteGravatarUriQueryParams
1 parent 788a927 commit fc91874

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

gravatar/src/main/java/com/gravatar/GravatarUtils.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ fun emailAddressToGravatarUri(
6060
.build()
6161
}
6262

63-
fun gravatarImageUrlToGravatarImageUrl(
63+
fun rewriteGravatarImageUrlQueryParams(
6464
url: String,
6565
size: Int? = null,
6666
defaultAvatarImage: DefaultAvatarImage? = null,
6767
rating: ImageRating? = null,
6868
forceDefaultAvatarImage: Boolean? = null,
6969
): String {
70-
return gravatarImageUrlToGravatarImageUri(url, size, defaultAvatarImage, rating, forceDefaultAvatarImage).toString()
70+
return rewriteGravatarImageUriQueryParams(url, size, defaultAvatarImage, rating, forceDefaultAvatarImage).toString()
7171
}
7272

7373
/**
@@ -79,7 +79,7 @@ fun gravatarImageUrlToGravatarImageUrl(
7979
* @param rating Image rating. Optional: default to General, suitable for display on all websites with any audience
8080
* @param forceDefaultAvatarImage Force default avatar image. Optional: default to false
8181
*/
82-
fun gravatarImageUrlToGravatarImageUri(
82+
fun rewriteGravatarImageUriQueryParams(
8383
url: String,
8484
size: Int? = null,
8585
defaultAvatarImage: DefaultAvatarImage? = null,

gravatar/src/test/java/com/gravatar/GravatarUtilsTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class GravatarUtilsTest {
8989
fun `rewrite gravatar url must replace size and default`() {
9090
assertEquals(
9191
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66",
92-
gravatarImageUrlToGravatarImageUrl(
92+
rewriteGravatarImageUrlQueryParams(
9393
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
9494
"970a1e66?d=identicon&s=42",
9595
),
@@ -101,7 +101,7 @@ class GravatarUtilsTest {
101101
assertEquals(
102102
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66" +
103103
"?d=identicon&s=42&r=pg&f=y",
104-
gravatarImageUrlToGravatarImageUrl(
104+
rewriteGravatarImageUrlQueryParams(
105105
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
106106
"970a1e66",
107107
42,
@@ -116,7 +116,7 @@ class GravatarUtilsTest {
116116
fun `rewrite gravatar url must remove size and default if no parameter given`() {
117117
assertEquals(
118118
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66",
119-
gravatarImageUrlToGravatarImageUrl(
119+
rewriteGravatarImageUrlQueryParams(
120120
"https://www.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
121121
"970a1e66?d=identicon&s=42",
122122
),
@@ -127,7 +127,7 @@ class GravatarUtilsTest {
127127
fun `keep url scheme on gravatar urls and drop parameters`() {
128128
assertEquals(
129129
"http://gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66",
130-
gravatarImageUrlToGravatarImageUrl(
130+
rewriteGravatarImageUrlQueryParams(
131131
"http://gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
132132
"970a1e66?d=identicon",
133133
),
@@ -139,7 +139,7 @@ class GravatarUtilsTest {
139139
assertEquals(
140140
"https://gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66" +
141141
"?d=identicon&s=42",
142-
gravatarImageUrlToGravatarImageUrl(
142+
rewriteGravatarImageUrlQueryParams(
143143
"https://gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
144144
"970a1e66?d=identicon&s=42",
145145
42,
@@ -153,7 +153,7 @@ class GravatarUtilsTest {
153153
assertEquals(
154154
"https://1.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66" +
155155
"?d=identicon&s=42",
156-
gravatarImageUrlToGravatarImageUrl(
156+
rewriteGravatarImageUrlQueryParams(
157157
"https://1.gravatar.com/avatar/31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe" +
158158
"970a1e66?d=identicon&s=42",
159159
42,
@@ -165,7 +165,7 @@ class GravatarUtilsTest {
165165
@Test
166166
fun `rewrite gravatar url fails on a non gravatar URL`() {
167167
assertThrows(IllegalArgumentException::class.java) {
168-
gravatarImageUrlToGravatarImageUrl(
168+
rewriteGravatarImageUrlQueryParams(
169169
"https://example.com/avatar/oiresntioes",
170170
)
171171
}

0 commit comments

Comments
 (0)