Merge pull request #46 from wordpress-mobile/issue/rename_method

ScoutHarris · web-flow · commit 69a1a0594e43 · 2019-10-29T11:48:59.000-06:00
Rename md5 method
diff --git a/WordPressUI.podspec b/WordPressUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressUI"
-  s.version       = "1.4"
+  s.version       = "1.5-beta.1"
   s.summary       = "Home of reusable WordPress UI components."
 
   s.description   = <<-DESC
diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
 		B5C82AE22077C01B00DB2E78 /* UILabel+SuggestSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+SuggestSize.h"; sourceTree = "<group>"; };
 		B5C82AE42077C02100DB2E78 /* UILabel+SuggestSize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+SuggestSize.m"; sourceTree = "<group>"; };
 		B5D91457206AD8BA00EF333D /* FancyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FancyButton.swift; sourceTree = "<group>"; };
-		FF20AD1620B76A2300082398 /* WordPressUI.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WordPressUI.podspec; sourceTree = "<group>"; };
+		FF20AD1620B76A2300082398 /* WordPressUI.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WordPressUI.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
diff --git a/WordPressUI/Extensions/Gravatar/Gravatar.swift b/WordPressUI/Extensions/Gravatar/Gravatar.swift
@@ -4,7 +4,6 @@ public struct Gravatar {
     fileprivate struct Defaults {
         static let scheme = "https"
         static let host = "secure.gravatar.com"
-        // unknownHash = md5("unknown@gravatar.com")
         static let unknownHash = "ad516503a11cd5ca435acc9bb6523536"
     }
 
diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h b/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h
@@ -2,6 +2,6 @@
 
 @interface NSString (Gravatar)
 
-- (NSString *)md5;
+- (NSString *)md5Hash;
 
 @end
diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m b/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m
@@ -4,7 +4,7 @@
 
 @implementation NSString (Gravatar)
 
-- (NSString *)md5
+- (NSString *)md5Hash
 {
     const char *cStr = [self UTF8String];
     unsigned char result[CC_MD5_DIGEST_LENGTH];
diff --git a/WordPressUI/Extensions/UIImageView+Gravatar.swift b/WordPressUI/Extensions/UIImageView+Gravatar.swift
@@ -213,7 +213,7 @@ extension UIImageView {
         return email
             .lowercased()
             .trimmingCharacters(in: .whitespaces)
-            .md5()
+            .md5Hash()
     }
 
     /// Returns the required gravatar size. If the current view's size is zero, falls back to the default size.

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ public struct Gravatar {`
`4`	`4`	`fileprivate struct Defaults {`
`5`	`5`	`static let scheme = "https"`
`6`	`6`	`static let host = "secure.gravatar.com"`
`7`		`- // unknownHash = md5("[email protected]")`
`8`	`7`	`static let unknownHash = "ad516503a11cd5ca435acc9bb6523536"`
`9`	`8`	`}`
`10`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`@implementation NSString (Gravatar)`
`6`	`6`
`7`		`-- (NSString *)md5`
	`7`	`+- (NSString *)md5Hash`
`8`	`8`	`{`
`9`	`9`	`const char *cStr = [self UTF8String];`
`10`	`10`	`unsigned char result[CC_MD5_DIGEST_LENGTH];`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ extension UIImageView {`
`213`	`213`	`return email`
`214`	`214`	`.lowercased()`
`215`	`215`	`.trimmingCharacters(in: .whitespaces)`
`216`		`- .md5()`
	`216`	`+ .md5Hash()`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/// Returns the required gravatar size. If the current view's size is zero, falls back to the default size.`